Skip to content

Commit 67af94e

Browse files
jotojoto
committed
Add tests for extract that check use of 64 bit ids for relations
These will only work with libosmium 2.22.0 and above.
1 parent 1ca88a6 commit 67af94e

File tree

8 files changed

+218
-0
lines changed

8 files changed

+218
-0
lines changed

‎test/extract/CMakeLists.txt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,20 @@ check_extract_cfg(simple input1.osm output-simple.osm "-s simple --out
3535

3636
#-----------------------------------------------------------------------------
3737

38+
check_extract(clean64 input64.osm output-clean64.osm "--clean version --clean uid")
39+
40+
check_extract(simple64 input64.osm output-simple64.osm "-s simple --output-header=xml_josm_upload!")
41+
check_extract(complete_ways64 input64.osm output-complete-ways64.osm "-s complete_ways")
42+
check_extract(complete_ways_norels64 input64.osm output-complete-ways-norels64.osm "-s complete_ways -S relations=false")
43+
check_extract(smart_default64 input64.osm output-smart64.osm "-s smart")
44+
check_extract(smart_mp64 input64.osm output-smart64.osm "-s smart -S types=multipolygon")
45+
check_extract(smart_any64 input64.osm output-smart64.osm "-s smart -S types=any")
46+
check_extract(smart_nonmp64 input64.osm output-smart-nonmp64.osm "-s smart -S types=x")
47+
48+
check_extract_cfg(simple64 input64.osm output-simple64.osm "-s simple --output-header=xml_josm_upload=false")
49+
50+
#-----------------------------------------------------------------------------
51+
3852
check_extract_opl(antimeridian-east-bbox antimeridian.opl output-antimeridian-east.opl "--bbox=160,60,180,80")
3953
check_extract_opl(antimeridian-west-bbox antimeridian.opl output-antimeridian-west.opl "--bbox=-180,60,-160,80")
4054
check_extract_opl(antimeridian-east-poly antimeridian.opl output-antimeridian-east.opl "--polygon=extract/polygon-russia-east.geojson")

‎test/extract/input64.osm‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<osm version="0.6" upload="false" generator="testdata">
3+
<node id="5000000010" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="0" lon="1"/>
4+
<node id="5000000011" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="1" lon="1"/>
5+
<node id="5000000012" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="2" lon="1"/>
6+
<node id="5000000013" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="3" lon="2"/>
7+
<node id="5000000014" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="4" lon="2"/>
8+
<node id="5000000015" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="5" lon="2"/>
9+
<node id="5000000016" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="6" lon="2"/>
10+
<way id="5000000020" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
11+
<nd ref="5000000011"/>
12+
<nd ref="5000000012"/>
13+
<nd ref="5000000013"/>
14+
<tag k="foo" v="bar"/>
15+
</way>
16+
<way id="5000000021" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
17+
<nd ref="5000000014"/>
18+
<nd ref="5000000015"/>
19+
<tag k="xyz" v="abc"/>
20+
</way>
21+
<relation id="5000000031" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
22+
<member type="node" ref="5000000010" role=""/>
23+
</relation>
24+
<relation id="5000000032" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
25+
<member type="node" ref="5000000013" role=""/>
26+
</relation>
27+
<relation id="5000000033" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
28+
<member type="way" ref="5000000020" role=""/>
29+
</relation>
30+
<relation id="5000000034" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
31+
<member type="way" ref="5000000020" role=""/>
32+
<member type="way" ref="5000000021" role=""/>
33+
<tag k="type" v="multipolygon"/>
34+
</relation>
35+
<relation id="5000000035" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
36+
<member type="relation" ref="5000000031" role=""/>
37+
</relation>
38+
<relation id="5000000036" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
39+
<member type="relation" ref="5000000035" role=""/>
40+
</relation>
41+
</osm>

‎test/extract/output-clean64.osm‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<osm version="0.6" generator="test">
3+
<node id="5000000010" timestamp="2015-01-01T01:00:00Z" user="test" changeset="1" lat="0" lon="1"/>
4+
<node id="5000000011" timestamp="2015-01-01T01:00:00Z" user="test" changeset="1" lat="1" lon="1"/>
5+
<node id="5000000012" timestamp="2015-01-01T01:00:00Z" user="test" changeset="1" lat="2" lon="1"/>
6+
<node id="5000000013" timestamp="2015-01-01T01:00:00Z" user="test" changeset="1" lat="3" lon="2"/>
7+
<way id="5000000020" timestamp="2015-01-01T01:00:00Z" user="test" changeset="1">
8+
<nd ref="5000000011"/>
9+
<nd ref="5000000012"/>
10+
<nd ref="5000000013"/>
11+
<tag k="foo" v="bar"/>
12+
</way>
13+
<relation id="5000000031" timestamp="2015-01-01T01:00:00Z" user="test" changeset="1">
14+
<member type="node" ref="5000000010" role=""/>
15+
</relation>
16+
<relation id="5000000033" timestamp="2015-01-01T01:00:00Z" user="test" changeset="1">
17+
<member type="way" ref="5000000020" role=""/>
18+
</relation>
19+
<relation id="5000000034" timestamp="2015-01-01T01:00:00Z" user="test" changeset="1">
20+
<member type="way" ref="5000000020" role=""/>
21+
<member type="way" ref="5000000021" role=""/>
22+
<tag k="type" v="multipolygon"/>
23+
</relation>
24+
<relation id="5000000035" timestamp="2015-01-01T01:00:00Z" user="test" changeset="1">
25+
<member type="relation" ref="5000000031" role=""/>
26+
</relation>
27+
<relation id="5000000036" timestamp="2015-01-01T01:00:00Z" user="test" changeset="1">
28+
<member type="relation" ref="5000000035" role=""/>
29+
</relation>
30+
</osm>

‎test/extract/output-complete-ways-norels64.osm‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<osm version="0.6" generator="test">
3+
<node id="5000000010" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="0" lon="1"/>
4+
<node id="5000000011" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="1" lon="1"/>
5+
<node id="5000000012" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="2" lon="1"/>
6+
<node id="5000000013" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="3" lon="2"/>
7+
<way id="5000000020" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
8+
<nd ref="5000000011"/>
9+
<nd ref="5000000012"/>
10+
<nd ref="5000000013"/>
11+
<tag k="foo" v="bar"/>
12+
</way>
13+
</osm>

‎test/extract/output-complete-ways64.osm‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<osm version="0.6" generator="test">
3+
<node id="5000000010" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="0" lon="1"/>
4+
<node id="5000000011" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="1" lon="1"/>
5+
<node id="5000000012" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="2" lon="1"/>
6+
<node id="5000000013" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="3" lon="2"/>
7+
<way id="5000000020" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
8+
<nd ref="5000000011"/>
9+
<nd ref="5000000012"/>
10+
<nd ref="5000000013"/>
11+
<tag k="foo" v="bar"/>
12+
</way>
13+
<relation id="5000000031" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
14+
<member type="node" ref="5000000010" role=""/>
15+
</relation>
16+
<relation id="5000000033" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
17+
<member type="way" ref="5000000020" role=""/>
18+
</relation>
19+
<relation id="5000000034" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
20+
<member type="way" ref="5000000020" role=""/>
21+
<member type="way" ref="5000000021" role=""/>
22+
<tag k="type" v="multipolygon"/>
23+
</relation>
24+
<relation id="5000000035" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
25+
<member type="relation" ref="5000000031" role=""/>
26+
</relation>
27+
<relation id="5000000036" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
28+
<member type="relation" ref="5000000035" role=""/>
29+
</relation>
30+
</osm>

‎test/extract/output-simple64.osm‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<osm version="0.6" upload="false" generator="test">
3+
<node id="5000000010" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="0" lon="1"/>
4+
<node id="5000000011" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="1" lon="1"/>
5+
<node id="5000000012" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="2" lon="1"/>
6+
<way id="5000000020" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
7+
<nd ref="5000000011"/>
8+
<nd ref="5000000012"/>
9+
<nd ref="5000000013"/>
10+
<tag k="foo" v="bar"/>
11+
</way>
12+
<relation id="5000000031" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
13+
<member type="node" ref="5000000010" role=""/>
14+
</relation>
15+
<relation id="5000000033" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
16+
<member type="way" ref="5000000020" role=""/>
17+
</relation>
18+
<relation id="5000000034" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
19+
<member type="way" ref="5000000020" role=""/>
20+
<member type="way" ref="5000000021" role=""/>
21+
<tag k="type" v="multipolygon"/>
22+
</relation>
23+
</osm>

‎test/extract/output-smart-nonmp64.osm‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<osm version="0.6" generator="test">
3+
<node id="5000000010" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="0" lon="1"/>
4+
<node id="5000000011" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="1" lon="1"/>
5+
<node id="5000000012" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="2" lon="1"/>
6+
<node id="5000000013" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="3" lon="2"/>
7+
<way id="5000000020" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
8+
<nd ref="5000000011"/>
9+
<nd ref="5000000012"/>
10+
<nd ref="5000000013"/>
11+
<tag k="foo" v="bar"/>
12+
</way>
13+
<relation id="5000000031" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
14+
<member type="node" ref="5000000010" role=""/>
15+
</relation>
16+
<relation id="5000000033" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
17+
<member type="way" ref="5000000020" role=""/>
18+
</relation>
19+
<relation id="5000000034" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
20+
<member type="way" ref="5000000020" role=""/>
21+
<member type="way" ref="5000000021" role=""/>
22+
<tag k="type" v="multipolygon"/>
23+
</relation>
24+
<relation id="5000000035" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
25+
<member type="relation" ref="5000000031" role=""/>
26+
</relation>
27+
<relation id="5000000036" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
28+
<member type="relation" ref="5000000035" role=""/>
29+
</relation>
30+
</osm>

‎test/extract/output-smart64.osm‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<osm version="0.6" generator="test">
3+
<node id="5000000010" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="0" lon="1"/>
4+
<node id="5000000011" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="1" lon="1"/>
5+
<node id="5000000012" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="2" lon="1"/>
6+
<node id="5000000013" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="3" lon="2"/>
7+
<node id="5000000014" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="4" lon="2"/>
8+
<node id="5000000015" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="5" lon="2"/>
9+
<way id="5000000020" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
10+
<nd ref="5000000011"/>
11+
<nd ref="5000000012"/>
12+
<nd ref="5000000013"/>
13+
<tag k="foo" v="bar"/>
14+
</way>
15+
<way id="5000000021" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
16+
<nd ref="5000000014"/>
17+
<nd ref="5000000015"/>
18+
<tag k="xyz" v="abc"/>
19+
</way>
20+
<relation id="5000000031" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
21+
<member type="node" ref="5000000010" role=""/>
22+
</relation>
23+
<relation id="5000000033" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
24+
<member type="way" ref="5000000020" role=""/>
25+
</relation>
26+
<relation id="5000000034" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
27+
<member type="way" ref="5000000020" role=""/>
28+
<member type="way" ref="5000000021" role=""/>
29+
<tag k="type" v="multipolygon"/>
30+
</relation>
31+
<relation id="5000000035" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
32+
<member type="relation" ref="5000000031" role=""/>
33+
</relation>
34+
<relation id="5000000036" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
35+
<member type="relation" ref="5000000035" role=""/>
36+
</relation>
37+
</osm>

0 commit comments

Comments
 (0)