diff --git a/grid/data/7/769/data.osm b/grid/data/7/769/data.osm new file mode 100644 index 0000000..3a7f495 --- /dev/null +++ b/grid/data/7/769/data.osm @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/grid/data/7/769/nodes.wkt b/grid/data/7/769/nodes.wkt new file mode 100644 index 0000000..0bf93c8 --- /dev/null +++ b/grid/data/7/769/nodes.wkt @@ -0,0 +1,8 @@ +769000 POINT(7.92 1.62) +769001 POINT(7.95 1.62) +769002 POINT(7.98 1.62) +769003 POINT(7.98 1.68) +769004 POINT(7.95 1.68) +769005 POINT(7.92 1.68) +769006 POINT(7.93 1.65) +769007 POINT(7.97 1.65) diff --git a/grid/data/7/769/result b/grid/data/7/769/result new file mode 100644 index 0000000..1e2466d --- /dev/null +++ b/grid/data/7/769/result @@ -0,0 +1 @@ +valid diff --git a/grid/data/7/769/test.json b/grid/data/7/769/test.json new file mode 100644 index 0000000..cf8d49a --- /dev/null +++ b/grid/data/7/769/test.json @@ -0,0 +1,18 @@ +{ + "test_id": 769, + "description": "Multipolygon with one outer and one inner ring, inner touching outer in two nodes, splitting the outer into two components.", + "areas": { + "default": [ + { + "from_id": 769900, + "from_type": "relation", + "wkt": "MULTIPOLYGON(((7.92 1.62,7.95 1.62,7.93 1.65,7.95 1.68,7.92 1.68,7.92 1.62)),((7.95 1.62,7.98 1.62,7.98 1.68,7.95 1.68,7.97 1.65,7.95 1.62)))", + "tags": { + "landuse": "forest", + "test:section": "mp-geom", + "test:id": "769" + } + } + ] + } +} diff --git a/grid/data/7/769/ways.wkt b/grid/data/7/769/ways.wkt new file mode 100644 index 0000000..5f2adde --- /dev/null +++ b/grid/data/7/769/ways.wkt @@ -0,0 +1,2 @@ +769800 LINESTRING(7.92 1.62,7.95 1.62,7.98 1.62,7.98 1.68,7.95 1.68,7.92 1.68,7.92 1.62) +769801 LINESTRING(7.95 1.68,7.93 1.65,7.95 1.62,7.97 1.65,7.95 1.68) diff --git a/grid/data/all.osm b/grid/data/all.osm index 791b594..8b23c50 100644 --- a/grid/data/all.osm +++ b/grid/data/all.osm @@ -613,6 +613,14 @@ + + + + + + + + @@ -2367,6 +2375,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -3755,6 +3783,14 @@ + + + + + + + + diff --git a/grid/data/tests.json b/grid/data/tests.json index 26381bb..a7f8623 100644 --- a/grid/data/tests.json +++ b/grid/data/tests.json @@ -1204,6 +1204,24 @@ ] } }, + { + "test_id": 769, + "description": "Multipolygon with one outer and one inner ring, inner touching outer in two nodes, splitting the outer into two components.", + "areas": { + "default": [ + { + "from_id": 769900, + "from_type": "relation", + "wkt": "MULTIPOLYGON(((7.92 1.62,7.95 1.62,7.93 1.65,7.95 1.68,7.92 1.68,7.92 1.62)),((7.95 1.62,7.98 1.62,7.98 1.68,7.95 1.68,7.97 1.65,7.95 1.62)))", + "tags": { + "landuse": "forest", + "test:section": "mp-geom", + "test:id": "769" + } + } + ] + } + }, { "test_id": 770, "description": "Multipolygon with two outer rings touching in single node.", diff --git a/grid/grid.db b/grid/grid.db index 54a93f0..f73bf33 100644 Binary files a/grid/grid.db and b/grid/grid.db differ