Move out GEOS 3.8 specific result into a version-tested file

git-svn-id: http://svn.osgeo.org/postgis/trunk@17664 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/regress/core/Makefile.in b/regress/core/Makefile.in
index 3d04e528767fe28ffdeee42c5f643f3b44cdaa43..0cc1038735b4e9e77db58cefa83f2502ade13555 100644 (file)
--- a/regress/core/Makefile.in
+++ b/regress/core/Makefile.in
@@ -181,6 +181,13 @@ ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 37),1)
                frechet
 endif
 
+ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 38),1)
+       # GEOS-3.8 adds stable pointonsurface implementation
+       TESTS += \
+               geos38
+endif
+
+
 ifeq ($(INTERRUPTTESTS),yes)
        # Allow CI servers to configure --with-interrupt-tests
        TESTS += \

diff --git a/regress/core/geos38.sql b/regress/core/geos38.sql
new file mode 100644 (file)
index 0000000..3b38a58
--- /dev/null
+++ b/regress/core/geos38.sql
@@ -0,0 +1 @@
+select '#4103', ST_Intersects(ST_PointOnSurface('0103000020110F0000010000000A000000000000C41E644741000000EEA2A75A41000000F420644741000000629EA75A410000007A2D644741000000E49FA75A41000000C02E644741000000409DA75A41000000286A64474100000064A4A75A410000007867644741000000FAA9A75A41000000E82B644741000000D2A2A75A41000000222D64474100000046A0A75A41000000242B6447410000006CA4A75A41000000C41E644741000000EEA2A75A41'::geometry), '0103000020110F0000010000000A000000000000C41E644741000000EEA2A75A41000000F420644741000000629EA75A410000007A2D644741000000E49FA75A41000000C02E644741000000409DA75A41000000286A64474100000064A4A75A410000007867644741000000FAA9A75A41000000E82B644741000000D2A2A75A41000000222D64474100000046A0A75A41000000242B6447410000006CA4A75A41000000C41E644741000000EEA2A75A41'::geometry);

diff --git a/regress/core/geos38_expected b/regress/core/geos38_expected
new file mode 100644 (file)
index 0000000..f3647f0
--- /dev/null
+++ b/regress/core/geos38_expected
@@ -0,0 +1 @@
+#4103|t

diff --git a/regress/core/tickets.sql b/regress/core/tickets.sql
index a959bc1e918c0ad92eeefbb946b912f7b4d73bf4..9567e6e3986a30365f86fbb8d5c53202beed26bb 100644 (file)
--- a/regress/core/tickets.sql
+++ b/regress/core/tickets.sql
@@ -1092,8 +1092,6 @@ SELECT '#4055b', ST_SRID(unnest(ST_ClusterIntersecting(ARRAY['SRID=4326;POINT (3
 --#4089
 select '#4089', st_astext(st_geomfromtwkb(st_AsTWKB(st_GeometryFromText('LINESTRING Z(1 1 1, 3 3 1)'), 1, 0, 0, false, true)));
 
---select '#4103', ST_Intersects(ST_PointOnSurface('0103000020110F0000010000000A000000000000C41E644741000000EEA2A75A41000000F420644741000000629EA75A410000007A2D644741000000E49FA75A41000000C02E644741000000409DA75A41000000286A64474100000064A4A75A410000007867644741000000FAA9A75A41000000E82B644741000000D2A2A75A41000000222D64474100000046A0A75A41000000242B6447410000006CA4A75A41000000C41E644741000000EEA2A75A41'::geometry), '0103000020110F0000010000000A000000000000C41E644741000000EEA2A75A41000000F420644741000000629EA75A410000007A2D644741000000E49FA75A41000000C02E644741000000409DA75A41000000286A64474100000064A4A75A410000007867644741000000FAA9A75A41000000E82B644741000000D2A2A75A41000000222D64474100000046A0A75A41000000242B6447410000006CA4A75A41000000C41E644741000000EEA2A75A41'::geometry);
-
 -- #4081
 select '#4081',
 ST_DWithin(a, b, 110575, true) as within_110575_true,
@@ -1215,15 +1213,15 @@ SELECT 'relate_pattern212', ST_relate('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'::
 SELECT 'relate_pattern213', ST_relate('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'::geometry, 'GEOMETRYCOLLECTION (POINT(-1 0), LINESTRING(4 4,5 5))'::geometry, 'FF*FF****');
 
 -- equals - element inside polygon
-SELECT 'equals210', ST_equals('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'::geometry, 
+SELECT 'equals210', ST_equals('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'::geometry,
 'GEOMETRYCOLLECTION (POLYGON((0 0, 10 0, 10 10, 0 10, 0 0)),LINESTRING(0 2, 0 5))'::geometry);
 -- equals - element on border of polygon
-SELECT 'equals211', ST_equals('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'::geometry, 
+SELECT 'equals211', ST_equals('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'::geometry,
 'GEOMETRYCOLLECTION (POLYGON((0 0, 10 0, 10 10, 0 10, 0 0)),MULTIPOINT(0 2, 0 5))'::geometry);
 -- equals - element on border and inside polygon
-SELECT 'equals212', ST_equals('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'::geometry, 
+SELECT 'equals212', ST_equals('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'::geometry,
 'GEOMETRYCOLLECTION (POLYGON((0 0, 10 0, 10 10, 0 10, 0 0)),LINESTRING(0 2, 0 5, 5 5))'::geometry);
-SELECT 'equals213', ST_equals('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'::geometry, 
+SELECT 'equals213', ST_equals('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'::geometry,
 'GEOMETRYCOLLECTION (POLYGON((0 0, 10 0, 10 10, 0 10, 0 0)),MULTIPOINT(0 2, 5 5))'::geometry);
 
 -- #4299