Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
24184938
Commit
24184938
authored
Nov 14, 2017
by
Alexey Botchkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-11881 Empty coordinates must be rejected in GeoJSON objects.
Check for the empty 'coordinates' array.
parent
56326528
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
60 additions
and
1 deletion
+60
-1
mysql-test/r/gis-json.result
mysql-test/r/gis-json.result
+15
-0
mysql-test/t/gis-json.test
mysql-test/t/gis-json.test
+4
-0
sql/item_geofunc.cc
sql/item_geofunc.cc
+3
-0
sql/share/errmsg-utf8.txt
sql/share/errmsg-utf8.txt
+3
-0
sql/spatial.cc
sql/spatial.cc
+34
-1
sql/spatial.h
sql/spatial.h
+1
-0
No files found.
mysql-test/r/gis-json.result
View file @
24184938
...
...
@@ -89,6 +89,21 @@ ST_AsGeoJSON(ST_GeomFromText("POINT(10 11)"), 100, 1)
SELECT ST_AsGeoJSON(ST_GeomFromText("POINT(10 11)"), 100, 5);
ST_AsGeoJSON(ST_GeomFromText("POINT(10 11)"), 100, 5)
{"bbox": [10, 11, 10, 11], "type": "Point", "coordinates": [10, 11]}
SELECT st_astext(st_geomfromgeojson('{"type": "MultiLineString","coordinates": []}')) as a;
a
NULL
Warnings:
Warning 4076 Incorrect GeoJSON format - empty 'coordinates' array.
SELECT st_astext(st_geomfromgeojson('{"type": "Polygon","coordinates": []}')) as a;
a
NULL
Warnings:
Warning 4076 Incorrect GeoJSON format - empty 'coordinates' array.
SELECT st_astext(st_geomfromgeojson('{"type": "MultiPolygon","coordinates": []}')) as a;
a
NULL
Warnings:
Warning 4076 Incorrect GeoJSON format - empty 'coordinates' array.
#
# End of 10.2 tests
#
mysql-test/t/gis-json.test
View file @
24184938
...
...
@@ -40,6 +40,10 @@ SELECT ST_AsGeoJSON(ST_GeomFromText('POINT(5.363 7.266)'),10);
SELECT
ST_AsGeoJSON
(
ST_GeomFromText
(
"POINT(10 11)"
),
100
,
1
);
SELECT
ST_AsGeoJSON
(
ST_GeomFromText
(
"POINT(10 11)"
),
100
,
5
);
SELECT
st_astext
(
st_geomfromgeojson
(
'{"type": "MultiLineString","coordinates": []}'
))
as
a
;
SELECT
st_astext
(
st_geomfromgeojson
(
'{"type": "Polygon","coordinates": []}'
))
as
a
;
SELECT
st_astext
(
st_geomfromgeojson
(
'{"type": "MultiPolygon","coordinates": []}'
))
as
a
;
--
echo
#
--
echo
# End of 10.2 tests
--
echo
#
sql/item_geofunc.cc
View file @
24184938
...
...
@@ -174,6 +174,9 @@ String *Item_func_geometry_from_json::val_str(String *str)
case
Geometry
:
:
GEOJ_TOO_FEW_POINTS
:
code
=
ER_GEOJSON_TOO_FEW_POINTS
;
break
;
case
Geometry
:
:
GEOJ_EMPTY_COORDINATES
:
code
=
ER_GEOJSON_EMPTY_COORDINATES
;
break
;
case
Geometry
:
:
GEOJ_POLYGON_NOT_CLOSED
:
code
=
ER_GEOJSON_NOT_CLOSED
;
break
;
...
...
sql/share/errmsg-utf8.txt
View file @
24184938
...
...
@@ -7746,3 +7746,6 @@ ER_SUM_FUNC_WITH_WINDOW_FUNC_AS_ARG
ER_NET_OK_PACKET_TOO_LARGE
eng "OK packet too large"
ER_GEOJSON_EMPTY_COORDINATES
eng "Incorrect GeoJSON format - empty 'coordinates' array."
sql/spatial.cc
View file @
24184938
...
...
@@ -1041,7 +1041,7 @@ bool Gis_line_string::init_from_json(json_engine_t *je, bool er_on_3D,
}
if
(
n_points
<
1
)
{
je
->
s
.
error
=
GEOJ_TOO_FEW_POINTS
;
je
->
s
.
error
=
G
eometry
::
G
EOJ_TOO_FEW_POINTS
;
return
TRUE
;
}
wkb
->
write_at_position
(
np_pos
,
n_points
);
...
...
@@ -1440,6 +1440,15 @@ bool Gis_polygon::init_from_json(json_engine_t *je, bool er_on_3D, String *wkb)
}
n_linear_rings
++
;
}
if
(
je
->
s
.
error
)
return
TRUE
;
if
(
n_linear_rings
==
0
)
{
je
->
s
.
error
=
Geometry
::
GEOJ_EMPTY_COORDINATES
;
return
TRUE
;
}
wkb
->
write_at_position
(
lr_pos
,
n_linear_rings
);
return
FALSE
;
}
...
...
@@ -1945,6 +1954,14 @@ bool Gis_multi_point::init_from_json(json_engine_t *je, bool er_on_3D,
n_points
++
;
}
if
(
je
->
s
.
error
)
return
TRUE
;
if
(
n_points
==
0
)
{
je
->
s
.
error
=
Geometry
::
GEOJ_EMPTY_COORDINATES
;
return
TRUE
;
}
wkb
->
write_at_position
(
np_pos
,
n_points
);
return
FALSE
;
}
...
...
@@ -2214,6 +2231,15 @@ bool Gis_multi_line_string::init_from_json(json_engine_t *je, bool er_on_3D,
n_line_strings
++
;
}
if
(
je
->
s
.
error
)
return
TRUE
;
if
(
n_line_strings
==
0
)
{
je
->
s
.
error
=
Geometry
::
GEOJ_EMPTY_COORDINATES
;
return
TRUE
;
}
wkb
->
write_at_position
(
ls_pos
,
n_line_strings
);
return
FALSE
;
}
...
...
@@ -2603,6 +2629,13 @@ bool Gis_multi_polygon::init_from_json(json_engine_t *je, bool er_on_3D,
n_polygons
++
;
}
if
(
je
->
s
.
error
)
return
TRUE
;
if
(
n_polygons
==
0
)
{
je
->
s
.
error
=
Geometry
::
GEOJ_EMPTY_COORDINATES
;
return
TRUE
;
}
wkb
->
write_at_position
(
np_pos
,
n_polygons
);
return
FALSE
;
}
...
...
sql/spatial.h
View file @
24184938
...
...
@@ -256,6 +256,7 @@ class Geometry
GEOJ_TOO_FEW_POINTS
=
2
,
GEOJ_POLYGON_NOT_CLOSED
=
3
,
GEOJ_DIMENSION_NOT_SUPPORTED
=
4
,
GEOJ_EMPTY_COORDINATES
=
5
,
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment