diff options
| -rw-r--r-- | mysql-test/r/gis.result | 11 | ||||
| -rw-r--r-- | mysql-test/t/gis.test | 6 | ||||
| -rw-r--r-- | sql/item_geofunc.cc | 16 |
3 files changed, 28 insertions, 5 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index 4f65aa2e500..f696466f38c 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -1378,7 +1378,7 @@ SELECT IsRing(LineFromWKB(AsBinary(Boundary(boundary)),SRID(boundary))) FROM named_places WHERE name = 'Goose Island'; IsRing(LineFromWKB(AsBinary(Boundary(boundary)),SRID(boundary))) -0 +1 # Conformance Item T21 SELECT GLength(centerline) FROM road_segments @@ -1765,3 +1765,12 @@ SRID 0 0 drop table t1; +# +# MDEV-7510 GIS: IsRing returns false for a primitive triangle. +# +select ST_IsRing(ST_LineFromText('LINESTRING(0 0,0 10,10 10,0 0)')); +ST_IsRing(ST_LineFromText('LINESTRING(0 0,0 10,10 10,0 0)')) +1 +select ST_IsRing(ST_LineFromText('LINESTRING(0 0,0 10,10 10,-10 -10, 0 -10, 0 0)')); +ST_IsRing(ST_LineFromText('LINESTRING(0 0,0 10,10 10,-10 -10, 0 -10, 0 0)')) +0 diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test index a4e95b7549e..888ee681eeb 100644 --- a/mysql-test/t/gis.test +++ b/mysql-test/t/gis.test @@ -1486,3 +1486,9 @@ ALTER TABLE t1 ADD fid INT NOT NULL; select SRID from information_schema.geometry_columns where F_TABLE_NAME='t1'; drop table t1; +--echo # +--echo # MDEV-7510 GIS: IsRing returns false for a primitive triangle. +--echo # +select ST_IsRing(ST_LineFromText('LINESTRING(0 0,0 10,10 10,0 0)')); +select ST_IsRing(ST_LineFromText('LINESTRING(0 0,0 10,10 10,-10 -10, 0 -10, 0 0)')); + diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index 7e8edbc8e7d..7f63388fc81 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -1867,7 +1867,6 @@ longlong Item_func_issimple::val_int() Gcalc_operation_transporter trn(&func, &collector); Geometry *g; int result= 1; - const Gcalc_scan_iterator::event_point *ev; MBR mbr; const char *c_end; @@ -1892,6 +1891,8 @@ longlong Item_func_issimple::val_int() while (scan_it.more_points()) { + const Gcalc_scan_iterator::event_point *ev, *next_ev; + if (scan_it.step()) goto mem_error; @@ -1899,11 +1900,18 @@ longlong Item_func_issimple::val_int() if (ev->simple_event()) continue; - if ((ev->event == scev_thread || ev->event == scev_single_point) && - !ev->get_next()) + next_ev= ev->get_next(); + if ((ev->event & (scev_thread | scev_single_point)) && !next_ev) + continue; + + if ((ev->event == scev_two_threads) && !next_ev->get_next()) continue; - if (ev->event == scev_two_threads && !ev->get_next()->get_next()) + /* If the first and last points of a curve coincide - that is */ + /* an exception to the rule and the line is considered as simple. */ + if ((next_ev && !next_ev->get_next()) && + (ev->event & (scev_thread | scev_end)) && + (next_ev->event & (scev_thread | scev_end))) continue; result= 0; |