Skip to content

Commit bc47fca

Browse files
bmarchantmattjdnv
bmarchant
authored and
mattjdnv
committed
CentOS 6.7 o2sTranslationTest failure (#2022)
* Updated ordering in o2sTranslationTest to work on CentOS 6.7 and enabled GGDM and TDS 4.0 test comparisons * Updated expected OSM files for GGDM and TDS 4.0 tests * Script clean up
1 parent 7de2c9e commit bc47fca

File tree

3 files changed

+163
-9
lines changed

3 files changed

+163
-9
lines changed

‎test-files/cmd/slow/o2sTranslationTest.sh‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ TRANS_MGCP=$HOOT_HOME/translations/MGCP_TRD4.js
88
TRANS_GGDM=$HOOT_HOME/translations/GGDMv30.js
99

1010
inputFile=test-files/o2s_test.osm
11+
tds40File=test-files/o2s_tds40.osm
12+
ggdmFile=test-files/o2s_ggdm.osm
1113

1214
outputDir=test-output/o2s
1315
mkdir -p $outputDir
@@ -25,22 +27,29 @@ HOOT_OPT="--info"
2527
# Export files
2628
echo "### TDSv40 ###"
2729
hoot osm2ogr $HOOT_OPT -D ogr.thematic.structure=false $TRANS_TDS40 $inputFile $outputDir/tds40.shp
28-
hoot ogr2osm $HOOT_OPT $TRANS_TDS40 $outputDir/tds40.osm $outputDir/tds40/*.shp
30+
hoot ogr2osm $HOOT_OPT $TRANS_TDS40 $outputDir/tds40.osm \
31+
$outputDir/tds40/HUT_P.shp \
32+
$outputDir/tds40/o2s_*.shp \
33+
$outputDir/tds40/ORCHARD_S.shp \
34+
$outputDir/tds40/RIVER_C.shp
2935

30-
# TDSv40 complains about the "source" tag. It maps to an attibute but it is not on each element
31-
#hoot is-match $outputDir/tds40.osm $inputFile || diff $outputDir/tds40.osm $inputFile
36+
hoot is-match $outputDir/tds40.osm $tds40File || diff $outputDir/tds40.osm $tds40File
3237

3338
echo
3439
echo "### TDSv61 ###"
3540
hoot osm2ogr $HOOT_OPT -D ogr.thematic.structure=false $TRANS_TDS61 $inputFile $outputDir/tds61.shp
36-
hoot ogr2osm $HOOT_OPT $TRANS_TDS61 $outputDir/tds61.osm $outputDir/tds61/*.shp
41+
hoot ogr2osm $HOOT_OPT $TRANS_TDS61 $outputDir/tds61.osm \
42+
$outputDir/tds61/HUT_P.shp \
43+
$outputDir/tds61/o2s_*.shp \
44+
$outputDir/tds61/ORCHARD_S.shp \
45+
$outputDir/tds61/RIVER_C.shp
46+
3747
hoot is-match $outputDir/tds61.osm $inputFile || diff $outputDir/tds61.osm $inputFile
3848

3949
echo
4050
echo "### MGCP ###"
4151
hoot osm2ogr $HOOT_OPT $TRANS_MGCP $inputFile $outputDir/mgcp.shp
42-
# hoot ogr2osm $HOOT_OPT $TRANS_MGCP $outputDir/mgcp.osm $outputDir/mgcp/*.shp
43-
hoot ogr2osm $HOOT_OPT $TRANS_MGCP $outputDir/mgcp.osm \
52+
hoot ogr2osm $HOOT_OPT $TRANS_MGCP $outputDir/mgcp.osm \
4453
$outputDir/mgcp/PAL099.shp \
4554
$outputDir/mgcp/o2s_*.shp \
4655
$outputDir/mgcp/AEA040.shp \
@@ -51,7 +60,10 @@ hoot is-match $outputDir/mgcp.osm $inputFile || diff $outputDir/mgcp.osm $inputF
5160
echo
5261
echo "### GGDM ###"
5362
hoot osm2ogr $HOOT_OPT -D ogr.thematic.structure=false $TRANS_GGDM $inputFile $outputDir/ggdm.shp
54-
hoot ogr2osm $HOOT_OPT $TRANS_GGDM $outputDir/ggdm.osm $outputDir/ggdm/*.shp
63+
hoot ogr2osm $HOOT_OPT $TRANS_GGDM $outputDir/ggdm.osm \
64+
$outputDir/ggdm/HUT_P.shp \
65+
$outputDir/ggdm/o2s_*.shp \
66+
$outputDir/ggdm/ORCHARD_S.shp \
67+
$outputDir/ggdm/RIVER_C.shp
5568

56-
# GGDMv30 complains about the "source" tag. It maps to an attibute but it is not on each element
57-
#hoot is-match $outputDir/ggdm.osm $inputFile || diff $outputDir/ggdm.osm $inputFile
69+
hoot is-match $outputDir/ggdm.osm $ggdmFile || diff $outputDir/ggdm.osm $ggdmFile

‎test-files/o2s_ggdm.osm‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<osm version="0.6" generator="hootenanny" srs="+epsg:4326" schema="GGDMv30">
3+
<bounds minlat="-25.42965211496126" minlon="153.16023944736" maxlat="-25.42494299723994" maxlon="153.16587208629"/>
4+
<node visible="true" id="-13" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4294534830511338" lon="153.1619614255399995"/>
5+
<node visible="true" id="-12" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4274477669206078" lon="153.1618434083399904"/>
6+
<node visible="true" id="-11" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4294583277411519" lon="153.1629753005499879"/>
7+
<node visible="true" id="-10" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4296521149612609" lon="153.1658720862899941"/>
8+
<node visible="true" id="-9" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4273460268105964" lon="153.1640374553199990"/>
9+
<node visible="true" id="-8" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4257084836401397" lon="153.1602394473599702">
10+
<tag k="source:ingest:datetime" v="2017-12-18T20:47:56.969Z"/>
11+
<tag k="papa" v="smurf"/>
12+
<tag k="source" v="cartoon"/>
13+
<tag k="uuid" v="{bfbf2946-4342-444c-9926-1477c7bcce05}"/>
14+
<tag k="error:circular" v="15"/>
15+
</node>
16+
<node visible="true" id="-7" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4270165820404834" lon="153.1617843997499904"/>
17+
<node visible="true" id="-6" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4250108253499469" lon="153.1616663825500098"/>
18+
<node visible="true" id="-5" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4249429972399419" lon="153.1638657939400048"/>
19+
<node visible="true" id="-4" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4272491313805595" lon="153.1657004249099998"/>
20+
<node visible="true" id="-3" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4270553402905044" lon="153.1628036391699936"/>
21+
<node visible="true" id="-1" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4279564662007758" lon="153.1603145492099998">
22+
<tag k="source:ingest:datetime" v="2017-12-18T20:47:56.965Z"/>
23+
<tag k="building" v="hut"/>
24+
<tag k="uuid" v="{1514e475-0a8b-450d-8138-af8623cbdd56}"/>
25+
<tag k="source" v="ggdmv30:hut_p"/>
26+
<tag k="source:accuracy:horizontal:category" v="accurate"/>
27+
<tag k="error:circular" v="15"/>
28+
</node>
29+
<way visible="true" id="-4" timestamp="1970-01-01T00:00:00Z" version="1">
30+
<nd ref="-12"/>
31+
<nd ref="-13"/>
32+
<tag k="source:ingest:datetime" v="2017-12-18T20:47:56.974Z"/>
33+
<tag k="waterway" v="river"/>
34+
<tag k="uuid" v="{16006a93-ad6c-451e-b5ae-b530e6c5427a}"/>
35+
<tag k="source" v="ggdmv30:river_c"/>
36+
<tag k="source:accuracy:horizontal:category" v="accurate"/>
37+
<tag k="error:circular" v="15"/>
38+
</way>
39+
<way visible="true" id="-3" timestamp="1970-01-01T00:00:00Z" version="1">
40+
<nd ref="-9"/>
41+
<nd ref="-10"/>
42+
<nd ref="-11"/>
43+
<nd ref="-9"/>
44+
<tag k="source:ingest:datetime" v="2017-12-18T20:47:56.971Z"/>
45+
<tag k="uuid" v="{162abddf-bb8a-470a-8986-afdf5a171d45}"/>
46+
<tag k="source" v="ggdmv30:orchard_s"/>
47+
<tag k="landuse" v="orchard"/>
48+
<tag k="source:accuracy:horizontal:category" v="accurate"/>
49+
<tag k="error:circular" v="15"/>
50+
</way>
51+
<way visible="true" id="-2" timestamp="1970-01-01T00:00:00Z" version="1">
52+
<nd ref="-6"/>
53+
<nd ref="-7"/>
54+
<tag k="source:ingest:datetime" v="2017-12-18T20:47:56.967Z"/>
55+
<tag k="papa" v="smurf"/>
56+
<tag k="source" v="cartoon"/>
57+
<tag k="uuid" v="{79cd86b0-882c-4d66-b7ec-60fed3cac8f7}"/>
58+
<tag k="error:circular" v="15"/>
59+
</way>
60+
<way visible="true" id="-1" timestamp="1970-01-01T00:00:00Z" version="1">
61+
<nd ref="-5"/>
62+
<nd ref="-3"/>
63+
<nd ref="-4"/>
64+
<nd ref="-5"/>
65+
<tag k="source:ingest:datetime" v="2017-12-18T20:47:56.967Z"/>
66+
<tag k="papa" v="smurf"/>
67+
<tag k="source" v="cartoon"/>
68+
<tag k="uuid" v="{c0b66070-d3be-44bd-bb52-03d34716cd49}"/>
69+
<tag k="error:circular" v="15"/>
70+
</way>
71+
</osm>

‎test-files/o2s_tds40.osm‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<osm version="0.6" generator="hootenanny" srs="+epsg:4326" schema="TDSv40">
3+
<bounds minlat="-25.42965211496126" minlon="153.16023944736" maxlat="-25.42494299723994" maxlon="153.16587208629"/>
4+
<node visible="true" id="-13" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4294534830511338" lon="153.1619614255399995"/>
5+
<node visible="true" id="-12" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4274477669206078" lon="153.1618434083399904"/>
6+
<node visible="true" id="-11" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4294583277411519" lon="153.1629753005499879"/>
7+
<node visible="true" id="-10" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4296521149612609" lon="153.1658720862899941"/>
8+
<node visible="true" id="-9" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4273460268105964" lon="153.1640374553199990"/>
9+
<node visible="true" id="-8" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4257084836401397" lon="153.1602394473599702">
10+
<tag k="source:ingest:datetime" v="2017-12-18T20:34:25.112Z"/>
11+
<tag k="papa" v="smurf"/>
12+
<tag k="source" v="cartoon"/>
13+
<tag k="uuid" v="{bfbf2946-4342-444c-9926-1477c7bcce05}"/>
14+
<tag k="error:circular" v="15"/>
15+
</node>
16+
<node visible="true" id="-7" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4270165820404834" lon="153.1617843997499904"/>
17+
<node visible="true" id="-6" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4250108253499469" lon="153.1616663825500098"/>
18+
<node visible="true" id="-5" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4249429972399419" lon="153.1638657939400048"/>
19+
<node visible="true" id="-4" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4272491313805595" lon="153.1657004249099998"/>
20+
<node visible="true" id="-3" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4270553402905044" lon="153.1628036391699936"/>
21+
<node visible="true" id="-1" timestamp="1970-01-01T00:00:00Z" version="1" lat="-25.4279564662007758" lon="153.1603145492099998">
22+
<tag k="source:ingest:datetime" v="2017-12-18T20:34:25.107Z"/>
23+
<tag k="building" v="hut"/>
24+
<tag k="uuid" v="{1514e475-0a8b-450d-8138-af8623cbdd56}"/>
25+
<tag k="source" v="tdsv40:hut_p"/>
26+
<tag k="source:accuracy:horizontal:category" v="accurate"/>
27+
<tag k="error:circular" v="15"/>
28+
</node>
29+
<way visible="true" id="-4" timestamp="1970-01-01T00:00:00Z" version="1">
30+
<nd ref="-12"/>
31+
<nd ref="-13"/>
32+
<tag k="source:ingest:datetime" v="2017-12-18T20:34:25.257Z"/>
33+
<tag k="waterway" v="river"/>
34+
<tag k="uuid" v="{16006a93-ad6c-451e-b5ae-b530e6c5427a}"/>
35+
<tag k="source" v="tdsv40:river_c"/>
36+
<tag k="source:accuracy:horizontal:category" v="accurate"/>
37+
<tag k="error:circular" v="15"/>
38+
</way>
39+
<way visible="true" id="-3" timestamp="1970-01-01T00:00:00Z" version="1">
40+
<nd ref="-9"/>
41+
<nd ref="-10"/>
42+
<nd ref="-11"/>
43+
<nd ref="-9"/>
44+
<tag k="source:ingest:datetime" v="2017-12-18T20:34:25.114Z"/>
45+
<tag k="uuid" v="{162abddf-bb8a-470a-8986-afdf5a171d45}"/>
46+
<tag k="source" v="tdsv40:orchard_s"/>
47+
<tag k="landuse" v="orchard"/>
48+
<tag k="source:accuracy:horizontal:category" v="accurate"/>
49+
<tag k="error:circular" v="15"/>
50+
</way>
51+
<way visible="true" id="-2" timestamp="1970-01-01T00:00:00Z" version="1">
52+
<nd ref="-6"/>
53+
<nd ref="-7"/>
54+
<tag k="source:ingest:datetime" v="2017-12-18T20:34:25.110Z"/>
55+
<tag k="papa" v="smurf"/>
56+
<tag k="source" v="cartoon"/>
57+
<tag k="uuid" v="{79cd86b0-882c-4d66-b7ec-60fed3cac8f7}"/>
58+
<tag k="error:circular" v="15"/>
59+
</way>
60+
<way visible="true" id="-1" timestamp="1970-01-01T00:00:00Z" version="1">
61+
<nd ref="-5"/>
62+
<nd ref="-3"/>
63+
<nd ref="-4"/>
64+
<nd ref="-5"/>
65+
<tag k="source:ingest:datetime" v="2017-12-18T20:34:25.110Z"/>
66+
<tag k="papa" v="smurf"/>
67+
<tag k="source" v="cartoon"/>
68+
<tag k="uuid" v="{c0b66070-d3be-44bd-bb52-03d34716cd49}"/>
69+
<tag k="error:circular" v="15"/>
70+
</way>
71+
</osm>

0 commit comments

Comments
 (0)