[postgis-tickets] [SCM] PostGIS branch stable-2.3 updated. 5586322781f356abccd4340453f811dd810de941
git at osgeo.org
git at osgeo.org
Thu Mar 26 07:35:08 PDT 2020
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, stable-2.3 has been updated
via 5586322781f356abccd4340453f811dd810de941 (commit)
from 22a0333906ff36aecb0bf7c4dc822eec7aca6cdb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5586322781f356abccd4340453f811dd810de941
Author: Regina Obe <lr at pcorp.us>
Date: Thu Mar 26 10:34:51 2020 -0400
Change ogc line intersection test to one that sfcgal will always give same answer regardless of version of sfcgal
diff --git a/regress/core/Makefile b/regress/core/Makefile
new file mode 100644
index 0000000..b54cc70
--- /dev/null
+++ b/regress/core/Makefile
@@ -0,0 +1,240 @@
+# **********************************************************************
+# *
+# * PostGIS - Spatial Types for PostgreSQL
+# * http://postgis.net
+# *
+# * Copyright (C) 2011-2012 Sandro Santilli <strk at kbt.io>
+# * Copyright (C) 2009-2011 Paul Ramsey <pramsey at cleverelephant.ca>
+# * Copyright (C) 2008-2009 Mark Cave-Ayland
+# *
+# * This is free software; you can redistribute and/or modify it under
+# * the terms of the GNU General Public Licence. See the COPYING file.
+# *
+# **********************************************************************
+
+PERL=/usr/bin/perl
+TMPDIR?=/tmp
+
+POSTGIS_PGSQL_VERSION=120
+POSTGIS_GEOS_VERSION=39
+GEOS_NUMERIC_VERSION=30900
+POSTGIS_PROJ_VERSION=62
+POSTGIS_MAJOR_VERSION=3
+POSTGIS_MINOR_VERSION=1
+HAVE_JSON=yes
+PROTOC_VERSION=1002001
+HAVE_SPGIST=yes
+INTERRUPTTESTS=no
+
+# MingW hack: rather than use PGSQL_BINDIR directly, we change
+# to the directory and then use "pwd" to return the path. This
+# ensures that the returned path is in MSYS format, otherwise
+# colons in drive letters will break PATH.
+PGSQL_BINDIR=$(shell cd "C:/MING64~1/projects/POSTGR~1/rel/PG12W6~4/bin" && pwd)
+
+
+#
+# Put path from pg_config into front of search path
+#
+PATH := $(PGSQL_BINDIR):$(PATH)
+export PATH
+
+
+TESTS = \
+ ../loader/Point \
+ ../loader/PointM \
+ ../loader/PointZ \
+ ../loader/MultiPoint \
+ ../loader/MultiPointM \
+ ../loader/MultiPointZ \
+ ../loader/Arc \
+ ../loader/ArcM \
+ ../loader/ArcZ \
+ ../loader/Polygon \
+ ../loader/PolygonM \
+ ../loader/PolygonZ \
+ ../loader/TSTPolygon \
+ ../loader/TSIPolygon \
+ ../loader/TSTIPolygon \
+ ../loader/PointWithSchema \
+ ../loader/NoTransPoint \
+ ../loader/NotReallyMultiPoint \
+ ../loader/MultiToSinglePoint \
+ ../loader/ReprojectPts \
+ ../loader/ReprojectPtsD \
+ ../loader/ReprojectPtsGeog \
+ ../loader/ReprojectPtsGeogD \
+ ../loader/Latin1 \
+ ../loader/Latin1-implicit \
+ ../loader/mfile \
+ ../dumper/literalsrid \
+ ../dumper/realtable \
+ ../dumper/nullsintable \
+ ../dumper/null3d \
+ affine \
+ bestsrid \
+ binary \
+ boundary \
+ chaikin \
+ filterm \
+ cluster \
+ concave_hull\
+ ctors \
+ curvetoline \
+ dump \
+ dumppoints \
+ empty \
+ estimatedextent \
+ forcecurve \
+ geography \
+ geometric_median \
+ hausdorff \
+ in_geohash \
+ in_gml \
+ in_kml \
+ in_encodedpolyline \
+ iscollection \
+ legacy \
+ long_xact \
+ lwgeom_regress \
+ measures \
+ minimum_bounding_circle \
+ normalize \
+ operators \
+ orientation \
+ out_geometry \
+ out_geography \
+ polygonize \
+ polyhedralsurface \
+ postgis_type_name \
+ quantize_coordinates \
+ regress \
+ regress_bdpoly \
+ regress_buffer_params \
+ regress_gist_index_nd \
+ regress_index \
+ regress_index_nulls \
+ regress_management \
+ regress_selectivity \
+ regress_lrs \
+ regress_ogc \
+ regress_ogc_cover \
+ regress_ogc_prep \
+ regress_proj \
+ relate \
+ remove_repeated_points \
+ removepoint \
+ reverse \
+ setpoint \
+ simplify \
+ simplifyvw \
+ size \
+ snaptogrid \
+ split \
+ sql-mm-serialize \
+ sql-mm-circularstring \
+ sql-mm-compoundcurve \
+ sql-mm-curvepoly \
+ sql-mm-general \
+ sql-mm-multicurve \
+ sql-mm-multisurface \
+ swapordinates \
+ summary \
+ temporal \
+ temporal_knn \
+ tickets \
+ twkb \
+ typmod \
+ wkb \
+ wkt \
+ wmsservers \
+ offsetcurve \
+ relatematch \
+ isvaliddetail \
+ sharedpaths \
+ snap \
+ node \
+ unaryunion \
+ clean \
+ relate_bnr \
+ delaunaytriangles \
+ clipbybox2d \
+ subdivide \
+ voronoi \
+ regress_brin_index \
+ regress_brin_index_3d \
+ regress_brin_index_geography \
+ minimum_clearance \
+ oriented_envelope \
+ point_coordinates
+
+# Slow slow tests
+TESTS_SLOW = \
+ concave_hull_hard \
+ knn_recheck
+
+ifeq ($(shell expr "$(POSTGIS_GEOS_VERSION)" ">=" 37),1)
+ # GEOS-3.7 adds:
+ # ST_FrechetDistance
+ TESTS += \
+ 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 += \
+ interrupt \
+ interrupt_relate \
+ interrupt_buffer
+endif
+
+ifeq ($(HAVE_JSON),yes)
+ # JSON-C adds:
+ # ST_GeomFromGeoJSON()
+ TESTS += \
+ in_geojson
+endif
+
+ifeq ($(HAVE_SPGIST),yes)
+ TESTS += \
+ regress_spgist_index_2d \
+ regress_spgist_index_3d \
+ regress_spgist_index_nd
+endif
+
+ifeq (yes,yes)
+ # protobuf-c adds:
+ # ST_AsMVT, ST_AsGeobuf
+ TESTS += \
+ mvt \
+ mvt_jsonb
+ifeq (yes,yes)
+ TESTS += \
+ geobuf
+endif
+endif
+
+all install uninstall:
+
+distclean: clean
+ rm Makefile
+
+test check:
+ $(PERL) ../run_test.pl $(RUNTESTFLAGS) $(TESTS)
+ # only run upgrade test if RUNTESTFLAGS was not already doing that
+ if echo "$(RUNTESTFLAGS)" | grep -vq -- --upgrade; then \
+ $(PERL) ../run_test.pl --upgrade $(RUNTESTFLAGS) $(TESTS); \
+ fi
+
+check-long:
+ $(PERL) ../run_test.pl $(RUNTESTFLAGS) $(TESTS) $(TESTS_SLOW)
+
+
+clean:
diff --git a/regress/regress_ogc.sql b/regress/regress_ogc.sql
index e53e373..a4d25e8 100644
--- a/regress/regress_ogc.sql
+++ b/regress/regress_ogc.sql
@@ -157,7 +157,7 @@ SELECT 'overlaps', ST_overlaps('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'::geometr
SELECT 'isvalid', ST_isvalid('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'::geometry);
SELECT 'isvalid', ST_isvalid('POLYGON((0 0, 0 10, 10 10, -5 10, 10 0, 0 0))'::geometry);
SELECT 'isvalid', ST_isvalid('GEOMETRYCOLLECTION EMPTY'::geometry);
-SELECT 'intersection', ST_astext(ST_intersection('LINESTRING(0 10, 0 -10)'::geometry, 'LINESTRING(0 0, 1 1)'::geometry));
+SELECT 'intersection', ST_astext(ST_intersection('LINESTRING(0 10, 0 -10, 0 5)'::geometry, 'LINESTRING(0 1, 1 1)'::geometry));
SELECT 'difference', ST_astext(ST_difference('LINESTRING(0 10, 0 -10)'::GEOMETRY, 'LINESTRING(0 2, 0 -2)'::GEOMETRY));
SELECT 'boundary', ST_astext(ST_boundary('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0),(2 2, 2 4, 4 4, 4 2, 2 2))'::geometry));
SELECT 'symdifference', ST_astext(ST_symdifference('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0),(2 2, 2 4, 4 4, 4 2, 2 2))'::geometry, 'LINESTRING(0 0, 20 20)'::geometry));
diff --git a/regress/regress_ogc_expected b/regress/regress_ogc_expected
index 5ab5f91..06a517a 100644
--- a/regress/regress_ogc_expected
+++ b/regress/regress_ogc_expected
@@ -88,7 +88,7 @@ isvalid|t
NOTICE: Self-intersection
isvalid|f
isvalid|t
-intersection|POINT(0 0)
+intersection|POINT(0 1)
difference|MULTILINESTRING((0 10,0 2),(0 -2,0 -10))
boundary|MULTILINESTRING((0 0,0 10,10 10,10 0,0 0),(2 2,2 4,4 4,4 2,2 2))
symdifference|GEOMETRYCOLLECTION(LINESTRING(2 2,4 4),LINESTRING(10 10,20 20),POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,2 4,2 2,4 2,4 4)))
diff --git a/regress/sfcgal/Makefile b/regress/sfcgal/Makefile
new file mode 100644
index 0000000..1494275
--- /dev/null
+++ b/regress/sfcgal/Makefile
@@ -0,0 +1,57 @@
+# **********************************************************************
+# *
+# * PostGIS - Spatial Types for PostgreSQL
+# * http://postgis.net
+# *
+# * Copyright (C) 2011-2012 Sandro Santilli <strk at kbt.io>
+# * Copyright (C) 2009-2011 Paul Ramsey <pramsey at cleverelephant.ca>
+# * Copyright (C) 2008-2009 Mark Cave-Ayland
+# *
+# * This is free software; you can redistribute and/or modify it under
+# * the terms of the GNU General Public Licence. See the COPYING file.
+# *
+# **********************************************************************
+
+PERL=/usr/bin/perl
+TMPDIR?=/tmp
+
+HAVE_SFCGAL=yes
+
+ifeq ($(HAVE_SFCGAL),yes)
+
+# MingW hack: rather than use PGSQL_BINDIR directly, we change
+# to the directory and then use "pwd" to return the path. This
+# ensures that the returned path is in MSYS format, otherwise
+# colons in drive letters will break PATH.
+PGSQL_BINDIR=$(shell cd "C:/MING64~1/projects/POSTGR~1/rel/PG12W6~4/bin" && pwd)
+
+#
+# Put path from pg_config into front of search path
+#
+PATH := $(PGSQL_BINDIR):$(PATH)
+export PATH
+
+TESTS = \
+ regress_sfcgal \
+ approximatemedialaxis.sql
+
+test check:
+ $(PERL) ../run_test.pl --sfcgal $(RUNTESTFLAGS) $(TESTS)
+ # only run upgrade test if RUNTESTFLAGS was not already doing that
+ if echo "$(RUNTESTFLAGS)" | grep -vq -- --upgrade; then \
+ $(PERL) ../run_test.pl --sfcgal --upgrade $(RUNTESTFLAGS) $(TESTS); \
+ fi
+
+else
+
+check:
+
+endif # HAVE_SFCGAL
+
+distclean: clean
+ rm Makefile
+
+all install uninstall:
+
+
+clean:
diff --git a/regress/sfcgal/regress_ogc_expected b/regress/sfcgal/regress_ogc_expected
index 65205fc..ee98579 100644
--- a/regress/sfcgal/regress_ogc_expected
+++ b/regress/sfcgal/regress_ogc_expected
@@ -88,7 +88,7 @@ isvalid|t
NOTICE: Self-intersection
isvalid|f
isvalid|t
-intersection|POINT(-0 -0)
+intersection|POINT(0 1)
difference|MULTILINESTRING((0 -2,0 -10),(0 10,0 2))
boundary|MULTILINESTRING((0 0,0 10,10 10,10 0,0 0),(2 2,2 4,4 4,4 2,2 2))
symdifference|GEOMETRYCOLLECTION(LINESTRING(2 2,4 4),LINESTRING(10 10,20 20),POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,2 4,2 2,4 2,4 4)))
-----------------------------------------------------------------------
Summary of changes:
regress/core/Makefile | 240 ++++++++++++++++++++++++++++++++++++
regress/regress_ogc.sql | 2 +-
regress/regress_ogc_expected | 2 +-
regress/sfcgal/Makefile | 57 +++++++++
regress/sfcgal/regress_ogc_expected | 2 +-
5 files changed, 300 insertions(+), 3 deletions(-)
create mode 100644 regress/core/Makefile
create mode 100644 regress/sfcgal/Makefile
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list