Skip to content

Commit

Permalink
Add testcases for nodes with same locations
Browse files Browse the repository at this point in the history
  • Loading branch information
joto committed Mar 24, 2014
1 parent 7d054d0 commit ced85e3
Show file tree
Hide file tree
Showing 20 changed files with 195 additions and 0 deletions.
17 changes: 17 additions & 0 deletions grid/data/7/780/data.osm
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version='1.0' encoding='UTF-8'?>
<osm version="0.6" generator="testdata" upload="false">
<node id="780000" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.05" lat="1.85"/>
<node id="780001" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.05" lat="1.81"/>
<node id="780002" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.01" lat="1.81"/>
<node id="780003" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.01" lat="1.85"/>
<node id="780004" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.05" lat="1.85"/>
<way id="780800" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<nd ref="780000"/>
<nd ref="780001"/>
<nd ref="780002"/>
<nd ref="780003"/>
<nd ref="780004"/>
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="780"/>
</way>
</osm>
1 change: 1 addition & 0 deletions grid/data/7/780/description.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Way with different nodes as start and endpoint, but same location of those nodes.
2 changes: 2 additions & 0 deletions grid/data/7/780/multipolygons.wkt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
780800 w default INVALID
780800 w location MULTIPOLYGON(((7.05 1.85,7.05 1.81,7.01 1.81,7.01 1.85,7.05 1.85)))
5 changes: 5 additions & 0 deletions grid/data/7/780/nodes.wkt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
780000 POINT(7.05 1.85)
780001 POINT(7.05 1.81)
780002 POINT(7.01 1.81)
780003 POINT(7.01 1.85)
780004 POINT(7.05 1.85)
1 change: 1 addition & 0 deletions grid/data/7/780/result
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
invalid
1 change: 1 addition & 0 deletions grid/data/7/780/ways.wkt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
780800 LINESTRING(7.05 1.85,7.05 1.81,7.01 1.81,7.01 1.85,7.05 1.85)
23 changes: 23 additions & 0 deletions grid/data/7/781/data.osm
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version='1.0' encoding='UTF-8'?>
<osm version="0.6" generator="testdata" upload="false">
<node id="781000" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.15" lat="1.85"/>
<node id="781001" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.15" lat="1.81"/>
<node id="781002" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.11" lat="1.81"/>
<node id="781003" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.11" lat="1.85"/>
<node id="781004" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.15" lat="1.85"/>
<way id="781800" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<nd ref="781000"/>
<nd ref="781001"/>
<nd ref="781002"/>
<nd ref="781003"/>
<nd ref="781004"/>
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="781"/>
</way>
<relation id="781900" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<member type="way" ref="781800" role="outer"/>
<tag k="type" v="multipolygon"/>
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="781"/>
</relation>
</osm>
1 change: 1 addition & 0 deletions grid/data/7/781/description.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Multipolygon with one outer ring from single way that has different end-nodes, but they have same location.
2 changes: 2 additions & 0 deletions grid/data/7/781/multipolygons.wkt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
781900 r default INVALID
781900 r location MULTIPOLYGON(((7.15 1.85,7.15 1.81,7.11 1.81,7.11 1.85,7.15 1.85)))
5 changes: 5 additions & 0 deletions grid/data/7/781/nodes.wkt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
781000 POINT(7.15 1.85)
781001 POINT(7.15 1.81)
781002 POINT(7.11 1.81)
781003 POINT(7.11 1.85)
781004 POINT(7.15 1.85)
1 change: 1 addition & 0 deletions grid/data/7/781/result
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
invalid
1 change: 1 addition & 0 deletions grid/data/7/781/ways.wkt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
781800 LINESTRING(7.15 1.85,7.15 1.81,7.11 1.81,7.11 1.85,7.15 1.85)
45 changes: 45 additions & 0 deletions grid/data/7/782/data.osm
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version='1.0' encoding='UTF-8'?>
<osm version="0.6" generator="testdata" upload="false">
<node id="782000" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.25" lat="1.85"/>
<node id="782001" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.25" lat="1.81"/>
<node id="782002" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.21" lat="1.81"/>
<node id="782003" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.21" lat="1.85"/>

<node id="782004" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.24" lat="1.84"/>
<node id="782005" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.22" lat="1.84"/>
<node id="782006" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.22" lat="1.82"/>
<node id="782007" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.24" lat="1.82"/>
<node id="782008" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.24" lat="1.84"/>

