[postgis-tickets] [SCM] PostGIS; Spatial objects for PostgreSQL. branch master updated. 171a8876bc0e2774bc3a76851e9da7fccc5c4822
git at osgeo.org
git at osgeo.org
Wed Oct 30 06:03:29 PDT 2019
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS; Spatial objects for PostgreSQL.".
The branch, master has been updated
via 171a8876bc0e2774bc3a76851e9da7fccc5c4822 (commit)
from 12fa8e1cd559450331c9cab93e7ddbb0399e47f5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 171a8876bc0e2774bc3a76851e9da7fccc5c4822
Author: Regina Obe <lr at pcorp.us>
Date: Wed Oct 30 09:00:40 2019 -0400
Revert "Merge branch 'master' of https://git.osgeo.org/gitea/postgis/postgis"
This reverts commit 12fa8e1cd559450331c9cab93e7ddbb0399e47f5, reversing
changes made to 48cd308dad76af81c6b3647a6e3c9fadc31d419d.
diff --git a/ci/dronie/postgis_regress.sh b/ci/dronie/postgis_regress.sh
index ef75397..a5d13c2 100644
--- a/ci/dronie/postgis_regress.sh
+++ b/ci/dronie/postgis_regress.sh
@@ -8,7 +8,7 @@ export PGPORT=`grep ^port /etc/postgresql/$PGVER/main/postgresql.conf | awk '{pr
export PATH=/usr/lib/postgresql/$PGVER/bin:$PATH
psql --version
./autogen.sh
-./configure CFLAGS="-O2 -Wall -fno-omit-frame-pointer -Werror" --without-interrupt-tests
+./configure CFLAGS="-O0 -Wall -fno-omit-frame-pointer -Werror" --without-interrupt-tests
make clean
make -j
# we should maybe wait for postgresql service to startup here...
diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index 3113e66..0b31ae6 100644
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -74,7 +74,7 @@ export PATHOLD=$PATH
WEB=/home/www/postgis/htdocs
DWN=${WEB}/download
-export PATHOLD="/mingw/bin:/mingw/include:/c/Windows/system32:/c/Windows:.:/bin:/include:/usr/local/bin"
+export PATHOLD="/mingw/bin:/mingw/include:/c/Windows/system32:/c/Windows:.:/bin:/include:/usr/local/bin:/c/ming${OS_BUILD}}${GCC_TYPE}/svn"
#export PG_VER=9.2beta2
echo PATH BEFORE: $PATH
@@ -100,12 +100,13 @@ export REL_PGVER=${PG_VER//./} #strip the period
export RELDIR=${PROJECTS}/postgis/builds/${POSTGIS_MINOR_VER}
export RELVERDIR=postgis-pg${REL_PGVER}-binaries-${POSTGIS_MICRO_VER}w${OS_BUILD}${GCC_TYPE}
export PATH="${PATHOLD}:${PGPATH}/bin:${PGPATH}/lib"
-export PCRE_VER=8.33
+export PCRE_VER=8.33
#PATH="${PGPATH}/bin:${PGPATH}/lib:${PROJECTS}/xsltproc:${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/gtkw${OS_BUILD}/bin:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include:${PROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin:${PATH}"
#echo PATH AFTER: $PATH
outdir="${RELDIR}/${RELVERDIR}"
package="${RELDIR}/${RELVERDIR}.zip"
verfile="${RELDIR}/${RELVERDIR}/version.txt"
+#svnurl="http://svn.osgeo.org/postgis/trunk"
rm -rf $outdir
rm $package
mkdir -p $outdir
@@ -205,6 +206,10 @@ cp doc/*_comments.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MIN
cp postgis/*.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}
cp raster/rt_pg/*.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}
cp utils/*.pl ${RELDIR}/${RELVERDIR}/utils
+#add extras
+#svn export "${svnurl}/extras" ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}/extras
+#cp raster/rt_pg/rtpostgis.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}
+#cp raster/rt_pg/rtpostgis_upgrade_20_minor.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}
cp raster/loader/.libs/raster2pgsql.exe ${RELDIR}/${RELVERDIR}/bin
cp liblwgeom/.libs/*.dll ${RELDIR}/${RELVERDIR}/bin
@@ -249,4 +254,4 @@ cd ${RELDIR}
zip -r $package ${RELVERDIR}
#scp $package robe at www.refractions.net:${DWN}/${REL_PGVER}/buildbot/${RELVERDIR}.zip
cp $package ${PROJECTS}/postgis/win_web/download/windows/pg${REL_PGVER}/buildbot
-cd ${POSTGIS_SRC}
+cd ${POSTGIS_SRC}
\ No newline at end of file
diff --git a/doc/geography.txt b/doc/geography.txt
index 0342683..976e6f0 100644
--- a/doc/geography.txt
+++ b/doc/geography.txt
@@ -1,7 +1,7 @@
Introduction to the Geography Type
==================================
-The geography type provides native support for spatial features represented on "geographic" coordinates (sometimes called "geodetic" coordinates, or "lat/lon", or "lon/lat"). Geographic coordinates are spherical coordinates expressed in angular units (degrees).
+The geography type provides native support for spatial features represented on "geographic" coordinates (sometimes called "geodetic" coordinates, or "lat/lon", or "lon/lat"). Geographic coordinates are spherical coordinates expressed in angular units (degrees).
The basis for the PostGIS geometry type is a plane. The shortest path between two points on the plane is a straight line. That means calculations on geometries (areas, distances, lengths, intersections, etc) can be calculated using cartesian mathematics and straight line vectors.
@@ -29,7 +29,7 @@ The text representations for geography objects are the same as for geometries:
* POINT(0 0)
* LINESTRING(0 0, 1 1)
-* POLYGON((0 0, 1 0, 1 1, 1 0, 0 0))
+* POLYGON((0 0, 1 0, 1 1, 1 0, 0 0))
* ..etc..
The coordinates for geography objects are expected to be in decimal degrees, with longitude as the first ordinate and latitude as the second:
@@ -39,6 +39,34 @@ The coordinates for geography objects are expected to be in decimal degrees, wit
The geography implementation currently assumes that all coordinates are relative to the WGS84 spheroid (using an SRID of 4326), and does not allow any other SRID values to be used. Future enhancements may allow multiple spheroids to be supported and transformations between spheroids. An SRID value of 0 (undefined) will be treated as implicitly using WGS84 (4326).
+
+Installing the Geography Extension
+==================================
+
+* Pull the source from the geography sandbox.
+
+ svn checkout http://svn.osgeo.org/postgis/spike/pramsey/geodetic postgis-geodetic-svn
+
+* Compile and install PostGIS as usual.
+
+ cd postgis-geodetic-svn
+ ./configure
+ make
+ make install
+
+* Then, create a database and install PostGIS into that database. (Assuming your PostgreSQL is installed in /usr/local/pgsql.)
+
+ createdb geography
+ psql geography < /usr/local/pgsql/share/contrib/postgis.sql
+ psql geography < /usr/local/pgsql/share/contrib/spatial_ref_sys
+
+* Then, install the geography extension.
+
+ psql geography < /usr/local/pgsql/share/contrib/geography.sql
+
+* That's it!
+
+
Creating a Geography Table
==========================
@@ -49,31 +77,31 @@ You can create a geography-enabled table using the CREATE TABLE statement as fol
Check out the contents of "gtable":
\d gtable
-
+
Table "public.gtable"
- Column | Type | Modifiers
+ Column | Type | Modifiers
--------+-----------+-----------
id | integer | not null
- geog | geography |
+ geog | geography |
Indexes:
"gtable_pkey" PRIMARY KEY, btree (id)
-
-
+
+
Now, check the "geography_columns" view and see that your table is listed:
SELECT * FROM geography_columns;
-
+
Note that "geography_columns" metadata is a view against the system tables and kept up to date automatically. This is a big improvement on the manually maintained "geometry_columns" table.
Insert some data into the table and then pull it out:
INSERT INTO gtable1 VALUES (1, 'POINT(0 0)');
SELECT id,ST_AsText(geog) FROM gtable2;
-
+
Try inserting some invalid geography data and see the database complain:
INSERT INTO gtable1 values (1, 'POINT(1000 0)');
-
+
Using Type Restrictions
=======================
@@ -81,32 +109,32 @@ Using Type Restrictions
You can restrict the geography types allowed in a column by adding a type restriction when you create the table:
CREATE TABLE gtable2 ( id integer, geog geography(linestring) );
-
+
\d gtable2
-
+
Table "public.gtable2"
- Column | Type | Modifiers
+ Column | Type | Modifiers
--------+-----------------------+-----------
- id | integer |
- geog | geography(LineString) |
-
+ id | integer |
+ geog | geography(LineString) |
+
Now, if you try to insert a point, the database will complain:
INSERT INTO gtable2 VALUES (1, 'POINT(0 0)');
-
+
You can also add SRID restrictions to a column, though at this point (with only one SRID supported) there is not a lot of utility to the feature:
CREATE TABLE gtable3 ( id integer, geog geography(polygon, 4326) );
-
+
\d gtable3
-
+
Table "public.gtable3"
- Column | Type | Modifiers
+ Column | Type | Modifiers
--------+-------------------------+-----------
- id | integer |
- geog | geography(Polygon,4326) |
-
+ id | integer |
+ geog | geography(Polygon,4326) |
+
Using Input/Output Functions
@@ -122,7 +150,7 @@ There are only four input/output functions at this time supporting the OGC well-
You can test that they are bi-directional by stringing them together:
SELECT ST_AsText(ST_GeographyFromBinary(ST_AsBinary(ST_GeographyFromText('LINESTRING(0 0, 1 1)'))));
-
+
Casting from Geometry
=====================
@@ -133,5 +161,5 @@ There is currently a simple cast from geometry to geography, which can be useful
INSERT INTO geomtable VALUES ( 2, 'POINT(0 0)' );
CREATE TABLE geogtable AS SELECT id, geom::geography AS geog FROM geomtable;
SELECT ST_AsText(geog), id FROM geogtable;
-
+
diff --git a/liblwgeom/cunit/README b/liblwgeom/cunit/README
index dc6bbca..978653c 100644
--- a/liblwgeom/cunit/README
+++ b/liblwgeom/cunit/README
@@ -80,7 +80,7 @@ Add a new line for your test:
PG_ADD_TEST(<your test function name>);
-The tests will be run in the order they appear in the list.
+The tests will be run in the order they appear in the list.
CU_TEST_INFO_NULL must always be the last entry.
2.3 Add any necessary init / cleanup code.
@@ -102,8 +102,8 @@ Do the following steps to create a whole new test suite (new .c file).
3.1 Create the file.
-Create the new file (remember to add to repository as well).
-The naming convention is cu_<suite name>.c.
+Create the new file (remember to add to svn as well). The naming convention
+is cu_<suite name>.c.
Make sure to import:
diff --git a/regress/run_test.pl b/regress/run_test.pl
index 5bf3227..ccbfea2 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -416,15 +416,14 @@ if ( $OPT_DUMPRESTORE )
my $geosver = sql("select postgis_geos_version()");
my $projver = sql("select postgis_proj_version()");
+# TODO: call postgis_lib_revision() instead of postgis_svn_version
+# if $libver >= 3.1.0
+my $librev = sql("select postgis_svn_version()");
my $libbuilddate = sql("select postgis_lib_build_date()");
my $pgsqlver = sql("select version()");
my $gdalver = sql("select postgis_gdal_version()") if $OPT_WITH_RASTER;
my $sfcgalver = sql("select postgis_sfcgal_version()") if $OPT_WITH_SFCGAL;
my $scriptver = sql("select postgis_scripts_installed()");
-# postgis_lib_revision was introduced in 3.1.0
-my $librev = semver_lessthan($scriptver, "3.1.0") ?
- sql("select postgis_svn_version()") :
- sql("select postgis_lib_revision()");
my $raster_scriptver = sql("select postgis_raster_scripts_installed()")
if ( $OPT_WITH_RASTER );
diff --git a/utils/repo_revision.pl b/utils/repo_revision.pl
index 4d4f243..cceeb2e 100755
--- a/utils/repo_revision.pl
+++ b/utils/repo_revision.pl
@@ -11,7 +11,7 @@ my $rev_file = $top_srcdir.'/postgis_revision.h';
my $target = 'local';
$target = $ARGV[0] if $ARGV[0];
-# Read the revision number
+# Read the svn revision number
my $rev = &read_rev($target);
# Write it
@@ -31,7 +31,7 @@ sub read_rev_git {
# TODO: test on old systems, I think I saw some `which`
# implementations returning "nothing found" or something
- # like that, making the later if ( ! $git_exe ) always false
+ # like that, making the later if ( ! $svn_exe ) always false
#
my $git_exe = `which git`;
if ( ! $git_exe ) {
-----------------------------------------------------------------------
Summary of changes:
ci/dronie/postgis_regress.sh | 2 +-
ci/winnie/package_postgis.sh | 11 +++++--
doc/geography.txt | 78 ++++++++++++++++++++++++++++++--------------
liblwgeom/cunit/README | 6 ++--
regress/run_test.pl | 7 ++--
utils/repo_revision.pl | 4 +--
6 files changed, 70 insertions(+), 38 deletions(-)
hooks/post-receive
--
PostGIS; Spatial objects for PostgreSQL.
More information about the postgis-tickets
mailing list