[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha3-47-g2a09c02

Tue Dec 8 13:14:41 PST 2020

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".

The branch, master has been updated
       via  2a09c0294a9790997c381bd2d38697f62757246a (commit)
       via  f7ab9d6ca42c05bcd3ca36bded6abcaaceffb0b8 (commit)
      from  ffca75a77c4c0451e7a451ddff6841eb49ce2c00 (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 2a09c0294a9790997c381bd2d38697f62757246a
Merge: f7ab9d6 ffca75a
Author: Regina Obe <lr at pcorp.us>
Date:   Tue Dec 8 16:14:32 2020 -0500

    Merge branch 'master' of https://git.osgeo.org/gitea/postgis/postgis


commit f7ab9d6ca42c05bcd3ca36bded6abcaaceffb0b8
Author: Regina Obe <lr at pcorp.us>
Date:   Tue Dec 8 16:04:42 2020 -0500

    Do fake srid for EPSG:2393  to fix 2.1.9 upgrade tests references #4810

diff --git a/regress/core/in_gml.sql b/regress/core/in_gml.sql
index b33a631..4206c94 100644
--- a/regress/core/in_gml.sql
+++ b/regress/core/in_gml.sql
@@ -641,6 +641,9 @@ INSERT INTO spatial_ref_sys(srid, auth_name, auth_srid, srtext, proj4text) VALUE
 INSERT INTO spatial_ref_sys(srid, auth_name, auth_srid, srtext, proj4text) VALUES (5, 'EPSG', 8433, 'PROJCS["Macao 1920 / Macao Grid",GEOGCS["Macao 1920",DATUM["Macao_1920",SPHEROID["International 1924",6378388,297,AUTHORITY["EPSG","7022"]],AUTHORITY["EPSG","1207"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","8428"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",22.2123972222222],PARAMETER["central_meridian",113.536469444444],PARAMETER["scale_factor",1],PARAMETER["false_easting",20000],PARAMETER["false_northing",20000],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Northing",NORTH],AXIS["Easting",EAST],AUTHORITY["EPSG","8433"]]', '+proj=tmerc +lat_0=22.2123972222222 +lon_0=113.536469444444 +k=1 +x_0=20000 +y_0=20000 +ellps=intl +units=m +no_defs');
 INSERT INTO spatial_ref_sys(srid, auth_name, auth_srid, srtext, proj4text) VALUES (6, 'EPSG', 8857, NULL, '+proj=eqearth +lon_0=0 +x_0=0 +y_0=0 +datum=WGS84 +units=m +no_defs');
 
+INSERT INTO spatial_ref_sys(srid, auth_name, auth_srid, srtext, proj4text) VALUES (7, 'EPSG', 2393, NULL, '+proj=tmerc +lat_0=0 +lon_0=27 +k=1 +x_0=3500000 +y_0=0 +ellps=intl +towgs84=-96.062,-82.428,-121.753,4.801,0.345,-1.376,1.496 +units=m +no_defs');
+
+
 -- Reverse axis with all kind of simples geometry types
 SELECT 'srs_17', ST_AsEWKT(ST_GeomFromGML('<gml:MultiGeometry srsName="urn:ogc:def:crs:EPSG::4326"><gml:geometryMember><gml:Point><gml:pos srsDimension="2">1 2</gml:pos></gml:Point></gml:geometryMember><gml:geometryMember><gml:LineString><gml:posList srsDimension="2">3 4 5 6</gml:posList></gml:LineString></gml:geometryMember><gml:geometryMember><gml:Curve><gml:segments><gml:LineStringSegment><gml:posList srsDimension="2">7 8 9 10</gml:posList></gml:LineStringSegment></gml:segments></gml:Curve></gml:geometryMember><gml:geometryMember><gml:Polygon><gml:exterior><gml:LinearRing><gml:posList srsDimension="2">11 12 13 14 15 16 11 12</gml:posList></gml:LinearRing></gml:exterior><gml:interior><gml:LinearRing><gml:posList srsDimension="2">17 18 19 20 21 22 17 18</gml:posList></gml:LinearRing></gml:interior></gml:Polygon></gml:geometryMember><gml:geometryMember><gml:Surface><gml:patches><gml:PolygonPatch><gml:exterior><gml:LinearRing><gml:posList srsDimension="2">23 24 25 26 27 28 23 24</gml
 :posList></gml:LinearRing></gml:exterior><gml:interior><gml:LinearRing><gml:posList srsDimension="2">25 26 27 28 29 30 25 26</gml:posList></gml:LinearRing></gml:interior></gml:PolygonPatch></gml:patches></gml:Surface></gml:geometryMember></gml:MultiGeometry>'));
 
@@ -648,7 +651,7 @@ SELECT 'srs_17', ST_AsEWKT(ST_GeomFromGML('<gml:MultiGeometry srsName="urn:ogc:d
 SELECT 'srs_18', ST_AsEWKT(ST_GeomFromGML('<gml:Point srsName="urn:ogc:def:crs:EPSG::32631"><gml:pos>500000 0</gml:pos></gml:Point>'));
 
 -- Projected CRS with northing, easting axis order, but with no explicit AXIS (EPSG 2393: KKJ / Finland Uniform Coordinate System). We must swap the coordinates
-SELECT 'srs_19', ST_AsEWKT(ST_GeomFromGML('<gml:Point srsName="urn:ogc:def:crs:EPSG::2393"><gml:pos>6000000 3500000</gml:pos></gml:Point>'));
+SELECT 'srs_19', ST_AsEWKT(ST_GeomFromGML('<gml:Point srsName="urn:ogc:def:crs:EPSG::7"><gml:pos>6000000 3500000</gml:pos></gml:Point>'));
 
 -- Geocentric CRS with explicit geocentric AXIS (WGS 84 geocentric). No coordinate swapping
 SELECT 'srs_20', ST_AsEWKT(ST_GeomFromGML('<gml:Point srsName="urn:ogc:def:crs:EPSG::1"><gml:pos srsDimension="3">1 2 3</gml:pos></gml:Point>'));
diff --git a/regress/core/in_gml_expected b/regress/core/in_gml_expected
index 4de90f2..02f6481 100644
--- a/regress/core/in_gml_expected
+++ b/regress/core/in_gml_expected
@@ -216,7 +216,7 @@ ERROR:  unknown spatial reference system
 ERROR:  unknown spatial reference system
 srs_17|SRID=4326;GEOMETRYCOLLECTION(POINT(2 1),LINESTRING(4 3,6 5),LINESTRING(8 7,10 9),POLYGON((12 11,14 13,16 15,12 11),(18 17,20 19,22 21,18 17)),POLYGON((24 23,26 25,28 27,24 23),(26 25,28 27,30 29,26 25)))
 srs_18|SRID=32631;POINT(500000 0)
-srs_19|SRID=2393;POINT(3500000 6000000)
+srs_19|SRID=7;POINT(3500000 6000000)
 srs_20|SRID=1;POINT(1 2 3)
 srs_21|SRID=2;POINT(2 49 3)
 srs_22|SRID=3;POINT(2 49)

-----------------------------------------------------------------------

Summary of changes:
 regress/core/in_gml.sql      | 5 ++++-
 regress/core/in_gml_expected | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
PostGIS
