[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-565-g510b41799
git at osgeo.org
git at osgeo.org
Thu Feb 17 16:16:57 PST 2022
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 510b41799113e55b1eb3633eca31e730ff3b34b6 (commit)
via ad7d6038431e22a831b57184507de63372d0e172 (commit)
via 329eab4d00c7be3fb99873ca9de519c574198aa0 (commit)
from ab04f0267b100e10866f770f1dba8f3d5672a33b (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 510b41799113e55b1eb3633eca31e730ff3b34b6
Author: Regina Obe <lr at pcorp.us>
Date: Thu Feb 17 19:16:53 2022 -0500
Take out Changed: 3.3.0 on gist_geometry. Causes upgrade to fail as it tries to add already added
diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in
index 86ba08bca..a66f82370 100644
--- a/postgis/postgis.sql.in
+++ b/postgis/postgis.sql.in
@@ -1029,7 +1029,6 @@ CREATE OPERATOR CLASS gist_geometry_ops_nd
FUNCTION 1 geometry_gist_consistent_nd (internal, geometry, int4),
FUNCTION 2 geometry_gist_union_nd (bytea, internal),
FUNCTION 3 geometry_gist_compress_nd (internal),
- -- Changed: 3.3.0
FUNCTION 4 geometry_gist_decompress_nd (internal),
FUNCTION 5 geometry_gist_penalty_nd (internal, internal, internal),
FUNCTION 6 geometry_gist_picksplit_nd (internal, internal),
commit ad7d6038431e22a831b57184507de63372d0e172
Author: Regina Obe <lr at pcorp.us>
Date: Thu Feb 17 19:13:28 2022 -0500
Add missed news item
diff --git a/NEWS b/NEWS
index 9b4407b0f..6923a8e19 100644
--- a/NEWS
+++ b/NEWS
@@ -14,12 +14,12 @@ PostGIS 3.3.0dev
- #4912, GiST: fix crash on STORAGE EXTERNAL for geography (Aliaksandr Kalenik)
- ST_ConcaveHull GEOS 3.11+ native implementation (Paul Ramsey, Martin Davis)
-
* New features*
- ST_Letters creates geometries that look like letters (Paul Ramsey)
- #5037, postgis_sfcgal: ST_3DConvexHull (Loïc Bartoletti)
- postgis_sfcgal: sfcgal_full_version - reports BOOST and CGAL version
(Loïc Bartoletti)
+ - GH659, MARC21/XML, ST_GeomFromMARC21, ST_AsMARC21 (Jim Jones)
commit 329eab4d00c7be3fb99873ca9de519c574198aa0
Author: Jim Jones <jim.jones at uni-muenster.de>
Date: Fri Feb 18 00:37:20 2022 +0100
Minor changes to test cases
- Adds missing ST_AsText(geom,5) to input test polygon_14
- Adds ORDER BY to output tests
diff --git a/regress/core/in_marc21.sql b/regress/core/in_marc21.sql
index 1ea46e3d5..d0a1bbe3a 100644
--- a/regress/core/in_marc21.sql
+++ b/regress/core/in_marc21.sql
@@ -616,7 +616,7 @@ SELECT 'polygon_14',
<subfield code="f">05119.5833</subfield>
<subfield code="g">N04961.8333</subfield>
</datafield>
- </record>'));
+ </record>'),5);
-- PASS: coordinates formats [EN]dddmmss.sssss, +dddmmss.sssss, dddmmss.sssss
SELECT 'polygon_15',
diff --git a/regress/core/in_marc21_expected b/regress/core/in_marc21_expected
index 040b8f524..a23de2051 100644
--- a/regress/core/in_marc21_expected
+++ b/regress/core/in_marc21_expected
@@ -49,7 +49,7 @@ polygon_9|POLYGON((-58.79583 -51.57111,-58.41417 -51.57111,-58.41417 -51.74722,-
polygon_10|POLYGON((2.31806 51.19583,4.48444 51.19583,4.48444 49.61833,2.31806 49.61833,2.31806 51.19583))
polygon_11|POLYGON((2.31806 51.19583,4.48444 51.19583,4.48444 49.61833,2.31806 49.61833,2.31806 51.19583))
polygon_13|POLYGON((2.31806 51.19583,4.48444 51.19583,4.48444 49.61833,2.31806 49.61833,2.31806 51.19583))
-polygon_14|POLYGON((2.530091666666666 51.326388333333334,4.807406666666667 51.326388333333334,4.807406666666667 50.030555,2.530091666666666 50.030555,2.530091666666666 51.326388333333334))
+polygon_14|POLYGON((2.53009 51.32639,4.80741 51.32639,4.80741 50.03056,2.53009 50.03056,2.53009 51.32639))
polygon_15|POLYGON((2.53904 51.33287,4.81234 51.33287,4.81234 50.03981,2.53904 50.03981,2.53904 51.33287))
polygon_16|POLYGON((-154.44833 35.78333,-154.44833 48.78333,-120.43333 48.78333,-120.43333 35.78333,-154.44833 35.78333))
polygon_17|POLYGON((-154.26542 35.47002,-154.26542 48.47002,-120.26002 48.47002,-120.26002 35.47002,-154.26542 35.47002))
diff --git a/regress/core/out_marc21.sql b/regress/core/out_marc21.sql
index 547054f41..f3d11533b 100644
--- a/regress/core/out_marc21.sql
+++ b/regress/core/out_marc21.sql
@@ -74,28 +74,28 @@ UPDATE asmarc21_rt SET geom = ST_AsEWKT(geom,5);
-- Converts to geometries to MARC21/XML
-SELECT gid,ST_AsMARC21(geom,'hdddmmss') AS marc21 FROM asmarc21_rt;
+SELECT gid,ST_AsMARC21(geom,'hdddmmss') AS marc21 FROM asmarc21_rt ORDER BY gid;
-- Converts to geometries to MARC21/XML
-SELECT 'hdddmmss',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'hdddmmss')),5) AS marc21 FROM asmarc21_rt;
-SELECT 'hddd.dddddd',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'hddd.dddddd')),5) AS marc21 FROM asmarc21_rt;
-SELECT 'hdddmm.mmmmmm',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'hdddmm.mmmmmm')),5) AS marc21 FROM asmarc21_rt;
-SELECT 'hdddmmss.ssssss',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'hdddmmss.ssssss')),5) AS marc21 FROM asmarc21_rt;
-
-SELECT 'hdddmmss',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'hdddmmss')),5) AS marc21 FROM asmarc21_rt;
-SELECT 'hddd,dddddd',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'hddd,dddddd')),5) AS marc21 FROM asmarc21_rt;
-SELECT 'hdddmm,mmmmmm',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'hdddmm,mmmmmm')),5) AS marc21 FROM asmarc21_rt;
-SELECT 'hdddmmss,ssssss',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'hdddmmss,ssssss')),5) AS marc21 FROM asmarc21_rt;
-
-SELECT 'dddmmss',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'dddmmss')),5) AS marc21 FROM asmarc21_rt;
-SELECT 'ddd.dddddd',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'ddd.dddddd')),5) AS marc21 FROM asmarc21_rt;
-SELECT 'dddmm.mmmmmm',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'dddmm.mmmmmm')),5) AS marc21 FROM asmarc21_rt;
-SELECT 'dddmmss.ssssss',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'dddmmss.ssssss')),5) AS marc21 FROM asmarc21_rt;
-
-SELECT 'dddmmss',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'dddmmss')),5) AS marc21 FROM asmarc21_rt;
-SELECT 'ddd,dddddd',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'ddd,dddddd')),5) AS marc21 FROM asmarc21_rt;
-SELECT 'dddmm,mmmmmm',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'dddmm,mmmmmm')),5) AS marc21 FROM asmarc21_rt;
-SELECT 'dddmmss,ssssss',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'dddmmss,ssssss')),5) AS marc21 FROM asmarc21_rt;
+SELECT 'hdddmmss',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'hdddmmss')),5) AS marc21 FROM asmarc21_rt ORDER BY gid;
+SELECT 'hddd.dddddd',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'hddd.dddddd')),5) AS marc21 FROM asmarc21_rt ORDER BY gid;
+SELECT 'hdddmm.mmmmmm',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'hdddmm.mmmmmm')),5) AS marc21 FROM asmarc21_rt ORDER BY gid;
+SELECT 'hdddmmss.ssssss',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'hdddmmss.ssssss')),5) AS marc21 FROM asmarc21_rt ORDER BY gid;
+
+SELECT 'hdddmmss',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'hdddmmss')),5) AS marc21 FROM asmarc21_rt ORDER BY gid;
+SELECT 'hddd,dddddd',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'hddd,dddddd')),5) AS marc21 FROM asmarc21_rt ORDER BY gid;
+SELECT 'hdddmm,mmmmmm',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'hdddmm,mmmmmm')),5) AS marc21 FROM asmarc21_rt ORDER BY gid;
+SELECT 'hdddmmss,ssssss',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'hdddmmss,ssssss')),5) AS marc21 FROM asmarc21_rt ORDER BY gid;
+
+SELECT 'dddmmss',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'dddmmss')),5) AS marc21 FROM asmarc21_rt ORDER BY gid;
+SELECT 'ddd.dddddd',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'ddd.dddddd')),5) AS marc21 FROM asmarc21_rt ORDER BY gid;
+SELECT 'dddmm.mmmmmm',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'dddmm.mmmmmm')),5) AS marc21 FROM asmarc21_rt ORDER BY gid;
+SELECT 'dddmmss.ssssss',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'dddmmss.ssssss')),5) AS marc21 FROM asmarc21_rt ORDER BY gid;
+
+SELECT 'dddmmss',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'dddmmss')),5) AS marc21 FROM asmarc21_rt ORDER BY gid;
+SELECT 'ddd,dddddd',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'ddd,dddddd')),5) AS marc21 FROM asmarc21_rt ORDER BY gid;
+SELECT 'dddmm,mmmmmm',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'dddmm,mmmmmm')),5) AS marc21 FROM asmarc21_rt ORDER BY gid;
+SELECT 'dddmmss,ssssss',gid,ST_AsText(ST_GeomFromMARC21(ST_AsMARC21(geom,'dddmmss,ssssss')),5) AS marc21 FROM asmarc21_rt ORDER BY gid;
-- Converts geometries (except points) to MARC21/XML, converts them back to geometry,
-- and compare their sizes and intersection areas.
@@ -126,7 +126,8 @@ SELECT
) / ST_Area(box2d(geom))*100 AS box_intersection
FROM asmarc21_rt
-WHERE ST_GeometryType(geom) <> 'ST_Point';
+WHERE ST_GeometryType(geom) <> 'ST_Point'
+ORDER BY gid;
-- Converts points to MARC21/XML, converts them back to geometry,
@@ -145,7 +146,8 @@ SELECT
ST_AsMARC21(geom,'hddd.ddddd')),4326)) AS equals,
ST_AsMARC21(geom,'hdddmmss.ss') AS point_as_marc21
FROM asmarc21_rt
-WHERE ST_GeometryType(geom) = 'ST_Point';
+WHERE ST_GeometryType(geom) = 'ST_Point'
+ORDER BY gid;
@@ -157,7 +159,8 @@ SELECT
gid,(ST_Dump(geom)).path[1],
ST_AsMARC21(
(ST_Dump(geom)).geom,'hdddmmss') AS marc21
-FROM asmarc21_rt;
+FROM asmarc21_rt
+ORDER BY gid;
-- Dumps geometries from collections, converts them to MARC21/XML,
diff --git a/regress/core/out_marc21_expected b/regress/core/out_marc21_expected
index b039394aa..812e793a5 100644
--- a/regress/core/out_marc21_expected
+++ b/regress/core/out_marc21_expected
@@ -1,5 +1,4 @@
1|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0044903</subfield><subfield code="e">W0044903</subfield><subfield code="f">N0540319</subfield><subfield code="g">N0540319</subfield></datafield><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0044940</subfield><subfield code="e">W0044940</subfield><subfield code="f">N0540314</subfield><subfield code="g">N0540314</subfield></datafield><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0044944</subfield><subfield code="e">W0044944</subfield><subfield code="f">N0540311</subfield><subfield code="g">N0540311</subfield></datafield><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0044943</subfield><subfield code="e">W0044943</subfield><subfield code="f">N0540308</subfield><subfield code="g">N0540308</subfield></datafield></record>
-10|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043356</subfield><subfield code="e">W0043356</subfield><subfield code="f">N0541105</subfield><subfield code="g">N0541105</subfield></datafield></record>
2|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043637</subfield><subfield code="e">W0043254</subfield><subfield code="f">N0540927</subfield><subfield code="g">N0540637</subfield></datafield><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043915</subfield><subfield code="e">W0043527</subfield><subfield code="f">N0541155</subfield><subfield code="g">N0541008</subfield></datafield><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043329</subfield><subfield code="e">W0043050</subfield><subfield code="f">N0541057</subfield><subfield code="g">N0540856</subfield></datafield></record>
3|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0044118</subfield><subfield code="e">W0043716</subfield><subfield code="f">N0540700</subfield><subfield code="g">N0540429</subfield></datafield><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0044034</subfield><subfield code="e">W0043557</subfield><subfield code="f">N0540901</subfield><subfield code="g">N0540634</subfield></datafield><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043408</subfield><subfield code="e">W0042917</subfield><subfield code="f">N0540919</subfield><subfield code="g">N0540850</subfield></datafield></record>
4|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043704</subfield><subfield code="e">W0043536</subfield><subfield code="f">N0541104</subfield><subfield code="g">N0541001</subfield></datafield><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043730</subfield><subfield code="e">W0043658</subfield><subfield code="f">N0541006</subfield><subfield code="g">N0540955</subfield></datafield><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043719</subfield><subfield code="e">W0043719</subfield><subfield code="f">N0541023</subfield><subfield code="g">N0541023</subfield></datafield><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0044029</subfield><subfield code="e">W0043532</subfield><subfield code="f">N0540933</subfield><subfield code="g">N0540637</subfield></datafield><datafield t
ag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0044347</subfield><subfield code="e">W0043522</subfield><subfield code="f">N0540657</subfield><subfield code="g">N0540602</subfield></datafield><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043445</subfield><subfield code="e">W0043248</subfield><subfield code="f">N0541149</subfield><subfield code="g">N0541054</subfield></datafield></record>
@@ -8,6 +7,7 @@
7|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0044118</subfield><subfield code="e">W0043716</subfield><subfield code="f">N0540700</subfield><subfield code="g">N0540429</subfield></datafield><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0044034</subfield><subfield code="e">W0043557</subfield><subfield code="f">N0540901</subfield><subfield code="g">N0540634</subfield></datafield><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043408</subfield><subfield code="e">W0042917</subfield><subfield code="f">N0540919</subfield><subfield code="g">N0540850</subfield></datafield></record>
8|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043259</subfield><subfield code="e">W0043137</subfield><subfield code="f">N0540941</subfield><subfield code="g">N0540847</subfield></datafield><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043445</subfield><subfield code="e">W0043248</subfield><subfield code="f">N0541149</subfield><subfield code="g">N0541054</subfield></datafield></record>
9|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043704</subfield><subfield code="e">W0043536</subfield><subfield code="f">N0541104</subfield><subfield code="g">N0541001</subfield></datafield></record>
+10|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043356</subfield><subfield code="e">W0043356</subfield><subfield code="f">N0541105</subfield><subfield code="g">N0541105</subfield></datafield></record>
11|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0044148</subfield><subfield code="e">W0042904</subfield><subfield code="f">N0541325</subfield><subfield code="g">N0540455</subfield></datafield></record>
12|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043730</subfield><subfield code="e">W0043658</subfield><subfield code="f">N0541006</subfield><subfield code="g">N0540955</subfield></datafield></record>
13|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043445</subfield><subfield code="e">W0043248</subfield><subfield code="f">N0541149</subfield><subfield code="g">N0541054</subfield></datafield></record>
@@ -34,7 +34,6 @@
35|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043704</subfield><subfield code="e">W0043536</subfield><subfield code="f">N0541104</subfield><subfield code="g">N0541001</subfield></datafield></record>
36|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0044148</subfield><subfield code="e">W0042904</subfield><subfield code="f">N0541325</subfield><subfield code="g">N0540455</subfield></datafield></record>
hdddmmss|1|MULTIPOINT(-4.8175 54.05528,-4.82778 54.05389,-4.82889 54.05306,-4.82861 54.05222)
-hdddmmss|10|POINT(-4.56556 54.18472)
hdddmmss|2|MULTIPOLYGON(((-4.61028 54.1575,-4.54833 54.1575,-4.54833 54.11028,-4.61028 54.11028,-4.61028 54.1575)),((-4.65417 54.19861,-4.59083 54.19861,-4.59083 54.16889,-4.65417 54.16889,-4.65417 54.19861)),((-4.55806 54.1825,-4.51389 54.1825,-4.51389 54.14889,-4.55806 54.14889,-4.55806 54.1825)))
hdddmmss|3|MULTIPOLYGON(((-4.68833 54.11667,-4.62111 54.11667,-4.62111 54.07472,-4.68833 54.07472,-4.68833 54.11667)),((-4.67611 54.15028,-4.59917 54.15028,-4.59917 54.10944,-4.67611 54.10944,-4.67611 54.15028)),((-4.56889 54.15528,-4.48806 54.15528,-4.48806 54.14722,-4.56889 54.14722,-4.56889 54.15528)))
hdddmmss|4|GEOMETRYCOLLECTION(POLYGON((-4.61778 54.18444,-4.59333 54.18444,-4.59333 54.16694,-4.61778 54.16694,-4.61778 54.18444)),POLYGON((-4.625 54.16833,-4.61611 54.16833,-4.61611 54.16528,-4.625 54.16528,-4.625 54.16833)),POINT(-4.62194 54.17306),POLYGON((-4.67472 54.15917,-4.59222 54.15917,-4.59222 54.11028,-4.67472 54.11028,-4.67472 54.15917)),POLYGON((-4.72972 54.11583,-4.58944 54.11583,-4.58944 54.10056,-4.72972 54.10056,-4.72972 54.11583)),POLYGON((-4.57917 54.19694,-4.54667 54.19694,-4.54667 54.18167,-4.57917 54.18167,-4.57917 54.19694)))
@@ -43,6 +42,7 @@ hdddmmss|6|MULTIPOLYGON(((-4.625 54.16833,-4.61611 54.16833,-4.61611 54.16528,-4
hdddmmss|7|MULTIPOLYGON(((-4.68833 54.11667,-4.62111 54.11667,-4.62111 54.07472,-4.68833 54.07472,-4.68833 54.11667)),((-4.67611 54.15028,-4.59917 54.15028,-4.59917 54.10944,-4.67611 54.10944,-4.67611 54.15028)),((-4.56889 54.15528,-4.48806 54.15528,-4.48806 54.14722,-4.56889 54.14722,-4.56889 54.15528)))
hdddmmss|8|MULTIPOLYGON(((-4.54972 54.16139,-4.52694 54.16139,-4.52694 54.14639,-4.54972 54.14639,-4.54972 54.16139)),((-4.57917 54.19694,-4.54667 54.19694,-4.54667 54.18167,-4.57917 54.18167,-4.57917 54.19694)))
hdddmmss|9|POLYGON((-4.61778 54.18444,-4.59333 54.18444,-4.59333 54.16694,-4.61778 54.16694,-4.61778 54.18444))
+hdddmmss|10|POINT(-4.56556 54.18472)
hdddmmss|11|POLYGON((-4.69667 54.22361,-4.48444 54.22361,-4.48444 54.08194,-4.69667 54.08194,-4.69667 54.22361))
hdddmmss|12|POLYGON((-4.625 54.16833,-4.61611 54.16833,-4.61611 54.16528,-4.625 54.16528,-4.625 54.16833))
hdddmmss|13|POLYGON((-4.57917 54.19694,-4.54667 54.19694,-4.54667 54.18167,-4.57917 54.18167,-4.57917 54.19694))
@@ -69,7 +69,6 @@ hdddmmss|34|POINT(-4.56556 54.18472)
hdddmmss|35|POLYGON((-4.61778 54.18444,-4.59333 54.18444,-4.59333 54.16694,-4.61778 54.16694,-4.61778 54.18444))
hdddmmss|36|POLYGON((-4.69667 54.22361,-4.48444 54.22361,-4.48444 54.08194,-4.69667 54.08194,-4.69667 54.22361))
hddd.dddddd|1|MULTIPOINT(-4.81763 54.05518,-4.8278 54.05375,-4.82888 54.05319,-4.82866 54.05228)
-hddd.dddddd|10|POINT(-4.56559 54.18477)
hddd.dddddd|2|MULTIPOLYGON(((-4.61014 54.15761,-4.54834 54.15761,-4.54834 54.11014,-4.61014 54.11014,-4.61014 54.15761)),((-4.65408 54.1986,-4.59091 54.1986,-4.59091 54.16887,-4.65408 54.16887,-4.65408 54.1986)),((-4.55795 54.18253,-4.51401 54.18253,-4.51401 54.14876,-4.55795 54.14876,-4.55795 54.18253)))
hddd.dddddd|3|MULTIPOLYGON(((-4.68842 54.11658,-4.62112 54.11658,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.11658)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
hddd.dddddd|4|GEOMETRYCOLLECTION(POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457)),POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839)),POINT(-4.62206 54.17312),POLYGON((-4.67468 54.15922,-4.59229 54.15922,-4.59229 54.11014,-4.67468 54.11014,-4.67468 54.15922)),POLYGON((-4.72961 54.11577,-4.58954 54.11577,-4.58954 54.10048,-4.72961 54.10048,-4.72961 54.11577)),POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
@@ -78,6 +77,7 @@ hddd.dddddd|6|MULTIPOLYGON(((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518
hddd.dddddd|7|MULTIPOLYGON(((-4.68842 54.11658,-4.62112 54.11658,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.11658)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
hddd.dddddd|8|MULTIPOLYGON(((-4.54971 54.16143,-4.52705 54.16143,-4.52705 54.14635,-4.54971 54.14635,-4.54971 54.16143)),((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
hddd.dddddd|9|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
+hddd.dddddd|10|POINT(-4.56559 54.18477)
hddd.dddddd|11|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
hddd.dddddd|12|POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839))
hddd.dddddd|13|POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699))
@@ -104,7 +104,6 @@ hddd.dddddd|34|POINT(-4.56559 54.18477)
hddd.dddddd|35|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
hddd.dddddd|36|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
hdddmm.mmmmmm|1|MULTIPOINT(-4.81763 54.05518,-4.8278 54.05375,-4.82888 54.05319,-4.82866 54.05228)
-hdddmm.mmmmmm|10|POINT(-4.56559 54.18477)
hdddmm.mmmmmm|2|MULTIPOLYGON(((-4.61014 54.15761,-4.54834 54.15761,-4.54834 54.11014,-4.61014 54.11014,-4.61014 54.15761)),((-4.65408 54.1986,-4.59091 54.1986,-4.59091 54.16887,-4.65408 54.16887,-4.65408 54.1986)),((-4.55795 54.18253,-4.51401 54.18253,-4.51401 54.14876,-4.55795 54.14876,-4.55795 54.18253)))
hdddmm.mmmmmm|3|MULTIPOLYGON(((-4.68842 54.13325,-4.62112 54.13325,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.13325)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
hdddmm.mmmmmm|4|GEOMETRYCOLLECTION(POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457)),POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839)),POINT(-4.62206 54.17312),POLYGON((-4.67468 54.15922,-4.59229 54.15922,-4.59229 54.11014,-4.67468 54.11014,-4.67468 54.15922)),POLYGON((-4.72961 54.11577,-4.58954 54.11577,-4.58954 54.10048,-4.72961 54.10048,-4.72961 54.11577)),POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
@@ -113,6 +112,7 @@ hdddmm.mmmmmm|6|MULTIPOLYGON(((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.165
hdddmm.mmmmmm|7|MULTIPOLYGON(((-4.68842 54.13325,-4.62112 54.13325,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.13325)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
hdddmm.mmmmmm|8|MULTIPOLYGON(((-4.54971 54.16143,-4.52705 54.16143,-4.52705 54.14635,-4.54971 54.14635,-4.54971 54.16143)),((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
hdddmm.mmmmmm|9|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
+hdddmm.mmmmmm|10|POINT(-4.56559 54.18477)
hdddmm.mmmmmm|11|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
hdddmm.mmmmmm|12|POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839))
hdddmm.mmmmmm|13|POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699))
@@ -139,7 +139,6 @@ hdddmm.mmmmmm|34|POINT(-4.56559 54.18477)
hdddmm.mmmmmm|35|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
hdddmm.mmmmmm|36|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
hdddmmss.ssssss|1|MULTIPOINT(-4.81763 54.05518,-4.8278 54.05375,-4.82888 54.05319,-4.82866 54.05228)
-hdddmmss.ssssss|10|POINT(-4.56559 54.18477)
hdddmmss.ssssss|2|MULTIPOLYGON(((-4.61014 54.15761,-4.54834 54.15761,-4.54834 54.11014,-4.61014 54.11014,-4.61014 54.15761)),((-4.65408 54.1986,-4.59091 54.1986,-4.59091 54.16887,-4.65408 54.16887,-4.65408 54.1986)),((-4.55795 54.18253,-4.51401 54.18253,-4.51401 54.14876,-4.55795 54.14876,-4.55795 54.18253)))
hdddmmss.ssssss|3|MULTIPOLYGON(((-4.68842 54.11675,-4.62112 54.11675,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.11675)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
hdddmmss.ssssss|4|GEOMETRYCOLLECTION(POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457)),POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839)),POINT(-4.62206 54.17312),POLYGON((-4.67468 54.15922,-4.59229 54.15922,-4.59229 54.11014,-4.67468 54.11014,-4.67468 54.15922)),POLYGON((-4.72961 54.11577,-4.58954 54.11577,-4.58954 54.10048,-4.72961 54.10048,-4.72961 54.11577)),POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
@@ -148,6 +147,7 @@ hdddmmss.ssssss|6|MULTIPOLYGON(((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.1
hdddmmss.ssssss|7|MULTIPOLYGON(((-4.68842 54.11675,-4.62112 54.11675,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.11675)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
hdddmmss.ssssss|8|MULTIPOLYGON(((-4.54971 54.16143,-4.52705 54.16143,-4.52705 54.14635,-4.54971 54.14635,-4.54971 54.16143)),((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
hdddmmss.ssssss|9|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
+hdddmmss.ssssss|10|POINT(-4.56559 54.18477)
hdddmmss.ssssss|11|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
hdddmmss.ssssss|12|POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839))
hdddmmss.ssssss|13|POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699))
@@ -174,7 +174,6 @@ hdddmmss.ssssss|34|POINT(-4.56559 54.18477)
hdddmmss.ssssss|35|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
hdddmmss.ssssss|36|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
hdddmmss|1|MULTIPOINT(-4.8175 54.05528,-4.82778 54.05389,-4.82889 54.05306,-4.82861 54.05222)
-hdddmmss|10|POINT(-4.56556 54.18472)
hdddmmss|2|MULTIPOLYGON(((-4.61028 54.1575,-4.54833 54.1575,-4.54833 54.11028,-4.61028 54.11028,-4.61028 54.1575)),((-4.65417 54.19861,-4.59083 54.19861,-4.59083 54.16889,-4.65417 54.16889,-4.65417 54.19861)),((-4.55806 54.1825,-4.51389 54.1825,-4.51389 54.14889,-4.55806 54.14889,-4.55806 54.1825)))
hdddmmss|3|MULTIPOLYGON(((-4.68833 54.11667,-4.62111 54.11667,-4.62111 54.07472,-4.68833 54.07472,-4.68833 54.11667)),((-4.67611 54.15028,-4.59917 54.15028,-4.59917 54.10944,-4.67611 54.10944,-4.67611 54.15028)),((-4.56889 54.15528,-4.48806 54.15528,-4.48806 54.14722,-4.56889 54.14722,-4.56889 54.15528)))
hdddmmss|4|GEOMETRYCOLLECTION(POLYGON((-4.61778 54.18444,-4.59333 54.18444,-4.59333 54.16694,-4.61778 54.16694,-4.61778 54.18444)),POLYGON((-4.625 54.16833,-4.61611 54.16833,-4.61611 54.16528,-4.625 54.16528,-4.625 54.16833)),POINT(-4.62194 54.17306),POLYGON((-4.67472 54.15917,-4.59222 54.15917,-4.59222 54.11028,-4.67472 54.11028,-4.67472 54.15917)),POLYGON((-4.72972 54.11583,-4.58944 54.11583,-4.58944 54.10056,-4.72972 54.10056,-4.72972 54.11583)),POLYGON((-4.57917 54.19694,-4.54667 54.19694,-4.54667 54.18167,-4.57917 54.18167,-4.57917 54.19694)))
@@ -183,6 +182,7 @@ hdddmmss|6|MULTIPOLYGON(((-4.625 54.16833,-4.61611 54.16833,-4.61611 54.16528,-4
hdddmmss|7|MULTIPOLYGON(((-4.68833 54.11667,-4.62111 54.11667,-4.62111 54.07472,-4.68833 54.07472,-4.68833 54.11667)),((-4.67611 54.15028,-4.59917 54.15028,-4.59917 54.10944,-4.67611 54.10944,-4.67611 54.15028)),((-4.56889 54.15528,-4.48806 54.15528,-4.48806 54.14722,-4.56889 54.14722,-4.56889 54.15528)))
hdddmmss|8|MULTIPOLYGON(((-4.54972 54.16139,-4.52694 54.16139,-4.52694 54.14639,-4.54972 54.14639,-4.54972 54.16139)),((-4.57917 54.19694,-4.54667 54.19694,-4.54667 54.18167,-4.57917 54.18167,-4.57917 54.19694)))
hdddmmss|9|POLYGON((-4.61778 54.18444,-4.59333 54.18444,-4.59333 54.16694,-4.61778 54.16694,-4.61778 54.18444))
+hdddmmss|10|POINT(-4.56556 54.18472)
hdddmmss|11|POLYGON((-4.69667 54.22361,-4.48444 54.22361,-4.48444 54.08194,-4.69667 54.08194,-4.69667 54.22361))
hdddmmss|12|POLYGON((-4.625 54.16833,-4.61611 54.16833,-4.61611 54.16528,-4.625 54.16528,-4.625 54.16833))
hdddmmss|13|POLYGON((-4.57917 54.19694,-4.54667 54.19694,-4.54667 54.18167,-4.57917 54.18167,-4.57917 54.19694))
@@ -209,7 +209,6 @@ hdddmmss|34|POINT(-4.56556 54.18472)
hdddmmss|35|POLYGON((-4.61778 54.18444,-4.59333 54.18444,-4.59333 54.16694,-4.61778 54.16694,-4.61778 54.18444))
hdddmmss|36|POLYGON((-4.69667 54.22361,-4.48444 54.22361,-4.48444 54.08194,-4.69667 54.08194,-4.69667 54.22361))
hddd,dddddd|1|MULTIPOINT(-4.81763 54.05518,-4.8278 54.05375,-4.82888 54.05319,-4.82866 54.05228)
-hddd,dddddd|10|POINT(-4.56559 54.18477)
hddd,dddddd|2|MULTIPOLYGON(((-4.61014 54.15761,-4.54834 54.15761,-4.54834 54.11014,-4.61014 54.11014,-4.61014 54.15761)),((-4.65408 54.1986,-4.59091 54.1986,-4.59091 54.16887,-4.65408 54.16887,-4.65408 54.1986)),((-4.55795 54.18253,-4.51401 54.18253,-4.51401 54.14876,-4.55795 54.14876,-4.55795 54.18253)))
hddd,dddddd|3|MULTIPOLYGON(((-4.68842 54.11658,-4.62112 54.11658,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.11658)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
hddd,dddddd|4|GEOMETRYCOLLECTION(POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457)),POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839)),POINT(-4.62206 54.17312),POLYGON((-4.67468 54.15922,-4.59229 54.15922,-4.59229 54.11014,-4.67468 54.11014,-4.67468 54.15922)),POLYGON((-4.72961 54.11577,-4.58954 54.11577,-4.58954 54.10048,-4.72961 54.10048,-4.72961 54.11577)),POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
@@ -218,6 +217,7 @@ hddd,dddddd|6|MULTIPOLYGON(((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518
hddd,dddddd|7|MULTIPOLYGON(((-4.68842 54.11658,-4.62112 54.11658,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.11658)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
hddd,dddddd|8|MULTIPOLYGON(((-4.54971 54.16143,-4.52705 54.16143,-4.52705 54.14635,-4.54971 54.14635,-4.54971 54.16143)),((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
hddd,dddddd|9|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
+hddd,dddddd|10|POINT(-4.56559 54.18477)
hddd,dddddd|11|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
hddd,dddddd|12|POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839))
hddd,dddddd|13|POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699))
@@ -244,7 +244,6 @@ hddd,dddddd|34|POINT(-4.56559 54.18477)
hddd,dddddd|35|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
hddd,dddddd|36|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
hdddmm,mmmmmm|1|MULTIPOINT(-4.81763 54.05518,-4.8278 54.05375,-4.82888 54.05319,-4.82866 54.05228)
-hdddmm,mmmmmm|10|POINT(-4.56559 54.18477)
hdddmm,mmmmmm|2|MULTIPOLYGON(((-4.61014 54.15761,-4.54834 54.15761,-4.54834 54.11014,-4.61014 54.11014,-4.61014 54.15761)),((-4.65408 54.1986,-4.59091 54.1986,-4.59091 54.16887,-4.65408 54.16887,-4.65408 54.1986)),((-4.55795 54.18253,-4.51401 54.18253,-4.51401 54.14876,-4.55795 54.14876,-4.55795 54.18253)))
hdddmm,mmmmmm|3|MULTIPOLYGON(((-4.68842 54.13325,-4.62112 54.13325,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.13325)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
hdddmm,mmmmmm|4|GEOMETRYCOLLECTION(POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457)),POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839)),POINT(-4.62206 54.17312),POLYGON((-4.67468 54.15922,-4.59229 54.15922,-4.59229 54.11014,-4.67468 54.11014,-4.67468 54.15922)),POLYGON((-4.72961 54.11577,-4.58954 54.11577,-4.58954 54.10048,-4.72961 54.10048,-4.72961 54.11577)),POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
@@ -253,6 +252,7 @@ hdddmm,mmmmmm|6|MULTIPOLYGON(((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.165
hdddmm,mmmmmm|7|MULTIPOLYGON(((-4.68842 54.13325,-4.62112 54.13325,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.13325)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
hdddmm,mmmmmm|8|MULTIPOLYGON(((-4.54971 54.16143,-4.52705 54.16143,-4.52705 54.14635,-4.54971 54.14635,-4.54971 54.16143)),((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
hdddmm,mmmmmm|9|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
+hdddmm,mmmmmm|10|POINT(-4.56559 54.18477)
hdddmm,mmmmmm|11|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
hdddmm,mmmmmm|12|POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839))
hdddmm,mmmmmm|13|POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699))
@@ -279,7 +279,6 @@ hdddmm,mmmmmm|34|POINT(-4.56559 54.18477)
hdddmm,mmmmmm|35|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
hdddmm,mmmmmm|36|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
hdddmmss,ssssss|1|MULTIPOINT(-4.81763 54.05518,-4.8278 54.05375,-4.82888 54.05319,-4.82866 54.05228)
-hdddmmss,ssssss|10|POINT(-4.56559 54.18477)
hdddmmss,ssssss|2|MULTIPOLYGON(((-4.61014 54.15761,-4.54834 54.15761,-4.54834 54.11014,-4.61014 54.11014,-4.61014 54.15761)),((-4.65408 54.1986,-4.59091 54.1986,-4.59091 54.16887,-4.65408 54.16887,-4.65408 54.1986)),((-4.55795 54.18253,-4.51401 54.18253,-4.51401 54.14876,-4.55795 54.14876,-4.55795 54.18253)))
hdddmmss,ssssss|3|MULTIPOLYGON(((-4.68842 54.11675,-4.62112 54.11675,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.11675)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
hdddmmss,ssssss|4|GEOMETRYCOLLECTION(POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457)),POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839)),POINT(-4.62206 54.17312),POLYGON((-4.67468 54.15922,-4.59229 54.15922,-4.59229 54.11014,-4.67468 54.11014,-4.67468 54.15922)),POLYGON((-4.72961 54.11577,-4.58954 54.11577,-4.58954 54.10048,-4.72961 54.10048,-4.72961 54.11577)),POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
@@ -288,6 +287,7 @@ hdddmmss,ssssss|6|MULTIPOLYGON(((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.1
hdddmmss,ssssss|7|MULTIPOLYGON(((-4.68842 54.11675,-4.62112 54.11675,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.11675)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
hdddmmss,ssssss|8|MULTIPOLYGON(((-4.54971 54.16143,-4.52705 54.16143,-4.52705 54.14635,-4.54971 54.14635,-4.54971 54.16143)),((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
hdddmmss,ssssss|9|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
+hdddmmss,ssssss|10|POINT(-4.56559 54.18477)
hdddmmss,ssssss|11|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
hdddmmss,ssssss|12|POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839))
hdddmmss,ssssss|13|POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699))
@@ -314,7 +314,6 @@ hdddmmss,ssssss|34|POINT(-4.56559 54.18477)
hdddmmss,ssssss|35|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
hdddmmss,ssssss|36|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
dddmmss|1|MULTIPOINT(-4.8175 54.05528,-4.82778 54.05389,-4.82889 54.05306,-4.82861 54.05222)
-dddmmss|10|POINT(-4.56556 54.18472)
dddmmss|2|MULTIPOLYGON(((-4.61028 54.1575,-4.54833 54.1575,-4.54833 54.11028,-4.61028 54.11028,-4.61028 54.1575)),((-4.65417 54.19861,-4.59083 54.19861,-4.59083 54.16889,-4.65417 54.16889,-4.65417 54.19861)),((-4.55806 54.1825,-4.51389 54.1825,-4.51389 54.14889,-4.55806 54.14889,-4.55806 54.1825)))
dddmmss|3|MULTIPOLYGON(((-4.68833 54.11667,-4.62111 54.11667,-4.62111 54.07472,-4.68833 54.07472,-4.68833 54.11667)),((-4.67611 54.15028,-4.59917 54.15028,-4.59917 54.10944,-4.67611 54.10944,-4.67611 54.15028)),((-4.56889 54.15528,-4.48806 54.15528,-4.48806 54.14722,-4.56889 54.14722,-4.56889 54.15528)))
dddmmss|4|GEOMETRYCOLLECTION(POLYGON((-4.61778 54.18444,-4.59333 54.18444,-4.59333 54.16694,-4.61778 54.16694,-4.61778 54.18444)),POLYGON((-4.625 54.16833,-4.61611 54.16833,-4.61611 54.16528,-4.625 54.16528,-4.625 54.16833)),POINT(-4.62194 54.17306),POLYGON((-4.67472 54.15917,-4.59222 54.15917,-4.59222 54.11028,-4.67472 54.11028,-4.67472 54.15917)),POLYGON((-4.72972 54.11583,-4.58944 54.11583,-4.58944 54.10056,-4.72972 54.10056,-4.72972 54.11583)),POLYGON((-4.57917 54.19694,-4.54667 54.19694,-4.54667 54.18167,-4.57917 54.18167,-4.57917 54.19694)))
@@ -323,6 +322,7 @@ dddmmss|6|MULTIPOLYGON(((-4.625 54.16833,-4.61611 54.16833,-4.61611 54.16528,-4.
dddmmss|7|MULTIPOLYGON(((-4.68833 54.11667,-4.62111 54.11667,-4.62111 54.07472,-4.68833 54.07472,-4.68833 54.11667)),((-4.67611 54.15028,-4.59917 54.15028,-4.59917 54.10944,-4.67611 54.10944,-4.67611 54.15028)),((-4.56889 54.15528,-4.48806 54.15528,-4.48806 54.14722,-4.56889 54.14722,-4.56889 54.15528)))
dddmmss|8|MULTIPOLYGON(((-4.54972 54.16139,-4.52694 54.16139,-4.52694 54.14639,-4.54972 54.14639,-4.54972 54.16139)),((-4.57917 54.19694,-4.54667 54.19694,-4.54667 54.18167,-4.57917 54.18167,-4.57917 54.19694)))
dddmmss|9|POLYGON((-4.61778 54.18444,-4.59333 54.18444,-4.59333 54.16694,-4.61778 54.16694,-4.61778 54.18444))
+dddmmss|10|POINT(-4.56556 54.18472)
dddmmss|11|POLYGON((-4.69667 54.22361,-4.48444 54.22361,-4.48444 54.08194,-4.69667 54.08194,-4.69667 54.22361))
dddmmss|12|POLYGON((-4.625 54.16833,-4.61611 54.16833,-4.61611 54.16528,-4.625 54.16528,-4.625 54.16833))
dddmmss|13|POLYGON((-4.57917 54.19694,-4.54667 54.19694,-4.54667 54.18167,-4.57917 54.18167,-4.57917 54.19694))
@@ -349,7 +349,6 @@ dddmmss|34|POINT(-4.56556 54.18472)
dddmmss|35|POLYGON((-4.61778 54.18444,-4.59333 54.18444,-4.59333 54.16694,-4.61778 54.16694,-4.61778 54.18444))
dddmmss|36|POLYGON((-4.69667 54.22361,-4.48444 54.22361,-4.48444 54.08194,-4.69667 54.08194,-4.69667 54.22361))
ddd.dddddd|1|MULTIPOINT(-4.81763 54.05518,-4.8278 54.05375,-4.82888 54.05319,-4.82866 54.05228)
-ddd.dddddd|10|POINT(-4.56559 54.18477)
ddd.dddddd|2|MULTIPOLYGON(((-4.61014 54.15761,-4.54834 54.15761,-4.54834 54.11014,-4.61014 54.11014,-4.61014 54.15761)),((-4.65408 54.1986,-4.59091 54.1986,-4.59091 54.16887,-4.65408 54.16887,-4.65408 54.1986)),((-4.55795 54.18253,-4.51401 54.18253,-4.51401 54.14876,-4.55795 54.14876,-4.55795 54.18253)))
ddd.dddddd|3|MULTIPOLYGON(((-4.68842 54.11658,-4.62112 54.11658,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.11658)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
ddd.dddddd|4|GEOMETRYCOLLECTION(POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457)),POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839)),POINT(-4.62206 54.17312),POLYGON((-4.67468 54.15922,-4.59229 54.15922,-4.59229 54.11014,-4.67468 54.11014,-4.67468 54.15922)),POLYGON((-4.72961 54.11577,-4.58954 54.11577,-4.58954 54.10048,-4.72961 54.10048,-4.72961 54.11577)),POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
@@ -358,6 +357,7 @@ ddd.dddddd|6|MULTIPOLYGON(((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,
ddd.dddddd|7|MULTIPOLYGON(((-4.68842 54.11658,-4.62112 54.11658,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.11658)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
ddd.dddddd|8|MULTIPOLYGON(((-4.54971 54.16143,-4.52705 54.16143,-4.52705 54.14635,-4.54971 54.14635,-4.54971 54.16143)),((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
ddd.dddddd|9|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
+ddd.dddddd|10|POINT(-4.56559 54.18477)
ddd.dddddd|11|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
ddd.dddddd|12|POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839))
ddd.dddddd|13|POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699))
@@ -384,7 +384,6 @@ ddd.dddddd|34|POINT(-4.56559 54.18477)
ddd.dddddd|35|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
ddd.dddddd|36|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
dddmm.mmmmmm|1|MULTIPOINT(-4.81763 54.05518,-4.8278 54.05375,-4.82888 54.05319,-4.82866 54.05228)
-dddmm.mmmmmm|10|POINT(-4.56559 54.18477)
dddmm.mmmmmm|2|MULTIPOLYGON(((-4.61014 54.15761,-4.54834 54.15761,-4.54834 54.11014,-4.61014 54.11014,-4.61014 54.15761)),((-4.65408 54.1986,-4.59091 54.1986,-4.59091 54.16887,-4.65408 54.16887,-4.65408 54.1986)),((-4.55795 54.18253,-4.51401 54.18253,-4.51401 54.14876,-4.55795 54.14876,-4.55795 54.18253)))
dddmm.mmmmmm|3|MULTIPOLYGON(((-4.68842 54.13325,-4.62112 54.13325,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.13325)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
dddmm.mmmmmm|4|GEOMETRYCOLLECTION(POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457)),POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839)),POINT(-4.62206 54.17312),POLYGON((-4.67468 54.15922,-4.59229 54.15922,-4.59229 54.11014,-4.67468 54.11014,-4.67468 54.15922)),POLYGON((-4.72961 54.11577,-4.58954 54.11577,-4.58954 54.10048,-4.72961 54.10048,-4.72961 54.11577)),POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
@@ -393,6 +392,7 @@ dddmm.mmmmmm|6|MULTIPOLYGON(((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.1651
dddmm.mmmmmm|7|MULTIPOLYGON(((-4.68842 54.13325,-4.62112 54.13325,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.13325)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
dddmm.mmmmmm|8|MULTIPOLYGON(((-4.54971 54.16143,-4.52705 54.16143,-4.52705 54.14635,-4.54971 54.14635,-4.54971 54.16143)),((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
dddmm.mmmmmm|9|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
+dddmm.mmmmmm|10|POINT(-4.56559 54.18477)
dddmm.mmmmmm|11|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
dddmm.mmmmmm|12|POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839))
dddmm.mmmmmm|13|POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699))
@@ -419,7 +419,6 @@ dddmm.mmmmmm|34|POINT(-4.56559 54.18477)
dddmm.mmmmmm|35|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
dddmm.mmmmmm|36|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
dddmmss.ssssss|1|MULTIPOINT(-4.81763 54.05518,-4.8278 54.05375,-4.82888 54.05319,-4.82866 54.05228)
-dddmmss.ssssss|10|POINT(-4.56559 54.18477)
dddmmss.ssssss|2|MULTIPOLYGON(((-4.61014 54.15761,-4.54834 54.15761,-4.54834 54.11014,-4.61014 54.11014,-4.61014 54.15761)),((-4.65408 54.1986,-4.59091 54.1986,-4.59091 54.16887,-4.65408 54.16887,-4.65408 54.1986)),((-4.55795 54.18253,-4.51401 54.18253,-4.51401 54.14876,-4.55795 54.14876,-4.55795 54.18253)))
dddmmss.ssssss|3|MULTIPOLYGON(((-4.68842 54.11675,-4.62112 54.11675,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.11675)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
dddmmss.ssssss|4|GEOMETRYCOLLECTION(POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457)),POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839)),POINT(-4.62206 54.17312),POLYGON((-4.67468 54.15922,-4.59229 54.15922,-4.59229 54.11014,-4.67468 54.11014,-4.67468 54.15922)),POLYGON((-4.72961 54.11577,-4.58954 54.11577,-4.58954 54.10048,-4.72961 54.10048,-4.72961 54.11577)),POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
@@ -428,6 +427,7 @@ dddmmss.ssssss|6|MULTIPOLYGON(((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16
dddmmss.ssssss|7|MULTIPOLYGON(((-4.68842 54.11675,-4.62112 54.11675,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.11675)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
dddmmss.ssssss|8|MULTIPOLYGON(((-4.54971 54.16143,-4.52705 54.16143,-4.52705 54.14635,-4.54971 54.14635,-4.54971 54.16143)),((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
dddmmss.ssssss|9|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
+dddmmss.ssssss|10|POINT(-4.56559 54.18477)
dddmmss.ssssss|11|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
dddmmss.ssssss|12|POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839))
dddmmss.ssssss|13|POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699))
@@ -454,7 +454,6 @@ dddmmss.ssssss|34|POINT(-4.56559 54.18477)
dddmmss.ssssss|35|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
dddmmss.ssssss|36|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
dddmmss|1|MULTIPOINT(-4.8175 54.05528,-4.82778 54.05389,-4.82889 54.05306,-4.82861 54.05222)
-dddmmss|10|POINT(-4.56556 54.18472)
dddmmss|2|MULTIPOLYGON(((-4.61028 54.1575,-4.54833 54.1575,-4.54833 54.11028,-4.61028 54.11028,-4.61028 54.1575)),((-4.65417 54.19861,-4.59083 54.19861,-4.59083 54.16889,-4.65417 54.16889,-4.65417 54.19861)),((-4.55806 54.1825,-4.51389 54.1825,-4.51389 54.14889,-4.55806 54.14889,-4.55806 54.1825)))
dddmmss|3|MULTIPOLYGON(((-4.68833 54.11667,-4.62111 54.11667,-4.62111 54.07472,-4.68833 54.07472,-4.68833 54.11667)),((-4.67611 54.15028,-4.59917 54.15028,-4.59917 54.10944,-4.67611 54.10944,-4.67611 54.15028)),((-4.56889 54.15528,-4.48806 54.15528,-4.48806 54.14722,-4.56889 54.14722,-4.56889 54.15528)))
dddmmss|4|GEOMETRYCOLLECTION(POLYGON((-4.61778 54.18444,-4.59333 54.18444,-4.59333 54.16694,-4.61778 54.16694,-4.61778 54.18444)),POLYGON((-4.625 54.16833,-4.61611 54.16833,-4.61611 54.16528,-4.625 54.16528,-4.625 54.16833)),POINT(-4.62194 54.17306),POLYGON((-4.67472 54.15917,-4.59222 54.15917,-4.59222 54.11028,-4.67472 54.11028,-4.67472 54.15917)),POLYGON((-4.72972 54.11583,-4.58944 54.11583,-4.58944 54.10056,-4.72972 54.10056,-4.72972 54.11583)),POLYGON((-4.57917 54.19694,-4.54667 54.19694,-4.54667 54.18167,-4.57917 54.18167,-4.57917 54.19694)))
@@ -463,6 +462,7 @@ dddmmss|6|MULTIPOLYGON(((-4.625 54.16833,-4.61611 54.16833,-4.61611 54.16528,-4.
dddmmss|7|MULTIPOLYGON(((-4.68833 54.11667,-4.62111 54.11667,-4.62111 54.07472,-4.68833 54.07472,-4.68833 54.11667)),((-4.67611 54.15028,-4.59917 54.15028,-4.59917 54.10944,-4.67611 54.10944,-4.67611 54.15028)),((-4.56889 54.15528,-4.48806 54.15528,-4.48806 54.14722,-4.56889 54.14722,-4.56889 54.15528)))
dddmmss|8|MULTIPOLYGON(((-4.54972 54.16139,-4.52694 54.16139,-4.52694 54.14639,-4.54972 54.14639,-4.54972 54.16139)),((-4.57917 54.19694,-4.54667 54.19694,-4.54667 54.18167,-4.57917 54.18167,-4.57917 54.19694)))
dddmmss|9|POLYGON((-4.61778 54.18444,-4.59333 54.18444,-4.59333 54.16694,-4.61778 54.16694,-4.61778 54.18444))
+dddmmss|10|POINT(-4.56556 54.18472)
dddmmss|11|POLYGON((-4.69667 54.22361,-4.48444 54.22361,-4.48444 54.08194,-4.69667 54.08194,-4.69667 54.22361))
dddmmss|12|POLYGON((-4.625 54.16833,-4.61611 54.16833,-4.61611 54.16528,-4.625 54.16528,-4.625 54.16833))
dddmmss|13|POLYGON((-4.57917 54.19694,-4.54667 54.19694,-4.54667 54.18167,-4.57917 54.18167,-4.57917 54.19694))
@@ -489,7 +489,6 @@ dddmmss|34|POINT(-4.56556 54.18472)
dddmmss|35|POLYGON((-4.61778 54.18444,-4.59333 54.18444,-4.59333 54.16694,-4.61778 54.16694,-4.61778 54.18444))
dddmmss|36|POLYGON((-4.69667 54.22361,-4.48444 54.22361,-4.48444 54.08194,-4.69667 54.08194,-4.69667 54.22361))
ddd,dddddd|1|MULTIPOINT(-4.81763 54.05518,-4.8278 54.05375,-4.82888 54.05319,-4.82866 54.05228)
-ddd,dddddd|10|POINT(-4.56559 54.18477)
ddd,dddddd|2|MULTIPOLYGON(((-4.61014 54.15761,-4.54834 54.15761,-4.54834 54.11014,-4.61014 54.11014,-4.61014 54.15761)),((-4.65408 54.1986,-4.59091 54.1986,-4.59091 54.16887,-4.65408 54.16887,-4.65408 54.1986)),((-4.55795 54.18253,-4.51401 54.18253,-4.51401 54.14876,-4.55795 54.14876,-4.55795 54.18253)))
ddd,dddddd|3|MULTIPOLYGON(((-4.68842 54.11658,-4.62112 54.11658,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.11658)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
ddd,dddddd|4|GEOMETRYCOLLECTION(POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457)),POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839)),POINT(-4.62206 54.17312),POLYGON((-4.67468 54.15922,-4.59229 54.15922,-4.59229 54.11014,-4.67468 54.11014,-4.67468 54.15922)),POLYGON((-4.72961 54.11577,-4.58954 54.11577,-4.58954 54.10048,-4.72961 54.10048,-4.72961 54.11577)),POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
@@ -498,6 +497,7 @@ ddd,dddddd|6|MULTIPOLYGON(((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,
ddd,dddddd|7|MULTIPOLYGON(((-4.68842 54.11658,-4.62112 54.11658,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.11658)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
ddd,dddddd|8|MULTIPOLYGON(((-4.54971 54.16143,-4.52705 54.16143,-4.52705 54.14635,-4.54971 54.14635,-4.54971 54.16143)),((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
ddd,dddddd|9|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
+ddd,dddddd|10|POINT(-4.56559 54.18477)
ddd,dddddd|11|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
ddd,dddddd|12|POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839))
ddd,dddddd|13|POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699))
@@ -524,7 +524,6 @@ ddd,dddddd|34|POINT(-4.56559 54.18477)
ddd,dddddd|35|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
ddd,dddddd|36|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
dddmm,mmmmmm|1|MULTIPOINT(-4.81763 54.05518,-4.8278 54.05375,-4.82888 54.05319,-4.82866 54.05228)
-dddmm,mmmmmm|10|POINT(-4.56559 54.18477)
dddmm,mmmmmm|2|MULTIPOLYGON(((-4.61014 54.15761,-4.54834 54.15761,-4.54834 54.11014,-4.61014 54.11014,-4.61014 54.15761)),((-4.65408 54.1986,-4.59091 54.1986,-4.59091 54.16887,-4.65408 54.16887,-4.65408 54.1986)),((-4.55795 54.18253,-4.51401 54.18253,-4.51401 54.14876,-4.55795 54.14876,-4.55795 54.18253)))
dddmm,mmmmmm|3|MULTIPOLYGON(((-4.68842 54.13325,-4.62112 54.13325,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.13325)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
dddmm,mmmmmm|4|GEOMETRYCOLLECTION(POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457)),POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839)),POINT(-4.62206 54.17312),POLYGON((-4.67468 54.15922,-4.59229 54.15922,-4.59229 54.11014,-4.67468 54.11014,-4.67468 54.15922)),POLYGON((-4.72961 54.11577,-4.58954 54.11577,-4.58954 54.10048,-4.72961 54.10048,-4.72961 54.11577)),POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
@@ -533,6 +532,7 @@ dddmm,mmmmmm|6|MULTIPOLYGON(((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.1651
dddmm,mmmmmm|7|MULTIPOLYGON(((-4.68842 54.13325,-4.62112 54.13325,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.13325)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
dddmm,mmmmmm|8|MULTIPOLYGON(((-4.54971 54.16143,-4.52705 54.16143,-4.52705 54.14635,-4.54971 54.14635,-4.54971 54.16143)),((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
dddmm,mmmmmm|9|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
+dddmm,mmmmmm|10|POINT(-4.56559 54.18477)
dddmm,mmmmmm|11|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
dddmm,mmmmmm|12|POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839))
dddmm,mmmmmm|13|POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699))
@@ -559,7 +559,6 @@ dddmm,mmmmmm|34|POINT(-4.56559 54.18477)
dddmm,mmmmmm|35|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
dddmm,mmmmmm|36|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
dddmmss,ssssss|1|MULTIPOINT(-4.81763 54.05518,-4.8278 54.05375,-4.82888 54.05319,-4.82866 54.05228)
-dddmmss,ssssss|10|POINT(-4.56559 54.18477)
dddmmss,ssssss|2|MULTIPOLYGON(((-4.61014 54.15761,-4.54834 54.15761,-4.54834 54.11014,-4.61014 54.11014,-4.61014 54.15761)),((-4.65408 54.1986,-4.59091 54.1986,-4.59091 54.16887,-4.65408 54.16887,-4.65408 54.1986)),((-4.55795 54.18253,-4.51401 54.18253,-4.51401 54.14876,-4.55795 54.14876,-4.55795 54.18253)))
dddmmss,ssssss|3|MULTIPOLYGON(((-4.68842 54.11675,-4.62112 54.11675,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.11675)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
dddmmss,ssssss|4|GEOMETRYCOLLECTION(POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457)),POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839)),POINT(-4.62206 54.17312),POLYGON((-4.67468 54.15922,-4.59229 54.15922,-4.59229 54.11014,-4.67468 54.11014,-4.67468 54.15922)),POLYGON((-4.72961 54.11577,-4.58954 54.11577,-4.58954 54.10048,-4.72961 54.10048,-4.72961 54.11577)),POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
@@ -568,6 +567,7 @@ dddmmss,ssssss|6|MULTIPOLYGON(((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16
dddmmss,ssssss|7|MULTIPOLYGON(((-4.68842 54.11675,-4.62112 54.11675,-4.62112 54.0747,-4.68842 54.0747,-4.68842 54.11675)),((-4.67606 54.15037,-4.59915 54.15037,-4.59915 54.10933,-4.67606 54.10933,-4.67606 54.15037)),((-4.56894 54.1552,-4.48792 54.1552,-4.48792 54.14715,-4.56894 54.14715,-4.56894 54.1552)))
dddmmss,ssssss|8|MULTIPOLYGON(((-4.54971 54.16143,-4.52705 54.16143,-4.52705 54.14635,-4.54971 54.14635,-4.54971 54.16143)),((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699)))
dddmmss,ssssss|9|POLYGON((-4.61773 54.18457,-4.59327 54.18457,-4.59327 54.16689,-4.61773 54.16689,-4.61773 54.18457))
+dddmmss,ssssss|10|POINT(-4.56559 54.18477)
dddmmss,ssssss|11|POLYGON((-4.69666 54.2235,-4.48448 54.2235,-4.48448 54.08195,-4.69666 54.08195,-4.69666 54.2235))
dddmmss,ssssss|12|POLYGON((-4.62503 54.16839,-4.6161 54.16839,-4.6161 54.16518,-4.62503 54.16518,-4.62503 54.16839))
dddmmss,ssssss|13|POLYGON((-4.57924 54.19699,-4.54662 54.19699,-4.54662 54.18173,-4.57924 54.18173,-4.57924 54.19699))
@@ -632,7 +632,6 @@ dump geom -> convert to marc21|1|1|<record xmlns="http://www.loc.gov/MARC21/slim
dump geom -> convert to marc21|1|2|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0044940</subfield><subfield code="e">W0044940</subfield><subfield code="f">N0540314</subfield><subfield code="g">N0540314</subfield></datafield></record>
dump geom -> convert to marc21|1|3|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0044944</subfield><subfield code="e">W0044944</subfield><subfield code="f">N0540311</subfield><subfield code="g">N0540311</subfield></datafield></record>
dump geom -> convert to marc21|1|4|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0044943</subfield><subfield code="e">W0044943</subfield><subfield code="f">N0540308</subfield><subfield code="g">N0540308</subfield></datafield></record>
-dump geom -> convert to marc21|10||<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043356</subfield><subfield code="e">W0043356</subfield><subfield code="f">N0541105</subfield><subfield code="g">N0541105</subfield></datafield></record>
dump geom -> convert to marc21|2|1|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043637</subfield><subfield code="e">W0043254</subfield><subfield code="f">N0540927</subfield><subfield code="g">N0540637</subfield></datafield></record>
dump geom -> convert to marc21|2|2|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043915</subfield><subfield code="e">W0043527</subfield><subfield code="f">N0541155</subfield><subfield code="g">N0541008</subfield></datafield></record>
dump geom -> convert to marc21|2|3|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043329</subfield><subfield code="e">W0043050</subfield><subfield code="f">N0541057</subfield><subfield code="g">N0540856</subfield></datafield></record>
@@ -658,6 +657,7 @@ dump geom -> convert to marc21|7|3|<record xmlns="http://www.loc.gov/MARC21/slim
dump geom -> convert to marc21|8|1|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043259</subfield><subfield code="e">W0043137</subfield><subfield code="f">N0540941</subfield><subfield code="g">N0540847</subfield></datafield></record>
dump geom -> convert to marc21|8|2|<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043445</subfield><subfield code="e">W0043248</subfield><subfield code="f">N0541149</subfield><subfield code="g">N0541054</subfield></datafield></record>
dump geom -> convert to marc21|9||<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043704</subfield><subfield code="e">W0043536</subfield><subfield code="f">N0541104</subfield><subfield code="g">N0541001</subfield></datafield></record>
+dump geom -> convert to marc21|10||<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043356</subfield><subfield code="e">W0043356</subfield><subfield code="f">N0541105</subfield><subfield code="g">N0541105</subfield></datafield></record>
dump geom -> convert to marc21|11||<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0044148</subfield><subfield code="e">W0042904</subfield><subfield code="f">N0541325</subfield><subfield code="g">N0540455</subfield></datafield></record>
dump geom -> convert to marc21|12||<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043730</subfield><subfield code="e">W0043658</subfield><subfield code="f">N0541006</subfield><subfield code="g">N0540955</subfield></datafield></record>
dump geom -> convert to marc21|13||<record xmlns="http://www.loc.gov/MARC21/slim"><datafield tag="034" ind1="1" ind2=" "><subfield code="a">a</subfield><subfield code="d">W0043445</subfield><subfield code="e">W0043248</subfield><subfield code="f">N0541149</subfield><subfield code="g">N0541054</subfield></datafield></record>
-----------------------------------------------------------------------
Summary of changes:
NEWS | 2 +-
postgis/postgis.sql.in | 1 -
regress/core/in_marc21.sql | 2 +-
regress/core/in_marc21_expected | 2 +-
regress/core/out_marc21.sql | 49 +++++++++++++++++++++-------------------
regress/core/out_marc21_expected | 36 ++++++++++++++---------------
6 files changed, 47 insertions(+), 45 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list