From 5cdf133c683e625f3bdf4634f337b855ed06651e Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Mon, 23 May 2016 17:59:10 +1000 Subject: [PATCH] bug #81399: Use numberic rounding in gis test cases (Part 2) --replace_numberic_round used for the following test cases * gis.geometry_class_attri_prop * gis.spatial_analysis_functions_distance * gis.spatial_analysis_functions_centroid --- .../suite/gis/r/geometry_class_attri_prop.result | 120 ++++++++++----------- .../r/spatial_analysis_functions_centroid.result | 2 +- .../r/spatial_analysis_functions_distance.result | 56 +++++----- .../suite/gis/t/geometry_class_attri_prop.test | 10 ++ .../gis/t/spatial_analysis_functions_centroid.test | 2 + .../gis/t/spatial_analysis_functions_distance.test | 32 ++++++ 6 files changed, 133 insertions(+), 89 deletions(-) diff --git a/mysql-test/suite/gis/r/geometry_class_attri_prop.result b/mysql-test/suite/gis/r/geometry_class_attri_prop.result index e023700..03bdb01 100644 --- a/mysql-test/suite/gis/r/geometry_class_attri_prop.result +++ b/mysql-test/suite/gis/r/geometry_class_attri_prop.result @@ -1172,28 +1172,28 @@ fid ST_ASTEXT(ST_CENTROID(g)) 205 POINT(12 12) 206 POINT(50 50) 207 POINT(2.5 2.5) -208 POINT(-5.954915028125264 0.9549150281252626) -209 POINT(3.9999999999999996 3.9999999999999996) +208 POINT(-5.9549150281 0.9549150281) +209 POINT(4 4) 210 POINT(2.5 2.5) -211 POINT(-22.47548783981962 -27.52451216018038) -212 POINT(792.8932188134524 207.10678118654755) +211 POINT(-22.4754878398 -27.5245121602) +212 POINT(792.8932188135 207.1067811865) 213 POINT(1000 0) -214 POINT(4.999999999999999 4.999999999999999) +214 POINT(5 5) 215 POINT(0 0) -301 POINT(1.6666666666666667 3.3333333333333335) +301 POINT(1.6666666667 3.3333333333) 302 POINT(2.5 2.5) 303 POINT(5 5) 304 POINT(25 25) 305 POINT(5 5) 306 POINT(5 5) -307 POINT(1.6666666666666667 3.3333333333333335) +307 POINT(1.6666666667 3.3333333333) 308 POINT(7.5 7.5) 309 POINT(5 5) -310 POINT(1.6666666666666667 3.3333333333333335) +310 POINT(1.6666666667 3.3333333333) 311 POINT(12.5 12.5) 312 POINT(15 15) -313 POINT(5 6.111111111111111) -314 POINT(0 3.3333333333333335) +313 POINT(5 6.1111111111) +314 POINT(0 3.3333333333) 315 POINT(5 5) 401 POINT(0 0) 402 POINT(2 2) @@ -1213,7 +1213,7 @@ fid ST_ASTEXT(ST_CENTROID(g)) 501 POINT(1 1) 502 POINT(2 2) 503 POINT(5 5) -504 POINT(16.666666666666668 16.666666666666668) +504 POINT(16.6666666667 16.6666666667) 505 POINT(0 0) 506 POINT(0 0) 507 POINT(1 1) @@ -1221,22 +1221,22 @@ fid ST_ASTEXT(ST_CENTROID(g)) 509 POINT(5 5) 510 POINT(2 2) 511 POINT(1 1) -512 POINT(23.421052631578945 23.421052631578945) +512 POINT(23.4210526316 23.4210526316) 513 POINT(5 5) 514 POINT(0 0) 515 POINT(0 0) -601 POINT(1.6666666666666667 3.3333333333333335) -602 POINT(4.166666666666667 5.833333333333333) +601 POINT(1.6666666667 3.3333333333) +602 POINT(4.1666666667 5.8333333333) 603 POINT(5 5) -604 POINT(1.6666666666666667 3.3333333333333335) -605 POINT(4.884353741496598 4.870748299319728) +604 POINT(1.6666666667 3.3333333333) +605 POINT(4.8843537415 4.8707482993) 606 POINT(0 0) 607 POINT(2.5 2.5) 608 POINT(5 5) 609 POINT(0 0) 610 POINT(-2.5 -2.5) 611 POINT(15 15) -612 POINT(3.450413223140496 3.450413223140496) +612 POINT(3.4504132231 3.4504132231) 613 POINT(0 0) 614 POINT(0 0) 615 POINT(5 0) @@ -1248,10 +1248,10 @@ fid ST_ASTEXT(ST_CENTROID(g)) 706 POINT(0 0) 707 POINT(0 0) 708 POINT(5 5) -709 POINT(1.004566210045662 2.146118721461187) +709 POINT(1.00456621 2.1461187215) 710 POINT(50 50) 711 POINT(5 5) -712 POINT(1.004566210045662 2.146118721461187) +712 POINT(1.00456621 2.1461187215) 713 POINT(5 5) 714 POINT(5 5) 715 POINT(5 5) @@ -2163,28 +2163,28 @@ fid ST_ASTEXT(ST_CENTROID(g)) 205 POINT(12 12) 206 POINT(50 50) 207 POINT(2.5 2.5) -208 POINT(-5.954915028125264 0.9549150281252626) -209 POINT(3.9999999999999996 3.9999999999999996) +208 POINT(-5.9549150281 0.9549150281) +209 POINT(4 4) 210 POINT(2.5 2.5) -211 POINT(-22.47548783981962 -27.52451216018038) -212 POINT(792.8932188134524 207.10678118654755) +211 POINT(-22.4754878398 -27.5245121602) +212 POINT(792.8932188135 207.1067811865) 213 POINT(1000 0) -214 POINT(4.999999999999999 4.999999999999999) +214 POINT(5 5) 215 POINT(0 0) -301 POINT(1.6666666666666667 3.3333333333333335) +301 POINT(1.6666666667 3.3333333333) 302 POINT(2.5 2.5) 303 POINT(5 5) 304 POINT(25 25) 305 POINT(5 5) 306 POINT(5 5) -307 POINT(1.6666666666666667 3.3333333333333335) +307 POINT(1.6666666667 3.3333333333) 308 POINT(7.5 7.5) 309 POINT(5 5) -310 POINT(1.6666666666666667 3.3333333333333335) +310 POINT(1.6666666667 3.3333333333) 311 POINT(12.5 12.5) 312 POINT(15 15) -313 POINT(5 6.111111111111111) -314 POINT(0 3.3333333333333335) +313 POINT(5 6.1111111111) +314 POINT(0 3.3333333333) 315 POINT(5 5) 401 POINT(0 0) 402 POINT(2 2) @@ -2204,7 +2204,7 @@ fid ST_ASTEXT(ST_CENTROID(g)) 501 POINT(1 1) 502 POINT(2 2) 503 POINT(5 5) -504 POINT(16.666666666666668 16.666666666666668) +504 POINT(16.6666666667 16.6666666667) 505 POINT(0 0) 506 POINT(0 0) 507 POINT(1 1) @@ -2212,22 +2212,22 @@ fid ST_ASTEXT(ST_CENTROID(g)) 509 POINT(5 5) 510 POINT(2 2) 511 POINT(1 1) -512 POINT(23.421052631578945 23.421052631578945) +512 POINT(23.4210526316 23.4210526316) 513 POINT(5 5) 514 POINT(0 0) 515 POINT(0 0) -601 POINT(1.6666666666666667 3.3333333333333335) -602 POINT(4.166666666666667 5.833333333333333) +601 POINT(1.6666666667 3.3333333333) +602 POINT(4.1666666667 5.8333333333) 603 POINT(5 5) -604 POINT(1.6666666666666667 3.3333333333333335) -605 POINT(4.884353741496598 4.870748299319728) +604 POINT(1.6666666667 3.3333333333) +605 POINT(4.8843537415 4.8707482993) 606 POINT(0 0) 607 POINT(2.5 2.5) 608 POINT(5 5) 609 POINT(0 0) 610 POINT(-2.5 -2.5) 611 POINT(15 15) -612 POINT(3.450413223140496 3.450413223140496) +612 POINT(3.4504132231 3.4504132231) 613 POINT(0 0) 614 POINT(0 0) 615 POINT(5 0) @@ -2239,10 +2239,10 @@ fid ST_ASTEXT(ST_CENTROID(g)) 706 POINT(0 0) 707 POINT(0 0) 708 POINT(5 5) -709 POINT(1.004566210045662 2.146118721461187) +709 POINT(1.00456621 2.1461187215) 710 POINT(50 50) 711 POINT(5 5) -712 POINT(1.004566210045662 2.146118721461187) +712 POINT(1.00456621 2.1461187215) 713 POINT(5 5) 714 POINT(5 5) 715 POINT(5 5) @@ -3137,28 +3137,28 @@ fid ST_ASTEXT(ST_CENTROID(g)) 205 POINT(12 12) 206 POINT(50 50) 207 POINT(2.5 2.5) -208 POINT(-5.954915028125264 0.9549150281252626) -209 POINT(3.9999999999999996 3.9999999999999996) +208 POINT(-5.9549150281 0.9549150281) +209 POINT(4 4) 210 POINT(2.5 2.5) -211 POINT(-22.47548783981962 -27.52451216018038) -212 POINT(792.8932188134524 207.10678118654755) +211 POINT(-22.4754878398 -27.5245121602) +212 POINT(792.8932188135 207.1067811865) 213 POINT(1000 0) -214 POINT(4.999999999999999 4.999999999999999) +214 POINT(5 5) 215 POINT(0 0) -301 POINT(1.6666666666666667 3.3333333333333335) +301 POINT(1.6666666667 3.3333333333) 302 POINT(2.5 2.5) 303 POINT(5 5) 304 POINT(25 25) 305 POINT(5 5) 306 POINT(5 5) -307 POINT(1.6666666666666667 3.3333333333333335) +307 POINT(1.6666666667 3.3333333333) 308 POINT(7.5 7.5) 309 POINT(5 5) -310 POINT(1.6666666666666667 3.3333333333333335) +310 POINT(1.6666666667 3.3333333333) 311 POINT(12.5 12.5) 312 POINT(15 15) -313 POINT(5 6.111111111111111) -314 POINT(0 3.3333333333333335) +313 POINT(5 6.1111111111) +314 POINT(0 3.3333333333) 315 POINT(5 5) 401 POINT(0 0) 402 POINT(2 2) @@ -3178,7 +3178,7 @@ fid ST_ASTEXT(ST_CENTROID(g)) 501 POINT(1 1) 502 POINT(2 2) 503 POINT(5 5) -504 POINT(16.666666666666668 16.666666666666668) +504 POINT(16.6666666667 16.6666666667) 505 POINT(0 0) 506 POINT(0 0) 507 POINT(1 1) @@ -3186,22 +3186,22 @@ fid ST_ASTEXT(ST_CENTROID(g)) 509 POINT(5 5) 510 POINT(2 2) 511 POINT(1 1) -512 POINT(23.421052631578945 23.421052631578945) +512 POINT(23.4210526316 23.4210526316) 513 POINT(5 5) 514 POINT(0 0) 515 POINT(0 0) -601 POINT(1.6666666666666667 3.3333333333333335) -602 POINT(4.166666666666667 5.833333333333333) +601 POINT(1.6666666667 3.3333333333) +602 POINT(4.1666666667 5.8333333333) 603 POINT(5 5) -604 POINT(1.6666666666666667 3.3333333333333335) -605 POINT(4.884353741496598 4.870748299319728) +604 POINT(1.6666666667 3.3333333333) +605 POINT(4.8843537415 4.8707482993) 606 POINT(0 0) 607 POINT(2.5 2.5) 608 POINT(5 5) 609 POINT(0 0) 610 POINT(-2.5 -2.5) 611 POINT(15 15) -612 POINT(3.450413223140496 3.450413223140496) +612 POINT(3.4504132231 3.4504132231) 613 POINT(0 0) 614 POINT(0 0) 615 POINT(5 0) @@ -3213,10 +3213,10 @@ fid ST_ASTEXT(ST_CENTROID(g)) 706 POINT(0 0) 707 POINT(0 0) 708 POINT(5 5) -709 POINT(1.004566210045662 2.146118721461187) +709 POINT(1.00456621 2.1461187215) 710 POINT(50 50) 711 POINT(5 5) -712 POINT(1.004566210045662 2.146118721461187) +712 POINT(1.00456621 2.1461187215) 713 POINT(5 5) 714 POINT(5 5) 715 POINT(5 5) @@ -4451,10 +4451,10 @@ STD(ST_DIMENSION(g)) 0.8235059090550115 SELECT STD(ST_ISSIMPLE(g)) FROM gis_geometry; STD(ST_ISSIMPLE(g)) -0.3062463845869244 +0.3062463846 SELECT STD(ST_AREA(g)) FROM gis_geometry; STD(ST_AREA(g)) -245.96312077229248 +245.9631207723 SELECT STD(ST_ISEMPTY(g)) FROM gis_geometry; STD(ST_ISEMPTY(g)) 0 @@ -4473,7 +4473,7 @@ AVG(ST_ISSIMPLE(g)) 0.8952 SELECT AVG(ST_AREA(g)) FROM gis_geometry; AVG(ST_AREA(g)) -57.147619047619045 +57.1476190476 SELECT AVG(ST_ISEMPTY(g)) FROM gis_geometry; AVG(ST_ISEMPTY(g)) 0.0000 diff --git a/mysql-test/suite/gis/r/spatial_analysis_functions_centroid.result b/mysql-test/suite/gis/r/spatial_analysis_functions_centroid.result index c7e8a47..fd443b0 100644 --- a/mysql-test/suite/gis/r/spatial_analysis_functions_centroid.result +++ b/mysql-test/suite/gis/r/spatial_analysis_functions_centroid.result @@ -115,7 +115,7 @@ ST_ASTEXT(ST_CENTROID(ST_GEOMFROMTEXT(@star_lines_near_vertical))) POINT(7.5 18.75) SELECT ST_ASTEXT(ST_CENTROID(ST_GEOMFROMTEXT(@star_lines_near_horizontal))); ST_ASTEXT(ST_CENTROID(ST_GEOMFROMTEXT(@star_lines_near_horizontal))) -POINT(9.333108739249747 15.167565043001009) +POINT(9.3331087392 15.167565043) SELECT ST_ASTEXT(ST_CENTROID(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,-0.00 0),(0.0 0))'))); ERROR 22023: Invalid GIS data provided to function st_geometryfromtext. SELECT ST_ASTEXT(ST_CENTROID(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,0 5,5 5,5 0,0 0))'))); diff --git a/mysql-test/suite/gis/r/spatial_analysis_functions_distance.result b/mysql-test/suite/gis/r/spatial_analysis_functions_distance.result index 97fbb7c..aaabfe9 100644 --- a/mysql-test/suite/gis/r/spatial_analysis_functions_distance.result +++ b/mysql-test/suite/gis/r/spatial_analysis_functions_distance.result @@ -523,7 +523,7 @@ ST_DISTANCE(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10)'),ST_GEOMFROMTEXT('LINESTRING 0 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10)'),ST_GEOMFROMTEXT('LINESTRING(0 10,10 19)')); ST_DISTANCE(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10)'),ST_GEOMFROMTEXT('LINESTRING(0 10,10 19)')) -6.689647316224496 +6.6896473162 SELECT ST_DISTANCE(g,ST_GEOMFROMTEXT(@star_top_to_center)) FROM gis_geometrycollection WHERE fid=111; ST_DISTANCE(g,ST_GEOMFROMTEXT(@star_top_to_center)) 0 @@ -604,7 +604,7 @@ ST_DISTANCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collect 0 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(0 5)))')); ST_DISTANCE(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(0 5)))')) -3.5355339059327378 +3.5355339059 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('LINESTRING(4.5 4.5,5.5 5.5)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(' 'LINESTRING(1 1,2 2,3 3,4 4),' 'POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4)))')); @@ -776,7 +776,7 @@ ST_DISTANCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEX 0 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,10 10))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(0 5)))')); ST_DISTANCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,10 10))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(0 5)))')) -3.5355339059327378 +3.5355339059 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTILINESTRING((4.5 4.5,5.5 5.5))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(' 'LINESTRING(1 1,2 2,3 3,4 4),' 'POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4)))')); @@ -807,7 +807,7 @@ ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEX 0 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('POINT(20 20)')); ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('POINT(20 20)')) -14.142135623730951 +14.1421356237 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('POINT(5 5)')); ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('POINT(5 5)')) 1 @@ -834,7 +834,7 @@ ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEX 0 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('MULTIPOINT(20 20,-9 -9)')); ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('MULTIPOINT(20 20,-9 -9)')) -12.727922061357855 +12.7279220614 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('MULTIPOINT(4.5 4.5,5.5 5.5)')); ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('MULTIPOINT(4.5 4.5,5.5 5.5)')) 0.5 @@ -861,10 +861,10 @@ ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEX 0 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('LINESTRING(110 110,-100 50)')); ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('LINESTRING(110 110,-100 50)')) -65.93307069537072 +65.9330706954 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('LINESTRING(4.3 4.3,5.5 5.5)')); ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('LINESTRING(4.3 4.3,5.5 5.5)')) -0.2999999999999998 +0.3 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('LINESTRING(4 4,6 6,8 8,15 15)')); ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('LINESTRING(4 4,6 6,8 8,15 15)')) 0 @@ -894,7 +894,7 @@ SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOM ERROR 22023: Invalid GIS data provided to function st_geometryfromtext. SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('MULTILINESTRING((4.3 4.3,5.5 5.5))')); ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('MULTILINESTRING((4.3 4.3,5.5 5.5))')) -0.2999999999999998 +0.3 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'), ST_GEOMFROMTEXT('MULTILINESTRING((0 0,2 2,4 4,6 6),(8 8,10 10,15 15))')); ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'), @@ -922,10 +922,10 @@ ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEX 0 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('POLYGON((110 110,-100 100,-50 50,110 110))')); ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('POLYGON((110 110,-100 100,-50 50,110 110))')) -55.009339182181364 +55.0093391822 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('POLYGON((4.3 4.3,4.5 4.8,5 5.5,4.3 4.3))')); ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('POLYGON((4.3 4.3,4.5 4.8,5 5.5,4.3 4.3))')) -0.2999999999999998 +0.3 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('POLYGON((4 4,6 6,8 8,10 15,4 4))')); ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('POLYGON((4 4,6 6,8 8,10 15,4 4))')) 0 @@ -943,7 +943,7 @@ ST_DISTANCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_of_elems) 0 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('MULTIPOLYGON(((110 110,-100 100,-50 50,110 110)))')); ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('MULTIPOLYGON(((110 110,-100 100,-50 50,110 110)))')) -55.009339182181364 +55.0093391822 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('MULTIPOLYGON(((5 0,20 20,100 100,5 0)),((0 0,-10 -10,10 100,0 0)))')); ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('MULTIPOLYGON(((5 0,20 20,100 100,5 0)),((0 0,-10 -10,10 100,0 0)))')) 0 @@ -1005,7 +1005,7 @@ ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 4,4 4,0 0)),((0 5,0 10,10 5,0 0 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 4,4 4,0 0)),((0 5,0 10,10 5,0 5)))'),ST_GEOMFROMTEXT('POINT(20 20)')); ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 4,4 4,0 0)),((0 5,0 10,10 5,0 5)))'),ST_GEOMFROMTEXT('POINT(20 20)')) -18.027756377319946 +18.0277563773 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4)),((4 4,4 6,6 6,6 4,4 4)))'), ST_GEOMFROMTEXT('POINT(5 5)')); ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4)),((4 4,4 6,6 6,6 4,4 4)))'), @@ -1065,7 +1065,7 @@ ST_DISTANCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_top_to_center) 0 SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')); ST_DISTANCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')) -7.3979544287410794 +7.3979544287 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 4,4 4,0 0)),((0 5,0 10,10 5,0 5)))'),ST_GEOMFROMTEXT('LINESTRING(0 8,100 100)')); ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 4,4 4,0 0)),((0 5,0 10,10 5,0 5)))'),ST_GEOMFROMTEXT('LINESTRING(0 8,100 100)')) 0 @@ -1144,7 +1144,7 @@ ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 4,4 4,0 0)),((0 5,0 10,10 5,0 0 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 4,4 4,0 0)),((0 5,0 10,10 5,0 5)))'),ST_GEOMFROMTEXT('POLYGON((20 20,20 30,30 30,30 20,20 20))')); ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 4,4 4,0 0)),((0 5,0 10,10 5,0 5)))'),ST_GEOMFROMTEXT('POLYGON((20 20,20 30,30 30,30 20,20 20))')) -18.027756377319946 +18.0277563773 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4)),((4 4,4 6,6 6,6 4,4 4)))'), ST_GEOMFROMTEXT('POLYGON((4 4,4 6,6 6,6 4,4 4))')); ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4)),((4 4,4 6,6 6,6 4,4 4)))'), @@ -1212,7 +1212,7 @@ SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 4,4 4,0 0)),((0 5,0 10, ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(50 55)))')); ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 4,4 4,0 0)),((0 5,0 10,10 5,0 5)))'), ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(50 55)))')) -64.03124237432849 +64.0312423743 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 4,4 4,0 0)),((0 5,0 10,10 5,0 5)))'), ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((20 20,20 30,30 30,30 20,20 20),(0 0,0 10,10 10,10 0,0 0)))')); ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 4,4 4,0 0)),((0 5,0 10,10 5,0 5)))'), @@ -1249,16 +1249,16 @@ ST_DISTANCE(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT('POIN 15 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(50 50)))'),ST_GEOMFROMTEXT('POINT(0 0)')); ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(50 50)))'),ST_GEOMFROMTEXT('POINT(0 0)')) -70.71067811865476 +70.7106781187 Select ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,0 10,10 10,10 0,0 0)))'),ST_GEOMFROMTEXT('POINT(100 100)')); ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,0 10,10 10,10 0,0 0)))'),ST_GEOMFROMTEXT('POINT(100 100)')) -127.27922061357856 +127.2792206136 Select ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(),POLYGON((0 0,0 10,10 10,10 0,0 0)))'),ST_GEOMFROMTEXT('POINT(100 100)')); ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(),POLYGON((0 0,0 10,10 10,10 0,0 0)))'),ST_GEOMFROMTEXT('POINT(100 100)')) -127.27922061357856 +127.2792206136 Select ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,0 10,10 10,10 0,0 0)),GEOMETRYCOLLECTION())'),ST_GEOMFROMTEXT('POINT(100 100)')); ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,0 10,10 10,10 0,0 0)),GEOMETRYCOLLECTION())'),ST_GEOMFROMTEXT('POINT(100 100)')) -127.27922061357856 +127.2792206136 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((20 20,20 30,30 30,30 20,20 20),(0 0,0 10,10 10,10 0,0 0)))'), ST_GEOMFROMTEXT('POINT(20 20)')); ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((20 20,20 30,30 30,30 20,20 20),(0 0,0 10,10 10,10 0,0 0)))'), @@ -1291,13 +1291,13 @@ ST_DISTANCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOINT( 15 SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')); ST_DISTANCE(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')) -14.142135623730951 +14.1421356237 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(50 50)))'),ST_GEOMFROMTEXT('MULTIPOINT(0 0,100 100)')); ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(50 50)))'),ST_GEOMFROMTEXT('MULTIPOINT(0 0,100 100)')) -70.71067811865476 +70.7106781187 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,10 10,20 20),GEOMETRYCOLLECTION())'),ST_GEOMFROMTEXT('MULTIPOINT(5 0,10 0)')); ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,10 10,20 20),GEOMETRYCOLLECTION())'),ST_GEOMFROMTEXT('MULTIPOINT(5 0,10 0)')) -3.5355339059327378 +3.5355339059 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((20 20,20 30,30 30,30 20,20 20),(0 0,0 10,10 10,10 0,0 0)))'), ST_GEOMFROMTEXT('MULTIPOINT(20 20,40 40,60 60)')); ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((20 20,20 30,30 30,30 20,20 20),(0 0,0 10,10 10,10 0,0 0)))'), @@ -1327,10 +1327,10 @@ ST_DISTANCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top_to 0 SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')); ST_DISTANCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')) -7.3979544287410794 +7.3979544287 SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')); ST_DISTANCE(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')) -2.465984809580362 +2.4659848096 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(50 50)))'),ST_GEOMFROMTEXT('LINESTRING(0 0,100 100)')); ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(50 50)))'),ST_GEOMFROMTEXT('LINESTRING(0 0,100 100)')) 0 @@ -1350,10 +1350,10 @@ ST_GEOMFROMTEXT('LINESTRING(20 20,40 40,60 60)')) 0 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,10 10,20 20))'),ST_GEOMFROMTEXT('LINESTRING(5 0,10 0)')); ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,10 10,20 20))'),ST_GEOMFROMTEXT('LINESTRING(5 0,10 0)')) -3.5355339059327378 +3.5355339059 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,10 10,20 20),GEOMETRYCOLLECTION())'),ST_GEOMFROMTEXT('LINESTRING(5 0,10 0)')); ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,10 10,20 20),GEOMETRYCOLLECTION())'),ST_GEOMFROMTEXT('LINESTRING(5 0,10 0)')) -3.5355339059327378 +3.5355339059 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(LINESTRING(1 1,2 2,3 3,4 4))),' 'POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4)))'), ST_GEOMFROMTEXT('LINESTRING(4.5 4.5,5.5 5.5)')); @@ -1421,7 +1421,7 @@ ST_DISTANCE(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT('POLY 0 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(50 50)))'),ST_GEOMFROMTEXT('POLYGON((0 0,30 40,90 100, 0 0))')); ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(50 50)))'),ST_GEOMFROMTEXT('POLYGON((0 0,30 40,90 100, 0 0))')) -3.716470731235831 +3.7164707312 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((20 20,20 30,30 30,30 20,20 20),(0 0,0 10,10 10,10 0,0 0)))'), ST_GEOMFROMTEXT('POLYGON((20 20,40 40,50 60,20 20))')); ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((20 20,20 30,30 30,30 20,20 20),(0 0,0 10,10 10,10 0,0 0)))'), @@ -1433,7 +1433,7 @@ ST_GEOMFROMTEXT('POLYGON((4.2 4.2,5 5,5.7 5.8,4.2 4.2))')); ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(LINESTRING(1 1,2 2,3 3,4 4))),' 'POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4)))'), ST_GEOMFROMTEXT('POLY -0.20000000000000018 +0.2 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4))),' 'GEOMETRYCOLLECTION(MULTIPOLYGON(((3 3,3 7,7 7,7 3,3 3),(4 4,4 6,6 6,6 4,4 4)))))'), ST_GEOMFROMTEXT('POLYGON((4 4,6 6,8 8,10 20,4 4))')); diff --git a/mysql-test/suite/gis/t/geometry_class_attri_prop.test b/mysql-test/suite/gis/t/geometry_class_attri_prop.test index 55e90d4..d801174 100644 --- a/mysql-test/suite/gis/t/geometry_class_attri_prop.test +++ b/mysql-test/suite/gis/t/geometry_class_attri_prop.test @@ -395,10 +395,13 @@ SELECT COUNT(DISTINCT(ST_AREA(g))) FROM gis_geometry; ############################################################################################ --echo # Checking the Centroid of the spatial objects inserted into GEOMETRY class +--replace_numberic_round 10 SELECT fid, ST_ASTEXT(ST_CENTROID(g)) FROM gis_geometry; +--replace_numberic_round 10 SELECT COUNT(ST_CENTROID(g)) FROM gis_geometry; +--replace_numberic_round 10 SELECT COUNT(DISTINCT(ST_CENTROID(g))) FROM gis_geometry; ############################################################################################ @@ -445,6 +448,7 @@ END | DELIMITER ;| --echo # Call the proc +--replace_numberic_round 10 CALL geom_attri; --echo # Dropping the created procedure @@ -471,12 +475,14 @@ DELIMITER ;| UPDATE gis_geometry SET fid = 999 where fid = 111; --echo # Checking the GEOMETRY class properties on the spatial data in the gis_geometry_1 table +--replace_numberic_round 10 SELECT fid, ST_GEOMETRYTYPE(g) FROM gis_geometry_1; SELECT fid, ST_SRID(g) FROM gis_geometry_1; SELECT fid, ST_DIMENSION(g) FROM gis_geometry_1; SELECT fid, ST_ISSIMPLE(g) FROM gis_geometry_1; SELECT fid, ST_ASTEXT(ST_ENVELOPE(g)) FROM gis_geometry_1; SELECT fid, ST_AREA(g) FROM gis_geometry_1; +--replace_numberic_round 10 SELECT fid, ST_ASTEXT(ST_CENTROID(g)) FROM gis_geometry_1; SELECT fid, ST_ASTEXT(ST_CONVEXHULL(g)) FROM gis_geometry_1; SELECT fid, ST_ISEMPTY(g) FROM gis_geometry_1; @@ -591,10 +597,13 @@ SELECT STD(ST_SRID(g)) FROM gis_geometry; SELECT STD(ST_DIMENSION(g)) FROM gis_geometry; +--replace_numberic_round 10 SELECT STD(ST_ISSIMPLE(g)) FROM gis_geometry; +--replace_numberic_round 10 SELECT STD(ST_AREA(g)) FROM gis_geometry; +--replace_numberic_round 10 SELECT STD(ST_ISEMPTY(g)) FROM gis_geometry; --echo # Checking the AVG function @@ -606,6 +615,7 @@ SELECT AVG(ST_DIMENSION(g)) FROM gis_geometry; SELECT AVG(ST_ISSIMPLE(g)) FROM gis_geometry; +--replace_numberic_round 10 SELECT AVG(ST_AREA(g)) FROM gis_geometry; SELECT AVG(ST_ISEMPTY(g)) FROM gis_geometry; diff --git a/mysql-test/suite/gis/t/spatial_analysis_functions_centroid.test b/mysql-test/suite/gis/t/spatial_analysis_functions_centroid.test index 6b327c0..2cf43b0 100644 --- a/mysql-test/suite/gis/t/spatial_analysis_functions_centroid.test +++ b/mysql-test/suite/gis/t/spatial_analysis_functions_centroid.test @@ -68,6 +68,7 @@ INSERT INTO gis_geometrycollection VALUES (116,ST_GEOMFROMTEXT(@star_collection_multilinestr)); --enable_warnings +--replace_numberic_round 10 --echo # Checking the integrity of the above create/insert statements --echo # 17 rows. @@ -127,6 +128,7 @@ SELECT ST_ASTEXT(ST_CENTROID(g)) FROM gis_geometrycollection WHERE fid=110; SELECT ST_ASTEXT(ST_CENTROID(ST_GEOMFROMTEXT(@star_lines_near_vertical))); +--replace_numberic_round 10 SELECT ST_ASTEXT(ST_CENTROID(ST_GEOMFROMTEXT(@star_lines_near_horizontal))); --error ER_GIS_INVALID_DATA diff --git a/mysql-test/suite/gis/t/spatial_analysis_functions_distance.test b/mysql-test/suite/gis/t/spatial_analysis_functions_distance.test index 8fb706b..c0fc7ab 100644 --- a/mysql-test/suite/gis/t/spatial_analysis_functions_distance.test +++ b/mysql-test/suite/gis/t/spatial_analysis_functions_distance.test @@ -192,6 +192,7 @@ INSERT INTO gis_geometrycollection VALUES CREATE TABLE gis_geometrycollection_2 SELECT fid as fid2,g as g2 FROM gis_geometrycollection; +--replace_numberic_round 10 --echo # Checking the integrity of the above create/insert statements --echo # 64 rows. @@ -459,6 +460,7 @@ SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_li SELECT ST_DISTANCE(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10)'),ST_GEOMFROMTEXT('LINESTRING(0 10,10 0)')); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10)'),ST_GEOMFROMTEXT('LINESTRING(0 10,10 19)')); SELECT ST_DISTANCE(g,ST_GEOMFROMTEXT(@star_top_to_center)) FROM gis_geometrycollection WHERE fid=111; @@ -518,6 +520,7 @@ SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_ SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(0 5)))')); SELECT ST_DISTANCE(ST_GEOMFROMTEXT('LINESTRING(4.5 4.5,5.5 5.5)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(' @@ -639,6 +642,7 @@ SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@s SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_collection_elems)); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,10 10))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(0 5)))')); SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTILINESTRING((4.5 4.5,5.5 5.5))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(' @@ -660,6 +664,7 @@ SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('POINT(0 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('POINT(5 0)')); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('POINT(20 20)')); SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('POINT(5 5)')); @@ -679,6 +684,7 @@ SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('MULTIPO SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('MULTIPOINT(5 0,20 20)')); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('MULTIPOINT(20 20,-9 -9)')); SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('MULTIPOINT(4.5 4.5,5.5 5.5)')); @@ -698,8 +704,10 @@ SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_li SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('LINESTRING(5 0,20 20,100 100)')); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('LINESTRING(110 110,-100 50)')); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('LINESTRING(4.3 4.3,5.5 5.5)')); SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('LINESTRING(4 4,6 6,8 8,15 15)')); @@ -724,6 +732,7 @@ SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOM --error ER_GIS_INVALID_DATA SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('MULTILINESTRING((110 110,-100 100),(-50 50))')); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('MULTILINESTRING((4.3 4.3,5.5 5.5))')); SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'), @@ -743,8 +752,10 @@ SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star)); SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('POLYGON((5 0,20 20,100 100,5 0))')); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('POLYGON((110 110,-100 100,-50 50,110 110))')); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('POLYGON((4.3 4.3,4.5 4.8,5 5.5,4.3 4.3))')); SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('POLYGON((4 4,6 6,8 8,10 15,4 4))')); @@ -758,6 +769,7 @@ SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_of_elems)); SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_of_elems)); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('MULTIPOLYGON(((110 110,-100 100,-50 50,110 110)))')); SELECT ST_DISTANCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('MULTIPOLYGON(((5 0,20 20,100 100,5 0)),((0 0,-10 -10,10 100,0 0)))')); @@ -800,6 +812,7 @@ SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('POINT(30 30) SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 4,4 4,0 0)),((0 5,0 10,10 5,0 5)))'),ST_GEOMFROMTEXT('POINT(0 8)')); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 4,4 4,0 0)),((0 5,0 10,10 5,0 5)))'),ST_GEOMFROMTEXT('POINT(20 20)')); SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4)),((4 4,4 6,6 6,6 4,4 4)))'), @@ -840,6 +853,7 @@ SELECT ST_DISTANCE(g,ST_GEOMFROMTEXT(@star_bottom_points)) FROM gis_geometrycoll --echo #==================================================================================== SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_top_to_center)); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')); SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 4,4 4,0 0)),((0 5,0 10,10 5,0 5)))'),ST_GEOMFROMTEXT('LINESTRING(0 8,100 100)')); @@ -870,9 +884,11 @@ SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 4,4 4,0 0)),((0 5,0 10, SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 4,4 4,0 0)),((0 5,0 10,10 5,0 5)))'), ST_GEOMFROMTEXT('MULTILINESTRING((50 50,100 50),(-50 50,-40 50))')); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4)),((4 4,4 6,6 6,6 4,4 4)))'), ST_GEOMFROMTEXT('MULTILINESTRING((4.5 4.5,5.5 5.5))')); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0, 0 0),(4 4,4 6,6 6,6 4,4 4)),((10 10,10 20,20 20,20 10,10 10),(14 14,14 16,16 16,16 14,14 14)))'), ST_GEOMFROMTEXT('MULTILINESTRING((14.5 14.5,15.5 15.5))')); @@ -886,12 +902,14 @@ SELECT ST_DISTANCE(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)) FROM gis_geomet --echo #==================================================================================== SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_elem_vertical)); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star)); SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('POLYGON((0 0,15 25,35 0,0 0))')); SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 4,4 4,0 0)),((0 5,0 10,10 5,0 5)))'),ST_GEOMFROMTEXT('POLYGON((10 10,10 -10,-10 -10,-10 10,10 10))')); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 4,4 4,0 0)),((0 5,0 10,10 5,0 5)))'),ST_GEOMFROMTEXT('POLYGON((20 20,20 30,30 30,30 20,20 20))')); SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4)),((4 4,4 6,6 6,6 4,4 4)))'), @@ -936,6 +954,7 @@ SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collect SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_multilinestr)); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 4,4 4,0 0)),((0 5,0 10,10 5,0 5)))'), ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(50 55)))')); @@ -962,12 +981,16 @@ SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POIN SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT('POINT(30 30)')); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(50 50)))'),ST_GEOMFROMTEXT('POINT(0 0)')); +--replace_numberic_round 10 Select ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,0 10,10 10,10 0,0 0)))'),ST_GEOMFROMTEXT('POINT(100 100)')); +--replace_numberic_round 10 Select ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(),POLYGON((0 0,0 10,10 10,10 0,0 0)))'),ST_GEOMFROMTEXT('POINT(100 100)')); +--replace_numberic_round 10 Select ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,0 10,10 10,10 0,0 0)),GEOMETRYCOLLECTION())'),ST_GEOMFROMTEXT('POINT(100 100)')); SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((20 20,20 30,30 30,30 20,20 20),(0 0,0 10,10 10,10 0,0 0)))'), @@ -990,10 +1013,13 @@ SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(50 50)))'),ST_GEOMFROMTEXT('MULTIPOINT(0 0,100 100)')); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,10 10,20 20),GEOMETRYCOLLECTION())'),ST_GEOMFROMTEXT('MULTIPOINT(5 0,10 0)')); SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((20 20,20 30,30 30,30 20,20 20),(0 0,0 10,10 10,10 0,0 0)))'), @@ -1014,8 +1040,10 @@ SELECT ST_DISTANCE(g,ST_GEOMFROMTEXT(@star_bottom_points)) FROM gis_geometrycoll --echo #==================================================================================== SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top_to_center)); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')); SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(50 50)))'),ST_GEOMFROMTEXT('LINESTRING(0 0,100 100)')); @@ -1029,8 +1057,10 @@ Select ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,0 10,10 10,1 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((20 20,20 30,30 30,30 20,20 20),(0 0,0 10,10 10,10 0,0 0)))'), ST_GEOMFROMTEXT('LINESTRING(20 20,40 40,60 60)')); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,10 10,20 20))'),ST_GEOMFROMTEXT('LINESTRING(5 0,10 0)')); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,10 10,20 20),GEOMETRYCOLLECTION())'),ST_GEOMFROMTEXT('LINESTRING(5 0,10 0)')); SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(LINESTRING(1 1,2 2,3 3,4 4))),' @@ -1079,11 +1109,13 @@ SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POLY SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT('POLYGON((0 0,15 25,35 0,0 0))')); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(50 50)))'),ST_GEOMFROMTEXT('POLYGON((0 0,30 40,90 100, 0 0))')); SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((20 20,20 30,30 30,30 20,20 20),(0 0,0 10,10 10,10 0,0 0)))'), ST_GEOMFROMTEXT('POLYGON((20 20,40 40,50 60,20 20))')); +--replace_numberic_round 10 SELECT ST_DISTANCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(LINESTRING(1 1,2 2,3 3,4 4))),' 'POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4)))'), ST_GEOMFROMTEXT('POLYGON((4.2 4.2,5 5,5.7 5.8,4.2 4.2))'));