Skip to content

Add grid test 769: inner ring touching outer at two points, splitting it into two components #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brawer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add grid test 769: inner ring touching outer at two points, splitting it into two components #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions grid/data/7/769/data.osm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version='1.0' encoding='UTF-8'?>
<osm version="0.6" generator="testdata" upload="false">
<node id="769000" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.92" lat="1.62"/>
<node id="769001" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.95" lat="1.62"/>
<node id="769002" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.98" lat="1.62"/>
<node id="769003" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.98" lat="1.68"/>
<node id="769004" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.95" lat="1.68"/>
<node id="769005" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.92" lat="1.68"/>
<node id="769006" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.93" lat="1.65"/>
<node id="769007" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.97" lat="1.65"/>
<way id="769800" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<nd ref="769000"/>
<nd ref="769001"/>
<nd ref="769002"/>
<nd ref="769003"/>
<nd ref="769004"/>
<nd ref="769005"/>
<nd ref="769000"/>
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="769"/>
</way>
<way id="769801" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<nd ref="769004"/>
<nd ref="769006"/>
<nd ref="769001"/>
<nd ref="769007"/>
<nd ref="769004"/>
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="769"/>
</way>
<relation id="769900" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<member type="way" ref="769801" role="inner"/>
<member type="way" ref="769800" role="outer"/>
<tag k="type" v="multipolygon"/>
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="769"/>
<tag k="landuse" v="forest"/>
</relation>
</osm>
8 changes: 8 additions & 0 deletions grid/data/7/769/nodes.wkt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
1 change: 1 addition & 0 deletions grid/data/7/769/result
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
valid
18 changes: 18 additions & 0 deletions grid/data/7/769/test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
]
}
}
2 changes: 2 additions & 0 deletions grid/data/7/769/ways.wkt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
36 changes: 36 additions & 0 deletions grid/data/all.osm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,14 @@
<node id="768004" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.87" lat="1.64"/>
<node id="768005" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.87" lat="1.61"/>
<node id="768006" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.84" lat="1.62"/>
<node id="769000" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.92" lat="1.62"/>
<node id="769001" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.95" lat="1.62"/>
<node id="769002" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.98" lat="1.62"/>
<node id="769003" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.98" lat="1.68"/>
<node id="769004" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.95" lat="1.68"/>
<node id="769005" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.92" lat="1.68"/>
<node id="769006" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.93" lat="1.65"/>
<node id="769007" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.97" lat="1.65"/>
<node id="770000" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.06" lat="1.72"/>
<node id="770001" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.02" lat="1.72"/>
<node id="770002" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.02" lat="1.74"/>
Expand Down Expand Up @@ -2367,6 +2375,26 @@
<tag k="test:id" v="768"/>
<tag k="area" v="yes"/>
</way>
<way id="769800" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<nd ref="769000"/>
<nd ref="769001"/>
<nd ref="769002"/>
<nd ref="769003"/>
<nd ref="769004"/>
<nd ref="769005"/>
<nd ref="769000"/>
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="769"/>
</way>
<way id="769801" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<nd ref="769004"/>
<nd ref="769006"/>
<nd ref="769001"/>
<nd ref="769007"/>
<nd ref="769004"/>
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="769"/>
</way>
<way id="770800" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<nd ref="770000"/>
<nd ref="770001"/>
Expand Down Expand Up @@ -3755,6 +3783,14 @@
<tag k="test:id" v="768"/>
<tag k="landuse" v="forest"/>
</relation>
<relation id="769900" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<member type="way" ref="769801" role="inner"/>
<member type="way" ref="769800" role="outer"/>
<tag k="type" v="multipolygon"/>
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="769"/>
<tag k="landuse" v="forest"/>
</relation>
<relation id="770900" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<member type="way" ref="770800" role="outer"/>
<member type="way" ref="770801" role="outer"/>
Expand Down
18 changes: 18 additions & 0 deletions grid/data/tests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
Binary file modified grid/grid.db
View file
Open in desktop
Binary file not shown.