Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · aa0df9eb · aa0df9eb
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ env:
  - tag=pg11-geos37-gdal24-proj52 mode=coverage
  - tag=pg11-geos37-gdal24-proj52 mode=usan_gcc
  - tag=pg11-geos37-gdal24-proj52 mode=usan_clang
-  - tag=pg11-geos37-gdal24-proj52 mode=wagyu
+  - tag=pg11-geos37-gdal24-proj52 mode=nowagyu
  - tag=pg11-geos37-gdal24-proj52 mode=tests
  - tag=pg10-geos36-gdal23-proj49 mode=tests
  - tag=pg96-geos36-gdal22-proj49 mode=tests

--- a/ChangeLog
+++ b/ChangeLog
+2019-06-01 17:32  Darafei Praliaskouski <me@komzpa.net>
+
+	* [r17455] doc/reference_output.xml: [doc] ST_AsGeoJSON
+	  FeatureCollection example
+
+2019-06-01 16:24  Raúl Marín Rodríguez <rmrodriguez@carto.com>
+
+	* [r17454] ci/travis/run_nowagyu.sh: Add removed file
+
+2019-06-01 13:02  Darafei Praliaskouski <me@komzpa.net>
+
+	* [r17453] postgis/postgis.sql.in: Make upgrade finish notification
+	  copy-paste friendly.
+
+2019-06-01 02:10  Regina Obe <lr@pcorp.us>
+
+	* [r17452] ci/bessie/postgis_regress.sh,
+	  ci/bessie32/postgis_regress.sh, ci/debbie/postgis_regress.sh,
+	  ci/winnie/build_postgis.sh, ci/winnie/regress_postgis.sh: take
+	  off --with-wagyu on buildbots now that's the default no longer
+	  necessary
+	  Revise winnie's builds to use pkgconfig where available instead
+	  of the --with-<something>=path commands
+
+2019-06-01 01:29  Regina Obe <lr@pcorp.us>
+
+	* [r17451] .travis.yml, NEWS, ci/travis/run_wagyu.sh, configure.ac,
+	  doc/installation.xml: Make build with wagyu the default when
+	  protobuf is also enabled
+	  Closes https://github.com/postgis/postgis/pull/406
+
+2019-05-31 21:37  Regina Obe <lr@pcorp.us>
+
+	* [r17450] ci/bessie32/postgis_regress.sh,
+	  ci/winnie/regress_postgis.sh: reorder wagyu line in bessie
+	  regress
+	  configure winnie to test with wagyu to better troubleshoot issue
+	  References #4408
+
+2019-05-31 20:01  Regina Obe <lr@pcorp.us>
+
+	* [r17449] ci/bessie/postgis_regress.sh,
+	  ci/bessie32/postgis_regress.sh, ci/debbie/postgis_regress.sh:
+	  Change bessies and debbie to build with wagyu
+	  For testing what happens when wagyu becomes the default
+	  References https://github.com/postgis/postgis/pull/406
+
+2019-05-31 19:59  Darafei Praliaskouski <me@komzpa.net>
+
+	* [r17448] NEWS, doc/html/image_src/Makefile.in,
+	  doc/html/image_src/st_constraineddelaunaytriangles01.wkt,
+	  doc/html/image_src/st_constraineddelaunaytriangles02.wkt,
+	  doc/html/image_src/styles.conf, doc/reference_processing.xml,
+	  doc/reference_sfcgal.xml, postgis/lwgeom_sfcgal.c,
+	  postgis/sfcgal.sql.in, regress/sfcgal/regress_sfcgal.sql,
+	  regress/sfcgal/regress_sfcgal_expected: [sfcgal] Expose
+	  ST_ConstrainedDelaunayTriangles
+	  
+	  Closes #4198
+	  Closes https://github.com/postgis/postgis/pull/405
+
+2019-05-29 13:57  Sandro Santilli <strk@kbt.io>
+
+	* [r17447] configure.ac: Update GEOS recommendation to 3.7.0
+	  
+	  Doesn't make sense to recommend 3.6 if it takes 3.7 to use all
+	  features of PostGIS...
+
+2019-05-27 21:28  Paul Ramsey <pramsey@cleverelephant.ca>
+
+	* [r17446] postgis/geography_centroid.c, postgis/geography_inout.c,
+	  postgis/gserialized_estimate.c, postgis/gserialized_supportfn.c:
+	  Fix selectivity issue with support functions, wherein... default
+	  selectivities were the only thing we were returning.
+	  Closes #4404
+
+2019-05-26 20:51  Regina Obe <lr@pcorp.us>
+
+	* [r17445] Version.config, extensions/upgradeable_versions.mk: Flip
+	  version to alpha2dev (hopefully we won't need another alpha), but
+	  just in case
+
+2019-05-26 11:37  Regina Obe <lr@pcorp.us>
+
+	* [r17443] doc/release_notes.xml: put in date
+
+2019-05-26 01:02  Regina Obe <lr@pcorp.us>
+
+	* [r17442] ChangeLog, NEWS, Version.config, doc/release_notes.xml,
+	  extensions/upgradeable_versions.mk: Prep for 3.0.0alpha1 release
+
+2019-05-26 00:59  Regina Obe <lr@pcorp.us>
+
+	* [r17441] extras/tiger_geocoder/tiger_loader_2018.sql: schema
+	  qualify usage
+
 2019-05-21 23:56  Martin Davis <mtnclimb@gmail.com>
  
 	* [r17440] doc/reference_processing.xml: Improve ST_ConvexHull doc
--- a/NEWS
+++ b/NEWS
+PostGIS 3.0.0alpha2
+2019/06/02
+
+For full changes and enhancements, refer to PostGIS 3.0.0 section.
+This version requires PostgreSQL 9.5+-12 and GEOS >= 3.6+
+Additional features enabled if you are running Proj6+ and PostgreSQL 12
+
+* Major highlights *
+  - #4404, Fix selectivity issue with support functions (Paul Ramsey)
+  - #4311, Make wagyu the default option to validate polygons.
+          This option requires a C++11 compiler and will use CXXFLAGS (not CFLAGS).
+          It only enabled if built with MVT support (protobuf)
+          Add `--without-wagyu` to disable this option and keep the behaviour
+          from 2.5 (Raúl Marín)
+  - #4198, Add ST_ConstrainedDelaunayTriangles SFCGAL function (Darafei
+           Praliaskouski)
+
 PostGIS 3.0.0alpha1
 2019/05/26
 For full changes and enhancements, refer to PostGIS 3.0.0 section.
