[SCM] PostGIS branch stable-3.4 updated. 3.4.4-12-ga6b036da7
git at osgeo.org
git at osgeo.org
Tue Apr 22 11:24:36 PDT 2025
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, stable-3.4 has been updated
via a6b036da73c80421f19d3e25c5b983a3a989e18c (commit)
via 67ccf19538416460afa926b49a64375358aae90f (commit)
via d4e89be9cf1b857885d28e315c9d117e62f179f5 (commit)
from edee743b38f1518d683e1f879c26b579514ead66 (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 a6b036da73c80421f19d3e25c5b983a3a989e18c
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Tue Apr 22 11:15:50 2025 -0700
geometry_columns view fails with non-standard use of postgis functions in constraint definition, references #5829
diff --git a/NEWS b/NEWS
index 71e53f677..530c179f1 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Proj 6.1+ required.
(Paul Ramsey, Regina Obe)
- #5876, Fix ST_AddPoint with empty point argument
- #5874, Line substring returns wrong answer (Paul Ramsey)
+ - #5829, geometry_columns with non-standard constraints (Paul Ramsey)
PostGIS 3.4.4
diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in
index 7affd8c83..6a34f679a 100644
--- a/postgis/postgis.sql.in
+++ b/postgis/postgis.sql.in
@@ -6425,26 +6425,29 @@ CREATE OR REPLACE VIEW geometry_columns AS
JOIN pg_type t ON a.atttypid = t.oid
LEFT JOIN ( SELECT s.connamespace,
s.conrelid,
- s.conkey, replace(split_part(s.consrc, ''''::text, 2), ')'::text, ''::text) As type
+ s.conkey,
+ (regexp_match(s.consrc, 'geometrytype\(\w+\)\s*=\s*(\w+)', 'i'))[1]::text AS type
FROM (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
FROM pg_constraint) AS s
- WHERE s.consrc ~~* '%geometrytype(% = %'::text
+ WHERE s.consrc ~* 'geometrytype(\w+)\s*=\s*\w+'::text
) st ON st.connamespace = n.oid AND st.conrelid = c.oid AND (a.attnum = ANY (st.conkey))
LEFT JOIN ( SELECT s.connamespace,
s.conrelid,
- s.conkey, replace(split_part(s.consrc, ' = '::text, 2), ')'::text, ''::text)::integer As ndims
+ s.conkey,
+ (regexp_match(s.consrc, 'ndims\(\w+\)\s*=\s*(\d+)', 'i'))[1]::integer AS ndims
FROM (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
FROM pg_constraint) AS s
- WHERE s.consrc ~~* '%ndims(% = %'::text
+ WHERE s.consrc ~* 'ndims(\w+)\s*=\s*\d+'::text
) sn ON sn.connamespace = n.oid AND sn.conrelid = c.oid AND (a.attnum = ANY (sn.conkey))
LEFT JOIN ( SELECT s.connamespace,
s.conrelid,
- s.conkey, replace(replace(split_part(s.consrc, ' = '::text, 2), ')'::text, ''::text), '('::text, ''::text)::integer As srid
+ s.conkey,
+ (regexp_match(s.consrc, 'st_srid\(\w+\)\s*=\s*(\d+)', 'i'))[1]::integer As srid
FROM (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
FROM pg_constraint) AS s
- WHERE s.consrc ~~* '%srid(% = %'::text
+ WHERE s.consrc ~* 'srid(\w+)\s*=\s*\d+'::text
) sr ON sr.connamespace = n.oid AND sr.conrelid = c.oid AND (a.attnum = ANY (sr.conkey))
WHERE (c.relkind = ANY (ARRAY['r'::"char", 'v'::"char", 'm'::"char", 'f'::"char", 'p'::"char"]))
commit 67ccf19538416460afa926b49a64375358aae90f
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Tue Sep 3 16:32:14 2024 -0700
fix
diff --git a/regress/core/relate_bnr_expected b/regress/core/relate_bnr_expected
index 10a1b3b17..6f57aeaec 100644
--- a/regress/core/relate_bnr_expected
+++ b/regress/core/relate_bnr_expected
@@ -1,39 +1,39 @@
1|FF2FF1212|FF2FF1212|FF2FF1212|FF2FF1212
-2|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2
+2|2FFF1FFF2|2FFF1FFF2|2FFF0FFF2|2FFF1FFF2
3|212FF1FF2|212FF1FF2|212FF1FF2|212FF1FF2
4|2121F12F2|2121F12F2|2121F12F2|2121F12F2
5|2121F1212|2121F1212|2121F1212|2121F1212
6|212101212|212101212|212101212|212101212
-7|212101212|212101212|212101212|212101212
-8|212101212|212101212|212101212|212101212
-9|21210F212|21210F212|21210F212|21210F212
-10|2121012F2|2121012F2|2121012F2|2121012F2
-11|FF2F11212|FF2F11212|FF2F11212|FF2F11212
-12|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-13|21210F212|21210F212|21210F212|21210F212
-14|1010F0212|1010F0212|101FFF212|1010F0212
-15|1010F0212|1010F0212|101FFF212|1010F0212
-16|10F0FF212|10F0FF212|10FFFF212|10F0FF212
-17|F01FF0212|F01FF0212|F01FFF212|F01FF0212
-18|101FF0212|101FF0212|101FFF212|101FF0212
+7|212101212|212101212|2F2F002F2|212101212
+8|212101212|212101212|2F2F002F2|212101212
+9|21210F212|21210F212|2F200F202|21210F212
+10|2121012F2|2121012F2|2F210F2F2|2121012F2
+11|FF2F11212|FF2F11212|1F2F01202|FF2F11212
+12|FF2F01212|FF2F01212|FF2F01202|FF2F01212
+13|21210F212|21210F212|2F200F202|21210F212
+14|1010F0212|1010F0212|101FFF202|1010F0212
+15|1010F0212|1010F0212|101FFF202|1010F0212
+16|10F0FF212|10F0FF212|10FFFF202|10F0FF212
+17|F01FF0212|F01FF0212|F01FFF202|F01FF0212
+18|101FF0212|101FF0212|101FFF202|101FF0212
19|F01FF0212|F01FF0212|F01FFF212|F01FF0212
20|101FF0212|101FF0212|101FFF212|101FF0212
-21|1010FF212|1010FF212|101FFF212|1010FF212
-22|1010FF212|1010FF212|101FFF212|1010FF212
-23|10F0FF212|10F0FF212|10FFFF212|10F0FF212
-24|101FFF212|1010FF212|1010FF212|101FFF212
-25|1FFFFFFF2|10FF0FFF2|10FF0FFF2|1FFFFFFF2
-26|1FFF0F212|1FFF0F212|10FFFF212|1FFF0F212
-27|11FF0F212|11FF0F212|11FFFF212|11FF0F212
-28|10FF0FFF2|10FF0FFF2|10FFFFFF2|10FF0FFF2
-29|FF1FF0102|FF1FF0102|FF1FFF1F2|FF1FF0102
+21|1010FF212|1010FF212|101FFF202|1010FF212
+22|1010FF212|1010FF212|101FFF202|1010FF212
+23|10F0FF212|10F0FF212|10FFFF202|10F0FF212
+24|101FFF212|1010FF212|101FFF202|101FFF212
+25|1FFFFFFF2|10FF0FFF2|1FFFFFFF2|1FFFFFFF2
+26|1FF0FF212|F1F0FF212|01FFFF212|1FF0FF212
+27|11F00F212|F1F00F212|11FFFF212|11F00F212
+28|10FF0FFF2|10FF0FFF2|1FFFFFFF2|10FF0FFF2
+29|FF1FF0102|FF1FF0102|FF1FF0102|FF1FF0102
30|FF1FF0102|FF1FF0102|FF1FFF1F2|FF1FF0102
-32|FF1FF01F2|FF1FF0102|FF1FFF102|FF1FF01F2
+32|FF1FF01F2|FF1FF0102|FF1FFF1F2|FF1FF01F2
33|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2|1FFF0FFF2
34|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2|1FFF0FFF2
35|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2|1FFF0FFF2
36|10F00FFF2|10F00FFF2|1FFFFFFF2|10F00FFF2
-37|1FFFFFFF2|10FF0FFF2|10FF0FFF2|1FFFFFFF2
+37|1FFFFFFF2|10FF0FFF2|1FFFFFFF2|1FFFFFFF2
38|10FF0FFF2|10FF0FFF2|1FFFFFFF2|10FF0FFF2
39|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
40|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
@@ -42,7 +42,7 @@
43|F01FF0102|F01FF0102|0F1FFF1F2|F01FF0102
44|1F1F00102|1F1F00102|1F1FFF1F2|1F1F00102
45|1FFF0F1F2|1FFF0F1F2|1FFFFF1F2|1FFF0F1F2
-46|101FFF102|101FF0102|1F1FF01F2|101FFF102
+46|101FFF102|101FF0102|1F1FFF1F2|101FFF102
47|101FF0FF2|101FF0FF2|1F1FFFFF2|101FF0FF2
48|FF0FFF212|FF0FFF212|FF0FFF212|FF0FFF212
49|0F0FFF212|0F0FFF212|0F0FFF212|0F0FFF212
@@ -62,149 +62,149 @@
63|FF0FFF0F2|FF0FFF0F2|FF0FFF0F2|FF0FFF0F2
64|0F0FFF0F2|0F0FFF0F2|0F0FFF0F2|0F0FFF0F2
65|0FFFFFFF2|0FFFFFFF2|0FFFFFFF2|0FFFFFFF2
-66|212111212|212111212|212111212|212111212
-67|212111212|212111212|212111212|212111212
-68|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2
-69|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2
-70|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2
-71|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2
+66|212111212|212111212|212101212|212111212
+67|212111212|212111212|212101212|212111212
+68|2FFF1FFF2|2FFF1FFF2|2FFF0FFF2|2FFF1FFF2
+69|2FFF1FFF2|2FFF1FFF2|2FFF0FFF2|2FFF1FFF2
+70|2FFF1FFF2|2FFF1FFF2|2FFF0FFF2|2FFF1FFF2
+71|2FFF1FFF2|2FFF1FFF2|2FFF0FFF2|2FFF1FFF2
72|FF2FF1212|FF2FF1212|FF2FF1212|FF2FF1212
-73|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-74|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-75|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-76|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-77|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-78|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-79|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-80|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-81|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-82|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-83|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-84|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-85|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-86|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-87|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-88|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-89|FF2F11212|FF2F11212|FF2F11212|FF2F11212
-90|FF2F11212|FF2F11212|FF2F11212|FF2F11212
-91|FF2F11212|FF2F11212|FF2F11212|FF2F11212
-92|FF2F11212|FF2F11212|FF2F11212|FF2F11212
-93|FF2F11212|FF2F11212|FF2F11212|FF2F11212
-94|FF2F11212|FF2F11212|FF2F11212|FF2F11212
-95|FF2F11212|FF2F11212|FF2F11212|FF2F11212
-96|FF2F11212|FF2F11212|FF2F11212|FF2F11212
-97|FF2F11212|FF2F11212|FF2F11212|FF2F11212
-98|FF2F11212|FF2F11212|FF2F11212|FF2F11212
+73|FF2F01212|FF2F01212|FF2F0F2F2|FF2F01212
+74|FF2F01212|FF2F01212|FF2F0F202|FF2F01212
+75|FF2F01212|FF2F01212|FF2F0F202|FF2F01212
+76|FF2F01212|FF2F01212|FF2F002F2|FF2F01212
+77|FF2F01212|FF2F01212|FF2F00202|FF2F01212
+78|FF2F01212|FF2F01212|FF2F00202|FF2F01212
+79|FF2F01212|FF2F01212|FF2F00202|FF2F01212
+80|FF2F01212|FF2F01212|FF2F0F2F2|FF2F01212
+81|FF2F01212|FF2F01212|FF2F0F2F2|FF2F01212
+82|FF2F01212|FF2F01212|FF2F0F2F2|FF2F01212
+83|FF2F01212|FF2F01212|FF2F0F2F2|FF2F01212
+84|FF2F01212|FF2F01212|FF2F002F2|FF2F01212
+85|FF2F01212|FF2F01212|FF2F00202|FF2F01212
+86|FF2F01212|FF2F01212|FF2F00202|FF2F01212
+87|FF2F01212|FF2F01212|FF2F00202|FF2F01212
+88|FF2F01212|FF2F01212|FF2F00202|FF2F01212
+89|FF2F11212|FF2F11212|1F2F0F2F2|FF2F11212
+90|FF2F11212|FF2F11212|1F2F0F2F2|FF2F11212
+91|FF2F11212|FF2F11212|1F2F0F202|FF2F11212
+92|FF2F11212|FF2F11212|1F2F0F202|FF2F11212
+93|FF2F11212|FF2F11212|1F2F0F2F2|FF2F11212
+94|FF2F11212|FF2F11212|1F2F0F202|FF2F11212
+95|FF2F11212|FF2F11212|1F2F00202|FF2F11212
+96|FF2F11212|FF2F11212|1F2F0F202|FF2F11212
+97|FF2F11212|FF2F11212|1F2F0F2F2|FF2F11212
+98|FF2F11212|FF2F11212|1F2F0F202|FF2F11212
99|212FF1FF2|212FF1FF2|212FF1FF2|212FF1FF2
-100|212F01FF2|212F01FF2|212F01FF2|212F01FF2
-101|212F01FF2|212F01FF2|212F01FF2|212F01FF2
-102|212F01FF2|212F01FF2|212F01FF2|212F01FF2
-103|212F01FF2|212F01FF2|212F01FF2|212F01FF2
-104|212F01FF2|212F01FF2|212F01FF2|212F01FF2
-105|212F01FF2|212F01FF2|212F01FF2|212F01FF2
-106|212F01FF2|212F01FF2|212F01FF2|212F01FF2
-107|212F01FF2|212F01FF2|212F01FF2|212F01FF2
-108|212F01FF2|212F01FF2|212F01FF2|212F01FF2
-109|212F01FF2|212F01FF2|212F01FF2|212F01FF2
-110|212F01FF2|212F01FF2|212F01FF2|212F01FF2
-111|212F01FF2|212F01FF2|212F01FF2|212F01FF2
-112|212F11FF2|212F11FF2|212F11FF2|212F11FF2
-113|212F11FF2|212F11FF2|212F11FF2|212F11FF2
-114|212F11FF2|212F11FF2|212F11FF2|212F11FF2
-115|212F11FF2|212F11FF2|212F11FF2|212F11FF2
-116|212F11FF2|212F11FF2|212F11FF2|212F11FF2
-117|212F11FF2|212F11FF2|212F11FF2|212F11FF2
-118|212F11FF2|212F11FF2|212F11FF2|212F11FF2
-119|212F11FF2|212F11FF2|212F11FF2|212F11FF2
-120|212F11FF2|212F11FF2|212F11FF2|212F11FF2
-121|212111212|212111212|212111212|212111212
-122|212111212|212111212|212111212|212111212
+100|212F01FF2|212F01FF2|2F2F0FFF2|212F01FF2
+101|212F01FF2|212F01FF2|202F0FFF2|212F01FF2
+102|212F01FF2|212F01FF2|2F2F00FF2|212F01FF2
+103|212F01FF2|212F01FF2|202F00FF2|212F01FF2
+104|212F01FF2|212F01FF2|2F2F00FF2|212F01FF2
+105|212F01FF2|212F01FF2|202F00FF2|212F01FF2
+106|212F01FF2|212F01FF2|2F2F0FFF2|212F01FF2
+107|212F01FF2|212F01FF2|2F2F0FFF2|212F01FF2
+108|212F01FF2|212F01FF2|2F2F00FF2|212F01FF2
+109|212F01FF2|212F01FF2|2F2F00FF2|212F01FF2
+110|212F01FF2|212F01FF2|202F00FF2|212F01FF2
+111|212F01FF2|212F01FF2|202F00FF2|212F01FF2
+112|212F11FF2|212F11FF2|2F2F0FFF2|212F11FF2
+113|212F11FF2|212F11FF2|2F2F0FFF2|212F11FF2
+114|212F11FF2|212F11FF2|2F2F0FFF2|212F11FF2
+115|212F11FF2|212F11FF2|202F0FFF2|212F11FF2
+116|212F11FF2|212F11FF2|2F2F0FFF2|212F11FF2
+117|212F11FF2|212F11FF2|202F0FFF2|212F11FF2
+118|212F11FF2|212F11FF2|2F2F0FFF2|212F11FF2
+119|212F11FF2|212F11FF2|2F2F00FF2|212F11FF2
+120|212F11FF2|212F11FF2|2F2F0FFF2|212F11FF2
+121|212111212|212111212|212101212|212111212
+122|212111212|212111212|2F2F0F2F2|212111212
123|212101212|212101212|212101212|212101212
-124|212111212|212111212|212111212|212111212
-125|212101212|212101212|212101212|212101212
-126|212101212|212101212|212101212|212101212
-127|212101212|212101212|212101212|212101212
-128|212101212|212101212|212101212|212101212
-129|212101212|212101212|212101212|212101212
+124|212111212|212111212|212101212|212111212
+125|212101212|212101212|2F2F0F2F2|212101212
+126|212101212|212101212|2F2F0F2F2|212101212
+127|212101212|212101212|2F2F0F202|212101212
+128|212101212|212101212|2F2F0F202|212101212
+129|212101212|212101212|2F2F0F202|212101212
130|212101212|212101212|212101212|212101212
131|212101212|212101212|212101212|212101212
132|212101212|212101212|212101212|212101212
133|212101212|212101212|212101212|212101212
-134|212111212|212111212|212111212|212111212
-135|212111212|212111212|212111212|212111212
-136|212111212|212111212|212111212|212111212
-137|212111212|212111212|212111212|212111212
-138|212111212|212111212|212111212|212111212
-139|212111212|212111212|212111212|212111212
-140|212111212|212111212|212111212|212111212
-141|212111212|212111212|212111212|212111212
-142|212111212|212111212|212111212|212111212
+134|212111212|212111212|212101212|212111212
+135|212111212|212111212|212101212|212111212
+136|212111212|212111212|212101212|212111212
+137|212111212|212111212|212101212|212111212
+138|212111212|212111212|212101212|212111212
+139|212111212|212111212|212101212|212111212
+140|212111212|212111212|212101212|212111212
+141|212111212|212111212|212101212|212111212
+142|212111212|212111212|212101212|212111212
143|212101212|212101212|212101212|212101212
-144|212111212|212111212|212111212|212111212
+144|212111212|212111212|212101212|212111212
145|212101212|212101212|212101212|212101212
-146|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-147|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-148|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-149|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-150|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-151|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-152|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-153|FF2F1F212|FF2F1F212|FF2F1F212|FF2F1F212
-154|FF2F11212|FF2F11212|FF2F11212|FF2F11212
-155|FF2F11212|FF2F11212|FF2F11212|FF2F11212
-156|FF2F11212|FF2F11212|FF2F11212|FF2F11212
+146|FF2F01212|FF2F01212|FF2F0F2F2|FF2F01212
+147|FF2F01212|FF2F01212|FF2F0F212|FF2F01212
+148|FF2F01212|FF2F01212|FF2F00212|FF2F01212
+149|FF2F01212|FF2F01212|FF2F0F212|FF2F01212
+150|FF2F01212|FF2F01212|FF2F0F212|FF2F01212
+151|FF2F01212|FF2F01212|FF2F0F212|FF2F01212
+152|FF2F01212|FF2F01212|FF2F00212|FF2F01212
+153|FF2F1F212|FF2F1F212|1F2F0F212|FF2F1F212
+154|FF2F11212|FF2F11212|1F2F0F212|FF2F11212
+155|FF2F11212|FF2F11212|1F2F0F212|FF2F11212
+156|FF2F11212|FF2F11212|1F2F00212|FF2F11212
157|2FF1FF212|2FF1FF212|2FF1FF212|2FF1FF212
158|2FF1FF212|2FF1FF212|2FF1FF212|2FF1FF212
-159|2FF11F212|2FF11F212|2FF11F212|2FF11F212
-160|2FF11F212|2FF11F212|2FF11F212|2FF11F212
-161|2FF11F212|2FF11F212|2FF11F212|2FF11F212
-162|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2
-163|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2
-164|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-165|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-166|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-167|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-168|FF2F11212|FF2F11212|FF2F11212|FF2F11212
-169|FF2F11212|FF2F11212|FF2F11212|FF2F11212
-170|21210F212|21210F212|21210F212|21210F212
-171|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-172|FF2F01212|FF2F01212|FF2F01212|FF2F01212
-173|FF2F11212|FF2F11212|FF2F11212|FF2F11212
-174|FF2F11212|FF2F11212|FF2F11212|FF2F11212
-175|FF2F11212|FF2F11212|FF2F11212|FF2F11212
-176|212111212|212111212|212111212|212111212
-177|21210F212|21210F212|21210F212|21210F212
-178|FF1F00212|FF1F00212|F01FFF212|FF1F00212
-179|FF1F0F212|FF1F0F212|F01FFF212|FF1F0F212
-180|FF1F00212|FF1F00212|F01FFF212|FF1F00212
-181|F1FF0F212|F1FF0F212|F1FFFF212|F1FF0F212
-182|F11F00212|F11F00212|F11FFF212|F11F00212
-183|F11F0F212|F11F0F212|F11FFF212|F11F0F212
-184|F11FF0212|F11FF0212|F11FFF212|F11FF0212
-185|1010F0212|1010F0212|101FFF212|1010F0212
-186|101FF0212|101FF0212|101FFF212|101FF0212
-187|1010F0212|1010F0212|101FFF212|1010F0212
-188|101FF0212|101FF0212|101FFF212|101FF0212
-189|1010F0212|1010F0212|101FFF212|1010F0212
-190|101FF0212|101FF0212|101FFF212|101FF0212
-191|1010F0212|1010F0212|101FFF212|1010F0212
+159|2FF11F212|2FF11F212|2FF00F212|2FF11F212
+160|2FF11F212|2FF11F212|2FFF0F212|2FF11F212
+161|2FF11F212|2FF11F212|2FFF0F212|2FF11F212
+162|2FFF1FFF2|2FFF1FFF2|2FFF0FFF2|2FFF1FFF2
+163|2FFF1FFF2|2FFF1FFF2|2FFF0FFF2|2FFF1FFF2
+164|FF2F01212|FF2F01212|FF2F0F202|FF2F01212
+165|FF2F01212|FF2F01212|FF2F00202|FF2F01212
+166|FF2F01212|FF2F01212|FF2F00202|FF2F01212
+167|FF2F01212|FF2F01212|FF2F0F212|FF2F01212
+168|FF2F11212|FF2F11212|1F2F0F202|FF2F11212
+169|FF2F11212|FF2F11212|1F2F00202|FF2F11212
+170|21210F212|21210F212|2F200F202|21210F212
+171|FF2F01212|FF2F01212|FF2F0F2F2|FF2F01212
+172|FF2F01212|FF2F01212|FF2F0F2F2|FF2F01212
+173|FF2F11212|FF2F11212|1F2F0F2F2|FF2F11212
+174|FF2F11212|FF2F11212|1F2F0F2F2|FF2F11212
+175|FF2F11212|FF2F11212|1F2F0F2F2|FF2F11212
+176|212111212|212111212|212101212|212111212
+177|21210F212|21210F212|2F200F202|21210F212
+178|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
+179|FF1F0F212|FF1F0F212|F01FFF202|FF1F0F212
+180|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
+181|F1FF0F212|F1FF0F212|10FFFF202|F1FF0F212
+182|F11F00212|F11F00212|101FFF202|F11F00212
+183|F11F0F212|F11F0F212|101FFF202|F11F0F212
+184|F11FF0212|F11FF0212|101FFF202|F11FF0212
+185|1010F0212|1010F0212|101FFF202|1010F0212
+186|101FF0212|101FF0212|101FFF202|101FF0212
+187|1010F0212|1010F0212|101FFF2F2|1010F0212
+188|101FF0212|101FF0212|101FFF2F2|101FF0212
+189|1010F0212|1010F0212|101FFF202|1010F0212
+190|101FF0212|101FF0212|101FFF202|101FF0212
+191|1010F0212|1010F0212|101FFF2F2|1010F0212
192|1FF0FF212|1FF0FF212|1FFFFF212|1FF0FF212
-193|1FFF0F212|1FFF0F212|10FFFF212|1FFF0F212
-194|1FF00F212|1FF00F212|10FFFF212|1FF00F212
-195|11F00F212|11F00F212|11FFFF212|11F00F212
-196|11F0FF212|11F0FF212|11FFFF212|11F0FF212
+193|1FFF0F212|1FFF0F212|10FFFF202|1FFF0F212
+194|1FF00F212|1FF00F212|10FFFF202|1FF00F212
+195|11F00F212|11F00F212|10FFFF202|11F00F212
+196|11F0FF212|11F0FF212|10FFFF202|11F0FF212
197|FF1FF0212|FF1FF0212|FF1FFF212|FF1FF0212
198|FF1FF0212|FF1FF0212|FF1FFF212|FF1FF0212
199|FF1F00212|FF1F00212|F01FFF212|FF1F00212
200|FF1F0F212|FF1F0F212|F01FFF212|FF1F0F212
-201|F01FF0212|F01FF0212|F01FFF212|F01FF0212
-202|F01FF0212|F01FF0212|F01FFF212|F01FF0212
-203|F01FF0212|F01FF0212|F01FFF212|F01FF0212
-204|F01FF0212|F01FF0212|F01FFF212|F01FF0212
-205|F01FF0212|F01FF0212|F01FFF212|F01FF0212
-206|F01FF0212|F01FF0212|F01FFF212|F01FF0212
-207|F01FF0212|F01FF0212|F01FFF212|F01FF0212
-208|F01FF0212|F01FF0212|F01FFF212|F01FF0212
+201|F01FF0212|F01FF0212|F01FFF2F2|F01FF0212
+202|F01FF0212|F01FF0212|F01FFF202|F01FF0212
+203|F01FF0212|F01FF0212|101FFF202|F01FF0212
+204|F01FF0212|F01FF0212|101FFF202|F01FF0212
+205|F01FF0212|F01FF0212|F01FFF2F2|F01FF0212
+206|F01FF0212|F01FF0212|F01FFF202|F01FF0212
+207|F01FF0212|F01FF0212|0F1FFF202|F01FF0212
+208|F01FF0212|F01FF0212|0F1FFF202|F01FF0212
209|FF1F00212|FF1F00212|F01FFF212|FF1F00212
210|F01FF0212|F01FF0212|F01FFF212|F01FF0212
211|F01FF0212|F01FF0212|F01FFF212|F01FF0212
@@ -213,48 +213,48 @@
214|F01FF0212|F01FF0212|F01FFF212|F01FF0212
215|F01FF0212|F01FF0212|F01FFF212|F01FF0212
216|F01FF0212|F01FF0212|F01FFF212|F01FF0212
-217|1010FF212|1010FF212|101FFF212|1010FF212
-218|1010FF212|1010FF212|101FFF212|1010FF212
-219|10F0FF212|10F0FF212|10FFFF212|10F0FF212
-220|F01FFF212|FF1F0F212|FF1F0F212|F01FFF212
-221|F01FFF212|FF1F0F212|FF1F0F212|F01FFF212
-222|F01FFF212|FF1F0F212|FF1F0F212|F01FFF212
-223|F1FFFF2F2|F1FF0F2F2|F1FF0F2F2|F1FFFF2F2
-224|F1FFFF212|F1FF0F212|F1FF0F212|F1FFFF212
-225|F11FFF212|F11F0F212|F11F0F212|F11FFF212
-226|F11FFF212|F11F0F212|F11F0F212|F11FFF212
-227|101FFF212|1010FF212|1010FF212|101FFF212
-228|101FFF212|101FF0212|101FF0212|101FFF212
-229|1FFFFF212|1FF0FF212|1FF0FF212|1FFFFF212
-230|1FFFFF212|1FF0FF212|1FF0FF212|1FFFFF212
-231|10FFFF212|1FFF0F212|1FFF0F212|10FFFF212
-232|10FFFF212|1FFF0F212|1FFF0F212|10FFFF212
-233|11FFFF212|11FF0F212|11FF0F212|11FFFF212
-234|FF1F00212|FF1F00212|F01FFF212|FF1F00212
-235|FF1F00212|FF1F00212|F01FFF212|FF1F00212
-236|FF1F00212|FF1F00212|F01FFF212|FF1F00212
-237|FF1F00212|FF1F00212|F01FFF212|FF1F00212
-238|F11F00212|F11F00212|F11FFF212|F11F00212
-239|111F00212|111F00212|111FFF212|111F00212
+217|1010FF212|1010FF212|101FFF202|1010FF212
+218|1010FF212|1010FF212|101FFF202|1010FF212
+219|10F0FF212|10F0FF212|10FFFF202|10F0FF212
+220|F01FFF212|FF1F0F212|F01FFF202|F01FFF212
+221|F01FFF212|FF1F0F212|F01FFF202|F01FFF212
+222|F01FFF212|FF1F0F212|F01FFF212|F01FFF212
+223|F1FFFF2F2|F1FF0F2F2|10FFFF2F2|F1FFFF2F2
+224|F1FFFF212|F1FF0F212|10FFFF212|F1FFFF212
+225|F11FFF212|F11F0F212|101FFF212|F11FFF212
+226|F11FFF212|F11F0F212|101FFF212|F11FFF212
+227|101FFF212|1010FF212|101FFF202|101FFF212
+228|101FFF212|101FF0212|101FFF2F2|101FFF212
+229|1FFFFF212|1FF0FF212|1FFFFF212|1FFFFF212
+230|1FFFFF212|1FF0FF212|1FFFFF212|1FFFFF212
+231|10FFFF212|1FFF0F212|10FFFF212|10FFFF212
+232|10FFFF212|1FFF0F212|10FFFF212|10FFFF212
+233|11FFFF212|11FF0F212|10FFFF212|11FFFF212
+234|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
+235|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
+236|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
+237|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
+238|F11F00212|F11F00212|101FFF2F2|F11F00212
+239|111F00212|111F00212|101FFF2F2|111F00212
240|1FF0FF212|1FF0FF212|1FFFFF212|1FF0FF212
-241|11F00F212|11F00F212|11FFFF212|11F00F212
+241|11F00F212|11F00F212|10FFFF2F2|11F00F212
242|F01FF0212|F01FF0212|F01FFF212|F01FF0212
-243|FF1F00212|FF1F00212|F01FFF212|FF1F00212
-244|FF1F00212|FF1F00212|F01FFF212|FF1F00212
-245|FF1F00212|FF1F00212|F01FFF212|FF1F00212
-246|1010F0212|1010F0212|101FFF212|1010F0212
-247|1010F0212|1010F0212|101FFF212|1010F0212
-248|1010F0212|1010F0212|101FFF212|1010F0212
-249|1010F0212|1010F0212|101FFF212|1010F0212
+243|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
+244|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
+245|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
+246|1010F0212|1010F0212|101FFF2F2|1010F0212
+247|1010F0212|1010F0212|101FFF2F2|1010F0212
+248|1010F0212|1010F0212|101FFF2F2|1010F0212
+249|1010F0212|1010F0212|101FFF2F2|1010F0212
250|1FF0FF212|1FF0FF212|1FFFFF212|1FF0FF212
-251|11F00F212|11F00F212|11FFFF212|11F00F212
-252|FF1F00212|FF1F00212|F01FFF212|FF1F00212
-253|FF1F00212|FF1F00212|F01FFF212|FF1F00212
-254|FF1F00212|FF1F00212|F01FFF212|FF1F00212
-255|1FFFFFFF2|10FF0FFF2|10FF0FFF2|1FFFFFFF2
-256|1FFF0F212|1FFF0F212|10FFFF212|1FFF0F212
-257|11FF0F212|11FF0F212|11FFFF212|11FF0F212
-258|10FF0FFF2|10FF0FFF2|10FFFFFF2|10FF0FFF2
+251|11F00F212|11F00F212|10FFFF2F2|11F00F212
+252|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
+253|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
+254|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
+255|1FFFFFFF2|10FF0FFF2|1FFFFFFF2|1FFFFFFF2
+256|1FF0FF212|F1F0FF212|01FFFF212|1FF0FF212
+257|11F00F212|F1F00F212|11FFFF212|11F00F212
+258|10FF0FFF2|10FF0FFF2|1FFFFFFF2|10FF0FFF2
259|FF1F00102|FF1F00102|0F1FFF1F2|FF1F00102
260|FF1F00102|FF1F00102|0F1FFF1F2|FF1F00102
261|F01FF0102|F01FF0102|0F1FFF1F2|F01FF0102
@@ -306,7 +306,7 @@
307|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2|1FFF0FFF2
308|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2|1FFF0FFF2
309|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2|1FFF0FFF2
-310|FF1FF0102|FF1FF0102|FF1FFF1F2|FF1FF0102
+310|FF1FF0102|FF1FF0102|FF1FF0102|FF1FF0102
311|FF1FF0102|FF1FF0102|FF1FFF1F2|FF1FF0102
312|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2|1FFF0FFF2
313|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2|1FFF0FFF2
@@ -325,29 +325,29 @@
326|101FF0102|101FF0102|1F1FFF1F2|101FF0102
327|1F1FF0102|1F1FF0102|1F1FFF1F2|1F1FF0102
328|1F1FF0102|1F1FF0102|1F1FFF1F2|1F1FF0102
-329|FF10F01F2|FF1F001F2|F01FFF1F2|FF10F01F2
-330|0F1FF01F2|F01FF01F2|F01FFF1F2|0F1FF01F2
-331|0F1FF01F2|F01FF01F2|F01FFF1F2|0F1FF01F2
-332|0F1FF01F2|F01FF01F2|F01FFF1F2|0F1FF01F2
-333|1FF0FF1F2|1FF00F1F2|10FFFF1F2|1FF0FF1F2
-334|1FF0FF1F2|1FF00F1F2|10FFFF1F2|1FF0FF1F2
-335|1FF0FF1F2|10F0FF1F2|10FFFF1F2|1FF0FF1F2
-336|1F10F01F2|1F1F001F2|101FFF1F2|1F10F01F2
-337|1F10F01F2|1F1F001F2|101FFF1F2|1F10F01F2
-338|1F1FF01F2|101FF01F2|101FFF1F2|1F1FF01F2
+329|FF10F01F2|FF1F001F2|0F1FFF1F2|FF10F01F2
+330|0F1FF01F2|F01FF01F2|0F1FFF1F2|0F1FF01F2
+331|0F1FF01F2|F01FF01F2|0F1FFF1F2|0F1FF01F2
+332|0F1FF01F2|F01FF01F2|0F1FFF1F2|0F1FF01F2
+333|1FF0FF1F2|1FF00F1F2|1FFFFF1F2|1FF0FF1F2
+334|1FF0FF1F2|1FF00F1F2|1FFFFF1F2|1FF0FF1F2
+335|1FF0FF1F2|10F0FF1F2|1FFFFF1F2|1FF0FF1F2
+336|1F10F01F2|1F1F001F2|1F1FFF1F2|1F10F01F2
+337|1F10F01F2|1F1F001F2|1F1FFF1F2|1F10F01F2
+338|1F1FF01F2|101FF01F2|1F1FFF1F2|1F1FF01F2
339|F01FF0102|F01FF0102|0F1FFF1F2|F01FF0102
340|F01FF0102|F01FF0102|0F1FFF1F2|F01FF0102
341|F01FF0102|F01FF0102|0F1FFF1F2|F01FF0102
-342|0F1FF01F2|F01FF01F2|F01FFF1F2|0F1FF01F2
-343|0F1FF01F2|F01FF01F2|F01FFF1F2|0F1FF01F2
-344|0F1FF01F2|F01FF01F2|F01FFF1F2|0F1FF01F2
+342|0F1FF01F2|F01FF01F2|0F1FFF1F2|0F1FF01F2
+343|0F1FF01F2|F01FF01F2|0F1FFF1F2|0F1FF01F2
+344|0F1FF01F2|F01FF01F2|0F1FFF1F2|0F1FF01F2
345|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
346|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
-347|0F1FF01F2|0F1FF0102|0F1FFF102|0F1FF01F2
+347|0F1FF01F2|0F1FF0102|0F1FFF1F2|0F1FF01F2
348|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
349|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
350|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
-351|0F1FF01F2|0F1FF0102|0F1FFF102|0F1FF01F2
+351|0F1FF01F2|0F1FF0102|0F1FFF1F2|0F1FF01F2
352|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
353|FF1F00102|FF1F00102|0F1FFF1F2|FF1F00102
354|F01FF0102|F01FF0102|0F1FFF1F2|F01FF0102
@@ -361,41 +361,41 @@
362|101FF0102|101FF0102|1F1FFF1F2|101FF0102
363|101FF0102|101FF0102|1F1FFF1F2|101FF0102
364|FF10F0102|FF10F0102|0F1FFF1F2|FF10F0102
-365|1FFFFFFF2|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2
-366|1FFFFFFF2|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2
-367|1FFFFFFF2|10F0FFFF2|10F0FFFF2|1FFFFFFF2
-368|1FFFFFFF2|10F0FFFF2|10F0FFFF2|1FFFFFFF2
-369|0F1FFF1F2|FF1F0F1F2|FF1F0F1F2|0F1FFF1F2
-370|0F1FFF1F2|0F1F0F1F2|0F1F0F1F2|0F1FFF1F2
-371|0F1FFF1F2|FF10FF102|FF10FF102|0F1FFF1F2
-372|0F1FFF1F2|FF10FF102|FF10FF102|0F1FFF1F2
-373|0F1FFF1F2|0F1FF0102|0F1FF0102|0F1FFF1F2
-374|0F1FFF1F2|0F10FF102|0F10FF102|0F1FFF1F2
-375|1F1FFF1F2|1F1F0F1F2|1F1F0F1F2|1F1FFF1F2
-376|1F1FFF1F2|1F10FF102|1F10FF102|1F1FFF1F2
-377|1F1FFF1F2|1F1F0F1F2|1F1F0F1F2|1F1FFF1F2
-378|F01FFF102|FF1F0F102|FF10FF1F2|F01FFF102
-379|F01FFF102|FF1F0F102|FF10FF1F2|F01FFF102
-380|F01FFF102|FF1F0F102|FF10FF1F2|F01FFF102
-381|101FFF102|1010FF102|1F10FF1F2|101FFF102
-382|101FFF1F2|1010FF1F2|1F10FF1F2|101FFF1F2
-383|0F1FFF1F2|FF1F0F1F2|FF1F0F1F2|0F1FFF1F2
-384|0F1FFF1F2|0F1FF0102|0F1FF0102|0F1FFF1F2
-385|0F1FFF1F2|0F1FF0102|0F1FF0102|0F1FFF1F2
-386|0F1FFF1F2|0F1FF0102|0F1FF0102|0F1FFF1F2
-387|0F1FFF1F2|0F1FF0102|0F1FF0102|0F1FFF1F2
-388|0F1FFF1F2|0F1FF0102|0F1FF0102|0F1FFF1F2
-389|1FFFFFFF2|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2
+365|1FFFFFFF2|1FFF0FFF2|1FFFFFFF2|1FFFFFFF2
+366|1FFFFFFF2|1FFF0FFF2|1FFFFFFF2|1FFFFFFF2
+367|1FFFFFFF2|10F0FFFF2|1FFFFFFF2|1FFFFFFF2
+368|1FFFFFFF2|10F0FFFF2|1FFFFFFF2|1FFFFFFF2
+369|0F1FFF1F2|FF1F0F1F2|0F1FFF1F2|0F1FFF1F2
+370|0F1FFF1F2|0F1F0F1F2|0F1FFF1F2|0F1FFF1F2
+371|0F1FFF1F2|FF10FF102|0F1FFF1F2|0F1FFF1F2
+372|0F1FFF1F2|FF10FF102|0F1FFF1F2|0F1FFF1F2
+373|0F1FFF1F2|0F1FF0102|0F1FFF1F2|0F1FFF1F2
+374|0F1FFF1F2|0F10FF102|0F1FFF1F2|0F1FFF1F2
+375|1F1FFF1F2|1F1F0F1F2|1F1FFF1F2|1F1FFF1F2
+376|1F1FFF1F2|1F10FF102|1F1FFF1F2|1F1FFF1F2
+377|1F1FFF1F2|1F1F0F1F2|1F1FFF1F2|1F1FFF1F2
+378|F01FFF102|FF1F0F102|0F1FFF1F2|F01FFF102
+379|F01FFF102|FF1F0F102|0F1FFF1F2|F01FFF102
+380|F01FFF102|FF1F0F102|0F1FFF1F2|F01FFF102
+381|101FFF102|1010FF102|1F1FFF1F2|101FFF102
+382|101FFF1F2|1010FF1F2|1F1FFF1F2|101FFF1F2
+383|0F1FFF1F2|FF1F0F1F2|0F1FFF1F2|0F1FFF1F2
+384|0F1FFF1F2|0F1FF0102|0F1FFF1F2|0F1FFF1F2
+385|0F1FFF1F2|0F1FF0102|0F1FFF1F2|0F1FFF1F2
+386|0F1FFF1F2|0F1FF0102|0F1FFF1F2|0F1FFF1F2
+387|0F1FFF1F2|0F1FF0102|0F1FFF1F2|0F1FFF1F2
+388|0F1FFF1F2|0F1FF0102|0F1FFF1F2|0F1FFF1F2
+389|1FFFFFFF2|1FFF0FFF2|1FFFFFFF2|1FFFFFFF2
390|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2|1FFF0FFF2
391|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2|1FFF0FFF2
392|FF1F00102|FF1F00102|0F1FFF1F2|FF1F00102
393|FF1F00102|FF1F00102|0F1FFF1F2|FF1F00102
394|FF1F00102|FF1F00102|0F1FFF1F2|FF1F00102
-395|FF10F0102|FF1F00102|F01FFF1F2|FF10F0102
-396|FF10F0102|FF1F00102|F01FFF1F2|FF10F0102
-397|FF10F0102|FF1F00102|F01FFF1F2|FF10F0102
-398|FF10F0102|FF1F00102|F01FFF1F2|FF10F0102
-399|FF10F0102|FF1F00102|F01FFF1F2|FF10F0102
+395|FF10F0102|FF1F00102|0F1FFF1F2|FF10F0102
+396|FF10F0102|FF1F00102|0F1FFF1F2|FF10F0102
+397|FF10F0102|FF1F00102|0F1FFF1F2|FF10F0102
+398|FF10F0102|FF1F00102|0F1FFF1F2|FF10F0102
+399|FF10F0102|FF1F00102|0F1FFF1F2|FF10F0102
400|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
401|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
402|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
@@ -446,11 +446,11 @@
447|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
448|0FFFFF102|0FFFFF102|0FFFFF1F2|0FFFFF102
449|0FFFFF102|0FFFFF102|0FFFFF1F2|0FFFFF102
-450|FF0FFF1F2|FF0FFF102|FF0FFF102|FF0FFF1F2
-451|FF0FFF1F2|FF0FFF102|FF0FFF102|FF0FFF1F2
-452|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
-453|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
-454|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
+450|FF0FFF1F2|FF0FFF102|FF0FFF1F2|FF0FFF1F2
+451|FF0FFF1F2|FF0FFF102|FF0FFF1F2|FF0FFF1F2
+452|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
+453|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
+454|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
455|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
456|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
457|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
@@ -485,13 +485,13 @@
486|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
487|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
488|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
-489|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
-490|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
-491|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
-492|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
-493|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
-494|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
-495|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
+489|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
+490|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
+491|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
+492|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
+493|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
+494|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
+495|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
496|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
497|0FFFFF102|0FFFFF102|0FFFFF1F2|0FFFFF102
498|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
@@ -500,26 +500,26 @@
501|0FFFFF102|0FFFFF102|0FFFFF1F2|0FFFFF102
502|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
503|0FFFFF102|0FFFFF102|0FFFFF1F2|0FFFFF102
-504|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
-505|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
-506|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
-507|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
-508|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
-509|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
-510|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
-511|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
-512|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
-513|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
-514|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
-515|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
-516|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
-517|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
+504|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
+505|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
+506|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
+507|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
+508|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
+509|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
+510|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
+511|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
+512|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
+513|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
+514|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
+515|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
+516|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
+517|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
518|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
519|0FFFFF102|0FFFFF102|0FFFFF1F2|0FFFFF102
520|0FFFFF102|0FFFFF102|0FFFFF1F2|0FFFFF102
-521|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
-522|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
-523|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
+521|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
+522|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
+523|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
524|0FFFFF102|0FFFFF102|0FFFFF1F2|0FFFFF102
525|0FFFFF102|0FFFFF102|0FFFFF1F2|0FFFFF102
526|0FFFFF102|0FFFFF102|0FFFFF1F2|0FFFFF102
commit d4e89be9cf1b857885d28e315c9d117e62f179f5
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Tue Sep 3 16:27:37 2024 -0700
Back-port regression changes needed for clean support for GEOS 3.13
diff --git a/regress/core/relate_bnr_expected b/regress/core/relate_bnr_expected
index 6f57aeaec..10a1b3b17 100644
--- a/regress/core/relate_bnr_expected
+++ b/regress/core/relate_bnr_expected
@@ -1,39 +1,39 @@
1|FF2FF1212|FF2FF1212|FF2FF1212|FF2FF1212
-2|2FFF1FFF2|2FFF1FFF2|2FFF0FFF2|2FFF1FFF2
+2|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2
3|212FF1FF2|212FF1FF2|212FF1FF2|212FF1FF2
4|2121F12F2|2121F12F2|2121F12F2|2121F12F2
5|2121F1212|2121F1212|2121F1212|2121F1212
6|212101212|212101212|212101212|212101212
-7|212101212|212101212|2F2F002F2|212101212
-8|212101212|212101212|2F2F002F2|212101212
-9|21210F212|21210F212|2F200F202|21210F212
-10|2121012F2|2121012F2|2F210F2F2|2121012F2
-11|FF2F11212|FF2F11212|1F2F01202|FF2F11212
-12|FF2F01212|FF2F01212|FF2F01202|FF2F01212
-13|21210F212|21210F212|2F200F202|21210F212
-14|1010F0212|1010F0212|101FFF202|1010F0212
-15|1010F0212|1010F0212|101FFF202|1010F0212
-16|10F0FF212|10F0FF212|10FFFF202|10F0FF212
-17|F01FF0212|F01FF0212|F01FFF202|F01FF0212
-18|101FF0212|101FF0212|101FFF202|101FF0212
+7|212101212|212101212|212101212|212101212
+8|212101212|212101212|212101212|212101212
+9|21210F212|21210F212|21210F212|21210F212
+10|2121012F2|2121012F2|2121012F2|2121012F2
+11|FF2F11212|FF2F11212|FF2F11212|FF2F11212
+12|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+13|21210F212|21210F212|21210F212|21210F212
+14|1010F0212|1010F0212|101FFF212|1010F0212
+15|1010F0212|1010F0212|101FFF212|1010F0212
+16|10F0FF212|10F0FF212|10FFFF212|10F0FF212
+17|F01FF0212|F01FF0212|F01FFF212|F01FF0212
+18|101FF0212|101FF0212|101FFF212|101FF0212
19|F01FF0212|F01FF0212|F01FFF212|F01FF0212
20|101FF0212|101FF0212|101FFF212|101FF0212
-21|1010FF212|1010FF212|101FFF202|1010FF212
-22|1010FF212|1010FF212|101FFF202|1010FF212
-23|10F0FF212|10F0FF212|10FFFF202|10F0FF212
-24|101FFF212|1010FF212|101FFF202|101FFF212
-25|1FFFFFFF2|10FF0FFF2|1FFFFFFF2|1FFFFFFF2
-26|1FF0FF212|F1F0FF212|01FFFF212|1FF0FF212
-27|11F00F212|F1F00F212|11FFFF212|11F00F212
-28|10FF0FFF2|10FF0FFF2|1FFFFFFF2|10FF0FFF2
-29|FF1FF0102|FF1FF0102|FF1FF0102|FF1FF0102
+21|1010FF212|1010FF212|101FFF212|1010FF212
+22|1010FF212|1010FF212|101FFF212|1010FF212
+23|10F0FF212|10F0FF212|10FFFF212|10F0FF212
+24|101FFF212|1010FF212|1010FF212|101FFF212
+25|1FFFFFFF2|10FF0FFF2|10FF0FFF2|1FFFFFFF2
+26|1FFF0F212|1FFF0F212|10FFFF212|1FFF0F212
+27|11FF0F212|11FF0F212|11FFFF212|11FF0F212
+28|10FF0FFF2|10FF0FFF2|10FFFFFF2|10FF0FFF2
+29|FF1FF0102|FF1FF0102|FF1FFF1F2|FF1FF0102
30|FF1FF0102|FF1FF0102|FF1FFF1F2|FF1FF0102
-32|FF1FF01F2|FF1FF0102|FF1FFF1F2|FF1FF01F2
+32|FF1FF01F2|FF1FF0102|FF1FFF102|FF1FF01F2
33|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2|1FFF0FFF2
34|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2|1FFF0FFF2
35|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2|1FFF0FFF2
36|10F00FFF2|10F00FFF2|1FFFFFFF2|10F00FFF2
-37|1FFFFFFF2|10FF0FFF2|1FFFFFFF2|1FFFFFFF2
+37|1FFFFFFF2|10FF0FFF2|10FF0FFF2|1FFFFFFF2
38|10FF0FFF2|10FF0FFF2|1FFFFFFF2|10FF0FFF2
39|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
40|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
@@ -42,7 +42,7 @@
43|F01FF0102|F01FF0102|0F1FFF1F2|F01FF0102
44|1F1F00102|1F1F00102|1F1FFF1F2|1F1F00102
45|1FFF0F1F2|1FFF0F1F2|1FFFFF1F2|1FFF0F1F2
-46|101FFF102|101FF0102|1F1FFF1F2|101FFF102
+46|101FFF102|101FF0102|1F1FF01F2|101FFF102
47|101FF0FF2|101FF0FF2|1F1FFFFF2|101FF0FF2
48|FF0FFF212|FF0FFF212|FF0FFF212|FF0FFF212
49|0F0FFF212|0F0FFF212|0F0FFF212|0F0FFF212
@@ -62,149 +62,149 @@
63|FF0FFF0F2|FF0FFF0F2|FF0FFF0F2|FF0FFF0F2
64|0F0FFF0F2|0F0FFF0F2|0F0FFF0F2|0F0FFF0F2
65|0FFFFFFF2|0FFFFFFF2|0FFFFFFF2|0FFFFFFF2
-66|212111212|212111212|212101212|212111212
-67|212111212|212111212|212101212|212111212
-68|2FFF1FFF2|2FFF1FFF2|2FFF0FFF2|2FFF1FFF2
-69|2FFF1FFF2|2FFF1FFF2|2FFF0FFF2|2FFF1FFF2
-70|2FFF1FFF2|2FFF1FFF2|2FFF0FFF2|2FFF1FFF2
-71|2FFF1FFF2|2FFF1FFF2|2FFF0FFF2|2FFF1FFF2
+66|212111212|212111212|212111212|212111212
+67|212111212|212111212|212111212|212111212
+68|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2
+69|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2
+70|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2
+71|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2
72|FF2FF1212|FF2FF1212|FF2FF1212|FF2FF1212
-73|FF2F01212|FF2F01212|FF2F0F2F2|FF2F01212
-74|FF2F01212|FF2F01212|FF2F0F202|FF2F01212
-75|FF2F01212|FF2F01212|FF2F0F202|FF2F01212
-76|FF2F01212|FF2F01212|FF2F002F2|FF2F01212
-77|FF2F01212|FF2F01212|FF2F00202|FF2F01212
-78|FF2F01212|FF2F01212|FF2F00202|FF2F01212
-79|FF2F01212|FF2F01212|FF2F00202|FF2F01212
-80|FF2F01212|FF2F01212|FF2F0F2F2|FF2F01212
-81|FF2F01212|FF2F01212|FF2F0F2F2|FF2F01212
-82|FF2F01212|FF2F01212|FF2F0F2F2|FF2F01212
-83|FF2F01212|FF2F01212|FF2F0F2F2|FF2F01212
-84|FF2F01212|FF2F01212|FF2F002F2|FF2F01212
-85|FF2F01212|FF2F01212|FF2F00202|FF2F01212
-86|FF2F01212|FF2F01212|FF2F00202|FF2F01212
-87|FF2F01212|FF2F01212|FF2F00202|FF2F01212
-88|FF2F01212|FF2F01212|FF2F00202|FF2F01212
-89|FF2F11212|FF2F11212|1F2F0F2F2|FF2F11212
-90|FF2F11212|FF2F11212|1F2F0F2F2|FF2F11212
-91|FF2F11212|FF2F11212|1F2F0F202|FF2F11212
-92|FF2F11212|FF2F11212|1F2F0F202|FF2F11212
-93|FF2F11212|FF2F11212|1F2F0F2F2|FF2F11212
-94|FF2F11212|FF2F11212|1F2F0F202|FF2F11212
-95|FF2F11212|FF2F11212|1F2F00202|FF2F11212
-96|FF2F11212|FF2F11212|1F2F0F202|FF2F11212
-97|FF2F11212|FF2F11212|1F2F0F2F2|FF2F11212
-98|FF2F11212|FF2F11212|1F2F0F202|FF2F11212
+73|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+74|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+75|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+76|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+77|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+78|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+79|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+80|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+81|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+82|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+83|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+84|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+85|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+86|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+87|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+88|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+89|FF2F11212|FF2F11212|FF2F11212|FF2F11212
+90|FF2F11212|FF2F11212|FF2F11212|FF2F11212
+91|FF2F11212|FF2F11212|FF2F11212|FF2F11212
+92|FF2F11212|FF2F11212|FF2F11212|FF2F11212
+93|FF2F11212|FF2F11212|FF2F11212|FF2F11212
+94|FF2F11212|FF2F11212|FF2F11212|FF2F11212
+95|FF2F11212|FF2F11212|FF2F11212|FF2F11212
+96|FF2F11212|FF2F11212|FF2F11212|FF2F11212
+97|FF2F11212|FF2F11212|FF2F11212|FF2F11212
+98|FF2F11212|FF2F11212|FF2F11212|FF2F11212
99|212FF1FF2|212FF1FF2|212FF1FF2|212FF1FF2
-100|212F01FF2|212F01FF2|2F2F0FFF2|212F01FF2
-101|212F01FF2|212F01FF2|202F0FFF2|212F01FF2
-102|212F01FF2|212F01FF2|2F2F00FF2|212F01FF2
-103|212F01FF2|212F01FF2|202F00FF2|212F01FF2
-104|212F01FF2|212F01FF2|2F2F00FF2|212F01FF2
-105|212F01FF2|212F01FF2|202F00FF2|212F01FF2
-106|212F01FF2|212F01FF2|2F2F0FFF2|212F01FF2
-107|212F01FF2|212F01FF2|2F2F0FFF2|212F01FF2
-108|212F01FF2|212F01FF2|2F2F00FF2|212F01FF2
-109|212F01FF2|212F01FF2|2F2F00FF2|212F01FF2
-110|212F01FF2|212F01FF2|202F00FF2|212F01FF2
-111|212F01FF2|212F01FF2|202F00FF2|212F01FF2
-112|212F11FF2|212F11FF2|2F2F0FFF2|212F11FF2
-113|212F11FF2|212F11FF2|2F2F0FFF2|212F11FF2
-114|212F11FF2|212F11FF2|2F2F0FFF2|212F11FF2
-115|212F11FF2|212F11FF2|202F0FFF2|212F11FF2
-116|212F11FF2|212F11FF2|2F2F0FFF2|212F11FF2
-117|212F11FF2|212F11FF2|202F0FFF2|212F11FF2
-118|212F11FF2|212F11FF2|2F2F0FFF2|212F11FF2
-119|212F11FF2|212F11FF2|2F2F00FF2|212F11FF2
-120|212F11FF2|212F11FF2|2F2F0FFF2|212F11FF2
-121|212111212|212111212|212101212|212111212
-122|212111212|212111212|2F2F0F2F2|212111212
+100|212F01FF2|212F01FF2|212F01FF2|212F01FF2
+101|212F01FF2|212F01FF2|212F01FF2|212F01FF2
+102|212F01FF2|212F01FF2|212F01FF2|212F01FF2
+103|212F01FF2|212F01FF2|212F01FF2|212F01FF2
+104|212F01FF2|212F01FF2|212F01FF2|212F01FF2
+105|212F01FF2|212F01FF2|212F01FF2|212F01FF2
+106|212F01FF2|212F01FF2|212F01FF2|212F01FF2
+107|212F01FF2|212F01FF2|212F01FF2|212F01FF2
+108|212F01FF2|212F01FF2|212F01FF2|212F01FF2
+109|212F01FF2|212F01FF2|212F01FF2|212F01FF2
+110|212F01FF2|212F01FF2|212F01FF2|212F01FF2
+111|212F01FF2|212F01FF2|212F01FF2|212F01FF2
+112|212F11FF2|212F11FF2|212F11FF2|212F11FF2
+113|212F11FF2|212F11FF2|212F11FF2|212F11FF2
+114|212F11FF2|212F11FF2|212F11FF2|212F11FF2
+115|212F11FF2|212F11FF2|212F11FF2|212F11FF2
+116|212F11FF2|212F11FF2|212F11FF2|212F11FF2
+117|212F11FF2|212F11FF2|212F11FF2|212F11FF2
+118|212F11FF2|212F11FF2|212F11FF2|212F11FF2
+119|212F11FF2|212F11FF2|212F11FF2|212F11FF2
+120|212F11FF2|212F11FF2|212F11FF2|212F11FF2
+121|212111212|212111212|212111212|212111212
+122|212111212|212111212|212111212|212111212
123|212101212|212101212|212101212|212101212
-124|212111212|212111212|212101212|212111212
-125|212101212|212101212|2F2F0F2F2|212101212
-126|212101212|212101212|2F2F0F2F2|212101212
-127|212101212|212101212|2F2F0F202|212101212
-128|212101212|212101212|2F2F0F202|212101212
-129|212101212|212101212|2F2F0F202|212101212
+124|212111212|212111212|212111212|212111212
+125|212101212|212101212|212101212|212101212
+126|212101212|212101212|212101212|212101212
+127|212101212|212101212|212101212|212101212
+128|212101212|212101212|212101212|212101212
+129|212101212|212101212|212101212|212101212
130|212101212|212101212|212101212|212101212
131|212101212|212101212|212101212|212101212
132|212101212|212101212|212101212|212101212
133|212101212|212101212|212101212|212101212
-134|212111212|212111212|212101212|212111212
-135|212111212|212111212|212101212|212111212
-136|212111212|212111212|212101212|212111212
-137|212111212|212111212|212101212|212111212
-138|212111212|212111212|212101212|212111212
-139|212111212|212111212|212101212|212111212
-140|212111212|212111212|212101212|212111212
-141|212111212|212111212|212101212|212111212
-142|212111212|212111212|212101212|212111212
+134|212111212|212111212|212111212|212111212
+135|212111212|212111212|212111212|212111212
+136|212111212|212111212|212111212|212111212
+137|212111212|212111212|212111212|212111212
+138|212111212|212111212|212111212|212111212
+139|212111212|212111212|212111212|212111212
+140|212111212|212111212|212111212|212111212
+141|212111212|212111212|212111212|212111212
+142|212111212|212111212|212111212|212111212
143|212101212|212101212|212101212|212101212
-144|212111212|212111212|212101212|212111212
+144|212111212|212111212|212111212|212111212
145|212101212|212101212|212101212|212101212
-146|FF2F01212|FF2F01212|FF2F0F2F2|FF2F01212
-147|FF2F01212|FF2F01212|FF2F0F212|FF2F01212
-148|FF2F01212|FF2F01212|FF2F00212|FF2F01212
-149|FF2F01212|FF2F01212|FF2F0F212|FF2F01212
-150|FF2F01212|FF2F01212|FF2F0F212|FF2F01212
-151|FF2F01212|FF2F01212|FF2F0F212|FF2F01212
-152|FF2F01212|FF2F01212|FF2F00212|FF2F01212
-153|FF2F1F212|FF2F1F212|1F2F0F212|FF2F1F212
-154|FF2F11212|FF2F11212|1F2F0F212|FF2F11212
-155|FF2F11212|FF2F11212|1F2F0F212|FF2F11212
-156|FF2F11212|FF2F11212|1F2F00212|FF2F11212
+146|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+147|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+148|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+149|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+150|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+151|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+152|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+153|FF2F1F212|FF2F1F212|FF2F1F212|FF2F1F212
+154|FF2F11212|FF2F11212|FF2F11212|FF2F11212
+155|FF2F11212|FF2F11212|FF2F11212|FF2F11212
+156|FF2F11212|FF2F11212|FF2F11212|FF2F11212
157|2FF1FF212|2FF1FF212|2FF1FF212|2FF1FF212
158|2FF1FF212|2FF1FF212|2FF1FF212|2FF1FF212
-159|2FF11F212|2FF11F212|2FF00F212|2FF11F212
-160|2FF11F212|2FF11F212|2FFF0F212|2FF11F212
-161|2FF11F212|2FF11F212|2FFF0F212|2FF11F212
-162|2FFF1FFF2|2FFF1FFF2|2FFF0FFF2|2FFF1FFF2
-163|2FFF1FFF2|2FFF1FFF2|2FFF0FFF2|2FFF1FFF2
-164|FF2F01212|FF2F01212|FF2F0F202|FF2F01212
-165|FF2F01212|FF2F01212|FF2F00202|FF2F01212
-166|FF2F01212|FF2F01212|FF2F00202|FF2F01212
-167|FF2F01212|FF2F01212|FF2F0F212|FF2F01212
-168|FF2F11212|FF2F11212|1F2F0F202|FF2F11212
-169|FF2F11212|FF2F11212|1F2F00202|FF2F11212
-170|21210F212|21210F212|2F200F202|21210F212
-171|FF2F01212|FF2F01212|FF2F0F2F2|FF2F01212
-172|FF2F01212|FF2F01212|FF2F0F2F2|FF2F01212
-173|FF2F11212|FF2F11212|1F2F0F2F2|FF2F11212
-174|FF2F11212|FF2F11212|1F2F0F2F2|FF2F11212
-175|FF2F11212|FF2F11212|1F2F0F2F2|FF2F11212
-176|212111212|212111212|212101212|212111212
-177|21210F212|21210F212|2F200F202|21210F212
-178|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
-179|FF1F0F212|FF1F0F212|F01FFF202|FF1F0F212
-180|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
-181|F1FF0F212|F1FF0F212|10FFFF202|F1FF0F212
-182|F11F00212|F11F00212|101FFF202|F11F00212
-183|F11F0F212|F11F0F212|101FFF202|F11F0F212
-184|F11FF0212|F11FF0212|101FFF202|F11FF0212
-185|1010F0212|1010F0212|101FFF202|1010F0212
-186|101FF0212|101FF0212|101FFF202|101FF0212
-187|1010F0212|1010F0212|101FFF2F2|1010F0212
-188|101FF0212|101FF0212|101FFF2F2|101FF0212
-189|1010F0212|1010F0212|101FFF202|1010F0212
-190|101FF0212|101FF0212|101FFF202|101FF0212
-191|1010F0212|1010F0212|101FFF2F2|1010F0212
+159|2FF11F212|2FF11F212|2FF11F212|2FF11F212
+160|2FF11F212|2FF11F212|2FF11F212|2FF11F212
+161|2FF11F212|2FF11F212|2FF11F212|2FF11F212
+162|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2
+163|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2|2FFF1FFF2
+164|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+165|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+166|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+167|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+168|FF2F11212|FF2F11212|FF2F11212|FF2F11212
+169|FF2F11212|FF2F11212|FF2F11212|FF2F11212
+170|21210F212|21210F212|21210F212|21210F212
+171|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+172|FF2F01212|FF2F01212|FF2F01212|FF2F01212
+173|FF2F11212|FF2F11212|FF2F11212|FF2F11212
+174|FF2F11212|FF2F11212|FF2F11212|FF2F11212
+175|FF2F11212|FF2F11212|FF2F11212|FF2F11212
+176|212111212|212111212|212111212|212111212
+177|21210F212|21210F212|21210F212|21210F212
+178|FF1F00212|FF1F00212|F01FFF212|FF1F00212
+179|FF1F0F212|FF1F0F212|F01FFF212|FF1F0F212
+180|FF1F00212|FF1F00212|F01FFF212|FF1F00212
+181|F1FF0F212|F1FF0F212|F1FFFF212|F1FF0F212
+182|F11F00212|F11F00212|F11FFF212|F11F00212
+183|F11F0F212|F11F0F212|F11FFF212|F11F0F212
+184|F11FF0212|F11FF0212|F11FFF212|F11FF0212
+185|1010F0212|1010F0212|101FFF212|1010F0212
+186|101FF0212|101FF0212|101FFF212|101FF0212
+187|1010F0212|1010F0212|101FFF212|1010F0212
+188|101FF0212|101FF0212|101FFF212|101FF0212
+189|1010F0212|1010F0212|101FFF212|1010F0212
+190|101FF0212|101FF0212|101FFF212|101FF0212
+191|1010F0212|1010F0212|101FFF212|1010F0212
192|1FF0FF212|1FF0FF212|1FFFFF212|1FF0FF212
-193|1FFF0F212|1FFF0F212|10FFFF202|1FFF0F212
-194|1FF00F212|1FF00F212|10FFFF202|1FF00F212
-195|11F00F212|11F00F212|10FFFF202|11F00F212
-196|11F0FF212|11F0FF212|10FFFF202|11F0FF212
+193|1FFF0F212|1FFF0F212|10FFFF212|1FFF0F212
+194|1FF00F212|1FF00F212|10FFFF212|1FF00F212
+195|11F00F212|11F00F212|11FFFF212|11F00F212
+196|11F0FF212|11F0FF212|11FFFF212|11F0FF212
197|FF1FF0212|FF1FF0212|FF1FFF212|FF1FF0212
198|FF1FF0212|FF1FF0212|FF1FFF212|FF1FF0212
199|FF1F00212|FF1F00212|F01FFF212|FF1F00212
200|FF1F0F212|FF1F0F212|F01FFF212|FF1F0F212
-201|F01FF0212|F01FF0212|F01FFF2F2|F01FF0212
-202|F01FF0212|F01FF0212|F01FFF202|F01FF0212
-203|F01FF0212|F01FF0212|101FFF202|F01FF0212
-204|F01FF0212|F01FF0212|101FFF202|F01FF0212
-205|F01FF0212|F01FF0212|F01FFF2F2|F01FF0212
-206|F01FF0212|F01FF0212|F01FFF202|F01FF0212
-207|F01FF0212|F01FF0212|0F1FFF202|F01FF0212
-208|F01FF0212|F01FF0212|0F1FFF202|F01FF0212
+201|F01FF0212|F01FF0212|F01FFF212|F01FF0212
+202|F01FF0212|F01FF0212|F01FFF212|F01FF0212
+203|F01FF0212|F01FF0212|F01FFF212|F01FF0212
+204|F01FF0212|F01FF0212|F01FFF212|F01FF0212
+205|F01FF0212|F01FF0212|F01FFF212|F01FF0212
+206|F01FF0212|F01FF0212|F01FFF212|F01FF0212
+207|F01FF0212|F01FF0212|F01FFF212|F01FF0212
+208|F01FF0212|F01FF0212|F01FFF212|F01FF0212
209|FF1F00212|FF1F00212|F01FFF212|FF1F00212
210|F01FF0212|F01FF0212|F01FFF212|F01FF0212
211|F01FF0212|F01FF0212|F01FFF212|F01FF0212
@@ -213,48 +213,48 @@
214|F01FF0212|F01FF0212|F01FFF212|F01FF0212
215|F01FF0212|F01FF0212|F01FFF212|F01FF0212
216|F01FF0212|F01FF0212|F01FFF212|F01FF0212
-217|1010FF212|1010FF212|101FFF202|1010FF212
-218|1010FF212|1010FF212|101FFF202|1010FF212
-219|10F0FF212|10F0FF212|10FFFF202|10F0FF212
-220|F01FFF212|FF1F0F212|F01FFF202|F01FFF212
-221|F01FFF212|FF1F0F212|F01FFF202|F01FFF212
-222|F01FFF212|FF1F0F212|F01FFF212|F01FFF212
-223|F1FFFF2F2|F1FF0F2F2|10FFFF2F2|F1FFFF2F2
-224|F1FFFF212|F1FF0F212|10FFFF212|F1FFFF212
-225|F11FFF212|F11F0F212|101FFF212|F11FFF212
-226|F11FFF212|F11F0F212|101FFF212|F11FFF212
-227|101FFF212|1010FF212|101FFF202|101FFF212
-228|101FFF212|101FF0212|101FFF2F2|101FFF212
-229|1FFFFF212|1FF0FF212|1FFFFF212|1FFFFF212
-230|1FFFFF212|1FF0FF212|1FFFFF212|1FFFFF212
-231|10FFFF212|1FFF0F212|10FFFF212|10FFFF212
-232|10FFFF212|1FFF0F212|10FFFF212|10FFFF212
-233|11FFFF212|11FF0F212|10FFFF212|11FFFF212
-234|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
-235|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
-236|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
-237|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
-238|F11F00212|F11F00212|101FFF2F2|F11F00212
-239|111F00212|111F00212|101FFF2F2|111F00212
+217|1010FF212|1010FF212|101FFF212|1010FF212
+218|1010FF212|1010FF212|101FFF212|1010FF212
+219|10F0FF212|10F0FF212|10FFFF212|10F0FF212
+220|F01FFF212|FF1F0F212|FF1F0F212|F01FFF212
+221|F01FFF212|FF1F0F212|FF1F0F212|F01FFF212
+222|F01FFF212|FF1F0F212|FF1F0F212|F01FFF212
+223|F1FFFF2F2|F1FF0F2F2|F1FF0F2F2|F1FFFF2F2
+224|F1FFFF212|F1FF0F212|F1FF0F212|F1FFFF212
+225|F11FFF212|F11F0F212|F11F0F212|F11FFF212
+226|F11FFF212|F11F0F212|F11F0F212|F11FFF212
+227|101FFF212|1010FF212|1010FF212|101FFF212
+228|101FFF212|101FF0212|101FF0212|101FFF212
+229|1FFFFF212|1FF0FF212|1FF0FF212|1FFFFF212
+230|1FFFFF212|1FF0FF212|1FF0FF212|1FFFFF212
+231|10FFFF212|1FFF0F212|1FFF0F212|10FFFF212
+232|10FFFF212|1FFF0F212|1FFF0F212|10FFFF212
+233|11FFFF212|11FF0F212|11FF0F212|11FFFF212
+234|FF1F00212|FF1F00212|F01FFF212|FF1F00212
+235|FF1F00212|FF1F00212|F01FFF212|FF1F00212
+236|FF1F00212|FF1F00212|F01FFF212|FF1F00212
+237|FF1F00212|FF1F00212|F01FFF212|FF1F00212
+238|F11F00212|F11F00212|F11FFF212|F11F00212
+239|111F00212|111F00212|111FFF212|111F00212
240|1FF0FF212|1FF0FF212|1FFFFF212|1FF0FF212
-241|11F00F212|11F00F212|10FFFF2F2|11F00F212
+241|11F00F212|11F00F212|11FFFF212|11F00F212
242|F01FF0212|F01FF0212|F01FFF212|F01FF0212
-243|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
-244|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
-245|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
-246|1010F0212|1010F0212|101FFF2F2|1010F0212
-247|1010F0212|1010F0212|101FFF2F2|1010F0212
-248|1010F0212|1010F0212|101FFF2F2|1010F0212
-249|1010F0212|1010F0212|101FFF2F2|1010F0212
+243|FF1F00212|FF1F00212|F01FFF212|FF1F00212
+244|FF1F00212|FF1F00212|F01FFF212|FF1F00212
+245|FF1F00212|FF1F00212|F01FFF212|FF1F00212
+246|1010F0212|1010F0212|101FFF212|1010F0212
+247|1010F0212|1010F0212|101FFF212|1010F0212
+248|1010F0212|1010F0212|101FFF212|1010F0212
+249|1010F0212|1010F0212|101FFF212|1010F0212
250|1FF0FF212|1FF0FF212|1FFFFF212|1FF0FF212
-251|11F00F212|11F00F212|10FFFF2F2|11F00F212
-252|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
-253|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
-254|FF1F00212|FF1F00212|F01FFF2F2|FF1F00212
-255|1FFFFFFF2|10FF0FFF2|1FFFFFFF2|1FFFFFFF2
-256|1FF0FF212|F1F0FF212|01FFFF212|1FF0FF212
-257|11F00F212|F1F00F212|11FFFF212|11F00F212
-258|10FF0FFF2|10FF0FFF2|1FFFFFFF2|10FF0FFF2
+251|11F00F212|11F00F212|11FFFF212|11F00F212
+252|FF1F00212|FF1F00212|F01FFF212|FF1F00212
+253|FF1F00212|FF1F00212|F01FFF212|FF1F00212
+254|FF1F00212|FF1F00212|F01FFF212|FF1F00212
+255|1FFFFFFF2|10FF0FFF2|10FF0FFF2|1FFFFFFF2
+256|1FFF0F212|1FFF0F212|10FFFF212|1FFF0F212
+257|11FF0F212|11FF0F212|11FFFF212|11FF0F212
+258|10FF0FFF2|10FF0FFF2|10FFFFFF2|10FF0FFF2
259|FF1F00102|FF1F00102|0F1FFF1F2|FF1F00102
260|FF1F00102|FF1F00102|0F1FFF1F2|FF1F00102
261|F01FF0102|F01FF0102|0F1FFF1F2|F01FF0102
@@ -306,7 +306,7 @@
307|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2|1FFF0FFF2
308|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2|1FFF0FFF2
309|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2|1FFF0FFF2
-310|FF1FF0102|FF1FF0102|FF1FF0102|FF1FF0102
+310|FF1FF0102|FF1FF0102|FF1FFF1F2|FF1FF0102
311|FF1FF0102|FF1FF0102|FF1FFF1F2|FF1FF0102
312|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2|1FFF0FFF2
313|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2|1FFF0FFF2
@@ -325,29 +325,29 @@
326|101FF0102|101FF0102|1F1FFF1F2|101FF0102
327|1F1FF0102|1F1FF0102|1F1FFF1F2|1F1FF0102
328|1F1FF0102|1F1FF0102|1F1FFF1F2|1F1FF0102
-329|FF10F01F2|FF1F001F2|0F1FFF1F2|FF10F01F2
-330|0F1FF01F2|F01FF01F2|0F1FFF1F2|0F1FF01F2
-331|0F1FF01F2|F01FF01F2|0F1FFF1F2|0F1FF01F2
-332|0F1FF01F2|F01FF01F2|0F1FFF1F2|0F1FF01F2
-333|1FF0FF1F2|1FF00F1F2|1FFFFF1F2|1FF0FF1F2
-334|1FF0FF1F2|1FF00F1F2|1FFFFF1F2|1FF0FF1F2
-335|1FF0FF1F2|10F0FF1F2|1FFFFF1F2|1FF0FF1F2
-336|1F10F01F2|1F1F001F2|1F1FFF1F2|1F10F01F2
-337|1F10F01F2|1F1F001F2|1F1FFF1F2|1F10F01F2
-338|1F1FF01F2|101FF01F2|1F1FFF1F2|1F1FF01F2
+329|FF10F01F2|FF1F001F2|F01FFF1F2|FF10F01F2
+330|0F1FF01F2|F01FF01F2|F01FFF1F2|0F1FF01F2
+331|0F1FF01F2|F01FF01F2|F01FFF1F2|0F1FF01F2
+332|0F1FF01F2|F01FF01F2|F01FFF1F2|0F1FF01F2
+333|1FF0FF1F2|1FF00F1F2|10FFFF1F2|1FF0FF1F2
+334|1FF0FF1F2|1FF00F1F2|10FFFF1F2|1FF0FF1F2
+335|1FF0FF1F2|10F0FF1F2|10FFFF1F2|1FF0FF1F2
+336|1F10F01F2|1F1F001F2|101FFF1F2|1F10F01F2
+337|1F10F01F2|1F1F001F2|101FFF1F2|1F10F01F2
+338|1F1FF01F2|101FF01F2|101FFF1F2|1F1FF01F2
339|F01FF0102|F01FF0102|0F1FFF1F2|F01FF0102
340|F01FF0102|F01FF0102|0F1FFF1F2|F01FF0102
341|F01FF0102|F01FF0102|0F1FFF1F2|F01FF0102
-342|0F1FF01F2|F01FF01F2|0F1FFF1F2|0F1FF01F2
-343|0F1FF01F2|F01FF01F2|0F1FFF1F2|0F1FF01F2
-344|0F1FF01F2|F01FF01F2|0F1FFF1F2|0F1FF01F2
+342|0F1FF01F2|F01FF01F2|F01FFF1F2|0F1FF01F2
+343|0F1FF01F2|F01FF01F2|F01FFF1F2|0F1FF01F2
+344|0F1FF01F2|F01FF01F2|F01FFF1F2|0F1FF01F2
345|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
346|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
-347|0F1FF01F2|0F1FF0102|0F1FFF1F2|0F1FF01F2
+347|0F1FF01F2|0F1FF0102|0F1FFF102|0F1FF01F2
348|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
349|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
350|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
-351|0F1FF01F2|0F1FF0102|0F1FFF1F2|0F1FF01F2
+351|0F1FF01F2|0F1FF0102|0F1FFF102|0F1FF01F2
352|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
353|FF1F00102|FF1F00102|0F1FFF1F2|FF1F00102
354|F01FF0102|F01FF0102|0F1FFF1F2|F01FF0102
@@ -361,41 +361,41 @@
362|101FF0102|101FF0102|1F1FFF1F2|101FF0102
363|101FF0102|101FF0102|1F1FFF1F2|101FF0102
364|FF10F0102|FF10F0102|0F1FFF1F2|FF10F0102
-365|1FFFFFFF2|1FFF0FFF2|1FFFFFFF2|1FFFFFFF2
-366|1FFFFFFF2|1FFF0FFF2|1FFFFFFF2|1FFFFFFF2
-367|1FFFFFFF2|10F0FFFF2|1FFFFFFF2|1FFFFFFF2
-368|1FFFFFFF2|10F0FFFF2|1FFFFFFF2|1FFFFFFF2
-369|0F1FFF1F2|FF1F0F1F2|0F1FFF1F2|0F1FFF1F2
-370|0F1FFF1F2|0F1F0F1F2|0F1FFF1F2|0F1FFF1F2
-371|0F1FFF1F2|FF10FF102|0F1FFF1F2|0F1FFF1F2
-372|0F1FFF1F2|FF10FF102|0F1FFF1F2|0F1FFF1F2
-373|0F1FFF1F2|0F1FF0102|0F1FFF1F2|0F1FFF1F2
-374|0F1FFF1F2|0F10FF102|0F1FFF1F2|0F1FFF1F2
-375|1F1FFF1F2|1F1F0F1F2|1F1FFF1F2|1F1FFF1F2
-376|1F1FFF1F2|1F10FF102|1F1FFF1F2|1F1FFF1F2
-377|1F1FFF1F2|1F1F0F1F2|1F1FFF1F2|1F1FFF1F2
-378|F01FFF102|FF1F0F102|0F1FFF1F2|F01FFF102
-379|F01FFF102|FF1F0F102|0F1FFF1F2|F01FFF102
-380|F01FFF102|FF1F0F102|0F1FFF1F2|F01FFF102
-381|101FFF102|1010FF102|1F1FFF1F2|101FFF102
-382|101FFF1F2|1010FF1F2|1F1FFF1F2|101FFF1F2
-383|0F1FFF1F2|FF1F0F1F2|0F1FFF1F2|0F1FFF1F2
-384|0F1FFF1F2|0F1FF0102|0F1FFF1F2|0F1FFF1F2
-385|0F1FFF1F2|0F1FF0102|0F1FFF1F2|0F1FFF1F2
-386|0F1FFF1F2|0F1FF0102|0F1FFF1F2|0F1FFF1F2
-387|0F1FFF1F2|0F1FF0102|0F1FFF1F2|0F1FFF1F2
-388|0F1FFF1F2|0F1FF0102|0F1FFF1F2|0F1FFF1F2
-389|1FFFFFFF2|1FFF0FFF2|1FFFFFFF2|1FFFFFFF2
+365|1FFFFFFF2|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2
+366|1FFFFFFF2|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2
+367|1FFFFFFF2|10F0FFFF2|10F0FFFF2|1FFFFFFF2
+368|1FFFFFFF2|10F0FFFF2|10F0FFFF2|1FFFFFFF2
+369|0F1FFF1F2|FF1F0F1F2|FF1F0F1F2|0F1FFF1F2
+370|0F1FFF1F2|0F1F0F1F2|0F1F0F1F2|0F1FFF1F2
+371|0F1FFF1F2|FF10FF102|FF10FF102|0F1FFF1F2
+372|0F1FFF1F2|FF10FF102|FF10FF102|0F1FFF1F2
+373|0F1FFF1F2|0F1FF0102|0F1FF0102|0F1FFF1F2
+374|0F1FFF1F2|0F10FF102|0F10FF102|0F1FFF1F2
+375|1F1FFF1F2|1F1F0F1F2|1F1F0F1F2|1F1FFF1F2
+376|1F1FFF1F2|1F10FF102|1F10FF102|1F1FFF1F2
+377|1F1FFF1F2|1F1F0F1F2|1F1F0F1F2|1F1FFF1F2
+378|F01FFF102|FF1F0F102|FF10FF1F2|F01FFF102
+379|F01FFF102|FF1F0F102|FF10FF1F2|F01FFF102
+380|F01FFF102|FF1F0F102|FF10FF1F2|F01FFF102
+381|101FFF102|1010FF102|1F10FF1F2|101FFF102
+382|101FFF1F2|1010FF1F2|1F10FF1F2|101FFF1F2
+383|0F1FFF1F2|FF1F0F1F2|FF1F0F1F2|0F1FFF1F2
+384|0F1FFF1F2|0F1FF0102|0F1FF0102|0F1FFF1F2
+385|0F1FFF1F2|0F1FF0102|0F1FF0102|0F1FFF1F2
+386|0F1FFF1F2|0F1FF0102|0F1FF0102|0F1FFF1F2
+387|0F1FFF1F2|0F1FF0102|0F1FF0102|0F1FFF1F2
+388|0F1FFF1F2|0F1FF0102|0F1FF0102|0F1FFF1F2
+389|1FFFFFFF2|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2
390|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2|1FFF0FFF2
391|1FFF0FFF2|1FFF0FFF2|1FFFFFFF2|1FFF0FFF2
392|FF1F00102|FF1F00102|0F1FFF1F2|FF1F00102
393|FF1F00102|FF1F00102|0F1FFF1F2|FF1F00102
394|FF1F00102|FF1F00102|0F1FFF1F2|FF1F00102
-395|FF10F0102|FF1F00102|0F1FFF1F2|FF10F0102
-396|FF10F0102|FF1F00102|0F1FFF1F2|FF10F0102
-397|FF10F0102|FF1F00102|0F1FFF1F2|FF10F0102
-398|FF10F0102|FF1F00102|0F1FFF1F2|FF10F0102
-399|FF10F0102|FF1F00102|0F1FFF1F2|FF10F0102
+395|FF10F0102|FF1F00102|F01FFF1F2|FF10F0102
+396|FF10F0102|FF1F00102|F01FFF1F2|FF10F0102
+397|FF10F0102|FF1F00102|F01FFF1F2|FF10F0102
+398|FF10F0102|FF1F00102|F01FFF1F2|FF10F0102
+399|FF10F0102|FF1F00102|F01FFF1F2|FF10F0102
400|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
401|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
402|0F1FF0102|0F1FF0102|0F1FFF1F2|0F1FF0102
@@ -446,11 +446,11 @@
447|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
448|0FFFFF102|0FFFFF102|0FFFFF1F2|0FFFFF102
449|0FFFFF102|0FFFFF102|0FFFFF1F2|0FFFFF102
-450|FF0FFF1F2|FF0FFF102|FF0FFF1F2|FF0FFF1F2
-451|FF0FFF1F2|FF0FFF102|FF0FFF1F2|FF0FFF1F2
-452|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
-453|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
-454|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
+450|FF0FFF1F2|FF0FFF102|FF0FFF102|FF0FFF1F2
+451|FF0FFF1F2|FF0FFF102|FF0FFF102|FF0FFF1F2
+452|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
+453|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
+454|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
455|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
456|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
457|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
@@ -485,13 +485,13 @@
486|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
487|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
488|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
-489|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
-490|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
-491|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
-492|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
-493|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
-494|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
-495|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
+489|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
+490|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
+491|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
+492|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
+493|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
+494|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
+495|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
496|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
497|0FFFFF102|0FFFFF102|0FFFFF1F2|0FFFFF102
498|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
@@ -500,26 +500,26 @@
501|0FFFFF102|0FFFFF102|0FFFFF1F2|0FFFFF102
502|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
503|0FFFFF102|0FFFFF102|0FFFFF1F2|0FFFFF102
-504|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
-505|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
-506|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
-507|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
-508|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
-509|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
-510|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
-511|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
-512|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
-513|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
-514|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
-515|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
-516|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
-517|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
+504|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
+505|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
+506|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
+507|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
+508|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
+509|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
+510|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
+511|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
+512|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
+513|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
+514|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
+515|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
+516|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
+517|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
518|F0FFFF102|F0FFFF102|0FFFFF1F2|F0FFFF102
519|0FFFFF102|0FFFFF102|0FFFFF1F2|0FFFFF102
520|0FFFFF102|0FFFFF102|0FFFFF1F2|0FFFFF102
-521|0FFFFF1F2|F0FFFF1F2|0FFFFF1F2|0FFFFF1F2
-522|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
-523|0FFFFF1F2|0FFFFF102|0FFFFF1F2|0FFFFF1F2
+521|0FFFFF1F2|F0FFFF1F2|F0FFFF1F2|0FFFFF1F2
+522|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
+523|0FFFFF1F2|0FFFFF102|0FFFFF102|0FFFFF1F2
524|0FFFFF102|0FFFFF102|0FFFFF1F2|0FFFFF102
525|0FFFFF102|0FFFFF102|0FFFFF1F2|0FFFFF102
526|0FFFFF102|0FFFFF102|0FFFFF1F2|0FFFFF102
-----------------------------------------------------------------------
Summary of changes:
NEWS | 1 +
postgis/postgis.sql.in | 15 +++++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list