[postgis-commits] svn - r2756 - in trunk: lwgeom regress

postgis-commits at postgis.refractions.net postgis-commits at postgis.refractions.net
Mon Apr 7 12:47:05 PDT 2008 

Author: pramsey
Date: 2008-04-07 12:47:05 -0700 (Mon, 07 Apr 2008)
New Revision: 2756

Added:
   trunk/regress/regress_ogc_cover.sql
   trunk/regress/regress_ogc_cover_expected
Modified:
   trunk/lwgeom/lwpostgis.sql.in
   trunk/regress/Makefile
   trunk/regress/kml_expected
   trunk/regress/regress_ogc.sql
   trunk/regress/regress_ogc_expected
Log:
Allow conditional regression tests based on GEOS_VERNUM and move the
cover/prepared tests into the appropriate buckets. Fix the AT_AsKML 
regression tests.


Modified: trunk/lwgeom/lwpostgis.sql.in
===================================================================
--- trunk/lwgeom/lwpostgis.sql.in	2008-04-05 14:49:11 UTC (rev 2755)
+++ trunk/lwgeom/lwpostgis.sql.in	2008-04-07 19:47:05 UTC (rev 2756)
@@ -4828,6 +4828,13 @@
 	AS 'SELECT _ST_AsKML(2, transform($1,4326), 15)' 
 	LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- AsKML(version, geom, precision)
+-- Deprecation in 1.2.3
+CREATEFUNCTION AsKML(int4, geometry, int4) 
+	RETURNS TEXT
+	AS 'SELECT _ST_AsKML($1, transform($2,4326), $3)' 
+	LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 -- Availabiltiy: 1.2.2
 CREATEFUNCTION ST_AsKML(geometry)
 	RETURNS TEXT

Modified: trunk/regress/Makefile
===================================================================
--- trunk/regress/Makefile	2008-04-05 14:49:11 UTC (rev 2755)
+++ trunk/regress/Makefile	2008-04-07 19:47:05 UTC (rev 2756)
@@ -44,12 +44,22 @@
 	sql-mm-multicurve_expected \
 	sql-mm-multisurface_expected
 
+
+# GEOS tests only if GEOS is available
 ifeq ($(USE_GEOS),1)
-#       Temporarily remove prepared geometry tests to provide compatibility 
-#       with GEOS 3.0.0
-#	TESTS += regress_ogc regress_bdpoly regress_ogc_prep
 	TESTS += regress_ogc regress_bdpoly 
+
+# Covers/CoveredBy only if GEOS >= 3.0
+ifeq ($(shell expr $(GEOS_VERNUM) ">=" 30),1)
+	TESTS += regress_ogc_cover 
+
+# PreparedGeometry only if GEOS >= 3.1
+ifeq ($(shell expr $(GEOS_VERNUM) ">=" 31),1)
+	TESTS += regress_ogc_prep
+
 endif
+endif
+endif
 
 ifeq ($(USE_PROJ),1)
 	TESTS += regress_proj kml

Modified: trunk/regress/kml_expected
===================================================================
--- trunk/regress/kml_expected	2008-04-05 14:49:11 UTC (rev 2755)
+++ trunk/regress/kml_expected	2008-04-07 19:47:05 UTC (rev 2756)
@@ -8,17 +8,17 @@
 ERROR:  Precision out of range 1..15
 ERROR:  Precision out of range 1..15
 ERROR:  Only KML 2 is supported
