Commit 7bed3341 authored by Markus Wanner's avatar Markus Wanner

Import upstream version 2.1.4+dfsg

parent baf79b2a
This diff is collapsed.
......@@ -5,7 +5,7 @@
#-----------------------------------------------------
# todo: add all subdirs
SUBDIRS = liblwgeom libpgcommon postgis regress @RASTER@ @TOPOLOGY@ loader utils @EXTENSIONS@
SUBDIRS = liblwgeom libpgcommon postgis regress @RASTER@ @TOPOLOGY@ loader utils doc @EXTENSIONS@
PERL = @PERL@
......@@ -21,10 +21,6 @@ all install uninstall noop clean distclean check:
all: postgis_svn_revision.h
ifneq ($(XSLTPROC),)
all: comments
endif
install: all comments-install
uninstall: docs-uninstall comments-uninstall
......@@ -46,6 +42,7 @@ distclean-local: clean
rm -f GNUmakefile
rm -f config.log config.cache config.status
rm -f postgis_config.h
rm -f java/jdbc/Makefile
maintainer-clean:
@echo '------------------------------------------------------'
......
PostGIS 2.1.4
2014/09/10
* Enhancements *
- #2745, Speedup ST_Simplify calls against points
- #2747, Support for GDAL 2.0
- #2749, Make rtpostgis_upgrade_20_21.sql ACID
- #2811, Do not specify index names when loading shapefiles/rasters
- #2829, Shortcut ST_Clip(raster) if geometry fully contains the raster
and no NODATA specified
- #2895, Raise cost of ST_ConvexHull(raster) to 300 for better query plans
* Bug Fixes *
- #2605, armel: _ST_Covers() returns true for point in hole
- #2911, Fix output scale on ST_Rescale/ST_Resample/ST_Resize of rasters
with scale 1/-1 and offset 0/0.
- Fix crash in ST_Union(raster)
- #2704, ST_GeomFromGML() does not work properly with array of gml:pos
(Even Roualt)
- #2708, updategeometrysrid doesn't update srid check when schema
not specified. Patch from Marc Jansen
- #2720, lwpoly_add_ring should update maxrings after realloc
- #2759, Fix postgis_restore.pl handling of multiline object comments
embedding sql comments
- #2774, fix undefined behavior in ptarray_calculate_gbox_geodetic
- Fix potential memory fault in ST_MakeValid
- #2784, Fix handling of bogus argument to --with-sfcgal
- #2772, Premature memory free in RASTER_getBandPath (ST_BandPath)
- #2755, Fix regressions tests against all versions of SFCGAL
- #2775, lwline_from_lwmpoint leaks memory
- #2802, ST_MapAlgebra checks for valid callback function return value
- #2803, ST_MapAlgebra handles no userarg and STRICT callback function
- #2834, ST_Estimated_Extent and mixedCase table names (regression bug)
- #2845, Bad geometry created from ST_AddPoint
- #2870, Binary insert into geography column results geometry being inserted
- #2872, make install builds documentation (Greg Troxell)
- #2819, find isfinite or replacement on Centos5 / Solaris
- #2899, geocode limit 1 not returning best answer (tiger geocoder)
- #2903, Unable to compile on FreeBSD
- #2927 reverse_geocode not filling in direction prefix (tiger geocoder)
get rid of deprecated ST_Line_Locate_Point called
PostGIS 2.1.3
2014/05/13
......
PostGIS - Geographic Information Systems Extensions to PostgreSQL
=================================================================
:Version: 2.1.3
:Date: 2014-05-13
:Version: 2.1.4
:Date: 2014-09-10
:Website: http://postgis.net
This distribution contains a module which implements GIS simple features, ties
......
......@@ -5,5 +5,5 @@
POSTGIS_MAJOR_VERSION=2
POSTGIS_MINOR_VERSION=1
POSTGIS_MICRO_VERSION=3
POSTGIS_MICRO_VERSION=4
# generated automatically by aclocal 1.13.3 -*- Autoconf -*-
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......@@ -11,8 +11,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
# Copyright (C) 2003-2013 Free Software Foundation, Inc.
# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -20,16 +19,10 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun
# AM_PROG_MKDIR_P
# ---------------
# Check for 'mkdir -p'.
# Check for `mkdir -p'.
AC_DEFUN([AM_PROG_MKDIR_P],
[AC_PREREQ([2.60])dnl
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
dnl FIXME we are no longer going to remove this! adjust warning
dnl FIXME message accordingly.
AC_DIAGNOSE([obsolete],
[$0: this macro is deprecated, and will soon be removed.
You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead,
and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.])
dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
dnl while keeping a definition of mkdir_p for backward compatibility.
dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
......
......@@ -4,7 +4,7 @@ colivier:Olivier Courtin <olivier.courtin@camptocamp.com>
cvs:No Body <no@body.net>
dblasby:David Blasby <dblasby@gmail.com>
devrim:Devrim GÜNDÜZ <devrim@gunduz.org>
dustymugs:Bborie Park <bkpark at ucdavis.edu>
dustymugs:Bborie Park <dustymugs at gmail dot com>
dzwarg:David Zwarg <dzwarg@azavea.com>
jeffloun:Jeff Lounsbury <jeffloun@refractions.net>
jorgearevalo:Jorge Arévalo <jorge.arevalo at deimos-space.com>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -118,6 +118,26 @@ AC_CHECK_FUNC(asprintf, [HAVE_ASPRINTF=1], [HAVE_ASPRINTF=0])
AC_DEFINE([HAVE_ASPRINTF])
AC_FUNC_FSEEKO()
dnl
dnl First see if we have isfinite in basic header
dnl then check to see if it's a GNU extension
dnl
AC_CHECK_DECL(isfinite,
[AC_DEFINE([HAVE_ISFINITE])],
[],
[#include <math.h>])
dnl Clear the cache
unset ac_cv_have_decl_isfinite
AC_CHECK_DECL(isfinite,
AC_DEFINE([HAVE_GNU_ISFINITE]),
[],
[[
#define _GNU_SOURCE
#include <math.h>
]])
dnl
dnl MingW requires use of pwd -W to give proper Windows (not MingW) paths
dnl for in-place regression tests
......@@ -145,26 +165,37 @@ dnl
dnl Search for xsltproc which is required for building documentation
dnl
CAN_BUILD_COMMENTS=yes
AC_PATH_PROG([IMAGEMAGICK], [convert], [])
if test "x$IMAGEMAGICK" = "x"; then
AC_MSG_WARN([ImageMagick does not seem to be installed. Documentation cannot be built])
CAN_BUILD_COMMENTS=no
fi
AC_PATH_PROG([XSLTPROC], [xsltproc], [])
if test "x$XSLTPROC" = "x"; then
AC_MSG_WARN([xsltproc is not installed so documentation cannot be built])
CAN_BUILD_COMMENTS=no
fi
AC_PATH_PROG([XMLLINT], [xmllint], [])
if test "x$XMLLINT" = "x"; then
AC_MSG_WARN([xmllint is not installed so documentation cannot be checked])
CAN_BUILD_COMMENTS=no
fi
CAN_BUILD_PDF=${CAN_BUILD_COMMENTS}
AC_PATH_PROG([DBLATEX], [dblatex], [])
if test "x$DBLATEX" = "x"; then
AC_MSG_WARN([dblatex is not installed so PDF documentation cannot be built])
CAN_BUILD_PDF=no
fi
AC_SUBST(CAN_BUILD_COMMENTS)
AC_SUBST(CAN_BUILD_PDF)
dnl
dnl Allow the user to specify the location of the html/docbook.xsl stylesheet
dnl
......@@ -628,7 +659,7 @@ HAVE_SFCGAL="no"
if test "x$with_sfcgal" != "xno"; then
if test -x "$SFCGAL_CONFIG"; then
SFCGAL_VERSION=`$SFCGAL_CONFIG --version`
SFCGAL_VERSION=`$SFCGAL_CONFIG --version` || AC_MSG_ERROR([cannot determine sfcgal version (tried with $SFCGAL_CONFIG --version)])
SFCGAL_LDFLAGS=`$SFCGAL_CONFIG --libs`
SFCGAL_CPPFLAGS=`$SFCGAL_CONFIG --cflags`" -DHAVE_SFCGAL"
......@@ -751,6 +782,7 @@ dnl ===========================================================================
CHECK_JSON=yes
HAVE_JSON=no
HAVE_JSON_C=no
AC_ARG_WITH([json],
[AS_HELP_STRING([--without-json], [build without json-c support])],
......@@ -767,16 +799,6 @@ if test ! "x$JSONDIR" = "x"; then
if test "x$JSONDIR" = "xyes"; then
AC_MSG_ERROR([you must specify a parameter to --with-jsondir, e.g. --with-jsondir=/path/to])
else
dnl We need (libjson.so OR libjson.a OR libjson.dll) AND json/json.h
if test ! -e "${JSONDIR}/include/json/json.h" -o \
! \( -e "${JSONDIR}/lib/libjson.so" -o \
-e "${JSONDIR}/lib/libjson.dll" -o \
-e "${JSONDIR}/lib/libjson.dylib" -o \
-e "${JSONDIR}/bin/libjson.dll" -o \
-e "${JSONDIR}/lib/libjson.a" \)
then
AC_MSG_ERROR([Cannot find json dev files in "$JSONDIR"])
fi
AC_MSG_RESULT([Using user-specified json-c directory: $JSONDIR])
dnl Add the include directory to JSON_CPPFLAGS
......@@ -788,8 +810,9 @@ fi
dnl Check that we can find the json/json.h header file
CPPFLAGS_SAVE="$CPPFLAGS"
CPPFLAGS="$JSON_CPPFLAGS"
AC_CHECK_HEADER([json-c/json.h], [HAVE_JSON=yes], [
AC_CHECK_HEADER([json/json.h], [HAVE_JSON=yes], [])])
AC_CHECK_HEADER([json/json.h], [HAVE_JSON=yes], [
AC_CHECK_HEADER([json-c/json.h], [HAVE_JSON=yes; HAVE_JSON_C=yes], [])
])
CPPFLAGS="$CPPFLAGS_SAVE"
dnl Ensure we can link against libjson
......@@ -803,6 +826,9 @@ LIBS="$LIBS_SAVE"
if test "$HAVE_JSON" = "yes"; then
AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present])
fi
if test "$HAVE_JSON_C" = "yes"; then
AC_DEFINE([HAVE_LIBJSON_C], 1, [Define to 1 if libjson resides in a json-c subdir])
fi
AC_SUBST([JSON_CPPFLAGS])
AC_SUBST([JSON_LDFLAGS])
......
This diff is collapsed.
# **********************************************************************
# * $Id$
# *
# * PostGIS - Spatial Types for PostgreSQL
# * http://postgis.refractions.net
# * Copyright 2010 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.
# *
# **********************************************************************
# Separate PGXS-enabled Makefile for documentation installation (it is
# not possible to merge into the main Makefile as has been done for
# the shapefile loader)
MODULE_doc=postgis-2.1
MODULEDIR=contrib/$(MODULE_doc)
# Files to be copied to the contrib/ directory
DATA_built=postgis_comments.sql raster_comments.sql topology_comments.sql
# PGXS information
PG_CONFIG = /home/postgresql-9.3/bin/pg_config
PGXS := /home/postgresql-9.3.1/lib/pgxs/src/makefiles/pgxs.mk
include $(PGXS)
# PGXS override feature. The ability to allow PostGIS to install itself
# in a versioned directory is only available in PostgreSQL >= 8.5. To
# do this by default on older PostgreSQL versions, we need to override
# the existing PGXS targets.
#
# Once PostgreSQL 8.5 becomes the minimum supported version, this entire
# section and its associated Makefile.pgxs should be removed.
PGXSOVERRIDE = 0
ifeq ($(PGXSOVERRIDE),1)
include ../postgis/Makefile.pgxs
endif
# If REGRESS=1 passed as a parameter, change the default install paths
# so that no prefix is included. This allows us to relocate to a temporary
# directory for regression testing.
ifeq ($(REGRESS),1)
bindir=/bin
pkglibdir=/lib
datadir=/share
datamoduledir=contrib/postgis
endif
......@@ -27,12 +27,19 @@ POSTGIS_MAJOR_VERSION=@POSTGIS_MAJOR_VERSION@
POSTGIS_MINOR_VERSION=@POSTGIS_MINOR_VERSION@
POSTGIS_MICRO_VERSION=@POSTGIS_MICRO_VERSION@
ifneq (,$(findstring dev,$(POSTGIS_MICRO_VERSION)))
POSTGIS_DOWNLOAD_URL=http://postgis.net/stuff
else
POSTGIS_DOWNLOAD_URL=http://download.osgeo.org/postgis/source
endif
INSTALL=@INSTALL@
INSTALL_DATA=@INSTALL_DATA@
XSLTPROC=@XSLTPROC@
XSLBASE=@XSLBASE@
XMLLINT=@XMLLINT@
CAN_BUILD_COMMENTS=@CAN_BUILD_COMMENTS@
PERL=@PERL@
# To allow network access use:
......@@ -82,22 +89,20 @@ PGSQL_DOCDIR=@PGSQL_DOCDIR@
PGSQL_MANDIR=@PGSQL_MANDIR@
PGSQL_SHAREDIR=@PGSQL_SHAREDIR@
# If XSLTPROC or XSLBASE were not found during configure, we cannot
# build the documentation
ifeq ($(XSLTPROC),)
all: requirements_not_met_xsltproc
else
ifeq ($(XSLBASE),)
all: requirements_not_met_xslbase
else
ifeq ($(IMAGEMAGICK),)
all: requirements_not_met_imagemagick
else
all: comments
endif
BUILD_TARGET =
ifeq ($(CAN_BUILD_COMMENTS),yes)
BUILD_TARGET += comments
endif
ifeq ($(CAN_BUILD_PDF),yes)
BUILD_TARGET += pdf
endif
# TODO: add "html" to the BUILD_TARGET if it can be built
all: $(BUILD_TARGET)
XML_SOURCES = \
extras_historytable.xml \
extras_tigergeocoder.xml \
......@@ -195,7 +200,7 @@ tiger_geocoder_cheatsheet.html: ./xsl/tiger_geocoder_cheatsheet.html.xsl $(XML_I
$(XSLTPROC) --novalid ./xsl/tiger_geocoder_cheatsheet.html.xsl postgis-out.xml > $@
postgis-out.xml: postgis.xml Makefile
$(PERL) -lpe "s'@@LAST_RELEASE_VERSION@@'${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}'g" $< > $@
$(PERL) -lpe "s'@@LAST_RELEASE_VERSION@@'${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}'g;s'@@POSTGIS_DOWNLOAD_URL@@'${POSTGIS_DOWNLOAD_URL}'g;" $< > $@
chunked-html: postgis-out.xml Makefile images $(XML_INPUTS)
$(XSLTPROC) $(XSLTPROC_COMMONOPTS) $(XSLTPROC_HTMLOPTS) \
......@@ -279,20 +284,20 @@ clean:
distclean: clean
$(MAKE) -C html/image_src distclean
rm -f Makefile
rm -f Makefile Makefile.comments html/image_src/Makefile
maintainer-clean: clean images-clean
rm -f postgis_comments.sql raster_comments.sql topology_comments.sql tiger_geocoder_comments.sql
ifeq ($(XSLTPROC),)
comments: requirements_not_met_xsltproc
ifneq ($(CAN_BUILD_COMMENTS),yes)
comments:
else
comments: postgis_comments.sql raster_comments.sql topology_comments.sql sfcgal_comments.sql tiger_geocoder_comments.sql
endif
cheatsheets: postgis_cheatsheet.html raster_cheatsheet.html topology_cheatsheet.html sfcgal_cheatsheet.html tiger_geocoder_cheatsheet.html
ifeq ($(XSLTPROC),)
ifneq ($(CAN_BUILD_COMMENTS),yes)
comments-install:
if test -e postgis_comments.sql -a \
-e raster_comments.sql -a \
......
......@@ -17,7 +17,7 @@
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
PROJECT_NAME = "PostGIS Trunk Doxygen"
PROJECT_NAME = "PostGIS 2.1 Doxygen"
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
......
# **********************************************************************
# * $Id: Makefile.in
# *
# * PostGIS - Spatial Types for PostgreSQL
# * http://postgis.refractions.net
# * Copyright 2008 Kevin Neufeld
# *
# * This is free software; you can redistribute and/or modify it under
# * the terms of the GNU General Public Licence. See the COPYING file.
# *
# **********************************************************************
CC=gcc
CFLAGS=-g -O2 -Wall -Wmissing-prototypes
CUNIT_LDFLAGS= -lcunit
CUNIT_CPPFLAGS= -I../../../liblwgeom
IMAGES= \
../images/de9im01.png \
../images/de9im02.png \
../images/st_azimuth01.png \
../images/st_azimuth02.png \
../images/st_buffer01.png \
../images/st_buffer02.png \
../images/st_buffer03.png \
../images/st_buffer04.png \
../images/st_buffer05.png \
../images/st_buffer06.png \
../images/st_buffer07.png \
../images/st_buffer08.png \
../images/st_buildarea01.png \
../images/st_buildarea02.png \
../images/st_closestpoint01.png \
../images/st_closestpoint02.png \
../images/st_centroid01.png \
../images/st_centroid02.png \
../images/st_centroid03.png \
../images/st_centroid04.png \
../images/st_contains01.png \
../images/st_contains02.png \
../images/st_contains03.png \
../images/st_contains04.png \
../images/st_contains05.png \
../images/st_contains06.png \
../images/st_concavehull01.png \
../images/st_concavehull02.png \
../images/st_concavehull03.png \
../images/st_concavehull04.png \
../images/st_concavehull05.png \
../images/st_concavehull06.png \
../images/st_concavehull07.png \
../images/st_concavehull08.png \
../images/st_convexhull01.png \
../images/st_crosses01.png \
../images/st_crosses02.png \
../images/st_crosses03.png \
../images/st_crosses04.png \
../images/st_delaunaytriangles04.png \
../images/st_difference01.png \
../images/st_dumppoints01.png \
../images/st_issimple01.png \
../images/st_issimple02.png \
../images/st_issimple03.png \
../images/st_issimple04.png \
../images/st_issimple05.png \
../images/st_issimple06.png \
../images/st_issimple07.png \
../images/st_isvalid01.png \
../images/st_isvalid02.png \
../images/st_isvalid03.png \
../images/st_isvalid04.png \
../images/st_isvalid05.png \
../images/st_isvalid06.png \
../images/st_isvalid07.png \
../images/st_isvalid08.png \
../images/st_isvalid09.png \
../images/st_linecrossingdirection01.png \
../images/st_linecrossingdirection02.png \
../images/st_linecrossingdirection03.png \
../images/st_linecrossingdirection04.png \
../images/st_line_interpolate_point01.png \
../images/st_line_substring01.png \
../images/st_longestline01.png \
../images/st_longestline02.png \
../images/st_longestline03.png \
../images/st_minimumboundingcircle01.png \
../images/st_offsetcurve01.png \
../images/st_offsetcurve02.png \
../images/st_offsetcurve03.png \
../images/st_offsetcurve04.png \
../images/st_offsetcurve05.png \
../images/st_offsetcurve06.png \
../images/st_overlaps01.png \
../images/st_overlaps02.png \
../images/st_overlaps03.png \
../images/st_sharedpaths01.png \
../images/st_sharedpaths02.png \
../images/st_shortestline01.png \
../images/st_shortestline02.png \
../images/st_snap01.png \
../images/st_snap02.png \
../images/st_snap03.png \
../images/st_snap04.png \
../images/st_snap05.png \
../images/st_split01.png \
../images/st_split02.png \
../images/st_split03.png \
../images/st_split04.png \
../images/st_symdifference01.png \
../images/st_symdifference02.png \
../images/st_touches01.png \
../images/st_touches02.png \
../images/st_touches03.png \
../images/st_touches04.png \
../images/st_touches05.png \
../images/st_touches06.png \
../images/st_within01.png
# Images that are created with dimensions 100x100
IMAGES_RESIZED= \
../images/de9im03.png \
../images/de9im04.png \
../images/de9im05.png \
../images/de9im06.png \
../images/de9im07.png \
../images/de9im08.png \
../images/de9im09.png \
../images/de9im10.png \
../images/de9im11.png \
../images/de9im12.png \
../images/de9im13.png
OBJS=styles.o generator.o
# Build the generator
all: generator
# generate the images
images: $(IMAGES) $(IMAGES_RESIZED)
# Command to build each of the .o files
$(OBJS): %.o: %.c
$(CC) $(CFLAGS) $(CUNIT_CPPFLAGS) -c -o $@ $<
# Command to build each of the .wkt files
$(IMAGES): ../images/%.png: %.wkt generator styles.conf
@./generator $<
# Command to resize each of the images
$(IMAGES_RESIZED): ../images/%.png: %.wkt generator styles.conf
@./generator $<
convert $@ -resize 100x100 $@
# Build the main executable
generator: ../../../liblwgeom/.libs/liblwgeom.a $(OBJS)
$(CC) -o $@ $(OBJS) ../../../liblwgeom/.libs/liblwgeom.a -lm $(CUNIT_LDFLAGS)
# Build liblwgeom
../../../liblwgeom/.libs/liblwgeom.a:
make -C ../../../liblwgeom liblwgeom.la
# Clean target
clean:
rm -f $(OBJS)
rm -f generator
rm -f tmp[0-9].png
distclean: clean
rm -f Makefile
images-clean:
rm -f $(IMAGES) $(IMAGES_RESIZED)
......@@ -50,7 +50,9 @@ psql -d yourdatabase -f topology_comments.sql</programlisting>
<para>In order to enable all GDAL drivers available in your GDAL install, set this environment variable as follows</para>
<programlisting>POSTGIS_GDAL_ENABLED_DRIVERS=ENABLE_ALL</programlisting>
<para>If you want to only enable specific drivers, set your environment variable as follows:</para>
<programlisting>POSTGIS_GDAL_ENABLED_DRIVERS="EHdr GTiff PNG JPEG GIF XYZ"</programlisting>
<programlisting>POSTGIS_GDAL_ENABLED_DRIVERS="GTiff PNG JPEG GIF XYZ"</programlisting>
<note><para>If you are on windows, do not quote the driver list</para></note>
<para>Setting environment variables varies depending on OS. For PostgreSQL installed on Ubuntu or Debian via apt-postgresql, the preferred way is to
edit <filename>/etc/postgresql/<replaceable>9.3</replaceable>/<replaceable>main</replaceable>/environment</filename> where 9.3 refers to version of PostgreSQL and main refers to the cluster.</para>
......
......@@ -8,7 +8,7 @@
<!-- ONCE Tagged, this need to change to http://download.osgeo.org/postgis/source/postgis-@@LAST_RELEASE_VERSION@@.tar.gz -->
<!-- In dev should be, this need to change to http://postgis.net/stuff/postgis-@@LAST_RELEASE_VERSION@@.tar.gz -->
<!ENTITY postgis_download_url "http://download.osgeo.org/postgis/source/postgis-@@LAST_RELEASE_VERSION@@.tar.gz">
<!ENTITY postgis_download_url "@@POSTGIS_DOWNLOAD_URL@@/postgis-@@LAST_RELEASE_VERSION@@.tar.gz">
<!-- Change these values to update the version numbers referenced within the documentation -->
<!ENTITY last_proj_release_version "4.8.0">
......
......@@ -13,6 +13,14 @@ COMMENT ON FUNCTION DropRasterConstraints(name , name , name , boolean , boolean
COMMENT ON FUNCTION DropRasterConstraints(name , name , name , text[] ) IS 'args: rastschema, rasttable, rastcolumn, constraints - Drops PostGIS raster constraints that refer to a raster table column. Useful if you need to reload data or update your raster column data.';
COMMENT ON FUNCTION AddOverviewConstraints(name , name , name , name , name , name , int ) IS 'args: ovschema, ovtable, ovcolumn, refschema, reftable, refcolumn, ovfactor - Tag a raster column as being an overview of another.';
COMMENT ON FUNCTION AddOverviewConstraints(name , name , name , name , int ) IS 'args: ovtable, ovcolumn, reftable, refcolumn, ovfactor - Tag a raster column as being an overview of another.';
COMMENT ON FUNCTION DropOverviewConstraints(name , name , name ) IS 'args: ovschema, ovtable, ovcolumn - Untag a raster column from being an overview of another.';
COMMENT ON FUNCTION DropOverviewConstraints(name , name ) IS 'args: ovtable, ovcolumn - Untag a raster column from being an overview of another.';
COMMENT ON FUNCTION PostGIS_Raster_Lib_Build_Date() IS 'Reports full raster library build date.';
COMMENT ON FUNCTION PostGIS_Raster_Lib_Version() IS 'Reports full raster version and build configuration infos.';
......@@ -421,13 +429,13 @@ COMMENT ON FUNCTION ST_Touches(raster , integer , raster , integer ) IS 'args: r
COMMENT ON FUNCTION ST_Touches(raster , raster ) IS 'args: rastA, rastB - Return true if raster rastA and rastB have at least one point in common but their interiors do not intersect.';
COMMENT ON FUNCTION ST_SameAlignment(raster , raster ) IS 'args: rastA, rastB - Returns true if rasters have same skew, scale, spatial ref and false if they dont with notice detailing issue.';
COMMENT ON FUNCTION ST_SameAlignment(raster , raster ) IS 'args: rastA, rastB - Returns true if rasters have same skew, scale, spatial ref, and offset (pixels can be put on same grid without cutting into pixels) and false if they dont with notice detailing issue.';
COMMENT ON FUNCTION ST_SameAlignment(double precision , double precision , double precision , double precision , double precision , double precision , double precision , double precision , double precision , double precision , double precision , double precision ) IS 'args: ulx1, uly1, scalex1, scaley1, skewx1, skewy1, ulx2, uly2, scalex2, scaley2, skewx2, skewy2 - Returns true if rasters have same skew, scale, spatial ref and false if they dont with notice detailing issue.';
COMMENT ON FUNCTION ST_SameAlignment(double precision , double precision , double precision , double precision , double precision , double precision , double precision , double precision , double precision , double precision , double precision , double precision ) IS 'args: ulx1, uly1, scalex1, scaley1, skewx1, skewy1, ulx2, uly2, scalex2, scaley2, skewx2, skewy2 - Returns true if rasters have same skew, scale, spatial ref, and offset (pixels can be put on same grid without cutting into pixels) and false if they dont with notice detailing issue.';
COMMENT ON AGGREGATE ST_SameAlignment(raster) IS 'args: rastfield - Returns true if rasters have same skew, scale, spatial ref and false if they dont with notice detailing issue.';
COMMENT ON AGGREGATE ST_SameAlignment(raster) IS 'args: rastfield - Returns true if rasters have same skew, scale, spatial ref, and offset (pixels can be put on same grid without cutting into pixels) and false if they dont with notice detailing issue.';
COMMENT ON FUNCTION ST_SameAlignment(raster , raster ) IS 'args: rastA, rastB - Returns text stating if rasters are aligned and if not aligned, a reason why.';
COMMENT ON FUNCTION ST_NotSameAlignmentReason(raster , raster ) IS 'args: rastA, rastB - Returns text stating if rasters are aligned and if not aligned, a reason why.';
COMMENT ON FUNCTION ST_Within(raster , integer , raster , integer ) IS 'args: rastA, nbandA, rastB, nbandB - Return true if no points of raster rastA lie in the exterior of raster rastB and at least one point of the interior of rastA lies in the interior of rastB.';
......
......@@ -674,7 +674,7 @@ MULTILINESTRING((-45.2 -33.2,-46 -32),(-29 -27,-30 -29.7,-36 -31,-45 -33))
</refsection>
<refsection>
<title>See Also</title>
<para><xref linkend="ST_Segmentize" />, <xref linkend="ST_Line_Substring" /></para>
<para><xref linkend="ST_Segmentize" />, <xref linkend="ST_LineSubstring" /></para>
</refsection>
</refentry>
......@@ -1273,7 +1273,7 @@ SELECT ST_AsEWKT(ST_Scale(ST_GeomFromEWKT('LINESTRING(1 2 3, 1 1 1)'), 0.5, 0.75
<paramdef><type>float </type> <parameter>max_segment_length</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>geometry <function>ST_Segmentize</function></funcdef>
<funcdef>geography <function>ST_Segmentize</function></funcdef>
<paramdef><type>geography </type> <parameter>geog</parameter></paramdef>
<paramdef><type>float </type> <parameter>max_segment_length</parameter></paramdef>
</funcprototype>
......@@ -1318,7 +1318,7 @@ POLYGON((-29 28,-29.8304547985374 37.9654575824488,-30 40,-29.1695452014626 30.0
</refsection>
<refsection>
<title>See Also</title>
<para><xref linkend="ST_Line_Substring" /></para>
<para><xref linkend="ST_LineSubstring" /></para>
</refsection>
</refentry>
......
......@@ -2,7 +2,7 @@
<sect1 id="Linear_Referencing">
<title>Linear Referencing</title>
<refentry id="ST_Line_Interpolate_Point">
<refentry id="ST_LineInterpolatePoint">
<refnamediv>
<refname>ST_LineInterpolatePoint</refname>
......@@ -27,7 +27,7 @@
must be a LINESTRING. Second argument is a float8 between 0 and 1
representing fraction of total linestring length the point has to be located.</para>
<para>See <xref linkend="ST_Line_Locate_Point" /> for
<para>See <xref linkend="ST_LineLocatePoint" /> for
computing the line location nearest to a Point.</para>
<note>
......@@ -36,7 +36,7 @@
0.0.</para>
</note>
<para>Availability: 0.8.2, Z and M supported added in 1.1.1</para>
<para>Changed: 2.1.0. Up to 2.0.x this was called ST_LineInterpolatePoint.</para>
<para>Changed: 2.1.0. Up to 2.0.x this was called ST_Line_Interpolate_Point.</para>
<para>&Z_support;</para>
</refsection>
......@@ -83,11 +83,11 @@ FROM (SELECT ST_GeomFromText('LINESTRING(1 2, 4 5, 6 7)') As the_line) As foo;
<refsection>
<title>See Also</title>
<para><xref linkend="ST_AsText" />, <xref linkend="ST_AsEWKT" />, <xref linkend="ST_Length" />, <xref linkend="ST_Line_Locate_Point" /></para>
<para><xref linkend="ST_AsText" />, <xref linkend="ST_AsEWKT" />, <xref linkend="ST_Length" />, <xref linkend="ST_LineLocatePoint" /></para>
</refsection>
</refentry>
<refentry id="ST_Line_Locate_Point">
<refentry id="ST_LineLocatePoint">
<refnamediv>
<refname>ST_LineLocatePoint</refname>
......@@ -113,8 +113,8 @@ FROM (SELECT ST_GeomFromText('LINESTRING(1 2, 4 5, 6 7)') As the_line) As foo;
the closest point on LineString to the given Point, as a fraction
of total <link linkend="ST_Length2D">2d line</link> length.</para>
<para>You can use the returned location to extract a Point (<xref linkend="ST_Line_Interpolate_Point" />) or
a substring (<xref linkend="ST_Line_Substring" />).</para>
<para>You can use the returned location to extract a Point (<xref linkend="ST_LineInterpolatePoint" />) or