@@ -59,7 +76,9 @@ PostGIS 3.0.0
           within, equals (Esteban Zimányi and Arthur Lesuisse from Université
           Libre de Bruxelles (ULB), Darafei Praliaskouski)
  - #4171, ST_3DLineInterpolatePoint (Julien Cabieces, Vincent Mora)
-  - #4311, Introduce `--with-wagyu` as an option for MVT polygons (Raúl Marín)
+  - #4311, Introduce WAGYU to validate MVT polygons. This option requires a C++11
+           compiler and will use CXXFLAGS (not CFLAGS). Add `--without-wagyu`
+           to disable this option and keep the behaviour from 2.5 (Raúl Marín)
  - #1833, ST_AsGeoJSON(row) generates full GeoJSON Features (Joe Conway)
  - #3687, Casts json(geometry) and jsonb(geometry) for implicit GeoJSON
           generation (Paul Ramsey)
@@ -128,6 +147,8 @@ PostGIS 3.0.0
  - #4368, Reorder LWGEOM struct members to minimize extra padding (Raúl Marín)
  - #4141, Use uint64 to handle row counts in the topology extension (Raúl Marín)
  - #4225, Upgrade tiger to use tiger 2018 census files
+  - #4198, Add ST_ConstrainedDelaunayTriangles SFCGAL function (Darafei
+           Praliaskouski)


 PostGIS 2.5.0

--- a/README.postgis
+++ b/README.postgis
 PostGIS - Geographic Information Systems Extensions to PostgreSQL
 =================================================================

-:Version: 2.5.0rc1
-:Date: 2018-08-19
-:Website: http://postgis.net
+:Version: 3.0.0alpah2
+:Date: 2019-06-02
+:Website: https://postgis.net

 This distribution contains a module which implements GIS simple features, ties
 the features to R-tree indexing, and provides many spatial functions for
@@ -12,10 +12,12 @@ accessing and analyzing geographic data.
 Directory structure::

  ./            Build scripts and install directions
+  ./deps        Extra dependencies (currently only mapbox wagyu)
  ./doc         PostGIS Documentation
  ./extensions  Support for the PostgreSQL Extensions framework
  ./extras      Various pieces that didn't belong to mainstream
-                (package management specfiles, WFS_locks, sample WKB parser)
+                (package management specfiles, WFS_locks
+                  , sample WKB parser, postgis_tiger_geocoder)
  ./liblwgeom   LWGEOM geometry library
  ./libpgcommon PostGIS library to bridge LWGEOM to PostgreSQL
  ./loader      A program to convert ESRI Shape files into SQL text suitable
@@ -31,7 +33,7 @@ Directory structure::
 REQUIREMENTS
 ------------

-PostGIS is compatible with PostgreSQL 9.4 and above.
+PostGIS is compatible with PostgreSQL 9.5 and above.

 You *must* have the full PostgreSQL - including server headers - installed for
 this to work.

--- a/Version.config
+++ b/Version.config
@@ -5,7 +5,7 @@

 POSTGIS_MAJOR_VERSION=3
 POSTGIS_MINOR_VERSION=0
-POSTGIS_MICRO_VERSION=0alpha1
+POSTGIS_MICRO_VERSION=0alpha2

 # Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
 # when changing POSTGIS_MINOR_VERSION

--- a/ci/travis/run_wagyu.sh
+++ b/ci/travis/run_wagyu.sh
@@ -12,7 +12,7 @@ LDFLAGS="--coverage"
 ./autogen.sh

 # Standard build
-./configure --with-wagyu CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+./configure --without-wagyu CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 bash ./ci/travis/logbt -- make -j check RUNTESTFLAGS=--verbose
 curl -S -f https://codecov.io/bash -o .github/codecov.bash
 bash .github/codecov.bash