<way id="782800" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<nd ref="782000"/>
<nd ref="782001"/>
<nd ref="782002"/>
<nd ref="782003"/>
<nd ref="782000"/>
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="782"/>
</way>
<way id="782801" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<nd ref="782004"/>
<nd ref="782005"/>
<nd ref="782006"/>
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="782"/>
</way>
<way id="782802" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<nd ref="782006"/>
<nd ref="782007"/>
<nd ref="782008"/>
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="782"/>
</way>
<relation id="782900" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<member type="way" ref="782800" role="outer"/>
<member type="way" ref="782801" role="inner"/>
<member type="way" ref="782802" role="inner"/>
<tag k="type" v="multipolygon"/>
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="782"/>
</relation>
</osm>
1 change: 1 addition & 0 deletions grid/data/7/782/description.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Multipolygon with correct outer ring, but inner ring made up out of two ways where locations match but not node ids.
2 changes: 2 additions & 0 deletions grid/data/7/782/multipolygons.wkt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
782900 r default INVALID
782900 r location MULTIPOLYGON(((7.25 1.85,7.25 1.81,7.21 1.81,7.21 1.85,7.25 1.85),(7.24 1.84,7.22 1.84,7.22 1.82,7.24 1.82,7.24 1.84)))
9 changes: 9 additions & 0 deletions grid/data/7/782/nodes.wkt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
782000 POINT(7.25 1.85)
782001 POINT(7.25 1.81)
782002 POINT(7.21 1.81)
782003 POINT(7.21 1.85)
782004 POINT(7.24 1.84)
782005 POINT(7.22 1.84)
782006 POINT(7.22 1.82)
782007 POINT(7.24 1.82)
782008 POINT(7.24 1.84)
1 change: 1 addition & 0 deletions grid/data/7/782/result
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
invalid
3 changes: 3 additions & 0 deletions grid/data/7/782/ways.wkt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
782800 LINESTRING(7.25 1.85,7.25 1.81,7.21 1.81,7.21 1.85,7.25 1.85)
782801 LINESTRING(7.24 1.84,7.22 1.84,7.22 1.82)
782802 LINESTRING(7.22 1.82,7.24 1.82,7.24 1.84)
74 changes: 74 additions & 0 deletions grid/data/all.osm
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,25 @@
<node id="773011" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.31" lat="1.79"/>
<node id="773012" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.39" lat="1.79"/>
<node id="773013" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.39" lat="1.71"/>
<node id="780000" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.05" lat="1.85"/>
<node id="780001" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.05" lat="1.81"/>
<node id="780002" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.01" lat="1.81"/>
<node id="780003" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.01" lat="1.85"/>
<node id="780004" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.05" lat="1.85"/>
<node id="781000" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.15" lat="1.85"/>
<node id="781001" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.15" lat="1.81"/>
<node id="781002" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.11" lat="1.81"/>
<node id="781003" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.11" lat="1.85"/>
<node id="781004" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.15" lat="1.85"/>
<node id="782000" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.25" lat="1.85"/>
<node id="782001" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.25" lat="1.81"/>
<node id="782002" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.21" lat="1.81"/>
<node id="782003" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.21" lat="1.85"/>
<node id="782004" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.24" lat="1.84"/>
<node id="782005" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.22" lat="1.84"/>
<node id="782006" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.22" lat="1.82"/>
<node id="782007" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.24" lat="1.82"/>
<node id="782008" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="7.24" lat="1.84"/>
<node id="900000" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="9.01" lat="1.01"/>
<node id="900001" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="9.01" lat="1.04"/>
<node id="900002" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1" lon="9.04" lat="1.04"/>
Expand Down Expand Up @@ -2008,6 +2027,47 @@
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="773"/>
</way>
<way id="780800" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<nd ref="780000"/>
<nd ref="780001"/>
<nd ref="780002"/>
<nd ref="780003"/>
<nd ref="780004"/>
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="780"/>
</way>
<way id="781800" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<nd ref="781000"/>
<nd ref="781001"/>
<nd ref="781002"/>
<nd ref="781003"/>
<nd ref="781004"/>
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="781"/>
</way>
<way id="782800" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<nd ref="782000"/>
<nd ref="782001"/>
<nd ref="782002"/>
<nd ref="782003"/>
<nd ref="782000"/>
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="782"/>
</way>
<way id="782801" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<nd ref="782004"/>
<nd ref="782005"/>
<nd ref="782006"/>
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="782"/>
</way>
<way id="782802" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<nd ref="782006"/>
<nd ref="782007"/>
<nd ref="782008"/>
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="782"/>
</way>
<way id="900800" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<nd ref="900000"/>
<nd ref="900001"/>
Expand Down Expand Up @@ -2483,6 +2543,20 @@
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="773"/>
</relation>
<relation id="781900" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<member type="way" ref="781800" role="outer"/>
<tag k="type" v="multipolygon"/>
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="781"/>
</relation>
<relation id="782900" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<member type="way" ref="782800" role="outer"/>
<member type="way" ref="782801" role="inner"/>
<member type="way" ref="782802" role="inner"/>
<tag k="type" v="multipolygon"/>
<tag k="test:section" v="mp-geom"/>
<tag k="test:id" v="782"/>
</relation>
<relation id="900900" version="1" timestamp="2014-01-01T00:00:00Z" uid="1" user="test" changeset="1">
<member type="way" ref="900800" role="inner"/>
<tag k="type" v="multipolygon"/>
Expand Down
Binary file modified grid/grid.db
Binary file not shown.

0 comments on commit ced85e3

Please sign in to comment.