-<Point><coordinates>-75.5521729775749,10.4203366345305,0</coordinates></Point>
-<Point><coordinates>-75.55217298,10.42033663,0</coordinates></Point>
-<LineString><coordinates>-75.5884516874785,6.23081171191744,0 -75.5925764681848,6.20903425257533,0</coordinates></LineString>
-<LineString><coordinates>-75.58845169,6.230811712,0 -75.59257647,6.209034253,0</coordinates></LineString>
-<Polygon><outerBoundaryIs><LinearRing><coordinates>-74.042399,4.701288,0 -74.042099,4.700951,0 -74.042018,4.701012,0 -74.041835,4.700831,0 -74.041486,4.70114,0 -74.041328,4.700977,0 -74.04102,4.701245,0 -74.041178,4.701426,0 -74.040872,4.701697,0 -74.040941,4.701774,0 -74.0409,4.702606,0 -74.040824,4.702678,0 -74.041066,4.70295,0 -74.040873,4.703121,0 -74.041189,4.703468,0 -74.041383,4.703309,0 -74.041739,4.703689,0 -74.041924,4.703528,0 -74.041954,4.703555,0 -74.042307,4.703239,0 -74.042075,4.702978,0 -74.042155,4.702908,0 -74.04195,4.702675,0 -74.042096,4.702534,0 -74.042035,4.702467,0 -74.042053,4.702038,0 -74.042123,4.701974,0 -74.041986,4.701817,0 -74.042222,4.701604,0 -74.042149,4.70152,0 -74.042399,4.701288,0</coordinates></LinearRing></outerBoundaryIs></Polygon>
-<Polygon><outerBoundaryIs><LinearRing><coordinates>-74.04239911,4.701288195,0 -74.04209926,4.700950994,0 -74.0420183,4.701011516,0 -74.04183483,4.700831449,0 -74.04148629,4.70114015,0 -74.04132847,4.700976981,0 -74.04101991,4.701244757,0 -74.04117774,4.701425554,0 -74.04087245,4.701697127,0 -74.04094064,4.70177368,0 -74.04089953,4.70260566,0 -74.04082413,4.702677666,0 -74.04106565,4.702949831,0 -74.04087265,4.703121095,0 -74.04118885,4.703468333,0 -74.04138265,4.703308984,0 -74.04173931,4.703688848,0 -74.0419237,4.703528239,0 -74.04195356,4.703554861,0 -74.04230658,4.703239478,0 -74.04207492,4.702978243,0 -74.0421547,4.702907817,0 -74.04195033,4.702675127,0 -74.04209558,4.702533577,0 -74.04203505,4.702466796,0 -74.04205318,4.702038078,0 -74.04212336,4.701974338,0 -74.04198589,4.701816902,0 -74.04222168,4.701604424,0 -74.04214902,4.701519996,0 -74.04239911,4.701288195,0</coordinates></LinearRing></outerBoundaryIs></Polygon>
-<MultiGeometry><Point><coordinates>-74.0460345759477,4.75468700665652,0</coordinates></Point><Point><coordinates>-74.095833,4.746435,0</coordinates></Point><Point><coordinates>-74.1103754749261,4.7098754227297,0</coordinates></Point><Point><coordinates>-74.120148,4.533696,0</coordinates></Point></MultiGeometry>
-<MultiGeometry><Point><coordinates>-74.04603458,4.754687007,0</coordinates></Point><Point><coordinates>-74.095833,4.746435,0</coordinates></Point><Point><coordinates>-74.11037547,4.709875423,0</coordinates></Point><Point><coordinates>-74.120148,4.533696,0</coordinates></Point></MultiGeometry>
-<Point><coordinates>-73.1137865115871,7.10625638610512,0</coordinates></Point>
-<Point><coordinates>-73.1978481045547,6.76797715816346,0</coordinates></Point>
-<Point><coordinates>-74.0775046875181,4.59620005298432,0</coordinates></Point>
+<Point><coordinates>-75.5521729775749,10.4203366345305</coordinates></Point>
+<Point><coordinates>-75.55217298,10.42033663</coordinates></Point>
+<LineString><coordinates>-75.5884516874785,6.23081171191744 -75.5925764681848,6.20903425257533</coordinates></LineString>
+<LineString><coordinates>-75.58845169,6.230811712 -75.59257647,6.209034253</coordinates></LineString>
+<Polygon><outerBoundaryIs><LinearRing><coordinates>-74.042399,4.701288 -74.042099,4.700951 -74.042018,4.701012 -74.041835,4.700831 -74.041486,4.70114 -74.041328,4.700977 -74.04102,4.701245 -74.041178,4.701426 -74.040872,4.701697 -74.040941,4.701774 -74.0409,4.702606 -74.040824,4.702678 -74.041066,4.70295 -74.040873,4.703121 -74.041189,4.703468 -74.041383,4.703309 -74.041739,4.703689 -74.041924,4.703528 -74.041954,4.703555 -74.042307,4.703239 -74.042075,4.702978 -74.042155,4.702908 -74.04195,4.702675 -74.042096,4.702534 -74.042035,4.702467 -74.042053,4.702038 -74.042123,4.701974 -74.041986,4.701817 -74.042222,4.701604 -74.042149,4.70152 -74.042399,4.701288</coordinates></LinearRing></outerBoundaryIs></Polygon>
+<Polygon><outerBoundaryIs><LinearRing><coordinates>-74.04239911,4.701288195 -74.04209926,4.700950994 -74.0420183,4.701011516 -74.04183483,4.700831449 -74.04148629,4.70114015 -74.04132847,4.700976981 -74.04101991,4.701244757 -74.04117774,4.701425554 -74.04087245,4.701697127 -74.04094064,4.70177368 -74.04089953,4.70260566 -74.04082413,4.702677666 -74.04106565,4.702949831 -74.04087265,4.703121095 -74.04118885,4.703468333 -74.04138265,4.703308984 -74.04173931,4.703688848 -74.0419237,4.703528239 -74.04195356,4.703554861 -74.04230658,4.703239478 -74.04207492,4.702978243 -74.0421547,4.702907817 -74.04195033,4.702675127 -74.04209558,4.702533577 -74.04203505,4.702466796 -74.04205318,4.702038078 -74.04212336,4.701974338 -74.04198589,4.701816902 -74.04222168,4.701604424 -74.04214902,4.701519996 -74.04239911,4.701288195</coordinates></LinearRing></outerBoundaryIs></Polygon>
+<MultiGeometry><Point><coordinates>-74.0460345759477,4.75468700665652</coordinates></Point><Point><coordinates>-74.095833,4.746435</coordinates></Point><Point><coordinates>-74.1103754749261,4.7098754227297</coordinates></Point><Point><coordinates>-74.120148,4.533696</coordinates></Point></MultiGeometry>
+<MultiGeometry><Point><coordinates>-74.04603458,4.754687007</coordinates></Point><Point><coordinates>-74.095833,4.746435</coordinates></Point><Point><coordinates>-74.11037547,4.709875423</coordinates></Point><Point><coordinates>-74.120148,4.533696</coordinates></Point></MultiGeometry>
+<Point><coordinates>-73.1137865115871,7.10625638610512</coordinates></Point>
+<Point><coordinates>-73.1978481045547,6.76797715816346</coordinates></Point>
+<Point><coordinates>-74.0775046875181,4.59620005298432</coordinates></Point>
 ERROR:  Input geometry has unknown (-1) SRID
 ERROR:  geometry_to_kml: 'Curve' geometry type not supported by Google Earth
 ERROR:  geometry_to_kml: 'CompoundString' geometry type not supported by Google Earth
