Commit 4eb6b621 authored by Markus Wanner's avatar Markus Wanner

Import upstream version 2.1.0rc2

parent 88c0052d
......@@ -210,6 +210,11 @@ PostGIS 2.1.0
- #2351, st_distance between geographies wrong
- #2359, Fix handling of schema name when adding overview constraints
- #2371, Support GEOS versions with more than 1 digit in micro
- #2383, Remove unsafe use of \' from raster warning message
- #2384, Incorrect variable datatypes for ST_Neighborhood
* Known Issues *
- #2111, Raster bands can only reference the first 256 bands of out-db rasters
PostGIS 2.0.3
2013/03/01
......
......@@ -5,5 +5,5 @@
POSTGIS_MAJOR_VERSION=2
POSTGIS_MINOR_VERSION=1
POSTGIS_MICRO_VERSION=0rc1
POSTGIS_MICRO_VERSION=0rc2
......@@ -25,7 +25,7 @@ translations = it_IT pt_BR
POSTGIS_MAJOR_VERSION=2
POSTGIS_MINOR_VERSION=1
POSTGIS_MICRO_VERSION=0rc1
POSTGIS_MICRO_VERSION=0rc2
INSTALL=/usr/bin/install -c
INSTALL_DATA=${INSTALL} -m 644
......
......@@ -22,7 +22,7 @@ until release. If you have data from tiger_2010 and want replace with tiger_201
<note><para>New in PostGIS 2.1.0 release is ability to install tiger geocoder with PostgreSQL extension model if you are running PostgreSQL 9.1+. Refer to <xref linkend="install_tiger_geocoder_extension" /> for details.</para></note>
</para>
<para>Also new in PostGIS 2.1.0 is integration with pagc address standardizer C library which source can be downloaded from <ulink url="http://pagc.svn.sourceforge.net/viewvc/pagc/branches/sew-refactor/postgresql">PAGC PostgreSQL address standardizer extension</ulink> and after install and install of the libraray in your PostGIS database, you can use the <xref linkend="Pagc_Normalize_Address" /> function as a drop in replacement for in-built <xref linkend="Normalize_Address" />.</para>
<para>Also new in PostGIS 2.1.0 is integration with pagc address standardizer PostgreSQL extension which source can be downloaded from <ulink url="http://sourceforge.net/p/pagc/code/360/tree/branches/sew-refactor/postgresql">PAGC PostgreSQL address standardizer extension</ulink> and after install and install of the library in your PostGIS database, you can use the <xref linkend="Pagc_Normalize_Address" /> function as a drop in replacement for in-built <xref linkend="Normalize_Address" />. Refer to <xref linkend="installing_pagc_address_standardizer" /> for compile and installation instructions.</para>
......@@ -989,13 +989,13 @@ CREATE INDEX idx_tiger_data_ma_faces_countyfp ON tiger_data.ma_faces USING btree
<refname>Pagc_Normalize_Address</refname>
<refpurpose>Given a textual street address, returns a composite <varname>norm_addy</varname> type that has road suffix, prefix and type standardized, street, streetname etc. broken into separate fields. This function
will work with just the lookup data packaged with the tiger_geocoder (no need for tiger census data).</refpurpose>
will work with just the lookup data packaged with the tiger_geocoder (no need for tiger census data). Requires address_standardizer extension.</refpurpose>
</refnamediv>
<refsynopsisdiv>
<funcsynopsis>
<funcprototype>
<funcdef>norm_addy <function>normalize_address</function></funcdef>
<funcdef>norm_addy <function>pagc_normalize_address</function></funcdef>
<paramdef><type>varchar </type> <parameter>in_address</parameter></paramdef>
</funcprototype>
</funcsynopsis>
......@@ -1006,13 +1006,16 @@ CREATE INDEX idx_tiger_data_ma_faces_countyfp ON tiger_data.ma_faces USING btree
<para>Given a textual street address, returns a composite <varname>norm_addy</varname> type that has road suffix, prefix and type standardized, street, streetname etc. broken into separate fields. This is the first step in the geocoding process to
get all addresses into normalized postal form. No other data is required aside from what is packaged with the geocoder.</para>
<para>This function just uses the various direction/state/suffix lookup tables preloaded with the tiger_geocoder and located in the <varname>tiger</varname> schema, so it doesn't need you to download tiger census data or any other additional data to make use of it.
<para>This function just uses the various pagc_* lookup tables preloaded with the tiger_geocoder and located in the <varname>tiger</varname> schema, so it doesn't need you to download tiger census data or any other additional data to make use of it.
You may find the need to add more abbreviations or alternative namings to the various lookup tables in the <varname>tiger</varname> schema.</para>
<para>It uses various control lookup tables located in <varname>tiger</varname> schema to normalize the input address.</para>
<para>Fields in the <varname>norm_addy</varname> type object returned by this function in this order where () indicates a field required by the geocoder, [] indicates an optional field:</para>
<para>This version uses the PAGC address standardizer</para>
<para>This version uses the PAGC address standardizer C extension which you can download. There are slight variations in casing and formatting and also provides a richer breakout.</para>
<para>Availability: 2.1.0</para>
<para>(address) [predirAbbrev] (streetName) [streetTypeAbbrev] [postdirAbbrev] [internal] [location] [stateAbbrev] [zip]</para>
<para>The native standardaddr of address_standardizer extension is at this time a bit richer than norm_addy since its designed to support international addresses (including country). standardaddr equivalent fields are:</para>
<para>house_num,predir, name, suftype, sufdir, unit, city, state, postcode</para>
<orderedlist>
<listitem>
<para><varname>address</varname> is an integer: The street number</para>
......@@ -1048,11 +1051,44 @@ CREATE INDEX idx_tiger_data_ma_faces_countyfp ON tiger_data.ma_faces USING btree
</refsection>
<refsection>
<title>Examples</title>
<para>Single call example</para>
<programlisting>
SELECT addy.*
FROM pagc_normalize_address('9000 E ROO ST STE 999, Springfield, CO') AS addy;
address | predirabbrev | streetname | streettypeabbrev | postdirabbrev | internal | location | stateabbrev | zip | parsed
---------+--------------+------------+------------------+---------------+-----------+-------------+-------------+-----+--------
9000 | E | ROO | ST | | SUITE 999 | SPRINGFIELD | CO | | t</programlisting>
<para>Batch call. There are currently speed issues with the way postgis_tiger_geocoder wraps the address_standardizer. These will hopefully
be resolved in later editions. To work around them, if you need speed for batch geocoding to call generate a normaddy in batch mode, you are encouraged
to directly call the address_standardizer standardize_address function as shown below which is similar exercise to what we did in <xref linkend="Normalize_Address" /> that uses data created in <xref linkend="Geocode" />.</para>
<programlisting>WITH g AS (SELECT address, ROW((sa).house_num, (sa).predir, (sa).name
, (sa).suftype, (sa).sufdir, (sa).unit , (sa).city, (sa).state, (sa).postcode, true)::norm_addy As na
FROM (SELECT address, standardize_address('tiger.pagc_lex'
, 'tiger.pagc_gaz'
, 'tiger.pagc_rules', address) As sa
FROM addresses_to_geocode) As g)
SELECT address As orig, (g.na).streetname, (g.na).streettypeabbrev
FROM g;
orig | streetname | streettypeabbrev
-----------------------------------------------------+---------------+------------------
529 Main Street, Boston MA, 02129 | MAIN | ST
77 Massachusetts Avenue, Cambridge, MA 02139 | MASSACHUSETTS | AVE
25 Wizard of Oz, Walaford, KS 99912323 | WIZARD OF |
26 Capen Street, Medford, MA | CAPEN | ST
124 Mount Auburn St, Cambridge, Massachusetts 02138 | MOUNT AUBURN | ST
950 Main Street, Worcester, MA 01610 | MAIN | ST</programlisting>
</refsection>
<!-- Optionally add a "See Also" section -->
<refsection>
<title>See Also</title>
<para><xref linkend="Normalize_Address"/></para>
<para><xref linkend="Normalize_Address"/>, <xref linkend="Geocode"/></para>
</refsection>
</refentry>
......
......@@ -1236,7 +1236,19 @@ SELECT 'debbie', declare_sect, pgbin, wget, unzip_command, psql, path_sep,
<sect3 id="installing_pagc_address_standardizer"><title>Using PAGC address standardizer</title>
<para>One of the many complaints of folks is the address normalizer function <xref linkend="Normalize_Address" /> function that normalizes an address for prepping before geocoding. The normalizer is far from perfect and trying to patch its imperfectness takes a vast amount of resources. As such we have integrated with another
project that has a much better address standardizer engine. This is currently a separate project, which is a subproject of PAGC. The source code for this PostgreSQL standardizer extension can be downloaded from <ulink url="http://pagc.svn.sourceforge.net/viewvc/pagc/branches/sew-refactor/postgresql">PAGC PostgreSQL Address Standardizer</ulink>. To use this new normalizer, you compile the pagc extension and install as an extension in your database with:</para>
project that has a much better address standardizer engine. This is currently a separate project, which is a subproject of PAGC. The source code for this PostgreSQL standardizer extension can be downloaded from <ulink url="http://sourceforge.net/p/pagc/code/360/tree/branches/sew-refactor/postgresql">PAGC PostgreSQL Address Standardizer</ulink>. To use this new normalizer, you compile the pagc extension and install as an extension in your database.</para>
<para>The PAGC project and standardizer portion in particular, relies on PCRE which is usually already installed on most Nix systems,
but you can download the latest at: <ulink url="http://www.pcre.org">http://www.pcre.org</ulink> </para>
<para>For Windows users, the PostGIS 2.1+ bundle will come packaged with the address_standardizer already so no need to compile and can move straight to <code>CREATE EXTENSION</code> step.</para>
<para>Compiling</para>
<programlisting>svn co svn://svn.code.sf.net/p/pagc/code/branches/sew-refactor/postgresql address_standardizer
cd address_standardizer
make
#if you have in non-standard location pcre try
# make SHLIB_LINK="-L/path/pcre/lib -lpostgres -lpgport -lpcre" CPPFLAGS="-I. -I/path/pcre/include"
make install</programlisting>
<para>Once you have installed, you can connect to your database and run the SQL:</para>
<programlisting>CREATE EXTENSION address_standardizer;</programlisting>
<para>Once you install this extension in the same database as you have installed <code>postgis_tiger_geocoder</code>, then the <xref linkend="Pagc_Normalize_Address" /> can be used instead of <xref linkend="Normalize_Address" />. The other nice thing about this extension is that its tiger agnostic, so can be used with other data sources such as international addresses.</para>
......@@ -1262,7 +1274,7 @@ SELECT 'debbie', declare_sect, pgbin, wget, unzip_command, psql, path_sep,
</para>
<para>Edit the <filename>tiger_loader_2012.sql</filename> to the paths of your executables server etc or alternatively you can update the <varname>loader_platform</varname> table once installed. If you don't edit this file or the <varname>loader_platform</varname> table, it will just contain common case locations of items and you'll have to edit the generated script after the fact when you run the <xref linkend="Loader_Generate_Nation_Script" /> and <xref linkend="Loader_Generate_Script" /> SQL functions.
</para>
</para>
<para>If you are installing Tiger geocoder for the first time edit either the <filename>create_geocode.bat</filename> script If you are on windows
or the <filename>create_geocode.sh</filename> if you are on Linux/Unix/Mac OSX with your PostgreSQL specific settings and run the corresponding script from the commandline. </para>
......
......@@ -56,6 +56,10 @@
<title>Bug Fixes</title>
<para>#2126, Better handling of empty rasters from ST_ConvexHull()</para>
</simplesect>
<simplesect>
<title>Known Issues</title>
<para>#2111, Raster bands can only reference the first 256 bands of out-db rasters</para>
</simplesect>
</sect1>
<sect1>
......
......@@ -27,7 +27,7 @@ COMMENT ON FUNCTION Missing_Indexes_Generate_Script() IS 'Finds all tables with
COMMENT ON FUNCTION normalize_address(varchar ) IS 'args: in_address - Given a textual street address, returns a composite norm_addy type that has road suffix, prefix and type standardized, street, streetname etc. broken into separate fields. This function will work with just the lookup data packaged with the tiger_geocoder (no need for tiger census data).';
COMMENT ON FUNCTION normalize_address(varchar ) IS 'args: in_address - Given a textual street address, returns a composite norm_addy type that has road suffix, prefix and type standardized, street, streetname etc. broken into separate fields. This function will work with just the lookup data packaged with the tiger_geocoder (no need for tiger census data).';
COMMENT ON FUNCTION pagc_normalize_address(varchar ) IS 'args: in_address - Given a textual street address, returns a composite norm_addy type that has road suffix, prefix and type standardized, street, streetname etc. broken into separate fields. This function will work with just the lookup data packaged with the tiger_geocoder (no need for tiger census data). Requires address_standardizer extension.';
COMMENT ON FUNCTION pprint_addy(norm_addy ) IS 'args: in_addy - Given a norm_addy composite type object, returns a pretty print representation of it. Usually used in conjunction with normalize_address.';
......
......@@ -415,7 +415,7 @@ Available GDAL raster formats:
<listitem><para>Once you are done populating your table initially, you'll want to create a spatial index on the raster column with something like:</para>
<programlisting>CREATE INDEX myrasters_rast_st_convexhull_idx ON myrasters USING gist( ST_ConvexHull(rast) );</programlisting>
<para>Note the use of <xref linkend="RT_ST_ConvexHull" /> since most raster operators are based on the convex hull of the rasters.</para>
<note><para>Pre-2.0 versions of PostGIS raster were based on the envelop rather than the convex hull. For the spatial indexes to work properly you'll need to drop those and replace with convex hull based index.</para></note></listitem>
<note><para>Pre-2.0 versions of PostGIS raster were based on the envelope rather than the convex hull. For the spatial indexes to work properly you'll need to drop those and replace with convex hull based index.</para></note></listitem>
<listitem><para>Apply raster constraints using <xref linkend="RT_AddRasterConstraints" /></para></listitem>
</orderedlist>
</sect2>
......
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<!-- ********************************************************************
$Id: postgis_aggs_mm.xml.xsl 11424 2013-05-11 16:05:28Z robe $
$Id: postgis_aggs_mm.xml.xsl 11716 2013-08-02 01:30:11Z dustymugs $
********************************************************************
Copyright 2010, Regina Obe
License: BSD
......@@ -462,6 +462,7 @@
<note><para>Tiger Geocoder upgraded to work with TIGER 2012 census data. <varname>geocode_settings</varname> added for debugging and tweaking rating preferences, loader made less greedy, now only downloads tables to be loaded.
Please refer to <xref linkend="Tiger_Geocoder" /> for more details.</para></note>
<note><para>Raster bands can only reference the first 256 bands of out-db rasters.</para></note>
<para>Functions new in PostGIS 2.1</para>
<itemizedlist>
<!-- Pull out the purpose section for each ref entry and strip whitespace and put in a variable to be tagged unto each function comment -->
......
include ../upgradeable_versions.mk
EXTENSION = postgis
EXTVERSION = 2.1.0rc1
EXTVERSION = 2.1.0rc2
MINORVERSION = 2.1
GREP = /bin/grep
......
# postgis extension
comment = 'PostGIS geometry, geography, and raster spatial types and functions'
default_version = '2.1.0rc1'
default_version = '2.1.0rc2'
module_pathname = '$libdir/postgis-2.1'
relocatable = true
include ../upgradeable_versions.mk
EXTENSION = postgis_tiger_geocoder
EXTVERSION = 2.1.0rc1
EXTVERSION = 2.1.0rc2
MINORVERSION = 2011.2.1
MICRO_NUMBER = $(shell echo $(EXTVERSION) | sed "s/[0-9]\.[0-9]\.\([0-9]*\)[a-zA-Z]*[0-9]*/\1/")
......
# postgis tiger geocoder extension
comment = 'PostGIS tiger geocoder and reverse geocoder'
default_version = '2.1.0rc1'
default_version = '2.1.0rc2'
relocatable = false
schema = tiger
requires = 'postgis,fuzzystrmatch'
SELECT pg_catalog.pg_extension_config_dump('geocode_settings', '');
SELECT pg_catalog.pg_extension_config_dump('pagc_gaz', 'WHERE is_custom=true');
SELECT pg_catalog.pg_extension_config_dump('pagc_lex', 'WHERE is_custom=true');
SELECT pg_catalog.pg_extension_config_dump('pagc_rules', 'WHERE is_custom=true');
include ../upgradeable_versions.mk
EXTENSION = postgis_topology
EXTVERSION = 2.1.0rc1
EXTVERSION = 2.1.0rc2
MINORVERSION = 2.1
PGIS_MAJ_MIN=21
GREP=/bin/grep
......
# postgis topology extension
comment = 'PostGIS topology spatial types and functions'
default_version = '2.1.0rc1'
default_version = '2.1.0rc2'
relocatable = false
schema = topology
requires = postgis
......@@ -6,4 +6,4 @@ UPGRADEABLE_VERSIONS = \
2.0.4 \
2.1.0beta3 \
2.1.0rc1dev \
2.1.0rc1 \
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -130,8 +130,6 @@ main(int argc, char **argv)
it's a user-defined query then set that instead */
if (pgis_optind < argc)
{
char *ptr;
/* User-defined queries begin with SELECT */
if (!strncmp(argv[pgis_optind], "SELECT ", 7) ||
!strncmp(argv[pgis_optind], "select ", 7))
......@@ -141,21 +139,28 @@ main(int argc, char **argv)
else
{
/* Schema qualified table name */
ptr = strchr(argv[pgis_optind], '.');
if (ptr)
{
config->schema = malloc(strlen(argv[pgis_optind]) + 1);
snprintf(config->schema, ptr - argv[pgis_optind] + 1, "%s", argv[pgis_optind]);
config->table = malloc(strlen(argv[pgis_optind]));
snprintf(config->table, strlen(argv[pgis_optind]) - strlen(config->schema), "%s", ptr + 1);
}
else
{
config->table = malloc(strlen(argv[pgis_optind]) + 1);
strcpy(config->table, argv[pgis_optind]);
}
char *strptr = argv[pgis_optind];
char *chrptr = strchr(strptr, '.');
/* OK, this is a schema-qualified table name... */
if (chrptr)
{
if ( chrptr == strptr )
{
/* table is ".something" display help */
usage(0);
exit(0);
}
/* Null terminate at the '.' */
*chrptr = '\0';
/* Copy in the parts */
config->schema = strdup(strptr);
config->table = strdup(chrptr+1);
}
else
{
config->table = strdup(strptr);
}
}
}
......
.TH SHP2PGSQL-GUI 1 "January 14, 2012" "" "PostGIS"
.SH NAME
shp2pgsql-gui \- Graphical User Interface for shp2pgsql
.SH SYNOPSIS
.B shp2pgsql-gui
.RI [ options ]
.br
.SH DESCRIPTION
This manual page documents briefly the
.B shp2pgsql-gui
command.
.PP
.B shp2pgsql-gui
is a program that converts ESRI Shape files into SQL statements and imports these statements to a PostGIS/PostgreSQL database. The GUI allows the user to set the shape file to import, the PostGIS/PostgreSQL connection parameters and some options related to the table where the data will be imported to.
.PP
.B shp2pgsql-gui
can be called with some command line options that fill the PostGIS/PostgreSQL server connection parameters in.
.SH OPTIONS
.TP
.B -d \fIdatabase\fP
Specifies the name of the database where the data will be imported to.
.TP
.B -h \fIhost\fP
Specifies the host name of the machine on which the PostGIS/PostgreSQL server is running.
.TP
.B -p \fIport\fP
Specifies the TCP port on which the PostGIS/PostgreSQL server is listening for connections.
.TP
.B -U \fIusername\fP
Specifies the username with which the user will connect to the database.
.TP
.B -W \fIpassword\fP
Specifies the password with which the user will connect to the database.
.TP
.B -?
Shows help about shp2pgsql-gui command line arguments.
.SH "SEE ALSO"
shp2pgsql(1), pgsql2shp(1)
The documentation of pgsql2shp, shp2pgsql and shp2pgsql-gui in HTML format is available on the filesystem at /usr/share/doc/postgis.
.SH AUTHOR
shp2pgsql-gui was written by Paul Ramsey <pramsey@opengeo.org> and Mark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>.
.PP
This manual page was written by Mònica Ramírez Arceda <monica@probeta.net>, for the Debian project. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 and any later version published by the Free Software Foundation.
.PP
On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2.
......@@ -9,7 +9,7 @@
#define POSTGIS_PGSQL_VERSION 92
#define POSTGIS_GEOS_VERSION 34
#define POSTGIS_PROJ_VERSION 47
#define POSTGIS_LIB_VERSION 2.1.0rc1
#define POSTGIS_LIB_VERSION 2.1.0rc2
#define POSTGIS_LIBXML2_VERSION 2.7.8
/*
......@@ -18,12 +18,12 @@
* won't substitute within apostrophes)
*/
#define _POSTGIS_SQL_SELECT_POSTGIS_VERSION 'SELECT ''2.1 USE_GEOS=1 USE_PROJ=1 USE_STATS=1''::text AS version'
#define _POSTGIS_SQL_SELECT_POSTGIS_BUILD_DATE 'SELECT ''2013-07-10 16:21:24''::text AS version'
#define _POSTGIS_SQL_SELECT_POSTGIS_BUILD_DATE 'SELECT ''2013-08-03 17:42:38''::text AS version'
#if POSTGIS_SVN_REVISION
#define _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION $$ SELECT '2.1.0rc1'::text || ' r' || POSTGIS_SVN_REVISION::text AS version $$
#define _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION $$ SELECT '2.1.0rc2'::text || ' r' || POSTGIS_SVN_REVISION::text AS version $$
#else
#define _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION $$ SELECT '2.1.0rc1'::text AS version $$
#define _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION $$ SELECT '2.1.0rc2'::text AS version $$
#endif
#define SRID_USR_MAX 998999
......
#define POSTGIS_SVN_REVISION 11662
#define POSTGIS_SVN_REVISION 11726
......@@ -4798,7 +4798,7 @@ CREATE OR REPLACE FUNCTION st_setgeoreference(rast raster, georef text, format t
params[6]::float8 - (params[4]::float8 * 0.5));
ELSE
IF format != 'GDAL' THEN
RAISE WARNING E'Format \'%\' is not recognized, defaulting to GDAL format.', format;
RAISE WARNING 'Format ''%'' is not recognized, defaulting to GDAL format.', format;
END IF;
-- params array is now:
-- {scalex, skewy, skewx, scaley, upperleftx, upperlefty}
......@@ -6585,8 +6585,8 @@ CREATE OR REPLACE FUNCTION st_neighborhood(
RETURNS double precision[][]
AS $$
DECLARE
wx int;
wy int;
wx double precision;
wy double precision;
rtn double precision[][];
BEGIN
IF (st_geometrytype($3) != 'ST_Point') THEN
......
......@@ -87,4 +87,11 @@ SELECT
ST_Neighborhood(rast, 1, 4, 4, 1, 0)
FROM raster_neighborhood;
SELECT
ST_Neighborhood(rast, 1, 'POINT(0 0)'::geometry, 1, 1)
FROM raster_neighborhood;
SELECT
ST_Neighborhood(rast, 1, 'POINT(3 -3)'::geometry, 2, 2)
FROM raster_neighborhood;
DROP TABLE IF EXISTS raster_neighborhood;
......@@ -15,3 +15,5 @@ NOTICE: table "raster_neighborhood" does not exist, skipping
{{1,1,1,1,1},{NULL,1,1,NULL,1},{1,1,1,1,1},{1,NULL,1,1,NULL},{1,1,1,1,1}}
{{1,1,1},{1,1,NULL},{1,1,1},{NULL,1,1},{1,1,1}}
{{1,1,1}}
{{NULL,NULL,NULL},{NULL,NULL,1},{NULL,1,1}}
{{1,1,1,1,1},{NULL,1,1,NULL,1},{1,1,1,1,1},{1,NULL,1,1,NULL},{1,1,1,1,1}}
......@@ -71,7 +71,7 @@ TESTS = regress/legacy_validate.sql regress/legacy_predicate.sql \
TESTS_EXPECTED = $(TESTS:.sql=_expected)
regress/topogeo_addlinestring_expected: Makefile
ifeq ($(shell expr $(GEOS_NUMERIC_VERSION) ">=" 30308),1)
ifeq ($(shell expr $(GEOS_NUMERIC_VERSION) ">" 30308),1)
cp regress/topogeo_addlinestring_expected_newsnap regress/topogeo_addlinestring_expected
else
cp regress/topogeo_addlinestring_expected_oldsnap regress/topogeo_addlinestring_expected
......
......@@ -71,7 +71,7 @@ TESTS = regress/legacy_validate.sql regress/legacy_predicate.sql \
TESTS_EXPECTED = $(TESTS:.sql=_expected)
regress/topogeo_addlinestring_expected: Makefile
ifeq ($(shell expr $(GEOS_NUMERIC_VERSION) ">=" 30308),1)
ifeq ($(shell expr $(GEOS_NUMERIC_VERSION) ">" 30308),1)
cp regress/topogeo_addlinestring_expected_newsnap regress/topogeo_addlinestring_expected
else
cp regress/topogeo_addlinestring_expected_oldsnap regress/topogeo_addlinestring_expected
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment