[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0rc1-189-g7a1eb0e
git at osgeo.org
git at osgeo.org
Mon May 17 17:42:04 PDT 2021
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 7a1eb0e60f84f8fd08c87623ee83d5e5e15562c2 (commit)
from 933e23cd13891ff2bfe72b9bad9633a812333ae4 (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 7a1eb0e60f84f8fd08c87623ee83d5e5e15562c2
Author: Regina Obe <lr at pcorp.us>
Date: Mon May 17 20:36:15 2021 -0400
Break proj tests into two and add an additional to test improvements references #4890
diff --git a/regress/core/regress_proj_4890.sql b/regress/core/regress_proj_4890.sql
new file mode 100644
index 0000000..297c1ef
--- /dev/null
+++ b/regress/core/regress_proj_4890.sql
@@ -0,0 +1,12 @@
+CREATE TABLE points AS SELECT * FROM (VALUES ('SRID=4326;POINT(-124.9921 49.6851)'::geometry), ('SRID=4326;POINT(-119.4032 50.0305)'::geometry), ('SRID=4326;POINT(-122.799 49.1671)'::geometry), ('SRID=4326;POINT(-122.3379 49.0597)'::geometry), ('SRID=4326;POINT(-123.1264 49.2671)'::geometry), ('SRID=4326;POINT(-122.7132 49.0519)'::geometry), ('SRID=4326;POINT(-124.3475 49.3042)'::geometry), ('SRID=4326;POINT(-119.389 49.8891)'::geometry), ('SRID=4326;POINT(-123.126 49.281)'::geometry), ('SRID=4326;POINT(-122.6606 49.1134)'::geometry), ('SRID=4326;POINT(-124.3233 49.312)'::geometry), ('SRID=4326;POINT(-124.0478 49.2397)'::geometry), ('SRID=4326;POINT(-119.2683 50.266)'::geometry), ('SRID=4326;POINT(-121.9705 49.081)'::geometry), ('SRID=4326;POINT(-123.8854 49.482)'::geometry), ('SRID=4326;POINT(-123.1528 49.77)'::geometry), ('SRID=4326;POINT(-120.8051 50.488)'::geometry), ('SRID=4326;POINT(-122.6403 49.1652)'::geometry), ('SRID=4326;POINT(-122.7717 49.2433)'::geometry), ('SRID=4326;P
OINT(-121.9587 49.1661)'::geometry))
+p(g);
+
+CREATE OR REPLACE FUNCTION get_closest(p geometry(POINT)) RETURNS geometry(POINT) AS $$
+ SELECT g FROM points ORDER BY st_transform(p, 3005) <-> st_transform(points.g, 3005) LIMIT 1
+$$
+STABLE
+LANGUAGE SQL;
+
+SELECT 4890 AS id, ST_AsText(ST_SnapToGrid(ST_Centroid(ST_Collect(get_closest(g) )), 0.0001)) FROM points ;
+DROP TABLE points;
+DROP FUNCTION get_closest(geometry);
diff --git a/regress/core/regress_proj_4890_expected b/regress/core/regress_proj_4890_expected
new file mode 100644
index 0000000..6e5a92e
--- /dev/null
+++ b/regress/core/regress_proj_4890_expected
@@ -0,0 +1 @@
+4890|POINT(-122.4859 49.4531)
diff --git a/regress/core/regress_proj.sql b/regress/core/regress_proj_basic.sql
similarity index 74%
rename from regress/core/regress_proj.sql
rename to regress/core/regress_proj_basic.sql
index 70ea5ed..41c98be 100644
--- a/regress/core/regress_proj.sql
+++ b/regress/core/regress_proj_basic.sql
@@ -57,11 +57,3 @@ SELECT 12, ST_AsEWKT(ST_Transform(
'invalid projection'));
DELETE FROM spatial_ref_sys WHERE srid in (100001, 100002);
-
---- Overflow proj cache
-SELECT 13, count(*) FROM
-(
- SELECT ST_Transform('SRID=4326; POINT(0 0)'::geometry, srid) AS g
- FROM
- ( Select srid from spatial_ref_sys where srid IN (3819, 3821, 3824, 3889, 3906, 4001, 4002, 4003, 4004, 4005, 4006, 4007, 4008, 4009, 4010, 4011, 4012, 4013, 4014, 4015, 4016, 4018, 4019, 4020, 4021, 4022, 4023, 4024, 4025, 4027, 4028, 4029, 4030, 4031, 4032, 4033, 4034, 4035, 4036, 4041, 4042, 4043, 4044, 4045, 4046, 4047, 4052, 4053, 4054, 4055, 4075, 4081, 4120, 4121, 4122, 4123, 4124, 4125, 4126, 4127, 4128, 4129, 4130, 4131, 4132, 4133, 4134, 4135, 4139, 4140, 4141, 4142, 4143, 4144, 4145, 4146, 4147, 4148, 4149, 4150, 4151, 4152, 4153, 4154, 4155, 4156, 4157, 4158, 4159, 4160, 4161, 4162, 4163, 4164, 4165, 4166, 4167, 4168, 4169, 4170, 4171, 4172, 4173, 4174, 4175, 4176, 4178, 4179, 4180, 4181, 4182, 4183, 4184, 4185, 4188, 4189, 4190, 4191, 4192, 4193, 4194, 4195, 4196, 4197, 4198, 4199, 4200, 4201, 4202, 4203, 4204, 4205, 4206, 4207, 4
208, 4209, 4210, 4211, 4212, 4213, 4214, 4215, 4216, 4218, 4219, 4220, 4221)) _a
-) _b WHERE g IS NOT NULL;
diff --git a/regress/core/regress_proj_expected b/regress/core/regress_proj_basic_expected
similarity index 98%
rename from regress/core/regress_proj_expected
rename to regress/core/regress_proj_basic_expected
index 73058e6..b2792e7 100644
--- a/regress/core/regress_proj_expected
+++ b/regress/core/regress_proj_basic_expected
@@ -11,4 +11,3 @@ ERROR: ST_Transform: Input geometry has unknown (0) SRID
10|POINT(574600 5316780)
11|SRID=100001;POINT(574600 5316780)
ERROR: could not parse proj string 'invalid projection'
-13|147
diff --git a/regress/core/regress_proj_cache_overflow.sql b/regress/core/regress_proj_cache_overflow.sql
new file mode 100644
index 0000000..c404eff
--- /dev/null
+++ b/regress/core/regress_proj_cache_overflow.sql
@@ -0,0 +1,7 @@
+--- Overflow proj cache
+SELECT 13, count(*) FROM
+(
+ SELECT ST_Transform('SRID=4326; POINT(0 0)'::geometry, srid) AS g
+ FROM
+ ( Select srid from spatial_ref_sys where srid IN (3819, 3821, 3824, 3889, 3906, 4001, 4002, 4003, 4004, 4005, 4006, 4007, 4008, 4009, 4010, 4011, 4012, 4013, 4014, 4015, 4016, 4018, 4019, 4020, 4021, 4022, 4023, 4024, 4025, 4027, 4028, 4029, 4030, 4031, 4032, 4033, 4034, 4035, 4036, 4041, 4042, 4043, 4044, 4045, 4046, 4047, 4052, 4053, 4054, 4055, 4075, 4081, 4120, 4121, 4122, 4123, 4124, 4125, 4126, 4127, 4128, 4129, 4130, 4131, 4132, 4133, 4134, 4135, 4139, 4140, 4141, 4142, 4143, 4144, 4145, 4146, 4147, 4148, 4149, 4150, 4151, 4152, 4153, 4154, 4155, 4156, 4157, 4158, 4159, 4160, 4161, 4162, 4163, 4164, 4165, 4166, 4167, 4168, 4169, 4170, 4171, 4172, 4173, 4174, 4175, 4176, 4178, 4179, 4180, 4181, 4182, 4183, 4184, 4185, 4188, 4189, 4190, 4191, 4192, 4193, 4194, 4195, 4196, 4197, 4198, 4199, 4200, 4201, 4202, 4203, 4204, 4205, 4206, 4207, 4
208, 4209, 4210, 4211, 4212, 4213, 4214, 4215, 4216, 4218, 4219, 4220, 4221)) _a
+) _b WHERE g IS NOT NULL;
diff --git a/regress/core/regress_proj_cache_overflow_expected b/regress/core/regress_proj_cache_overflow_expected
new file mode 100644
index 0000000..e2e697c
--- /dev/null
+++ b/regress/core/regress_proj_cache_overflow_expected
@@ -0,0 +1 @@
+13|147
diff --git a/regress/core/tests.mk.in b/regress/core/tests.mk.in
index ddc2820..e68ecef 100644
--- a/regress/core/tests.mk.in
+++ b/regress/core/tests.mk.in
@@ -77,7 +77,9 @@ TESTS += \
$(topsrcdir)/regress/core/regress_ogc \
$(topsrcdir)/regress/core/regress_ogc_cover \
$(topsrcdir)/regress/core/regress_ogc_prep \
- $(topsrcdir)/regress/core/regress_proj \
+ $(topsrcdir)/regress/core/regress_proj_basic \
+ $(topsrcdir)/regress/core/regress_proj_cache_overflow \
+ $(topsrcdir)/regress/core/regress_proj_4890 \
$(topsrcdir)/regress/core/relate \
$(topsrcdir)/regress/core/remove_repeated_points \
$(topsrcdir)/regress/core/removepoint \
-----------------------------------------------------------------------
Summary of changes:
regress/core/regress_proj_4890.sql | 12 ++++++++++++
regress/core/regress_proj_4890_expected | 1 +
regress/core/{regress_proj.sql => regress_proj_basic.sql} | 8 --------
.../{regress_proj_expected => regress_proj_basic_expected} | 1 -
regress/core/regress_proj_cache_overflow.sql | 7 +++++++
regress/core/regress_proj_cache_overflow_expected | 1 +
regress/core/tests.mk.in | 4 +++-
7 files changed, 24 insertions(+), 10 deletions(-)
create mode 100644 regress/core/regress_proj_4890.sql
create mode 100644 regress/core/regress_proj_4890_expected
rename regress/core/{regress_proj.sql => regress_proj_basic.sql} (74%)
rename regress/core/{regress_proj_expected => regress_proj_basic_expected} (98%)
create mode 100644 regress/core/regress_proj_cache_overflow.sql
create mode 100644 regress/core/regress_proj_cache_overflow_expected
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list