@@ -28,14 +28,14 @@
 ERROR:  Precision out of range 1..15
 ERROR:  Precision out of range 1..15
 ERROR:  Only KML 2 is supported
-<Point><coordinates>-75.5521729775749,10.4203366345305,0</coordinates></Point>
-<Point><coordinates>-75.55217298,10.42033663,0</coordinates></Point>
-<LineString><coordinates>-75.5884516874785,6.23081171191744,0 -75.5925764681848,6.20903425257533,0</coordinates></LineString>
-<LineString><coordinates>-75.58845169,6.230811712,0 -75.59257647,6.209034253,0</coordinates></LineString>
-<Polygon><outerBoundaryIs><LinearRing><coordinates>-74.042399,4.701288,0 -74.042099,4.700951,0 -74.042018,4.701012,0 -74.041835,4.700831,0 -74.041486,4.70114,0 -74.041328,4.700977,0 -74.04102,4.701245,0 -74.041178,4.701426,0 -74.040872,4.701697,0 -74.040941,4.701774,0 -74.0409,4.702606,0 -74.040824,4.702678,0 -74.041066,4.70295,0 -74.040873,4.703121,0 -74.041189,4.703468,0 -74.041383,4.703309,0 -74.041739,4.703689,0 -74.041924,4.703528,0 -74.041954,4.703555,0 -74.042307,4.703239,0 -74.042075,4.702978,0 -74.042155,4.702908,0 -74.04195,4.702675,0 -74.042096,4.702534,0 -74.042035,4.702467,0 -74.042053,4.702038,0 -74.042123,4.701974,0 -74.041986,4.701817,0 -74.042222,4.701604,0 -74.042149,4.70152,0 -74.042399,4.701288,0</coordinates></LinearRing></outerBoundaryIs></Polygon>
-<Polygon><outerBoundaryIs><LinearRing><coordinates>-74.04239911,4.701288195,0 -74.04209926,4.700950994,0 -74.0420183,4.701011516,0 -74.04183483,4.700831449,0 -74.04148629,4.70114015,0 -74.04132847,4.700976981,0 -74.04101991,4.701244757,0 -74.04117774,4.701425554,0 -74.04087245,4.701697127,0 -74.04094064,4.70177368,0 -74.04089953,4.70260566,0 -74.04082413,4.702677666,0 -74.04106565,4.702949831,0 -74.04087265,4.703121095,0 -74.04118885,4.703468333,0 -74.04138265,4.703308984,0 -74.04173931,4.703688848,0 -74.0419237,4.703528239,0 -74.04195356,4.703554861,0 -74.04230658,4.703239478,0 -74.04207492,4.702978243,0 -74.0421547,4.702907817,0 -74.04195033,4.702675127,0 -74.04209558,4.702533577,0 -74.04203505,4.702466796,0 -74.04205318,4.702038078,0 -74.04212336,4.701974338,0 -74.04198589,4.701816902,0 -74.04222168,4.701604424,0 -74.04214902,4.701519996,0 -74.04239911,4.701288195,0</coordinates></LinearRing></outerBoundaryIs></Polygon>
-<MultiGeometry><Point><coordinates>-74.0460345759477,4.75468700665652,0</coordinates></Point><Point><coordinates>-74.095833,4.746435,0</coordinates></Point><Point><coordinates>-74.1103754749261,4.7098754227297,0</coordinates></Point><Point><coordinates>-74.120148,4.533696,0</coordinates></Point></MultiGeometry>
-<MultiGeometry><Point><coordinates>-74.04603458,4.754687007,0</coordinates></Point><Point><coordinates>-74.095833,4.746435,0</coordinates></Point><Point><coordinates>-74.11037547,4.709875423,0</coordinates></Point><Point><coordinates>-74.120148,4.533696,0</coordinates></Point></MultiGeometry>
-<Point><coordinates>-73.1137865115871,7.10625638610512,0</coordinates></Point>
-<Point><coordinates>-73.1978481045547,6.76797715816346,0</coordinates></Point>
-<Point><coordinates>-74.0775046875181,4.59620005298432,0</coordinates></Point>
+<Point><coordinates>-75.5521729775749,10.4203366345305</coordinates></Point>
+<Point><coordinates>-75.55217298,10.42033663</coordinates></Point>
+<LineString><coordinates>-75.5884516874785,6.23081171191744 -75.5925764681848,6.20903425257533</coordinates></LineString>
+<LineString><coordinates>-75.58845169,6.230811712 -75.59257647,6.209034253</coordinates></LineString>
+<Polygon><outerBoundaryIs><LinearRing><coordinates>-74.042399,4.701288 -74.042099,4.700951 -74.042018,4.701012 -74.041835,4.700831 -74.041486,4.70114 -74.041328,4.700977 -74.04102,4.701245 -74.041178,4.701426 -74.040872,4.701697 -74.040941,4.701774 -74.0409,4.702606 -74.040824,4.702678 -74.041066,4.70295 -74.040873,4.703121 -74.041189,4.703468 -74.041383,4.703309 -74.041739,4.703689 -74.041924,4.703528 -74.041954,4.703555 -74.042307,4.703239 -74.042075,4.702978 -74.042155,4.702908 -74.04195,4.702675 -74.042096,4.702534 -74.042035,4.702467 -74.042053,4.702038 -74.042123,4.701974 -74.041986,4.701817 -74.042222,4.701604 -74.042149,4.70152 -74.042399,4.701288</coordinates></LinearRing></outerBoundaryIs></Polygon>
+<Polygon><outerBoundaryIs><LinearRing><coordinates>-74.04239911,4.701288195 -74.04209926,4.700950994 -74.0420183,4.701011516 -74.04183483,4.700831449 -74.04148629,4.70114015 -74.04132847,4.700976981 -74.04101991,4.701244757 -74.04117774,4.701425554 -74.04087245,4.701697127 -74.04094064,4.70177368 -74.04089953,4.70260566 -74.04082413,4.702677666 -74.04106565,4.702949831 -74.04087265,4.703121095 -74.04118885,4.703468333 -74.04138265,4.703308984 -74.04173931,4.703688848 -74.0419237,4.703528239 -74.04195356,4.703554861 -74.04230658,4.703239478 -74.04207492,4.702978243 -74.0421547,4.702907817 -74.04195033,4.702675127 -74.04209558,4.702533577 -74.04203505,4.702466796 -74.04205318,4.702038078 -74.04212336,4.701974338 -74.04198589,4.701816902 -74.04222168,4.701604424 -74.04214902,4.701519996 -74.04239911,4.701288195</coordinates></LinearRing></outerBoundaryIs></Polygon>
+<MultiGeometry><Point><coordinates>-74.0460345759477,4.75468700665652</coordinates></Point><Point><coordinates>-74.095833,4.746435</coordinates></Point><Point><coordinates>-74.1103754749261,4.7098754227297</coordinates></Point><Point><coordinates>-74.120148,4.533696</coordinates></Point></MultiGeometry>
+<MultiGeometry><Point><coordinates>-74.04603458,4.754687007</coordinates></Point><Point><coordinates>-74.095833,4.746435</coordinates></Point><Point><coordinates>-74.11037547,4.709875423</coordinates></Point><Point><coordinates>-74.120148,4.533696</coordinates></Point></MultiGeometry>
+<Point><coordinates>-73.1137865115871,7.10625638610512</coordinates></Point>
+<Point><coordinates>-73.1978481045547,6.76797715816346</coordinates></Point>
+<Point><coordinates>-74.0775046875181,4.59620005298432</coordinates></Point>

