From 3741f4e3ddc416d0f0b64632b6f9bcd3c48ac4db Mon Sep 17 00:00:00 2001 From: Mark Leslie Date: Fri, 15 Jun 2007 19:06:11 +0000 Subject: [PATCH] Updated the regression test suite to allow variable results depending on jts/geos availability. git-svn-id: http://svn.osgeo.org/postgis/trunk@2625 b70326c6-7e19-0410-871a-916f4a2858ee --- config.h.in | 2 + configure.in | 5 +++ regress/Makefile | 13 +++++- ...cted => sql-mm-circularstring_expected.in} | 45 +++++++++++++++++++ ...ected => sql-mm-compoundcurve_expected.in} | 29 ++++++++++++ ..._expected => sql-mm-curvepoly_expected.in} | 15 +++++++ ...expected => sql-mm-multicurve_expected.in} | 15 +++++++ ...pected => sql-mm-multisurface_expected.in} | 15 +++++++ 8 files changed, 137 insertions(+), 2 deletions(-) rename regress/{sql-mm-circularstring_expected => sql-mm-circularstring_expected.in} (95%) rename regress/{sql-mm-compoundcurve_expected => sql-mm-compoundcurve_expected.in} (91%) rename regress/{sql-mm-curvepoly_expected => sql-mm-curvepoly_expected.in} (98%) rename regress/{sql-mm-multicurve_expected => sql-mm-multicurve_expected.in} (95%) rename regress/{sql-mm-multisurface_expected => sql-mm-multisurface_expected.in} (98%) diff --git a/config.h.in b/config.h.in index 30512be98..7f78a65a9 100644 --- a/config.h.in +++ b/config.h.in @@ -1 +1,3 @@ #undef HAVE_ICONV_H +#undef USE_GEOS +#undef USE_JTS diff --git a/configure.in b/configure.in index 5ffc281fe..4b90dba5f 100644 --- a/configure.in +++ b/configure.in @@ -374,6 +374,11 @@ AC_SUBST(DOC_RULE) if test $USE_JTS -gt 0; then dnl AC_MSG_RESULT([ GEOS disabled, using JTS.]) USE_GEOS=0 + AC_DEFINE(USE_JTS) +fi + +if test $USE_GEOS -gt 0; then + AC_DEFINE(USE_GEOS) fi # diff --git a/regress/Makefile b/regress/Makefile index 1552c6c93..7316dce8b 100644 --- a/regress/Makefile +++ b/regress/Makefile @@ -37,6 +37,12 @@ TESTS = \ sql-mm-multicurve \ sql-mm-multisurface +PREPROC = \ + sql-mm-circularstring_expected \ + sql-mm-compoundcurve_expected \ + sql-mm-curvepoly_expected \ + sql-mm-multicurve_expected \ + sql-mm-multisurface_expected ifeq ($(USE_GEOS),1) TESTS += regress_ogc regress_bdpoly @@ -48,7 +54,7 @@ endif all: test -test check: lwpostgis.sql ../lwgeom/liblwgeom.so ../loader/pgsql2shp ../loader/shp2pgsql +test check: lwpostgis.sql ../lwgeom/liblwgeom.so ../loader/pgsql2shp ../loader/shp2pgsql $(PREPROC) @USE_VERSION="$(USE_VERSION)" ./run_test $(TESTS) lwpostgis.sql: ../lwgeom/lwpostgis.sql.in @@ -63,9 +69,12 @@ lwpostgis.sql: ../lwgeom/lwpostgis.sql.in ../loader/shp2pgsql: $(MAKE) -C ../loader shp2pgsql +$(PREPROC): + cpp -P -traditional-cpp $@.in | grep -v "^$$" > $@ + cleanup: @sleep 1 @dropdb postgis_reg > /dev/null clean: - rm -f lwpostgis.sql + rm -f lwpostgis.sql $(PREPROC) diff --git a/regress/sql-mm-circularstring_expected b/regress/sql-mm-circularstring_expected.in similarity index 95% rename from regress/sql-mm-circularstring_expected rename to regress/sql-mm-circularstring_expected.in index 82c2adf33..3108f0bd2 100644 --- a/regress/sql-mm-circularstring_expected +++ b/regress/sql-mm-circularstring_expected.in @@ -1,3 +1,4 @@ +#include "../config.h" ndims01|4 geometrytype01|CIRCULARSTRING ndims02|3 @@ -7,10 +8,18 @@ geometrytype03|CIRCULARSTRINGM ndims04|2 geometrytype04|CIRCULARSTRING isClosed01|t +#ifdef USE_JTS +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +#else ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. +#endif ERROR: isring() should only be called on a LINE isClosed02|t +#ifdef USE_JTS +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +#else ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. +#endif ERROR: isring() should only be called on a LINE ndims01|4 geometrytype01|CIRCULARSTRING @@ -21,10 +30,18 @@ geometrytype03|CIRCULARSTRINGM ndims04|2 geometrytype04|CIRCULARSTRING isClosed01|t +#ifdef USE_JTS +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +#else ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. +#endif ERROR: isring() should only be called on a LINE isClosed02|t +#ifdef USE_JTS +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +#else ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. +#endif ERROR: isring() should only be called on a LINE public.circularstring.the_geom_2d SRID:-1 TYPE:CIRCULARSTRING DIMS:2 @@ -90,10 +107,17 @@ ST_CurveToLine03|LINESTRING(0 0 0,0.00240909 0.09813535 0.28125,0.00963055 0.196 ST_CurveToLine03|LINESTRING(-5 0 0,-4.99397728 0.24533837 0.03125,-4.97592363 0.4900857 0.0625,-4.94588255 0.73365237 0.09375,-4.9039264 0.97545161 0.125,-4.85015627 1.2149009 0.15625,-4.78470168 1.45142339 0.1875,-4.70772033 1.68444927 0.21875,-4.61939766 1.91341716 0.25,-4.51994647 2.13777547 0.28125,-4.40960632 2.35698368 0.3125,-4.28864305 2.57051372 0.34375,-4.15734806 2.77785117 0.375,-4.01603766 2.97849652 0.40625,-3.86505227 3.17196642 0.4375,-3.70475563 3.35779477 0.46875,-3.53553391 3.53553391 0.5,-3.35779477 3.70475563 0.53125,-3.17196642 3.86505227 0.5625,-2.97849652 4.01603766 0.59375,-2.77785117 4.15734806 0.625,-2.57051372 4.28864305 0.65625,-2.35698368 4.40960632 0.6875,-2.13777547 4.51994647 0.71875,-1.91341716 4.61939766 0.75,-1.68444927 4.70772033 0.78125,-1.45142339 4.78470168 0.8125,-1.2149009 4.85015627 0.84375,-0.97545161 4.9039264 0.875,-0.73365237 4.94588255 0.90625,-0.4900857 4.97592363 0.9375,-0.24533837 4.99397728 0.96875,0 5 1,0.24533837 4.99397728 1.03125,0.4900857 4.97592363 1.0625,0.73365237 4.94588255 1.09375,0.97545161 4.9039264 1.125,1.2149009 4.85015627 1.15625,1.45142339 4.78470168 1.1875,1.68444927 4.70772033 1.21875,1.91341716 4.61939766 1.25,2.13777547 4.51994647 1.28125,2.35698368 4.40960632 1.3125,2.57051372 4.28864305 1.34375,2.77785117 4.15734806 1.375,2.97849652 4.01603766 1.40625,3.17196642 3.86505227 1.4375,3.35779477 3.70475563 1.46875,3.53553391 3.53553391 1.5,3.70475563 3.35779477 1.53125,3.86505227 3.17196642 1.5625,4.01603766 2.97849652 1.59375,4.15734806 2.77785117 1.625,4.28864305 2.57051372 1.65625,4.40960632 2.35698368 1.6875,4.51994647 2.13777547 1.71875,4.61939766 1.91341716 1.75,4.70772033 1.68444927 1.78125,4.78470168 1.45142339 1.8125,4.85015627 1.2149009 1.84375,4.9039264 0.97545161 1.875,4.94588255 0.73365237 1.90625,4.97592363 0.4900857 1.9375,4.99397728 0.24533837 1.96875,5 0 2,5.00602272 -0.24533837 2.03125,5.02407637 -0.4900857 2.0625,5.05411745 -0.73365237 2.09375,5.0960736 -0.97545161 2.125,5.14984373 -1.2149009 2.15625,5.21529832 -1.45142339 2.1875,5.29227967 -1.68444927 2.21875,5.38060234 -1.91341716 2.25,5.48005353 -2.13777547 2.28125,5.59039368 -2.35698368 2.3125,5.71135695 -2.57051372 2.34375,5.84265194 -2.77785117 2.375,5.98396234 -2.97849652 2.40625,6.13494773 -3.17196642 2.4375,6.29524437 -3.35779477 2.46875,6.46446609 -3.53553391 2.5,6.64220523 -3.70475563 2.53125,6.82803358 -3.86505227 2.5625,7.02150348 -4.01603766 2.59375,7.22214883 -4.15734806 2.625,7.42948628 -4.28864305 2.65625,7.64301632 -4.40960632 2.6875,7.86222453 -4.51994647 2.71875,8.08658284 -4.61939766 2.75,8.31555073 -4.70772033 2.78125,8.54857661 -4.78470168 2.8125,8.7850991 -4.85015627 2.84375,9.02454839 -4.9039264 2.875,9.26634763 -4.94588255 2.90625,9.5099143 -4.97592363 2.9375,9.75466163 -4.99397728 2.96875,10 -5 3,10.24533837 -4.99397728 3.03125,10.4900857 -4.97592363 3.0625,10.73365237 -4.94588255 3.09375,10.97545161 -4.9039264 3.125,11.2149009 -4.85015627 3.15625,11.45142339 -4.78470168 3.1875,11.68444927 -4.70772033 3.21875,11.91341716 -4.61939766 3.25,12.13777547 -4.51994647 3.28125,12.35698368 -4.40960632 3.3125,12.57051372 -4.28864305 3.34375,12.77785117 -4.15734806 3.375,12.97849652 -4.01603766 3.40625,13.17196642 -3.86505227 3.4375,13.35779477 -3.70475563 3.46875,13.53553391 -3.53553391 3.5,13.70475563 -3.35779477 3.53125,13.86505227 -3.17196642 3.5625,14.01603766 -2.97849652 3.59375,14.15734806 -2.77785117 3.625,14.28864305 -2.57051372 3.65625,14.40960632 -2.35698368 3.6875,14.51994647 -2.13777547 3.71875,14.61939766 -1.91341716 3.75,14.70772033 -1.68444927 3.78125,14.78470168 -1.45142339 3.8125,14.85015627 -1.2149009 3.84375,14.9039264 -0.97545161 3.875,14.94588255 -0.73365237 3.90625,14.97592363 -0.4900857 3.9375,14.99397728 -0.24533837 3.96875,15 0 4) ST_CurveToLine04|LINESTRING(0 0 0 0,0.00240909 0.09813535 0.28125 -0.1875,0.00963055 0.19603428 0.5625 -0.375,0.02164698 0.29346095 0.84375 -0.5625,0.03842944 0.39018064 1.125 -0.75,0.05993749 0.48596036 1.40625 -0.9375,0.08611933 0.58056935 1.6875 -1.125,0.11691187 0.67377971 1.96875 -1.3125,0.15224093 0.76536686 2.25 -1.5,0.19202141 0.85511019 2.53125 -1.6875,0.23615747 0.94279347 2.8125 -1.875,0.28454278 1.02820549 2.875 -1.75,0.33706078 1.11114047 2.5 -1,0.39358494 1.19139861 2.125 -0.25,0.45397909 1.26878657 1.75 0.5,0.51809775 1.34311791 1.375 1.25,0.58578644 1.41421356 1 2) ST_CurveToLine04|LINESTRING(-5 0 0 4,-4.99397728 0.24533837 0.03125 3.96875,-4.97592363 0.4900857 0.0625 3.9375,-4.94588255 0.73365237 0.09375 3.90625,-4.9039264 0.97545161 0.125 3.875,-4.85015627 1.2149009 0.15625 3.84375,-4.78470168 1.45142339 0.1875 3.8125,-4.70772033 1.68444927 0.21875 3.78125,-4.61939766 1.91341716 0.25 3.75,-4.51994647 2.13777547 0.28125 3.71875,-4.40960632 2.35698368 0.3125 3.6875,-4.28864305 2.57051372 0.34375 3.65625,-4.15734806 2.77785117 0.375 3.625,-4.01603766 2.97849652 0.40625 3.59375,-3.86505227 3.17196642 0.4375 3.5625,-3.70475563 3.35779477 0.46875 3.53125,-3.53553391 3.53553391 0.5 3.5,-3.35779477 3.70475563 0.53125 3.46875,-3.17196642 3.86505227 0.5625 3.4375,-2.97849652 4.01603766 0.59375 3.40625,-2.77785117 4.15734806 0.625 3.375,-2.57051372 4.28864305 0.65625 3.34375,-2.35698368 4.40960632 0.6875 3.3125,-2.13777547 4.51994647 0.71875 3.28125,-1.91341716 4.61939766 0.75 3.25,-1.68444927 4.70772033 0.78125 3.21875,-1.45142339 4.78470168 0.8125 3.1875,-1.2149009 4.85015627 0.84375 3.15625,-0.97545161 4.9039264 0.875 3.125,-0.73365237 4.94588255 0.90625 3.09375,-0.4900857 4.97592363 0.9375 3.0625,-0.24533837 4.99397728 0.96875 3.03125,0 5 1 3,0.24533837 4.99397728 1.03125 2.96875,0.4900857 4.97592363 1.0625 2.9375,0.73365237 4.94588255 1.09375 2.90625,0.97545161 4.9039264 1.125 2.875,1.2149009 4.85015627 1.15625 2.84375,1.45142339 4.78470168 1.1875 2.8125,1.68444927 4.70772033 1.21875 2.78125,1.91341716 4.61939766 1.25 2.75,2.13777547 4.51994647 1.28125 2.71875,2.35698368 4.40960632 1.3125 2.6875,2.57051372 4.28864305 1.34375 2.65625,2.77785117 4.15734806 1.375 2.625,2.97849652 4.01603766 1.40625 2.59375,3.17196642 3.86505227 1.4375 2.5625,3.35779477 3.70475563 1.46875 2.53125,3.53553391 3.53553391 1.5 2.5,3.70475563 3.35779477 1.53125 2.46875,3.86505227 3.17196642 1.5625 2.4375,4.01603766 2.97849652 1.59375 2.40625,4.15734806 2.77785117 1.625 2.375,4.28864305 2.57051372 1.65625 2.34375,4.40960632 2.35698368 1.6875 2.3125,4.51994647 2.13777547 1.71875 2.28125,4.61939766 1.91341716 1.75 2.25,4.70772033 1.68444927 1.78125 2.21875,4.78470168 1.45142339 1.8125 2.1875,4.85015627 1.2149009 1.84375 2.15625,4.9039264 0.97545161 1.875 2.125,4.94588255 0.73365237 1.90625 2.09375,4.97592363 0.4900857 1.9375 2.0625,4.99397728 0.24533837 1.96875 2.03125,5 0 2 2,5.00602272 -0.24533837 2.03125 1.96875,5.02407637 -0.4900857 2.0625 1.9375,5.05411745 -0.73365237 2.09375 1.90625,5.0960736 -0.97545161 2.125 1.875,5.14984373 -1.2149009 2.15625 1.84375,5.21529832 -1.45142339 2.1875 1.8125,5.29227967 -1.68444927 2.21875 1.78125,5.38060234 -1.91341716 2.25 1.75,5.48005353 -2.13777547 2.28125 1.71875,5.59039368 -2.35698368 2.3125 1.6875,5.71135695 -2.57051372 2.34375 1.65625,5.84265194 -2.77785117 2.375 1.625,5.98396234 -2.97849652 2.40625 1.59375,6.13494773 -3.17196642 2.4375 1.5625,6.29524437 -3.35779477 2.46875 1.53125,6.46446609 -3.53553391 2.5 1.5,6.64220523 -3.70475563 2.53125 1.46875,6.82803358 -3.86505227 2.5625 1.4375,7.02150348 -4.01603766 2.59375 1.40625,7.22214883 -4.15734806 2.625 1.375,7.42948628 -4.28864305 2.65625 1.34375,7.64301632 -4.40960632 2.6875 1.3125,7.86222453 -4.51994647 2.71875 1.28125,8.08658284 -4.61939766 2.75 1.25,8.31555073 -4.70772033 2.78125 1.21875,8.54857661 -4.78470168 2.8125 1.1875,8.7850991 -4.85015627 2.84375 1.15625,9.02454839 -4.9039264 2.875 1.125,9.26634763 -4.94588255 2.90625 1.09375,9.5099143 -4.97592363 2.9375 1.0625,9.75466163 -4.99397728 2.96875 1.03125,10 -5 3 1,10.24533837 -4.99397728 3.03125 0.96875,10.4900857 -4.97592363 3.0625 0.9375,10.73365237 -4.94588255 3.09375 0.90625,10.97545161 -4.9039264 3.125 0.875,11.2149009 -4.85015627 3.15625 0.84375,11.45142339 -4.78470168 3.1875 0.8125,11.68444927 -4.70772033 3.21875 0.78125,11.91341716 -4.61939766 3.25 0.75,12.13777547 -4.51994647 3.28125 0.71875,12.35698368 -4.40960632 3.3125 0.6875,12.57051372 -4.28864305 3.34375 0.65625,12.77785117 -4.15734806 3.375 0.625,12.97849652 -4.01603766 3.40625 0.59375,13.17196642 -3.86505227 3.4375 0.5625,13.35779477 -3.70475563 3.46875 0.53125,13.53553391 -3.53553391 3.5 0.5,13.70475563 -3.35779477 3.53125 0.46875,13.86505227 -3.17196642 3.5625 0.4375,14.01603766 -2.97849652 3.59375 0.40625,14.15734806 -2.77785117 3.625 0.375,14.28864305 -2.57051372 3.65625 0.34375,14.40960632 -2.35698368 3.6875 0.3125,14.51994647 -2.13777547 3.71875 0.28125,14.61939766 -1.91341716 3.75 0.25,14.70772033 -1.68444927 3.78125 0.21875,14.78470168 -1.45142339 3.8125 0.1875,14.85015627 -1.2149009 3.84375 0.15625,14.9039264 -0.97545161 3.875 0.125,14.94588255 -0.73365237 3.90625 0.09375,14.97592363 -0.4900857 3.9375 0.0625,14.99397728 -0.24533837 3.96875 0.03125,15 0 4 0) +#ifdef USE_JTS +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +#else ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. +#endif dimension01|1 dimension01|1 dimension02|1 @@ -110,10 +134,17 @@ SRID03|-1 SRID03|-1 SRID04|-1 SRID04|-1 +#ifdef USE_JTS +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +#else ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. +#endif envelope01|POLYGON((0 0,0 1.41421366,0.58578646 1.41421366,0.58578646 0,0 0)) envelope01|POLYGON((-5 0,-5 5,15 5,15 0,-5 0)) envelope02|POLYGON((0 0,0 1.41421366,0.58578646 1.41421366,0.58578646 0,0 0)) @@ -162,10 +193,17 @@ asewkb03|01080000800300000000000000000000000000000000000000000000000000000056cd9 asewkb03|01080000800500000000000000000014c00000000000000000000000000000000000000000000000000000000000001440000000000000f03f000000000000144000000000000000000000000000000040000000000000244000000000000014c000000000000008400000000000002e4000000000000000000000000000001040 asewkb04|01080000c003000000000000000000000000000000000000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f000000000000084000000000000000c067880133c3bee23fcd3b7f669ea0f63f000000000000f03f0000000000000040 asewkb04|01080000c00500000000000000000014c000000000000000000000000000000000000000000000104000000000000000000000000000001440000000000000f03f00000000000008400000000000001440000000000000000000000000000000400000000000000040000000000000244000000000000014c00000000000000840000000000000f03f0000000000002e40000000000000000000000000000010400000000000000000 +#ifdef USE_JTS +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +#else ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. +#endif dimension01|1 dimension01|1 dimension02|1 @@ -182,10 +220,17 @@ SRID03|-1 SRID03|-1 SRID04|-1 SRID04|-1 +#ifdef USE_JTS +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +#else ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. +#endif envelope01|POLYGON((0 0,0 1.41421366,0.58578646 1.41421366,0.58578646 0,0 0)) envelope01|POLYGON((-5 0,-5 5,15 5,15 0,-5 0)) envelope02|POLYGON((0 0,0 1.41421366,0.58578646 1.41421366,0.58578646 0,0 0)) diff --git a/regress/sql-mm-compoundcurve_expected b/regress/sql-mm-compoundcurve_expected.in similarity index 91% rename from regress/sql-mm-compoundcurve_expected rename to regress/sql-mm-compoundcurve_expected.in index d2cd6d710..5f68d4a92 100644 --- a/regress/sql-mm-compoundcurve_expected +++ b/regress/sql-mm-compoundcurve_expected.in @@ -1,3 +1,4 @@ +#include "../config.h" ndims01|4 geometrytype01|COMPOUNDCURVE ndims02|3 @@ -50,10 +51,17 @@ ST_CurveToLine01|LINESTRING(0 0,0.00240909 0.09813535,0.00963055 0.19603428,0.02 ST_CurveToLine02|LINESTRINGM(0 0 0,0.00240909 0.09813535 -0.1875,0.00963055 0.19603428 -0.375,0.02164698 0.29346095 -0.5625,0.03842944 0.39018064 -0.75,0.05993749 0.48596036 -0.9375,0.08611933 0.58056935 -1.125,0.11691187 0.67377971 -1.3125,0.15224093 0.76536686 -1.5,0.19202141 0.85511019 -1.6875,0.23615747 0.94279347 -1.875,0.28454278 1.02820549 -1.75,0.33706078 1.11114047 -1,0.39358494 1.19139861 -0.25,0.45397909 1.26878657 0.5,0.51809775 1.34311791 1.25,0.58578644 1.41421356 2,2 0 0,0 0 0) ST_CurveToLine03|LINESTRING(0 0 0,0.00240909 0.09813535 0.28125,0.00963055 0.19603428 0.5625,0.02164698 0.29346095 0.84375,0.03842944 0.39018064 1.125,0.05993749 0.48596036 1.40625,0.08611933 0.58056935 1.6875,0.11691187 0.67377971 1.96875,0.15224093 0.76536686 2.25,0.19202141 0.85511019 2.53125,0.23615747 0.94279347 2.8125,0.28454278 1.02820549 2.875,0.33706078 1.11114047 2.5,0.39358494 1.19139861 2.125,0.45397909 1.26878657 1.75,0.51809775 1.34311791 1.375,0.58578644 1.41421356 1,2 0 0,0 0 0) ST_CurveToLine04|LINESTRING(0 0 0 0,0.00240909 0.09813535 0.28125 -0.1875,0.00963055 0.19603428 0.5625 -0.375,0.02164698 0.29346095 0.84375 -0.5625,0.03842944 0.39018064 1.125 -0.75,0.05993749 0.48596036 1.40625 -0.9375,0.08611933 0.58056935 1.6875 -1.125,0.11691187 0.67377971 1.96875 -1.3125,0.15224093 0.76536686 2.25 -1.5,0.19202141 0.85511019 2.53125 -1.6875,0.23615747 0.94279347 2.8125 -1.875,0.28454278 1.02820549 2.875 -1.75,0.33706078 1.11114047 2.5 -1,0.39358494 1.19139861 2.125 -0.25,0.45397909 1.26878657 1.75 0.5,0.51809775 1.34311791 1.375 1.25,0.58578644 1.41421356 1 2,2 0 0 0,0 0 0 0) +#ifdef USE_JTS +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +#else ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. +#endif dimension01|1 dimension02|1 dimension03|1 @@ -62,10 +70,17 @@ SRID01|-1 SRID02|-1 SRID03|-1 SRID04|-1 +#ifdef USE_JTS +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +#else ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. +#endif envelope01|POLYGON((0 0,0 1.41421366,2 1.41421366,2 0,0 0)) envelope02|POLYGON((0 0,0 1.41421366,2 1.41421366,2 0,0 0)) envelope03|POLYGON((0 0,0 1.41421366,2 1.41421366,2 0,0 0)) @@ -90,10 +105,17 @@ asewkb01|0109000000020000000108000000030000000000000000000000000000000000000056c asewkb02|01090000400200000001080000400300000000000000000000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f00000000000000c067880133c3bee23fcd3b7f669ea0f63f000000000000004001020000400300000067880133c3bee23fcd3b7f669ea0f63f0000000000000040000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000 asewkb03|01090000800200000001080000800300000000000000000000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f000000000000084067880133c3bee23fcd3b7f669ea0f63f000000000000f03f01020000800300000067880133c3bee23fcd3b7f669ea0f63f000000000000f03f000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000 asewkb04|01090000c00200000001080000c003000000000000000000000000000000000000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f000000000000084000000000000000c067880133c3bee23fcd3b7f669ea0f63f000000000000f03f000000000000004001020000c00300000067880133c3bee23fcd3b7f669ea0f63f000000000000f03f000000000000004000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +#ifdef USE_JTS +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +#else ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. +#endif dimension01|1 dimension02|1 dimension03|1 @@ -102,10 +124,17 @@ SRID01|-1 SRID02|-1 SRID03|-1 SRID04|-1 +#ifdef USE_JTS +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +#else ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. +#endif envelope01|POLYGON((0 0,0 1.41421366,2 1.41421366,2 0,0 0)) envelope02|POLYGON((0 0,0 1.41421366,2 1.41421366,2 0,0 0)) envelope03|POLYGON((0 0,0 1.41421366,2 1.41421366,2 0,0 0)) diff --git a/regress/sql-mm-curvepoly_expected b/regress/sql-mm-curvepoly_expected.in similarity index 98% rename from regress/sql-mm-curvepoly_expected rename to regress/sql-mm-curvepoly_expected.in index 4efa37420..decb02a22 100644 --- a/regress/sql-mm-curvepoly_expected +++ b/regress/sql-mm-curvepoly_expected.in @@ -1,3 +1,4 @@ +#include "../config.h" ndims01|4 geometrytype01|CURVEPOLYGON ndims02|3 @@ -50,10 +51,17 @@ ST_CurveToLine01|POLYGON((-2 0,-1.99879546 -0.04906767,-1.99518473 -0.09801714,- ST_CurveToLine02|POLYGONM((-2 0 0,-1.99879546 -0.04906767 0.0625,-1.99518473 -0.09801714 0.125,-1.98917651 -0.14673047 0.1875,-1.98078528 -0.19509032 0.25,-1.97003125 -0.24298018 0.3125,-1.95694034 -0.29028468 0.375,-1.94154407 -0.33688985 0.4375,-1.92387953 -0.38268343 0.5,-1.90398929 -0.42755509 0.5625,-1.88192126 -0.47139674 0.625,-1.85772861 -0.51410274 0.6875,-1.83146961 -0.55557023 0.75,-1.80320753 -0.5956993 0.8125,-1.77301045 -0.63439328 0.875,-1.74095113 -0.67155895 0.9375,-1.70710678 -0.70710678 1,-1.67155895 -0.74095113 1.0625,-1.63439328 -0.77301045 1.125,-1.5956993 -0.80320753 1.1875,-1.55557023 -0.83146961 1.25,-1.51410274 -0.85772861 1.3125,-1.47139674 -0.88192126 1.375,-1.42755509 -0.90398929 1.4375,-1.38268343 -0.92387953 1.5,-1.33688985 -0.94154407 1.5625,-1.29028468 -0.95694034 1.625,-1.24298018 -0.97003125 1.6875,-1.19509032 -0.98078528 1.75,-1.14673047 -0.98917651 1.8125,-1.09801714 -0.99518473 1.875,-1.04906767 -0.99879546 1.9375,-1 -1 2,-0.95093233 -0.99879546 2.0625,-0.90198286 -0.99518473 2.125,-0.85326953 -0.98917651 2.1875,-0.80490968 -0.98078528 2.25,-0.75701982 -0.97003125 2.3125,-0.70971532 -0.95694034 2.375,-0.66311015 -0.94154407 2.4375,-0.61731657 -0.92387953 2.5,-0.57244491 -0.90398929 2.5625,-0.52860326 -0.88192126 2.625,-0.48589726 -0.85772861 2.6875,-0.44442977 -0.83146961 2.75,-0.4043007 -0.80320753 2.8125,-0.36560672 -0.77301045 2.875,-0.32844105 -0.74095113 2.9375,-0.29289322 -0.70710678 3,-0.25904887 -0.67155895 3.0625,-0.22698955 -0.63439328 3.125,-0.19679247 -0.5956993 3.1875,-0.16853039 -0.55557023 3.25,-0.14227139 -0.51410274 3.3125,-0.11807874 -0.47139674 3.375,-0.09601071 -0.42755509 3.4375,-0.07612047 -0.38268343 3.5,-0.05845593 -0.33688985 3.5625,-0.04305966 -0.29028468 3.625,-0.02996875 -0.24298018 3.6875,-0.01921472 -0.19509032 3.75,-0.01082349 -0.14673047 3.8125,-0.00481527 -0.09801714 3.875,-0.00120454 -0.04906767 3.9375,0 0 4,0.00120454 -0.04906767 4.0625,0.00481527 -0.09801714 4.125,0.01082349 -0.14673047 4.1875,0.01921472 -0.19509032 4.25,0.02996875 -0.24298018 4.3125,0.04305966 -0.29028468 4.375,0.05845593 -0.33688985 4.4375,0.07612047 -0.38268343 4.5,0.09601071 -0.42755509 4.5625,0.11807874 -0.47139674 4.625,0.14227139 -0.51410274 4.6875,0.16853039 -0.55557023 4.75,0.19679247 -0.5956993 4.8125,0.22698955 -0.63439328 4.875,0.25904887 -0.67155895 4.9375,0.29289322 -0.70710678 5,0.32844105 -0.74095113 5.0625,0.36560672 -0.77301045 5.125,0.4043007 -0.80320753 5.1875,0.44442977 -0.83146961 5.25,0.48589726 -0.85772861 5.3125,0.52860326 -0.88192126 5.375,0.57244491 -0.90398929 5.4375,0.61731657 -0.92387953 5.5,0.66311015 -0.94154407 5.5625,0.70971532 -0.95694034 5.625,0.75701982 -0.97003125 5.6875,0.80490968 -0.98078528 5.75,0.85326953 -0.98917651 5.8125,0.90198286 -0.99518473 5.875,0.95093233 -0.99879546 5.9375,1 -1 6,1.04906767 -0.99879546 6.0625,1.09801714 -0.99518473 6.125,1.14673047 -0.98917651 6.1875,1.19509032 -0.98078528 6.25,1.24298018 -0.97003125 6.3125,1.29028468 -0.95694034 6.375,1.33688985 -0.94154407 6.4375,1.38268343 -0.92387953 6.5,1.42755509 -0.90398929 6.5625,1.47139674 -0.88192126 6.625,1.51410274 -0.85772861 6.6875,1.55557023 -0.83146961 6.75,1.5956993 -0.80320753 6.8125,1.63439328 -0.77301045 6.875,1.67155895 -0.74095113 6.9375,1.70710678 -0.70710678 7,1.74095113 -0.67155895 7.0625,1.77301045 -0.63439328 7.125,1.80320753 -0.5956993 7.1875,1.83146961 -0.55557023 7.25,1.85772861 -0.51410274 7.3125,1.88192126 -0.47139674 7.375,1.90398929 -0.42755509 7.4375,1.92387953 -0.38268343 7.5,1.94154407 -0.33688985 7.5625,1.95694034 -0.29028468 7.625,1.97003125 -0.24298018 7.6875,1.98078528 -0.19509032 7.75,1.98917651 -0.14673047 7.8125,1.99518473 -0.09801714 7.875,1.99879546 -0.04906767 7.9375,2 0 8,1.99759091 0.09813535 7.875,1.99036945 0.19603428 7.75,1.97835302 0.29346095 7.625,1.96157056 0.39018064 7.5,1.94006251 0.48596036 7.375,1.91388067 0.58056935 7.25,1.88308813 0.67377971 7.125,1.84775907 0.76536686 7,1.80797859 0.85511019 6.875,1.76384253 0.94279347 6.75,1.71545722 1.02820549 6.625,1.66293922 1.11114047 6.5,1.60641506 1.19139861 6.375,1.54602091 1.26878657 6.25,1.48190225 1.34311791 6.125,1.41421356 1.41421356 6,1.34311791 1.48190225 5.875,1.26878657 1.54602091 5.75,1.19139861 1.60641506 5.625,1.11114047 1.66293922 5.5,1.02820549 1.71545722 5.375,0.94279347 1.76384253 5.25,0.85511019 1.80797859 5.125,0.76536686 1.84775907 5,0.67377971 1.88308813 4.875,0.58056935 1.91388067 4.75,0.48596036 1.94006251 4.625,0.39018064 1.96157056 4.5,0.29346095 1.97835302 4.375,0.19603428 1.99036945 4.25,0.09813535 1.99759091 4.125,0 2 4,-0.09813535 1.99759091 3.875,-0.19603428 1.99036945 3.75,-0.29346095 1.97835302 3.625,-0.39018064 1.96157056 3.5,-0.48596036 1.94006251 3.375,-0.58056935 1.91388067 3.25,-0.67377971 1.88308813 3.125,-0.76536686 1.84775907 3,-0.85511019 1.80797859 2.875,-0.94279347 1.76384253 2.75,-1.02820549 1.71545722 2.625,-1.11114047 1.66293922 2.5,-1.19139861 1.60641506 2.375,-1.26878657 1.54602091 2.25,-1.34311791 1.48190225 2.125,-1.41421356 1.41421356 2,-1.48190225 1.34311791 1.875,-1.54602091 1.26878657 1.75,-1.60641506 1.19139861 1.625,-1.66293922 1.11114047 1.5,-1.71545722 1.02820549 1.375,-1.76384253 0.94279347 1.25,-1.80797859 0.85511019 1.125,-1.84775907 0.76536686 1,-1.88308813 0.67377971 0.875,-1.91388067 0.58056935 0.75,-1.94006251 0.48596036 0.625,-1.96157056 0.39018064 0.5,-1.97835302 0.29346095 0.375,-1.99036945 0.19603428 0.25,-1.99759091 0.09813535 0.125,-2 0 0),(-1 0 2,0 0.5 4,1 0 6,0 1 4,-1 0 2)) ST_CurveToLine03|POLYGON((-2 0 0,-1.99879546 -0.04906767 0.03125,-1.99518473 -0.09801714 0.0625,-1.98917651 -0.14673047 0.09375,-1.98078528 -0.19509032 0.125,-1.97003125 -0.24298018 0.15625,-1.95694034 -0.29028468 0.1875,-1.94154407 -0.33688985 0.21875,-1.92387953 -0.38268343 0.25,-1.90398929 -0.42755509 0.28125,-1.88192126 -0.47139674 0.3125,-1.85772861 -0.51410274 0.34375,-1.83146961 -0.55557023 0.375,-1.80320753 -0.5956993 0.40625,-1.77301045 -0.63439328 0.4375,-1.74095113 -0.67155895 0.46875,-1.70710678 -0.70710678 0.5,-1.67155895 -0.74095113 0.53125,-1.63439328 -0.77301045 0.5625,-1.5956993 -0.80320753 0.59375,-1.55557023 -0.83146961 0.625,-1.51410274 -0.85772861 0.65625,-1.47139674 -0.88192126 0.6875,-1.42755509 -0.90398929 0.71875,-1.38268343 -0.92387953 0.75,-1.33688985 -0.94154407 0.78125,-1.29028468 -0.95694034 0.8125,-1.24298018 -0.97003125 0.84375,-1.19509032 -0.98078528 0.875,-1.14673047 -0.98917651 0.90625,-1.09801714 -0.99518473 0.9375,-1.04906767 -0.99879546 0.96875,-1 -1 1,-0.95093233 -0.99879546 1.03125,-0.90198286 -0.99518473 1.0625,-0.85326953 -0.98917651 1.09375,-0.80490968 -0.98078528 1.125,-0.75701982 -0.97003125 1.15625,-0.70971532 -0.95694034 1.1875,-0.66311015 -0.94154407 1.21875,-0.61731657 -0.92387953 1.25,-0.57244491 -0.90398929 1.28125,-0.52860326 -0.88192126 1.3125,-0.48589726 -0.85772861 1.34375,-0.44442977 -0.83146961 1.375,-0.4043007 -0.80320753 1.40625,-0.36560672 -0.77301045 1.4375,-0.32844105 -0.74095113 1.46875,-0.29289322 -0.70710678 1.5,-0.25904887 -0.67155895 1.53125,-0.22698955 -0.63439328 1.5625,-0.19679247 -0.5956993 1.59375,-0.16853039 -0.55557023 1.625,-0.14227139 -0.51410274 1.65625,-0.11807874 -0.47139674 1.6875,-0.09601071 -0.42755509 1.71875,-0.07612047 -0.38268343 1.75,-0.05845593 -0.33688985 1.78125,-0.04305966 -0.29028468 1.8125,-0.02996875 -0.24298018 1.84375,-0.01921472 -0.19509032 1.875,-0.01082349 -0.14673047 1.90625,-0.00481527 -0.09801714 1.9375,-0.00120454 -0.04906767 1.96875,0 0 2,0.00120454 -0.04906767 2.03125,0.00481527 -0.09801714 2.0625,0.01082349 -0.14673047 2.09375,0.01921472 -0.19509032 2.125,0.02996875 -0.24298018 2.15625,0.04305966 -0.29028468 2.1875,0.05845593 -0.33688985 2.21875,0.07612047 -0.38268343 2.25,0.09601071 -0.42755509 2.28125,0.11807874 -0.47139674 2.3125,0.14227139 -0.51410274 2.34375,0.16853039 -0.55557023 2.375,0.19679247 -0.5956993 2.40625,0.22698955 -0.63439328 2.4375,0.25904887 -0.67155895 2.46875,0.29289322 -0.70710678 2.5,0.32844105 -0.74095113 2.53125,0.36560672 -0.77301045 2.5625,0.4043007 -0.80320753 2.59375,0.44442977 -0.83146961 2.625,0.48589726 -0.85772861 2.65625,0.52860326 -0.88192126 2.6875,0.57244491 -0.90398929 2.71875,0.61731657 -0.92387953 2.75,0.66311015 -0.94154407 2.78125,0.70971532 -0.95694034 2.8125,0.75701982 -0.97003125 2.84375,0.80490968 -0.98078528 2.875,0.85326953 -0.98917651 2.90625,0.90198286 -0.99518473 2.9375,0.95093233 -0.99879546 2.96875,1 -1 3,1.04906767 -0.99879546 3.03125,1.09801714 -0.99518473 3.0625,1.14673047 -0.98917651 3.09375,1.19509032 -0.98078528 3.125,1.24298018 -0.97003125 3.15625,1.29028468 -0.95694034 3.1875,1.33688985 -0.94154407 3.21875,1.38268343 -0.92387953 3.25,1.42755509 -0.90398929 3.28125,1.47139674 -0.88192126 3.3125,1.51410274 -0.85772861 3.34375,1.55557023 -0.83146961 3.375,1.5956993 -0.80320753 3.40625,1.63439328 -0.77301045 3.4375,1.67155895 -0.74095113 3.46875,1.70710678 -0.70710678 3.5,1.74095113 -0.67155895 3.53125,1.77301045 -0.63439328 3.5625,1.80320753 -0.5956993 3.59375,1.83146961 -0.55557023 3.625,1.85772861 -0.51410274 3.65625,1.88192126 -0.47139674 3.6875,1.90398929 -0.42755509 3.71875,1.92387953 -0.38268343 3.75,1.94154407 -0.33688985 3.78125,1.95694034 -0.29028468 3.8125,1.97003125 -0.24298018 3.84375,1.98078528 -0.19509032 3.875,1.98917651 -0.14673047 3.90625,1.99518473 -0.09801714 3.9375,1.99879546 -0.04906767 3.96875,2 0 4,1.99759091 0.09813535 3.9375,1.99036945 0.19603428 3.875,1.97835302 0.29346095 3.8125,1.96157056 0.39018064 3.75,1.94006251 0.48596036 3.6875,1.91388067 0.58056935 3.625,1.88308813 0.67377971 3.5625,1.84775907 0.76536686 3.5,1.80797859 0.85511019 3.4375,1.76384253 0.94279347 3.375,1.71545722 1.02820549 3.3125,1.66293922 1.11114047 3.25,1.60641506 1.19139861 3.1875,1.54602091 1.26878657 3.125,1.48190225 1.34311791 3.0625,1.41421356 1.41421356 3,1.34311791 1.48190225 2.9375,1.26878657 1.54602091 2.875,1.19139861 1.60641506 2.8125,1.11114047 1.66293922 2.75,1.02820549 1.71545722 2.6875,0.94279347 1.76384253 2.625,0.85511019 1.80797859 2.5625,0.76536686 1.84775907 2.5,0.67377971 1.88308813 2.4375,0.58056935 1.91388067 2.375,0.48596036 1.94006251 2.3125,0.39018064 1.96157056 2.25,0.29346095 1.97835302 2.1875,0.19603428 1.99036945 2.125,0.09813535 1.99759091 2.0625,0 2 2,-0.09813535 1.99759091 1.9375,-0.19603428 1.99036945 1.875,-0.29346095 1.97835302 1.8125,-0.39018064 1.96157056 1.75,-0.48596036 1.94006251 1.6875,-0.58056935 1.91388067 1.625,-0.67377971 1.88308813 1.5625,-0.76536686 1.84775907 1.5,-0.85511019 1.80797859 1.4375,-0.94279347 1.76384253 1.375,-1.02820549 1.71545722 1.3125,-1.11114047 1.66293922 1.25,-1.19139861 1.60641506 1.1875,-1.26878657 1.54602091 1.125,-1.34311791 1.48190225 1.0625,-1.41421356 1.41421356 1,-1.48190225 1.34311791 0.9375,-1.54602091 1.26878657 0.875,-1.60641506 1.19139861 0.8125,-1.66293922 1.11114047 0.75,-1.71545722 1.02820549 0.6875,-1.76384253 0.94279347 0.625,-1.80797859 0.85511019 0.5625,-1.84775907 0.76536686 0.5,-1.88308813 0.67377971 0.4375,-1.91388067 0.58056935 0.375,-1.94006251 0.48596036 0.3125,-1.96157056 0.39018064 0.25,-1.97835302 0.29346095 0.1875,-1.99036945 0.19603428 0.125,-1.99759091 0.09813535 0.0625,-2 0 0),(-1 0 1,0 0.5 2,1 0 3,0 1 3,-1 0 1)) ST_CurveToLine04|POLYGON((-2 0 0 0,-1.99879546 -0.04906767 0.03125 0.0625,-1.99518473 -0.09801714 0.0625 0.125,-1.98917651 -0.14673047 0.09375 0.1875,-1.98078528 -0.19509032 0.125 0.25,-1.97003125 -0.24298018 0.15625 0.3125,-1.95694034 -0.29028468 0.1875 0.375,-1.94154407 -0.33688985 0.21875 0.4375,-1.92387953 -0.38268343 0.25 0.5,-1.90398929 -0.42755509 0.28125 0.5625,-1.88192126 -0.47139674 0.3125 0.625,-1.85772861 -0.51410274 0.34375 0.6875,-1.83146961 -0.55557023 0.375 0.75,-1.80320753 -0.5956993 0.40625 0.8125,-1.77301045 -0.63439328 0.4375 0.875,-1.74095113 -0.67155895 0.46875 0.9375,-1.70710678 -0.70710678 0.5 1,-1.67155895 -0.74095113 0.53125 1.0625,-1.63439328 -0.77301045 0.5625 1.125,-1.5956993 -0.80320753 0.59375 1.1875,-1.55557023 -0.83146961 0.625 1.25,-1.51410274 -0.85772861 0.65625 1.3125,-1.47139674 -0.88192126 0.6875 1.375,-1.42755509 -0.90398929 0.71875 1.4375,-1.38268343 -0.92387953 0.75 1.5,-1.33688985 -0.94154407 0.78125 1.5625,-1.29028468 -0.95694034 0.8125 1.625,-1.24298018 -0.97003125 0.84375 1.6875,-1.19509032 -0.98078528 0.875 1.75,-1.14673047 -0.98917651 0.90625 1.8125,-1.09801714 -0.99518473 0.9375 1.875,-1.04906767 -0.99879546 0.96875 1.9375,-1 -1 1 2,-0.95093233 -0.99879546 1.03125 2.0625,-0.90198286 -0.99518473 1.0625 2.125,-0.85326953 -0.98917651 1.09375 2.1875,-0.80490968 -0.98078528 1.125 2.25,-0.75701982 -0.97003125 1.15625 2.3125,-0.70971532 -0.95694034 1.1875 2.375,-0.66311015 -0.94154407 1.21875 2.4375,-0.61731657 -0.92387953 1.25 2.5,-0.57244491 -0.90398929 1.28125 2.5625,-0.52860326 -0.88192126 1.3125 2.625,-0.48589726 -0.85772861 1.34375 2.6875,-0.44442977 -0.83146961 1.375 2.75,-0.4043007 -0.80320753 1.40625 2.8125,-0.36560672 -0.77301045 1.4375 2.875,-0.32844105 -0.74095113 1.46875 2.9375,-0.29289322 -0.70710678 1.5 3,-0.25904887 -0.67155895 1.53125 3.0625,-0.22698955 -0.63439328 1.5625 3.125,-0.19679247 -0.5956993 1.59375 3.1875,-0.16853039 -0.55557023 1.625 3.25,-0.14227139 -0.51410274 1.65625 3.3125,-0.11807874 -0.47139674 1.6875 3.375,-0.09601071 -0.42755509 1.71875 3.4375,-0.07612047 -0.38268343 1.75 3.5,-0.05845593 -0.33688985 1.78125 3.5625,-0.04305966 -0.29028468 1.8125 3.625,-0.02996875 -0.24298018 1.84375 3.6875,-0.01921472 -0.19509032 1.875 3.75,-0.01082349 -0.14673047 1.90625 3.8125,-0.00481527 -0.09801714 1.9375 3.875,-0.00120454 -0.04906767 1.96875 3.9375,0 0 2 4,0.00120454 -0.04906767 2.03125 4.0625,0.00481527 -0.09801714 2.0625 4.125,0.01082349 -0.14673047 2.09375 4.1875,0.01921472 -0.19509032 2.125 4.25,0.02996875 -0.24298018 2.15625 4.3125,0.04305966 -0.29028468 2.1875 4.375,0.05845593 -0.33688985 2.21875 4.4375,0.07612047 -0.38268343 2.25 4.5,0.09601071 -0.42755509 2.28125 4.5625,0.11807874 -0.47139674 2.3125 4.625,0.14227139 -0.51410274 2.34375 4.6875,0.16853039 -0.55557023 2.375 4.75,0.19679247 -0.5956993 2.40625 4.8125,0.22698955 -0.63439328 2.4375 4.875,0.25904887 -0.67155895 2.46875 4.9375,0.29289322 -0.70710678 2.5 5,0.32844105 -0.74095113 2.53125 5.0625,0.36560672 -0.77301045 2.5625 5.125,0.4043007 -0.80320753 2.59375 5.1875,0.44442977 -0.83146961 2.625 5.25,0.48589726 -0.85772861 2.65625 5.3125,0.52860326 -0.88192126 2.6875 5.375,0.57244491 -0.90398929 2.71875 5.4375,0.61731657 -0.92387953 2.75 5.5,0.66311015 -0.94154407 2.78125 5.5625,0.70971532 -0.95694034 2.8125 5.625,0.75701982 -0.97003125 2.84375 5.6875,0.80490968 -0.98078528 2.875 5.75,0.85326953 -0.98917651 2.90625 5.8125,0.90198286 -0.99518473 2.9375 5.875,0.95093233 -0.99879546 2.96875 5.9375,1 -1 3 6,1.04906767 -0.99879546 3.03125 6.0625,1.09801714 -0.99518473 3.0625 6.125,1.14673047 -0.98917651 3.09375 6.1875,1.19509032 -0.98078528 3.125 6.25,1.24298018 -0.97003125 3.15625 6.3125,1.29028468 -0.95694034 3.1875 6.375,1.33688985 -0.94154407 3.21875 6.4375,1.38268343 -0.92387953 3.25 6.5,1.42755509 -0.90398929 3.28125 6.5625,1.47139674 -0.88192126 3.3125 6.625,1.51410274 -0.85772861 3.34375 6.6875,1.55557023 -0.83146961 3.375 6.75,1.5956993 -0.80320753 3.40625 6.8125,1.63439328 -0.77301045 3.4375 6.875,1.67155895 -0.74095113 3.46875 6.9375,1.70710678 -0.70710678 3.5 7,1.74095113 -0.67155895 3.53125 7.0625,1.77301045 -0.63439328 3.5625 7.125,1.80320753 -0.5956993 3.59375 7.1875,1.83146961 -0.55557023 3.625 7.25,1.85772861 -0.51410274 3.65625 7.3125,1.88192126 -0.47139674 3.6875 7.375,1.90398929 -0.42755509 3.71875 7.4375,1.92387953 -0.38268343 3.75 7.5,1.94154407 -0.33688985 3.78125 7.5625,1.95694034 -0.29028468 3.8125 7.625,1.97003125 -0.24298018 3.84375 7.6875,1.98078528 -0.19509032 3.875 7.75,1.98917651 -0.14673047 3.90625 7.8125,1.99518473 -0.09801714 3.9375 7.875,1.99879546 -0.04906767 3.96875 7.9375,2 0 4 8,1.99759091 0.09813535 3.9375 7.875,1.99036945 0.19603428 3.875 7.75,1.97835302 0.29346095 3.8125 7.625,1.96157056 0.39018064 3.75 7.5,1.94006251 0.48596036 3.6875 7.375,1.91388067 0.58056935 3.625 7.25,1.88308813 0.67377971 3.5625 7.125,1.84775907 0.76536686 3.5 7,1.80797859 0.85511019 3.4375 6.875,1.76384253 0.94279347 3.375 6.75,1.71545722 1.02820549 3.3125 6.625,1.66293922 1.11114047 3.25 6.5,1.60641506 1.19139861 3.1875 6.375,1.54602091 1.26878657 3.125 6.25,1.48190225 1.34311791 3.0625 6.125,1.41421356 1.41421356 3 6,1.34311791 1.48190225 2.9375 5.875,1.26878657 1.54602091 2.875 5.75,1.19139861 1.60641506 2.8125 5.625,1.11114047 1.66293922 2.75 5.5,1.02820549 1.71545722 2.6875 5.375,0.94279347 1.76384253 2.625 5.25,0.85511019 1.80797859 2.5625 5.125,0.76536686 1.84775907 2.5 5,0.67377971 1.88308813 2.4375 4.875,0.58056935 1.91388067 2.375 4.75,0.48596036 1.94006251 2.3125 4.625,0.39018064 1.96157056 2.25 4.5,0.29346095 1.97835302 2.1875 4.375,0.19603428 1.99036945 2.125 4.25,0.09813535 1.99759091 2.0625 4.125,0 2 2 4,-0.09813535 1.99759091 1.9375 3.875,-0.19603428 1.99036945 1.875 3.75,-0.29346095 1.97835302 1.8125 3.625,-0.39018064 1.96157056 1.75 3.5,-0.48596036 1.94006251 1.6875 3.375,-0.58056935 1.91388067 1.625 3.25,-0.67377971 1.88308813 1.5625 3.125,-0.76536686 1.84775907 1.5 3,-0.85511019 1.80797859 1.4375 2.875,-0.94279347 1.76384253 1.375 2.75,-1.02820549 1.71545722 1.3125 2.625,-1.11114047 1.66293922 1.25 2.5,-1.19139861 1.60641506 1.1875 2.375,-1.26878657 1.54602091 1.125 2.25,-1.34311791 1.48190225 1.0625 2.125,-1.41421356 1.41421356 1 2,-1.48190225 1.34311791 0.9375 1.875,-1.54602091 1.26878657 0.875 1.75,-1.60641506 1.19139861 0.8125 1.625,-1.66293922 1.11114047 0.75 1.5,-1.71545722 1.02820549 0.6875 1.375,-1.76384253 0.94279347 0.625 1.25,-1.80797859 0.85511019 0.5625 1.125,-1.84775907 0.76536686 0.5 1,-1.88308813 0.67377971 0.4375 0.875,-1.91388067 0.58056935 0.375 0.75,-1.94006251 0.48596036 0.3125 0.625,-1.96157056 0.39018064 0.25 0.5,-1.97835302 0.29346095 0.1875 0.375,-1.99036945 0.19603428 0.125 0.25,-1.99759091 0.09813535 0.0625 0.125,-2 0 0 0),(-1 0 1 2,0 0.5 2 4,1 0 3 6,0 1 3 4,-1 0 1 2)) +#ifdef USE_JTS +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +#else ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. +#endif dimension01|2 dimension02|2 dimension03|2 @@ -110,10 +118,17 @@ asewkb01|010d0000000200000001080000000700000000000000000000c00000000000000000000 asewkb02|010d0000400200000001080000400700000000000000000000c000000000000000000000000000000000000000000000f0bf000000000000f0bf0000000000000040000000000000000000000000000000000000000000001040000000000000f03f000000000000f0bf000000000000184000000000000000400000000000000000000000000000204000000000000000000000000000000040000000000000104000000000000000c000000000000000000000000000000000010200004005000000000000000000f0bf000000000000000000000000000000400000000000000000000000000000e03f0000000000001040000000000000f03f000000000000000000000000000018400000000000000000000000000000f03f0000000000001040000000000000f0bf00000000000000000000000000000040 asewkb03|010d0000800200000001080000800700000000000000000000c000000000000000000000000000000000000000000000f0bf000000000000f0bf000000000000f03f000000000000000000000000000000000000000000000040000000000000f03f000000000000f0bf000000000000084000000000000000400000000000000000000000000000104000000000000000000000000000000040000000000000004000000000000000c000000000000000000000000000000000010200008005000000000000000000f0bf0000000000000000000000000000f03f0000000000000000000000000000e03f0000000000000040000000000000f03f000000000000000000000000000008400000000000000000000000000000f03f0000000000000840000000000000f0bf0000000000000000000000000000f03f asewkb04|010d0000c00200000001080000c00700000000000000000000c0000000000000000000000000000000000000000000000000000000000000f0bf000000000000f0bf000000000000f03f00000000000000400000000000000000000000000000000000000000000000400000000000001040000000000000f03f000000000000f0bf000000000000084000000000000018400000000000000040000000000000000000000000000010400000000000002040000000000000000000000000000000400000000000000040000000000000104000000000000000c000000000000000000000000000000000000000000000000001020000c005000000000000000000f0bf0000000000000000000000000000f03f00000000000000400000000000000000000000000000e03f00000000000000400000000000001040000000000000f03f0000000000000000000000000000084000000000000018400000000000000000000000000000f03f00000000000008400000000000001040000000000000f0bf0000000000000000000000000000f03f0000000000000040 +#ifdef USE_JTS +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +#else ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. +#endif dimension01|2 dimension02|2 dimension03|2 diff --git a/regress/sql-mm-multicurve_expected b/regress/sql-mm-multicurve_expected.in similarity index 95% rename from regress/sql-mm-multicurve_expected rename to regress/sql-mm-multicurve_expected.in index 825d7da14..b9b179576 100644 --- a/regress/sql-mm-multicurve_expected +++ b/regress/sql-mm-multicurve_expected.in @@ -1,3 +1,4 @@ +#include "../config.h" ndims01|4 geometrytype01|MULTICURVE ndims02|3 @@ -50,10 +51,17 @@ ST_CurveToLine01|MULTILINESTRING((5 5,3 5,3 3,0 3),(0 0,0.00240909 0.09813535,0. ST_CurveToLine02|MULTILINESTRINGM((5 5 3,3 5 2,3 3 1,0 3 1),(0 0 0,0.00240909 0.09813535 -0.1875,0.00963055 0.19603428 -0.375,0.02164698 0.29346095 -0.5625,0.03842944 0.39018064 -0.75,0.05993749 0.48596036 -0.9375,0.08611933 0.58056935 -1.125,0.11691187 0.67377971 -1.3125,0.15224093 0.76536686 -1.5,0.19202141 0.85511019 -1.6875,0.23615747 0.94279347 -1.875,0.28454278 1.02820549 -1.75,0.33706078 1.11114047 -1,0.39358494 1.19139861 -0.25,0.45397909 1.26878657 0.5,0.51809775 1.34311791 1.25,0.58578644 1.41421356 2)) ST_CurveToLine03|MULTILINESTRING((5 5 1,3 5 2,3 3 3,0 3 1),(0 0 0,0.00240909 0.09813535 0.28125,0.00963055 0.19603428 0.5625,0.02164698 0.29346095 0.84375,0.03842944 0.39018064 1.125,0.05993749 0.48596036 1.40625,0.08611933 0.58056935 1.6875,0.11691187 0.67377971 1.96875,0.15224093 0.76536686 2.25,0.19202141 0.85511019 2.53125,0.23615747 0.94279347 2.8125,0.28454278 1.02820549 2.875,0.33706078 1.11114047 2.5,0.39358494 1.19139861 2.125,0.45397909 1.26878657 1.75,0.51809775 1.34311791 1.375,0.58578644 1.41421356 1)) ST_CurveToLine04|MULTILINESTRING((5 5 1 3,3 5 2 2,3 3 3 1,0 3 1 1),(0 0 0 0,0.00240909 0.09813535 0.28125 -0.1875,0.00963055 0.19603428 0.5625 -0.375,0.02164698 0.29346095 0.84375 -0.5625,0.03842944 0.39018064 1.125 -0.75,0.05993749 0.48596036 1.40625 -0.9375,0.08611933 0.58056935 1.6875 -1.125,0.11691187 0.67377971 1.96875 -1.3125,0.15224093 0.76536686 2.25 -1.5,0.19202141 0.85511019 2.53125 -1.6875,0.23615747 0.94279347 2.8125 -1.875,0.28454278 1.02820549 2.875 -1.75,0.33706078 1.11114047 2.5 -1,0.39358494 1.19139861 2.125 -0.25,0.45397909 1.26878657 1.75 0.5,0.51809775 1.34311791 1.375 1.25,0.58578644 1.41421356 1 2)) +#ifdef USE_JTS +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +#else ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. +#endif dimension01|1 dimension02|1 dimension03|1 @@ -90,10 +98,17 @@ asewkb01|010e0000000200000001020000000400000000000000000014400000000000001440000 asewkb02|010e0000400200000001020000400400000000000000000014400000000000001440000000000000084000000000000008400000000000001440000000000000004000000000000008400000000000000840000000000000f03f00000000000000000000000000000840000000000000f03f01080000400300000000000000000000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f00000000000000c067880133c3bee23fcd3b7f669ea0f63f0000000000000040 asewkb03|010e0000800200000001020000800400000000000000000014400000000000001440000000000000f03f00000000000008400000000000001440000000000000004000000000000008400000000000000840000000000000084000000000000000000000000000000840000000000000f03f01080000800300000000000000000000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f000000000000084067880133c3bee23fcd3b7f669ea0f63f000000000000f03f asewkb04|010e0000c00200000001020000c00400000000000000000014400000000000001440000000000000f03f00000000000008400000000000000840000000000000144000000000000000400000000000000040000000000000084000000000000008400000000000000840000000000000f03f00000000000000000000000000000840000000000000f03f000000000000f03f01080000c003000000000000000000000000000000000000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f000000000000084000000000000000c067880133c3bee23fcd3b7f669ea0f63f000000000000f03f0000000000000040 +#ifdef USE_JTS +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +#else ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. +#endif dimension01|1 dimension02|1 dimension03|1 diff --git a/regress/sql-mm-multisurface_expected b/regress/sql-mm-multisurface_expected.in similarity index 98% rename from regress/sql-mm-multisurface_expected rename to regress/sql-mm-multisurface_expected.in index 3891cda84..386e4a95a 100644 --- a/regress/sql-mm-multisurface_expected +++ b/regress/sql-mm-multisurface_expected.in @@ -1,3 +1,4 @@ +#include "../config.h" ndims01|4 geometrytype01|MULTISURFACE ndims02|3 @@ -58,10 +59,17 @@ box3d01|BOX3D(-2 0 0,10 14 0) box3d02|BOX3D(-2 0 0,10 14 0) box3d03|BOX3D(-2 0 0,10 14 7) box3d04|BOX3D(-2 0 0,10 14 7) +#ifdef USE_JTS +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +#else ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. +#endif dimension01|2 dimension02|2 dimension03|2 @@ -106,10 +114,17 @@ box3d01|BOX3D(-2 0 0,10 14 0) box3d02|BOX3D(-2 0 0,10 14 0) box3d03|BOX3D(-2 0 0,10 14 7) box3d04|BOX3D(-2 0 0,10 14 7) +#ifdef USE_JTS +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +ERROR: Exception in LWGEOM2JTS: curved geometry not supported. +#else ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. ERROR: Exception in LWGEOM2GEOS: curved geometry not supported. +#endif dimension01|2 dimension02|2 dimension03|2 -- 2.50.0