--- a/ci/winnie/build_postgis.sh
+++ b/ci/winnie/build_postgis.sh
@@ -103,41 +103,35 @@ if [ -n "$PCRE_VER" ]; then
    export PATH="${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}/include:${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"
 fi

+export PKG_CONFIG_PATH="${PROJECTS}/sqlite/rel-sqlite3w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig"
+
 if [ -n "$SFCGAL_VER" ]; then
 	BOOST_VER=1.53.0
 	#BOOST_VER_WU=1_49_0
 	export BOOST_VER_WU=1_53_0
 	export PATH="${PROJECTS}/CGAL/rel-cgal-${CGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/boost/rel-${BOOST_VER_WU}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"

-CPPFLAGS="-I${PGPATH}/include -I${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/include" \
-CFLAGS="-Wall -fno-omit-frame-pointer" \
-LDFLAGS="-L${PGPATH}/lib -L${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/lib -L${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/lib" ./configure \
+#CPPFLAGS="-I${PGPATH}/include -I${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/include" \
+#CFLAGS="-Wall -fno-omit-frame-pointer" \
+LDFLAGS="-Wl,--enable-auto-import -L${PGPATH}/lib -L${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/lib" \
  --host=${MINGHOST} --with-xml2config=${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin/xml2-config \
  --with-pgconfig=${PGPATH}/bin/pg_config \
  --with-geosconfig=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/geos-config \
-  --with-projdir=${MINGPROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE} \
-  --with-gdalconfig=${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/gdal-config \
-  --with-jsondir=${MINGPROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE} \
  --with-libiconv=${PROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE} \
  --with-xsldir=${PROJECTS}/docbook/docbook-xsl-1.76.1 \
  --with-gui --with-gettext=no \
-  --with-protobufdir=${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE} \
  --with-sfcgal=${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/sfcgal-config \
-  --with-pcredir=${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE} \
  --without-interrupt-tests \
  --prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE}
 else
-CPPFLAGS="-I${PGPATH}/include -I${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/include" \
-CFLAGS="-Wall -fno-omit-frame-pointer" \
-LDFLAGS="-L${PGPATH}/lib -L${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/lib -L${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/lib" ./configure \
+#CPPFLAGS="-I${PGPATH}/include -I${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/include" \
+#CFLAGS="-Wall -fno-omit-frame-pointer" \
+
+LDFLAGS="-Wl,--enable-auto-import -L${PGPATH}/lib -L${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/lib" \
  --host=${MINGHOST} --with-xml2config=${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin/xml2-config \
  --with-pgconfig=${PGPATH}/bin/pg_config \
  --with-geosconfig=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/geos-config \
-  --with-projdir=${MINGPROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE} \
-  --with-gdalconfig=${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/gdal-config \
  --with-gui --with-gettext=no \
-  --with-protobufdir=${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE} \
-  --with-jsondir=${MINGPROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE} \
  --with-libiconv=${PROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE} \
  --with-xsldir=${PROJECTS}/docbook/docbook-xsl-1.76.1 \
  --without-interrupt-tests \

--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -97,6 +97,9 @@ if [ -n "$PCRE_VER" ]; then
    export PATH="${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}/include:${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"
 fi

+export PKG_CONFIG_PATH="${PROJECTS}/sqlite/rel-sqlite3w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig"
+
+
 if [ -n "$SFCGAL_VER" ]; then
 	##hard code versions of cgal etc. for now
 	export CGAL_VER=4.11
@@ -105,37 +108,32 @@ if [ -n "$SFCGAL_VER" ]; then
 	export BOOST_VER_WU=1_53_0
 	export PATH="${PROJECTS}/CGAL/rel-cgal-${CGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/boost/rel-${BOOST_VER_WU}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"

-CPPFLAGS="-I${PGPATH}/include -I${MINGPROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include" \
-CFLAGS="-Wall -fno-omit-frame-pointer" \
-LDFLAGS="-L${PGPATH}/lib -L${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/lib -L${MINGPROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/lib"
+#note need to --enable-auto-import for LDFLAGS because wagyu fails to compile in without that.
+#See https://trac.osgeo.org/postgis/ticket/440
+#CPPFLAGS="-I${PGPATH}/include -I${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include" \
+#CFLAGS="-Wall -fno-omit-frame-pointer" \

+LDFLAGS="-Wl,--enable-auto-import -L${PGPATH}/lib -L${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/lib" \
 ./configure \
  --host=${MINGHOST} --with-xml2config=${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin/xml2-config \
  --with-pgconfig=${PGPATH}/bin/pg_config \
  --with-geosconfig=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/geos-config \
-  --with-projdir=${MINGPROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE} \
-  --with-gdalconfig=${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/gdal-config \
-  --with-jsondir=${MINGPROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE} \
  --with-libiconv=${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE} \
  --with-xsldir=${PROJECTS}/docbook/docbook-xsl-1.76.1 \
  --with-gui --with-gettext=no \
-  --with-protobufdir=${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE} \
  --with-sfcgal=${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/sfcgal-config \
-  --with-pcredir=${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE} \
  --without-interrupt-tests \
  --prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE}
 else
-CPPFLAGS="-I${PGPATH}/include -I${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include" \
-CFLAGS="-Wall -fno-omit-frame-pointer" \
-LDFLAGS="-L${PGPATH}/lib -L${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/lib -L${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/lib" ./configure \
+#CPPFLAGS="-I${PGPATH}/include -I${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include" \
+#CFLAGS="-Wall -fno-omit-frame-pointer" \
+
+LDFLAGS="-Wl,--enable-auto-import -L${PGPATH}/lib -L${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/lib" \
+./configure \
  --host=${MINGHOST} --with-xml2config=${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin/xml2-config \
  --with-pgconfig=${PGPATH}/bin/pg_config \
  --with-geosconfig=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/geos-config \
-  --with-projdir=${MINGPROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE} \
-  --with-gdalconfig=${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/gdal-config \
  --with-gui --with-gettext=no \
-  --with-protobufdir=${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE} \
-  --with-jsondir=${PROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE} \
  --with-libiconv=${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE} \
  --with-xsldir=${PROJECTS}/docbook/docbook-xsl-1.76.1 \
  --without-interrupt-tests \

--- a/configure
+++ b/configure
@@ -1623,7 +1623,7 @@ Optional Packages:
                          --with-raster
  --with-gdalconfig=[ARG] specify location of gdal-config (ARG=path). Only
                          used with --with-raster
-  --with-wagyu            Use the wagyu library
+  --without-wagyu         Don't use the wagyu library
  
 Some influential environment variables:
  CC          C compiler command
@@ -18610,9 +18610,9 @@ if test "x$HAVE_PROTOBUF" = "xyes"; then
  
 # Check whether --with-wagyu was given.
 if test "${with_wagyu+set}" = set; then :
-  withval=$with_wagyu; HAVE_WAGYU=yes
+  withval=$with_wagyu; HAVE_WAGYU=no
 else
-  HAVE_WAGYU=no
+  HAVE_WAGYU=yes
 fi
  
  
@@ -25384,20 +25384,28 @@ $as_echo "" >&6; }
 if test "$GEOS_NUMERIC_VERSION" -lt 30700; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  --------- GEOS VERSION WARNING ------------ " >&5
 $as_echo "$as_me: WARNING:  --------- GEOS VERSION WARNING ------------ " >&2;}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:   You are building against GEOS ${GEOS_FULL_VERSION} " >&5
-$as_echo "$as_me: WARNING:   You are building against GEOS ${GEOS_FULL_VERSION} " >&2;}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:   To take advantage of all the features of " >&5
-$as_echo "$as_me: WARNING:   To take advantage of all the features of " >&2;}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:   this PostGIS version requires GEOS 3.7.0 or higher." >&5
-$as_echo "$as_me: WARNING:   this PostGIS version requires GEOS 3.7.0 or higher." >&2;}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:   To take advantage of most of the features of this PostGIS" >&5
-$as_echo "$as_me: WARNING:   To take advantage of most of the features of this PostGIS" >&2;}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:   we recommend GEOS 3.6 or higher" >&5
-$as_echo "$as_me: WARNING:   we recommend GEOS 3.6 or higher" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:   You are building against GEOS ${GEOS_FULL_VERSION}." >&5
+$as_echo "$as_me: WARNING:   You are building against GEOS ${GEOS_FULL_VERSION}." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: " >&5
+$as_echo "$as_me: WARNING: " >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:   To take advantage of _all_ the features of " >&5
+$as_echo "$as_me: WARNING:   To take advantage of _all_ the features of " >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:   PostGIS, GEOS 3.7.0 or higher is required." >&5
+$as_echo "$as_me: WARNING:   PostGIS, GEOS 3.7.0 or higher is required." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: " >&5
+$as_echo "$as_me: WARNING: " >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:   For _most_ features, GEOS 3.6.0 is enough." >&5
+$as_echo "$as_me: WARNING:   For _most_ features, GEOS 3.6.0 is enough." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: " >&5
+$as_echo "$as_me: WARNING: " >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:   We recommend GEOS 3.7.0 or higher" >&5
+$as_echo "$as_me: WARNING:   We recommend GEOS 3.7.0 or higher" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: " >&5
+$as_echo "$as_me: WARNING: " >&2;}
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:   You can download the latest versions from " >&5
 $as_echo "$as_me: WARNING:   You can download the latest versions from " >&2;}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:   http://trac.osgeo.org/geos " >&5