Modified: trunk/regress/regress_ogc.sql
===================================================================
--- trunk/regress/regress_ogc.sql	2008-04-05 14:49:11 UTC (rev 2755)
+++ trunk/regress/regress_ogc.sql	2008-04-07 19:47:05 UTC (rev 2756)
@@ -233,44 +233,10 @@
 -- moved here from regress.sql
 select 'within119', ST_within('LINESTRING(-1 -1, -1 101, 101 101, 101 -1)'::GEOMETRY,'BOX3D(0 0, 100 100)'::BOX3D);
 select 'within120', ST_within('LINESTRING(-1 -1, -1 100, 101 100, 101 -1)'::GEOMETRY,'BOX3D(0 0, 100 100)'::BOX3D);
--- Covers cases
 SELECT 'contains110', ST_Contains('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'LINESTRING(1 10, 9 10, 9 8)');
-SELECT 'covers100', ST_Covers('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'LINESTRING(1 10, 9 10, 9 8)');
 SELECT 'contains111', ST_Contains('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'LINESTRING(1 10, 10 10, 10 8)');
-SELECT 'covers101', ST_Covers('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'LINESTRING(1 10, 10 10, 10 8)');
--- PIP - point within polygon
-SELECT 'covers102', ST_Covers('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'POINT(5 5)');
--- PIP - point on vertex of polygon
-SELECT 'covers103', ST_Covers('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'POINT(0 0)');
--- PIP - point outside polygon
-SELECT 'covers104', ST_Covers('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'POINT(-1 0)');
--- PIP - point on edge of polygon
-SELECT 'covers105', ST_Covers('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'POINT(0 5)');
--- PIP - point in line with polygon edge
-SELECT 'covers106', ST_Covers('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'POINT(0 12)');
--- PIP - point vertically aligned with polygon vertex 
-SELECT 'covers107', ST_Covers(ST_GeomFromText('POLYGON((521526 5377783, 521481 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631), ST_GeomFromText('POINT(521513 5377804)', 32631));
--- PIP - repeated vertex 
-SELECT 'covers108', ST_Covers(ST_GeomFromText('POLYGON((521526 5377783, 521482 5377811, 521481 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631), ST_GeomFromText('POINT(521513 5377804)', 32631));
--- CoveredBy cases
 SELECT 'within130', ST_Within('LINESTRING(1 10, 9 10, 9 8)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
-SELECT 'coveredby100', ST_CoveredBy('LINESTRING(1 10, 9 10, 9 8)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
 SELECT 'within131', ST_Within('LINESTRING(1 10, 10 10, 10 8)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
-SELECT 'coveredby101', ST_CoveredBy('LINESTRING(1 10, 10 10, 10 8)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
--- PIP - point within polygon
-SELECT 'coveredby102', ST_CoveredBy('POINT(5 5)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
--- PIP - point on vertex of polygon
-SELECT 'coveredby103', ST_CoveredBy('POINT(0 0)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
--- PIP - point outside polygon
-SELECT 'coveredby104', ST_CoveredBy('POINT(-1 0)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
--- PIP - point on edge of polygon
-SELECT 'coveredby105', ST_CoveredBy('POINT(0 5)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
--- PIP - point in line with polygon edge
-SELECT 'coveredby106', ST_CoveredBy('POINT(0 12)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
--- PIP - point vertically aligned with polygon vertex 
-SELECT 'coveredby107', ST_CoveredBy(ST_GeomFromText('POINT(521513 5377804)', 32631), ST_GeomFromText('POLYGON((521526 5377783, 521481 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631));
--- PIP - repeated vertex 
-SELECT 'coveredby108', ST_CoveredBy(ST_GeomFromText('POINT(521513 5377804)', 32631), ST_GeomFromText('POLYGON((521526 5377783, 521482 5377811, 521481 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631));
 SELECT 'overlaps', ST_overlaps('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))','POINT(5 5)');
 SELECT 'isvalid', ST_isvalid('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
 SELECT 'isvalid', ST_isvalid('POLYGON((0 0, 0 10, 10 10, -5 10, 10 0, 0 0))');

Added: trunk/regress/regress_ogc_cover.sql
===================================================================
--- trunk/regress/regress_ogc_cover.sql	2008-04-05 14:49:11 UTC (rev 2755)
+++ trunk/regress/regress_ogc_cover.sql	2008-04-07 19:47:05 UTC (rev 2756)
@@ -0,0 +1,39 @@
+---
+--- Tests for GEOS/JTS implemented functions
+--- supported by GEOS 3.0 and upwards
+---
+
+SELECT 'covers100', ST_Covers('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'LINESTRING(1 10, 9 10, 9 8)');
+SELECT 'covers101', ST_Covers('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'LINESTRING(1 10, 10 10, 10 8)');
+-- PIP - point within polygon
+SELECT 'covers102', ST_Covers('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'POINT(5 5)');
+-- PIP - point on vertex of polygon
+SELECT 'covers103', ST_Covers('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'POINT(0 0)');
+-- PIP - point outside polygon
+SELECT 'covers104', ST_Covers('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'POINT(-1 0)');
+-- PIP - point on edge of polygon
+SELECT 'covers105', ST_Covers('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'POINT(0 5)');
+-- PIP - point in line with polygon edge
+SELECT 'covers106', ST_Covers('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'POINT(0 12)');
+-- PIP - point vertically aligned with polygon vertex 
+SELECT 'covers107', ST_Covers(ST_GeomFromText('POLYGON((521526 5377783, 521481 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631), ST_GeomFromText('POINT(521513 5377804)', 32631));
+-- PIP - repeated vertex 
+SELECT 'covers108', ST_Covers(ST_GeomFromText('POLYGON((521526 5377783, 521482 5377811, 521481 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631), ST_GeomFromText('POINT(521513 5377804)', 32631));
+-- CoveredBy cases
+SELECT 'coveredby100', ST_CoveredBy('LINESTRING(1 10, 9 10, 9 8)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+SELECT 'coveredby101', ST_CoveredBy('LINESTRING(1 10, 10 10, 10 8)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point within polygon
+SELECT 'coveredby102', ST_CoveredBy('POINT(5 5)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point on vertex of polygon
+SELECT 'coveredby103', ST_CoveredBy('POINT(0 0)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point outside polygon
+SELECT 'coveredby104', ST_CoveredBy('POINT(-1 0)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point on edge of polygon
+SELECT 'coveredby105', ST_CoveredBy('POINT(0 5)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point in line with polygon edge
+SELECT 'coveredby106', ST_CoveredBy('POINT(0 12)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point vertically aligned with polygon vertex 
+SELECT 'coveredby107', ST_CoveredBy(ST_GeomFromText('POINT(521513 5377804)', 32631), ST_GeomFromText('POLYGON((521526 5377783, 521481 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631));
+-- PIP - repeated vertex 
+SELECT 'coveredby108', ST_CoveredBy(ST_GeomFromText('POINT(521513 5377804)', 32631), ST_GeomFromText('POLYGON((521526 5377783, 521482 5377811, 521481 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631));
+


Property changes on: trunk/regress/regress_ogc_cover.sql
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/regress/regress_ogc_cover_expected
===================================================================
--- trunk/regress/regress_ogc_cover_expected	2008-04-05 14:49:11 UTC (rev 2755)
+++ trunk/regress/regress_ogc_cover_expected	2008-04-07 19:47:05 UTC (rev 2756)
@@ -0,0 +1,18 @@
+covers100|t
+covers101|t
+covers102|t
+covers103|t
+covers104|f
+covers105|t
+covers106|f
+covers107|t
+covers108|t
+coveredby100|t
+coveredby101|t
+coveredby102|t
+coveredby103|t
+coveredby104|f
+coveredby105|t
+coveredby106|f
+coveredby107|t
+coveredby108|t


Property changes on: trunk/regress/regress_ogc_cover_expected
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/regress/regress_ogc_expected
===================================================================
--- trunk/regress/regress_ogc_expected	2008-04-05 14:49:11 UTC (rev 2755)
+++ trunk/regress/regress_ogc_expected	2008-04-07 19:47:05 UTC (rev 2756)
@@ -131,27 +131,9 @@
 within119|f
 within120|f
 contains110|t
-covers100|t
 contains111|f
-covers101|t
-covers102|t
-covers103|t
-covers104|f
-covers105|t
-covers106|f
-covers107|t
-covers108|t
 within130|t
-coveredby100|t
 within131|f
-coveredby101|t
-coveredby102|t
-coveredby103|t
-coveredby104|f
-coveredby105|t
-coveredby106|f
-coveredby107|t
-coveredby108|t
 overlaps|f
 isvalid|t
 NOTICE:  Self-intersection

More information about the postgis-commits mailing list