v0.2.54..v0.2.55 changeset out.osm
Garret Voltz edited this page Aug 14, 2020
·
1 revision
diff --git a/test-files/cmd/slow/NetworkConflateCmdRelationEdgeTest/out.osm b/test-files/cmd/slow/NetworkConflateCmdRelationEdgeTest/out.osm
index a289cf0..188cae4 100644
--- a/test-files/cmd/slow/NetworkConflateCmdRelationEdgeTest/out.osm
+++ b/test-files/cmd/slow/NetworkConflateCmdRelationEdgeTest/out.osm
@@ -6,19 +6,6 @@
<node visible="true" id="-1341" timestamp="1970-01-01T00:00:00Z" version="1" lat="15.2911531000000007" lon="-16.5215050000000012"/>
<node visible="true" id="-1295" timestamp="1970-01-01T00:00:00Z" version="1" lat="15.2797613048901528" lon="-16.5237492506429398"/>
<node visible="true" id="-1181" timestamp="1970-01-01T00:00:00Z" version="1" lat="15.2848796683042156" lon="-16.5236242906602229"/>
- <node visible="true" id="-127" timestamp="2016-02-03T04:48:55Z" version="1" lat="15.2766830999999996" lon="-16.5160413000000013"/>
- <node visible="true" id="-126" timestamp="2016-02-03T04:48:55Z" version="1" lat="15.2669541000000031" lon="-16.5225645000000014"/>
- <node visible="true" id="-125" timestamp="2016-02-03T04:48:55Z" version="1" lat="15.2806987000000003" lon="-16.5154834000000008"/>
- <node visible="true" id="-124" timestamp="2016-02-03T04:48:55Z" version="1" lat="15.2825202999999963" lon="-16.5157837999999977"/>
- <node visible="true" id="-123" timestamp="2016-02-03T04:48:55Z" version="1" lat="15.2835965999999974" lon="-16.5161271999999997"/>
- <node visible="true" id="-122" timestamp="2016-02-03T04:48:55Z" version="1" lat="15.2787530000000000" lon="-16.5155263999999988"/>
- <node visible="true" id="-121" timestamp="2016-02-03T04:48:55Z" version="1" lat="15.2666228999999980" lon="-16.5234227999999987"/>
- <node visible="true" id="-118" timestamp="2016-02-03T04:48:55Z" version="1" lat="15.2853084000000035" lon="-16.5175733999999999"/>
- <node visible="true" id="-117" timestamp="2016-02-03T04:48:55Z" version="1" lat="15.2858547999999974" lon="-16.5184831999999986"/>
- <node visible="true" id="-116" timestamp="2016-02-03T04:48:55Z" version="1" lat="15.2846832999999993" lon="-16.5168287999999990"/>
- <node visible="true" id="-115" timestamp="2016-02-03T04:48:55Z" version="1" lat="15.2778008999999990" lon="-16.5156980000000004"/>
- <node visible="true" id="-114" timestamp="2016-02-03T04:48:55Z" version="1" lat="15.2678442000000025" lon="-16.5216674999999995"/>
- <node visible="true" id="-113" timestamp="2016-02-03T04:48:55Z" version="1" lat="15.2665401000000038" lon="-16.5247960999999961"/>
<node visible="true" id="-95" timestamp="2016-02-03T04:48:55Z" version="1" lat="15.2873114999999977" lon="-16.5176340000000010">
<tag k="source:datetime" v="2015-07-27T15:26:14.000Z"/>
<tag k="place" v="hamlet"/>
@@ -1199,7 +1186,7 @@
<node visible="true" id="6517545920" timestamp="2019-06-03T05:49:37Z" version="1" changeset="70872680" user="LakeComo" uid="9446673" lat="15.2798059999999953" lon="-16.5237392000000014"/>
<node visible="true" id="6517545921" timestamp="2019-06-03T05:49:37Z" version="1" changeset="70872680" user="LakeComo" uid="9446673" lat="15.2797399999999968" lon="-16.5237406000000000"/>
<node visible="true" id="6517545922" timestamp="2019-06-03T05:49:37Z" version="1" changeset="70872680" user="LakeComo" uid="9446673" lat="15.2812692999999946" lon="-16.5258931999999987"/>
- <way visible="true" id="-2965" timestamp="2017-11-05T19:13:24Z" version="5">
+ <way visible="true" id="-2967" timestamp="2017-11-05T19:13:24Z" version="5">
<nd ref="3668939756"/>
<nd ref="5189643477"/>
<nd ref="5189643479"/>
@@ -1218,7 +1205,7 @@
<tag k="usage" v="main"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-2955" timestamp="2016-02-03T10:44:26Z" version="1">
+ <way visible="true" id="-2957" timestamp="2016-02-03T10:44:26Z" version="1">
<nd ref="-93"/>
<nd ref="5294730924"/>
<tag k="oneway" v="no"/>
@@ -1227,7 +1214,7 @@
<tag k="surface" v="unpaved"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-2951" timestamp="2017-10-27T01:16:29Z" version="1">
+ <way visible="true" id="-2953" timestamp="2017-10-27T01:16:29Z" version="1">
<nd ref="5189643552"/>
<nd ref="-1349"/>
<nd ref="5192494442"/>
@@ -1240,7 +1227,28 @@
<tag k="noname" v="yes"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-2939" timestamp="2019-06-03T05:49:37Z" version="3">
+ <way visible="true" id="-2948" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="5189643472"/>
+ <nd ref="1977199876"/>
+ <nd ref="2142498121"/>
+ <nd ref="3668857778"/>
+ <nd ref="-1341"/>
+ <nd ref="3668857781"/>
+ <nd ref="-23"/>
+ <tag k="is_in:country_code" v="SN"/>
+ <tag k="maxspeed" v="90"/>
+ <tag k="oneway" v="no"/>
+ <tag k="source" v="Microsoft Bing orbital imagery"/>
+ <tag k="highway" v="trunk"/>
+ <tag k="name" v="Route de Saint-Louis"/>
+ <tag k="int_ref" v="TAH 1"/>
+ <tag k="nat_ref" v="N 2"/>
+ <tag k="source:datetime" v="2019-06-03T05:49:37Z;2015-09-11T12:28:29.000Z"/>
+ <tag k="surface" v="asphalt"/>
+ <tag k="lanes" v="2"/>
+ <tag k="error:circular" v="15"/>
+ </way>
+ <way visible="true" id="-2941" timestamp="2019-06-03T05:49:37Z" version="3">
<nd ref="3668874734"/>
<nd ref="6517545919"/>
<nd ref="5189643551"/>
@@ -1255,7 +1263,7 @@
<tag k="surface" v="ground"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-2929" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-2931" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-30"/>
<nd ref="-19"/>
<tag k="oneway" v="no"/>
@@ -1264,7 +1272,7 @@
<tag k="surface" v="unpaved"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-2907" timestamp="2016-02-03T08:20:34Z" version="1">
+ <way visible="true" id="-2909" timestamp="2016-02-03T08:20:34Z" version="1">
<nd ref="5189643559"/>
<nd ref="-1349"/>
<tag k="oneway" v="no"/>
@@ -1273,41 +1281,20 @@
<tag k="surface" v="unpaved"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-2885" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-2887" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-28"/>
<nd ref="6517545899"/>
<tag k="maxspeed" v="90"/>
<tag k="oneway" v="no"/>
<tag k="source" v="Microsoft Bing orbital imagery"/>
<tag k="highway" v="primary"/>
+ <tag k="hoot:hash" v="sha1sum:54473f717aacbadfb463974e0edf3a67d892ab75"/>
<tag k="name" v="Route de Saint-Louis"/>
<tag k="source:datetime" v="2015-09-11T12:28:29.000Z"/>
<tag k="surface" v="asphalt"/>
<tag k="lanes" v="2"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-49" timestamp="2016-02-03T10:44:27Z" version="1">
- <nd ref="3668939756"/>
- <nd ref="-117"/>
- <nd ref="-118"/>
- <nd ref="-116"/>
- <nd ref="-123"/>
- <nd ref="-124"/>
- <nd ref="-125"/>
- <nd ref="-122"/>
- <nd ref="-115"/>
- <nd ref="-127"/>
- <nd ref="-114"/>
- <nd ref="-126"/>
- <nd ref="-121"/>
- <nd ref="-113"/>
- <nd ref="3668939754"/>
- <tag k="source" v="estimated"/>
- <tag k="boundary" v="administrative"/>
- <tag k="source:datetime" v="2015-07-27T16:17:43.000Z"/>
- <tag k="admin_level" v="3"/>
- <tag k="error:circular" v="15"/>
- </way>
<way visible="true" id="-20" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="4747826969"/>
<nd ref="4748830808"/>
@@ -1379,17 +1366,12 @@
<nd ref="5192494421"/>
<nd ref="5189643495"/>
<nd ref="5189643472"/>
- <nd ref="1977199876"/>
- <nd ref="2142498121"/>
- <nd ref="3668857778"/>
- <nd ref="-1341"/>
- <nd ref="3668857781"/>
- <nd ref="-23"/>
<tag k="is_in:country_code" v="SN"/>
<tag k="source" v="Microsoft Bing orbital imagery"/>
<tag k="maxspeed" v="90"/>
<tag k="oneway" v="no"/>
<tag k="highway" v="trunk"/>
+ <tag k="hoot:hash" v="sha1sum:39514b8896036b7d1c27d68ff6e14979911c2e39;sha1sum:c3871b301ec12a2719a47b6badfa8a854f10b24c;sha1sum:d70afdf9d0235d514bbba540ead65cde824ad82d;sha1sum:7b9b0ab1519ee43fe603a38ee19b79574a6bf3fb;sha1sum:cc92139e58194936bb910ab8115173377ce2dfd8;sha1sum:d50fb8b15bfa840cddf20c2ed3fc5acd2556097d;sha1sum:578b24006d1efb9f1acc5a0e0d6afc4a45d50d77;sha1sum:9668ea8bcaa1528a8824e6f9fd002de64bcb5825;sha1sum:7075dc6d33780cc5c76378669a9df111014f1fdd;sha1sum:d3becd9dccfc5a488d68b797cb03c19763f5ac36"/>
<tag k="name" v="Route de Saint-Louis"/>
<tag k="int_ref" v="TAH 1"/>
<tag k="nat_ref" v="N 2"/>
@@ -1969,6 +1951,7 @@
<nd ref="3668939748"/>
<nd ref="3668939754"/>
<tag k="source" v="estimated"/>
+ <tag k="hoot:hash" v="sha1sum:a5c7281b2395b9ccb69c9cb9505512e8819b953e"/>
<tag k="boundary" v="administrative"/>
<tag k="source:datetime" v="2015-07-27T16:17:43Z"/>
<tag k="admin_level" v="3"/>
@@ -2749,6 +2732,7 @@
<tag k="oneway" v="no"/>
<tag k="source" v="Microsoft Bing orbital imagery"/>
<tag k="highway" v="residential"/>
+ <tag k="hoot:hash" v="sha1sum:fa325f358a79f738ce9a95494593dd0de21c1960"/>
<tag k="name" v="Route de Saint-Louis"/>
<tag k="source:datetime" v="2019-06-03T05:49:37Z;2015-09-11T12:28:29.000Z"/>
<tag k="surface" v="asphalt"/>
@@ -3558,50 +3542,9 @@
<tag k="hoot:review:score" v="-1"/>
<tag k="type" v="review"/>
</relation>
- <relation visible="true" id="-17" timestamp="2016-02-03T11:12:44Z" version="1">
- <member type="way" ref="-2885" role=""/>
- <member type="way" ref="535381757" role=""/>
- <member type="way" ref="-17" role=""/>
- <tag k="source" v="Microsoft Bing orbital imagery"/>
- <tag k="to" v="Kidira"/>
- <tag k="from" v="Pout"/>
- <tag k="highway" v="primary"/>
- <tag k="route" v="road"/>
- <tag k="ref" v="N 2"/>
- <tag k="source:datetime" v="2015-09-20T16:49:17.000Z"/>
- <tag k="network" v="Route Nationale du Sénégal"/>
- <tag k="error:circular" v="15"/>
- <tag k="type" v="route"/>
- </relation>
- <relation visible="true" id="-15" timestamp="2016-02-03T11:10:45Z" version="1">
- <member type="way" ref="-49" role="outer"/>
- <member type="way" ref="-13" role="outer"/>
- <tag k="wikipedia" v="en:Thiès Region"/>
- <tag k="source" v="http://www.naturalearthdata.com/downloads/10m-cultural-vectors/10m-admin-1-states-provinces/"/>
- <tag k="name" v="Thiès"/>
- <tag k="boundary" v="administrative"/>
- <tag k="name:en" v="Thiès Region"/>
- <tag k="source:datetime" v="2015-07-29T15:29:58.000Z"/>
- <tag k="admin_level" v="3"/>
- <tag k="error:circular" v="15"/>
- <tag k="type" v="boundary"/>
- </relation>
- <relation visible="true" id="-10" timestamp="2016-02-03T11:10:45Z" version="1">
- <member type="way" ref="-49" role="outer"/>
- <member type="way" ref="-13" role="outer"/>
- <tag k="wikipedia" v="en:Louga Region"/>
- <tag k="source" v="http://www.naturalearthdata.com/downloads/10m-cultural-vectors/10m-admin-1-states-provinces/"/>
- <tag k="name" v="Louga"/>
- <tag k="boundary" v="administrative"/>
- <tag k="name:en" v="Louga Region"/>
- <tag k="source:datetime" v="2015-07-29T08:19:50.000Z"/>
- <tag k="admin_level" v="3"/>
- <tag k="error:circular" v="15"/>
- <tag k="type" v="boundary"/>
- </relation>
<relation visible="true" id="-2" timestamp="2016-02-03T11:08:15Z" version="1">
- <member type="relation" ref="-10" role="subarea"/>
- <member type="relation" ref="-15" role="subarea"/>
+ <member type="relation" ref="2908172" role="subarea"/>
+ <member type="relation" ref="2906477" role="subarea"/>
<tag k="name:bcl" v="Senegal"/>
<tag k="name:oc" v="Senegal"/>
<tag k="name:fy" v="Senegal"/>
@@ -3795,18 +3738,19 @@
</relation>
<relation visible="true" id="2906477" timestamp="2019-02-06T09:46:07Z" version="16" changeset="66958490" user="mOlind" uid="53540">
<member type="way" ref="362621591" role="outer"/>
+ <member type="way" ref="-13" role="outer"/>
<member type="way" ref="-19" role="outer"/>
<tag k="wikipedia" v="en:Thiès Region"/>
<tag k="source" v="http://www.naturalearthdata.com/downloads/10m-cultural-vectors/10m-admin-1-states-provinces/"/>
<tag k="ISO3166-2" v="SN-TH"/>
- <tag k="wikidata" v="Q847682"/>
<tag k="name:de" v="Region Thiès"/>
+ <tag k="wikidata" v="Q847682"/>
<tag k="name" v="Thiès"/>
<tag k="name:ar" v="ثيس"/>
<tag k="name:en" v="Thiès Region"/>
<tag k="boundary" v="administrative"/>
<tag k="name:fr" v="Thiès"/>
- <tag k="source:datetime" v="2019-02-06T09:46:07Z"/>
+ <tag k="source:datetime" v="2019-02-06T09:46:07Z;2015-07-29T15:29:58.000Z"/>
<tag k="name:es" v="Thiès"/>
<tag k="admin_level" v="3"/>
<tag k="error:circular" v="15"/>
@@ -3815,16 +3759,17 @@
<relation visible="true" id="2908172" timestamp="2019-02-06T09:46:07Z" version="19" changeset="66958490" user="mOlind" uid="53540">
<member type="way" ref="-19" role="outer"/>
<member type="way" ref="362621591" role="outer"/>
+ <member type="way" ref="-13" role="outer"/>
<tag k="wikipedia" v="en:Louga Region"/>
<tag k="source" v="http://www.naturalearthdata.com/downloads/10m-cultural-vectors/10m-admin-1-states-provinces/"/>
<tag k="ISO3166-2" v="SN-LG"/>
- <tag k="wikidata" v="Q738061"/>
<tag k="name:de" v="Region Louga"/>
+ <tag k="wikidata" v="Q738061"/>
<tag k="name" v="Louga"/>
<tag k="name:en" v="Louga Region"/>
<tag k="boundary" v="administrative"/>
<tag k="name:fr" v="Louga"/>
- <tag k="source:datetime" v="2019-02-06T09:46:07Z"/>
+ <tag k="source:datetime" v="2019-02-06T09:46:07Z;2015-07-29T08:19:50.000Z"/>
<tag k="name:es" v="Louga"/>
<tag k="admin_level" v="3"/>
<tag k="error:circular" v="15"/>
@@ -3832,17 +3777,23 @@
</relation>
<relation visible="true" id="4828569" timestamp="2019-07-13T01:47:04Z" version="114" changeset="72201144" user="geo_roads" uid="6849512">
<member type="way" ref="-17" role=""/>
+ <member type="way" ref="-2948" role=""/>
+ <member type="way" ref="-2887" role=""/>
+ <member type="way" ref="535381757" role=""/>
+ <tag k="source" v="Microsoft Bing orbital imagery"/>
<tag k="to" v="Kidira"/>
<tag k="from" v="Pout"/>
+ <tag k="highway" v="primary"/>
<tag k="route" v="road"/>
<tag k="ref" v="N 2"/>
- <tag k="source:datetime" v="2019-07-13T01:47:04Z"/>
+ <tag k="source:datetime" v="2019-07-13T01:47:04Z;2015-09-20T16:49:17.000Z"/>
<tag k="network" v="Route Nationale du Sénégal"/>
<tag k="error:circular" v="15"/>
<tag k="type" v="route"/>
</relation>
<relation visible="true" id="6134983" timestamp="2019-04-17T01:34:32Z" version="48" changeset="69291497" user="dancingVJL" uid="8392762">
<member type="way" ref="-17" role=""/>
+ <member type="way" ref="-2948" role=""/>
<tag k="int_name" v="TAH 1-SN"/>
<tag k="is_in:country_code" v="SN"/>
<tag k="wikidata" v="Q1506411"/>