-$as_echo "$as_me: WARNING:   http://trac.osgeo.org/geos " >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:   http://geos.osgeo.org/ " >&5
+$as_echo "$as_me: WARNING:   http://geos.osgeo.org/ " >&2;}
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: " >&5
 $as_echo "$as_me: WARNING: " >&2;}
 fi

--- a/configure.ac
+++ b/configure.ac
@@ -1472,9 +1472,9 @@ HAVE_WAGYU=no
 if test "x$HAVE_PROTOBUF" = "xyes"; then
    AC_ARG_WITH(
            [wagyu],
-            AC_HELP_STRING([--with-wagyu], [Use the wagyu library]),
-            [HAVE_WAGYU=yes],
-            [HAVE_WAGYU=no])
+            AC_HELP_STRING([--without-wagyu], [Don't use the wagyu library]),
+            [HAVE_WAGYU=no],
+            [HAVE_WAGYU=yes])

    if test "x$HAVE_WAGYU" = "xyes"; then
            AC_MSG_RESULT([WAGYU: Wagyu usage requested])
@@ -1676,13 +1676,17 @@ AC_MSG_RESULT()

 if test "$GEOS_NUMERIC_VERSION" -lt 30700; then
 AC_MSG_WARN([ --------- GEOS VERSION WARNING ------------ ])
-AC_MSG_WARN([  You are building against GEOS ${GEOS_FULL_VERSION} ])
-AC_MSG_WARN([  To take advantage of all the features of ])
-AC_MSG_WARN([  this PostGIS version requires GEOS 3.7.0 or higher.])
-AC_MSG_WARN([  To take advantage of most of the features of this PostGIS])
-AC_MSG_WARN([  we recommend GEOS 3.6 or higher])
+AC_MSG_WARN([  You are building against GEOS ${GEOS_FULL_VERSION}.])
+AC_MSG_WARN([])
+AC_MSG_WARN([  To take advantage of _all_ the features of ])
+AC_MSG_WARN([  PostGIS, GEOS 3.7.0 or higher is required.])
+AC_MSG_WARN([])
+AC_MSG_WARN([  For _most_ features, GEOS 3.6.0 is enough.])
+AC_MSG_WARN([])
+AC_MSG_WARN([  We recommend GEOS 3.7.0 or higher])
+AC_MSG_WARN([])
 AC_MSG_WARN([  You can download the latest versions from ])
-AC_MSG_WARN([  http://trac.osgeo.org/geos ])
+AC_MSG_WARN([  http://geos.osgeo.org/ ])
 AC_MSG_WARN()
 fi


--- a/debian/changelog
+++ b/debian/changelog
+postgis (3.0.0~alpha2+dfsg-1~exp1) experimental; urgency=medium
+
+  * New upstream alpha release.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 02 Jun 2019 06:59:58 +0200
+
 postgis (3.0.0~alpha1+dfsg-1~exp2) experimental; urgency=medium

  * Update dh_install -a override to use --list-missing.

--- a/deps/Makefile
+++ b/deps/Makefile
-#/**********************************************************************
-# *
-# * PostGIS - Spatial Types for PostgreSQL
-# * http://postgis.net
-# *
-# * PostGIS is free software: you can redistribute it and/or modify
-# * it under the terms of the GNU General Public License as published by
-# * the Free Software Foundation, either version 2 of the License, or
-# * (at your option) any later version.
-# *
-# * PostGIS is distributed in the hope that it will be useful,
-# * but WITHOUT ANY WARRANTY; without even the implied warranty of
-# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# * GNU General Public License for more details.
-# *
-# * You should have received a copy of the GNU General Public License
-# * along with PostGIS.  If not, see <http://www.gnu.org/licenses/>.
-# *
-# **********************************************************************
-# *
-# * Copyright 2019 Raúl Marín
-# *
-# **********************************************************************/
-
-CC=gcc
-CXX=
-CFLAGS=-I../liblwgeom  -Wall -Wmissing-prototypes -std=gnu99 -g -O2 -fno-math-errno -fno-signed-zeros  -fPIC -DPIC
-CXXFLAGS=-I../liblwgeom  -Wall -Wmissing-prototypes   -fPIC -DPIC
-LDFLAGS = 
-top_builddir = ..
-libdir = ${exec_prefix}/lib
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-
-all: 
-
-:
-	$(MAKE) -C wagyu $@
-
-install:
-
-uninstall:
-
-check:
-
-clean:
-	$(MAKE) -C wagyu $@
-
-distclean: clean
-	$(MAKE) -C wagyu $@
-	rm -f Makefile
--- a/doc/html/image_src/Makefile.in
+++ b/doc/html/image_src/Makefile.in
@@ -67,6 +67,8 @@ IMAGES= \
 	../images/st_crosses02.png \
 	../images/st_crosses03.png \
 	../images/st_crosses04.png \
+	../images/st_constraineddelaunaytriangles01.png \
+	../images/st_constraineddelaunaytriangles02.png \
 	../images/st_delaunaytriangles04.png \
 	../images/st_difference01.png \
 	../images/st_dumppoints01.png \

--- a/doc/html/image_src/st_constraineddelaunaytriangles01.wkt
+++ b/doc/html/image_src/st_constraineddelaunaytriangles01.wkt
+Style1;MULTIPOLYGON(((175 150,125 100,50 60,20 40,175 150)),((130 170,130 166,128 162,127 159,124 156,121 153,118 152,114 150,110 150,106 150,102 152,99 153,96 156,93 159,92 162,90 166,90 170,90 174,92 178,93 181,96 184,99 187,102 188,106 190,110 190,114 190,118 188,121 187,124 184,127 181,128 178,130 174,130 170)))
+StrokedPoly1;MULTILINESTRING((20 40,125 100,50 60,20 40),(125 100,175 150,50 60,125 100),(110 150,106 150,20 40,110 150),(175 150,20 40,50 60,175 150),(114 150,118 152,110 150,114 150),(127 159,130 166,130 170,127 159),(175 150,130 170,130 166,175 150),(127 159,128 162,130 166,127 159),(175 150,130 166,128 162,175 150),(121 153,127 159,130 170,121 153),(175 150,128 162,127 159,175 150),(175 150,124 156,121 153,175 150),(175 150,127 159,124 156,175 150),(175 150,121 153,118 152,175 150),(124 156,127 159,121 153,124 156),(175 150,118 152,114 150,175 150),(121 153,130 170,124 184,121 153),(175 150,114 150,20 40,175 150),(118 152,121 153,110 150,118 152),(114 150,110 150,20 40,114 150),(106 150,102 152,20 40,106 150),(121 153,106 150,110 150,121 153),(102 152,99 153,20 40,102 152),(121 153,102 152,106 150,121 153),(99 153,96 156,20 40,99 153),(121 153,93 181,102 152,121 153),(96 156,93 159,20 40,96 156),(102 152,96 156,99 153,102 152),(93 159,92 162,20 40,93 159),(102 152,93 181,96 156,102 152),(92 162,90 166,20 40,92 162),(96 156,90 166,93 159,96 156),(90 166,90 170,20 40,90 166),(93 159,90 166,92 162,93 159),(90 170,90 174,20 40,90 170),(96 156,90 174,90 166,96 156),(90 174,92 178,20 40,90 174),(90 166,90 174,90 166),(96 156,93 181,90 174,96 156),(90 174,93 181,92 178,90 174),(121 153,118 188,93 181,121 153),(93 181,99 187,93 181),(124 184,175 150,121 187,124 184),(93 181,102 188,99 187,93 181),(93 181,118 188,102 188,93 181),(102 188,118 188,106 190,102 188),(106 190,114 190,106 190),(106 190,118 188,114 190,106 190),(121 153,124 184,118 188,121 153),(118 188,124 184,121 187,118 188),(127 181,175 150,124 184,127 181),(130 170,128 178,124 184,130 170),(128 178,175 150,127 181,128 178),(124 184,128 178,127 181,124 184),(130 174,175 150,128 178,130 174),(130 170,130 174,128 178,130 170),(130 170,175 150,130 174,130 170))
--- a/doc/html/image_src/st_constraineddelaunaytriangles02.wkt
+++ b/doc/html/image_src/st_constraineddelaunaytriangles02.wkt
+Style1;MULTIPOLYGON(((175 150,125 100,50 60,20 40,175 150)),((130 170,130 166,128 162,127 159,124 156,121 153,118 152,114 150,110 150,106 150,102 152,99 153,96 156,93 159,92 162,90 166,90 170,90 174,92 178,93 181,96 184,99 187,102 188,106 190,110 190,114 190,118 188,121 187,124 184,127 181,128 178,130 174,130 170)))
+StrokedPoly1;MULTILINESTRING((121 187,175 150),(118 188,121 187),(114 190,118 188),(110 190,114 190),(106 190,110 190),(102 188,106 190),(99 187,102 188),(96 184,99 187),(93 181,96 184),(92 178,93 181),(20 40,92 178),(20 40,125 100),(125 100,175 150),(124 156,125 100),(124 156,175 150),(124 156,127 159),(127 159,175 150),(127 159,128 162),(128 162,175 150),(128 162,130 166),(130 166,175 150),(130 166,130 170),(130 170,175 150),(130 174,130 170),(130 174,175 150),(128 178,130 174),(128 178,175 150),(127 181,128 178),(127 181,175 150),(124 184,127 181),(124 184,175 150),(121 187,124 184),(118 188,124 184),(121 153,124 184),(118 188,121 153),(93 181,121 153),(93 181,118 188),(93 181,102 188),(102 188,118 188),(93 181,99 187),(90 174,121 153),(90 174,93 181),(90 174,92 178),(20 40,90 174),(90 170,90 174),(20 40,90 170),(90 170,90 166),(20 40,90 166),(50 60,90 166),(20 40,50 60),(50 60,125 100),(50 60,99 153),(99 153,125 100),(99 153,102 152),(102 152,125 100),(102 152,106 150),(106 150,125 100),(106 150,110 150),(110 150,125 100),(110 150,114 150),(114 150,125 100),(114 150,118 152),(118 152,125 100),(118 152,121 153),(121 153,125 100),(121 153,124 156),(121 153,127 159),(121 153,130 170),(127 159,130 170),(110 150,118 152),(110 150,121 153),(106 150,121 153),(102 152,121 153),(90 174,102 152),(96 156,102 152),(90 174,96 156),(93 159,96 156),(90 174,93 159),(90 170,93 159),(90 166,93 159),(92 162,93 159),(90 166,92 162),(50 60,92 162),(50 60,93 159),(50 60,96 156),(96 156,99 153),(124 184,130 170),(124 184,128 178),(128 178,130 170),(127 159,130 166),(106 190,118 188),(106 190,114 190))
--- a/doc/html/image_src/styles.conf
+++ b/doc/html/image_src/styles.conf
@@ -167,8 +167,8 @@ polygonStrokeWidth = 0
 styleName = StrokedPoly1
 pointSize = 6
 pointColor = "#00bfff"
-lineWidth = 7
-lineColor = "#00bfff"
+lineWidth = 1
+lineColor = "#000000"
 polygonFillColor = "#00bfff"
 polygonStrokeColor = "#000000"
 polygonStrokeWidth = 1
--- a/doc/installation.xml
+++ b/doc/installation.xml
@@ -241,7 +241,7 @@ psql -d yourdatabase -f sfcgal_comments.sql
 			  To enable ST_AsMVT protobuf-c library (for usage) and the protoc-c compiler (for building) are required.
 				Also, pkg-config is required to verify the correct minimum version of protobuf-c.
 				See <ulink url="https://github.com/protobuf-c/protobuf-c">protobuf-c</ulink>.
-                To use Wagyu to validate MVT polygons faster, a c++11 compiler is required. It requires <varname>--with-wagyu</varname> to be passed during configure; and it will use CXXFLAGS and the same compiler as the PostgreSQL installation.
+				By default, Postgis will use Wagyu to validate MVT polygons faster which requires a c++11 compiler. It will use CXXFLAGS and the same compiler as the PostgreSQL installation. To disable this and use GEOS instead use the <varname>--without-wagyu</varname> during the configure step.
 			</para>
 		</listitem>

@@ -599,10 +599,10 @@ tar -xvzf postgis-&last_release_version;.tar.gz</programlisting>
 		  </listitem>
 		</varlistentry>
 		<varlistentry>
-		  <term><command>--with-wagyu</command></term>
+		  <term><command>--without-wagyu</command></term>
 		  <listitem>
 			<para>
-			  When building with MVT support, by default Postgis will use GEOS to clip and validate MVT polygons. You can use <ulink url="https://github.com/mapbox/wagyu/">Wagyu</ulink> instead which is faster and guaranteed to produce correct values for this specific case.
+			  When building with MVT support, Postgis will use <ulink url="https://github.com/mapbox/wagyu/">Wagyu</ulink> to clip and validate MVT polygons. Wagyu is the fastest alternative and guarantees producing correct values for this specific case, but it requires a C++-11 compiler. With this optional argument you can disable using this library; GEOS will be used instead.
 			</para>
 		  </listitem>
 		</varlistentry>

--- a/doc/reference_output.xml
+++ b/doc/reference_output.xml
@@ -613,32 +613,42 @@ POINT(111.11 1.11)
 		</para>
 		<para>You can test and view your GeoJSON data online on <ulink url="http://geojson.io/">geojson.io</ulink>.</para>

+<para>To build FeatureCollection:</para>
+<programlisting>select json_build_object(
+    'type', 'FeatureCollection',
+    'features', json_agg(ST_AsGeoJSON(t.*)::json)
+    )
+from ( values (1, 'one', 'POINT(1 1)'::geometry),
+              (2, 'two', 'POINT(2 2)'),
+              (3, 'three', 'POINT(3 3)')
+     ) as t(id, name, geom);</programlisting>
+<screen>{"type" : "FeatureCollection", "features" : [{"type": "Feature", "geometry": {"type":"Point","coordinates":[1,1]}, "properties": {"id": 1, "name": "one"}}, {"type": "Feature", "geometry": {"type":"Point","coordinates":[2,2]}, "properties": {"id": 2, "name": "two"}}, {"type": "Feature", "geometry": {"type":"Point","coordinates":[3,3]}, "properties": {"id": 3, "name": "three"}}]}</screen>
+
+<para>To get Features as records:</para>
 		<programlisting>SELECT ST_AsGeoJSON(t.*)
 FROM (VALUES
  (1, 'one', 'POINT(1 1)'::geometry),
  (2, 'two', 'POINT(2 2)'),
  (3, 'three', 'POINT(3 3)'))
-AS t(id, name, geom);
-                                                  st_asgeojson
+AS t(id, name, geom);</programlisting>
+<screen>                                                  st_asgeojson
 -----------------------------------------------------------------------------------------------------------------
 {"type": "Feature", "geometry": {"type":"Point","coordinates":[1,1]}, "properties": {"id": 1, "name": "one"}}
 {"type": "Feature", "geometry": {"type":"Point","coordinates":[2,2]}, "properties": {"id": 2, "name": "two"}}
 {"type": "Feature", "geometry": {"type":"Point","coordinates":[3,3]}, "properties": {"id": 3, "name": "three"}}
-</programlisting>
+</screen>

-		<programlisting>SELECT ST_AsGeoJSON(geom) from fe_edges limit 1;
-					   st_asgeojson
+<para>Don't forget to transform your data to WGS84 longitude, latitude to conform with RFC7946:</para>
+		<programlisting>SELECT ST_AsGeoJSON(ST_Transform(geom,4326)) from fe_edges limit 1;</programlisting>
+<screen>					   st_asgeojson
 -----------------------------------------------------------------------------------------------------------

 {"type":"MultiLineString","coordinates":[[[-89.734634999999997,31.492072000000000],
 [-89.734955999999997,31.492237999999997]]]}
-(1 row)</programlisting>
+(1 row)</screen>
 <para>You can also use it with 3D geometries:</para>
-<programlisting>SELECT ST_AsGeoJSON('LINESTRING(1 2 3, 4 5 6)');
-
-st_asgeojson
-----------------------------------------------------------------------------------------
- {"type":"LineString","coordinates":[[1,2,3],[4,5,6]]}</programlisting>
+<programlisting>SELECT ST_AsGeoJSON('LINESTRING(1 2 3, 4 5 6)');</programlisting>
+<screen>{"type":"LineString","coordinates":[[1,2,3],[4,5,6]]}</screen>
 	  </refsection>
  <refsection>
    <title>See Also</title>

--- a/doc/reference_processing.xml
+++ b/doc/reference_processing.xml
@@ -1236,7 +1236,7 @@ GEOMETRYCOLLECTION Z (POLYGON Z ((14 14 10,20 10 150,34 6 25,14 14 10))
 		</refsection>
 		<refsection>
 			<title>See Also</title>
-			<para><xref linkend="ST_ConcaveHull" />, <xref linkend="ST_Dump" />
+			<para><xref linkend="ST_ConstrainedDelaunayTriangles" />, <xref linkend="ST_ConcaveHull" />, <xref linkend="ST_Dump" />
 			</para>
 		</refsection>
 	</refentry>

--- a/doc/reference_sfcgal.xml
+++ b/doc/reference_sfcgal.xml
@@ -475,7 +475,88 @@ MULTIPOLYGON(
       </refsection>

 	</refentry>
+	<refentry id="ST_ConstrainedDelaunayTriangles">
+		<refnamediv>
+			<refname>ST_ConstrainedDelaunayTriangles</refname>
+
+			<refpurpose>
+Return a constrained Delaunay triangulation around the given input geometry.
+			</refpurpose>
+		</refnamediv>
+
+		<refsynopsisdiv>
+			<funcsynopsis>
+			  <funcprototype>
+				<funcdef>geometry <function>ST_ConstrainedDelaunayTriangles</function></funcdef>
+				<paramdef><type>geometry </type> <parameter>g1</parameter></paramdef>
+			  </funcprototype>
+			</funcsynopsis>
+		</refsynopsisdiv>
+
+		  <refsection>
+			<title>Description</title>

+			<para>
+Return a <ulink
+url="https://en.wikipedia.org/wiki/Constrained_Delaunay_triangulation">Constrained Delaunay
+triangulation</ulink> around the vertices of the input geometry.
+Output is a TIN.
+			</para>
+			<para>&sfcgal_required;</para>
+			<para>Availability: 3.0.0</para>
+			<para>&Z_support;</para>
+		</refsection>
+			  <refsection>
+		<title>Examples</title>
+			<informaltable>
+				  <tgroup cols="2">
+					<tbody>
+					  <row>					
+						  <entry><para><informalfigure>
+							<mediaobject>
+							  <imageobject>
+								<imagedata fileref="images/st_constraineddelaunaytriangles01.png" />
+							  </imageobject>
+							  <caption><para>ST_ConstrainedDelaunayTriangles of 2 polygons</para></caption>
+							</mediaobject>
+						  </informalfigure>
+						  <programlisting>
+select ST_ConstrainedDelaunayTriangles(
+               ST_Union(
+                       'POLYGON((175 150, 20 40, 50 60, 125 100, 175 150))'::geometry,
+                       ST_Buffer('POINT(110 170)'::geometry, 20)
+                   )
+           );
+				</programlisting>
+						  </para></entry>
+							<entry><para><informalfigure>
+							<mediaobject>
+							  <imageobject>
+								<imagedata fileref="images/st_constraineddelaunaytriangles02.png" />
+							  </imageobject>
+							  <caption><para><xref linkend="ST_DelaunayTriangles" />  of 2 polygons. Triangle edges cross polygon boundaries.</para></caption>
+							</mediaobject>
+						  </informalfigure>
+						  <programlisting>
+select ST_DelaunayTriangles(
+               ST_Union(
+                       'POLYGON((175 150, 20 40, 50 60, 125 100, 175 150))'::geometry,
+                       ST_Buffer('POINT(110 170)'::geometry, 20)
+                   )
+	   );
+</programlisting>
+						  </para></entry>						  
+			 </row>
+		</tbody>
+	</tgroup>
+</informaltable>
+	  </refsection>
+		<refsection>
+			<title>See Also</title>
+			<para><xref linkend="ST_DelaunayTriangles" />, <xref linkend="ST_ConcaveHull" />, <xref linkend="ST_Dump" />
+			</para>
+		</refsection>
+	</refentry>
 	<refentry id="ST_3DIntersection">
 	  <refnamediv>
 		<refname>ST_3DIntersection</refname>