-
Notifications
You must be signed in to change notification settings - Fork 74
v0.2.54..v0.2.55 changeset generic rivers out.osm
Garret Voltz edited this page Aug 14, 2020
·
1 revision
diff --git a/test-files/cmd/slow/ConflateCmdStatsTest/generic-rivers-out.osm b/test-files/cmd/slow/ConflateCmdStatsTest/generic-rivers-out.osm
index 29cfc46..81c0ef9 100644
--- a/test-files/cmd/slow/ConflateCmdStatsTest/generic-rivers-out.osm
+++ b/test-files/cmd/slow/ConflateCmdStatsTest/generic-rivers-out.osm
@@ -1,89 +1,89 @@
<?xml version="1.0" encoding="UTF-8"?>
<osm version="0.6" generator="hootenanny" srs="+epsg:4326" schema="TDSv61">
<bounds minlat="19.6980449" minlon="-73.4219114" maxlat="19.7378082" maxlon="-73.38699879999999"/>
- <node visible="true" id="-480075" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7005272524498061" lon="-73.3931636746741987">
+ <node visible="true" id="-480005" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7005272524498061" lon="-73.3931636746741987">
<tag k="hoot:status" v="1"/>
- <tag k="hoot:id" v="-480075"/>
+ <tag k="hoot:id" v="-480005"/>
</node>
- <node visible="true" id="-480074" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7026343696791457" lon="-73.3931280918447584">
+ <node visible="true" id="-480004" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7026343696791457" lon="-73.3931280918447584">
<tag k="hoot:status" v="1"/>
- <tag k="hoot:id" v="-480074"/>
+ <tag k="hoot:id" v="-480004"/>
</node>
- <node visible="true" id="-480068" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7302593656767264" lon="-73.3932186356416736">
+ <node visible="true" id="-479998" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7302593656767264" lon="-73.3932186356416736">
<tag k="hoot:status" v="1"/>
- <tag k="hoot:id" v="-480068"/>
+ <tag k="hoot:id" v="-479998"/>
</node>
- <node visible="true" id="-480067" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7244304237253978" lon="-73.3938731923094565">
+ <node visible="true" id="-479997" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7244304237253978" lon="-73.3938731923094565">
<tag k="hoot:status" v="1"/>
- <tag k="hoot:id" v="-480067"/>
+ <tag k="hoot:id" v="-479997"/>
</node>
- <node visible="true" id="-480065" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7196619563175233" lon="-73.3948018497815724">
+ <node visible="true" id="-479995" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7196619563175233" lon="-73.3948018497815724">
<tag k="hoot:status" v="1"/>
- <tag k="hoot:id" v="-480065"/>
+ <tag k="hoot:id" v="-479995"/>
</node>
- <node visible="true" id="-480061" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7375961731880984" lon="-73.4008886125798909">
+ <node visible="true" id="-479991" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7375961731880984" lon="-73.4008886125798909">
<tag k="hoot:status" v="1"/>
- <tag k="hoot:id" v="-480061"/>
+ <tag k="hoot:id" v="-479991"/>
</node>
- <node visible="true" id="-480060" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7375767538554925" lon="-73.4009226584579011">
+ <node visible="true" id="-479990" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7375767538554925" lon="-73.4009226584579011">
<tag k="hoot:status" v="1"/>
- <tag k="hoot:id" v="-480060"/>
+ <tag k="hoot:id" v="-479990"/>
</node>
- <node visible="true" id="-480056" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7296334591087614" lon="-73.4038954883372838">
+ <node visible="true" id="-479986" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7296334591087614" lon="-73.4038954883372838">
<tag k="hoot:status" v="1"/>
- <tag k="hoot:id" v="-480056"/>
+ <tag k="hoot:id" v="-479986"/>
</node>
- <node visible="true" id="-480054" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7126529663524011" lon="-73.4101828650655364">
+ <node visible="true" id="-479984" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7126529663524011" lon="-73.4101828650655364">
<tag k="hoot:status" v="1"/>
- <tag k="hoot:id" v="-480054"/>
+ <tag k="hoot:id" v="-479984"/>
</node>
- <node visible="true" id="-480053" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7261469857332408" lon="-73.4067025018936334">
+ <node visible="true" id="-479983" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7261469857332408" lon="-73.4067025018936334">
<tag k="hoot:status" v="1"/>
- <tag k="hoot:id" v="-480053"/>
+ <tag k="hoot:id" v="-479983"/>
</node>
- <node visible="true" id="-480051" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7274485291723245" lon="-73.4057881874015834">
+ <node visible="true" id="-479981" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7274485291723245" lon="-73.4057881874015834">
<tag k="hoot:status" v="1"/>
- <tag k="hoot:id" v="-480051"/>
+ <tag k="hoot:id" v="-479981"/>
</node>
- <node visible="true" id="-480050" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7266692748644559" lon="-73.4061417106525766">
+ <node visible="true" id="-479980" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7266692748644559" lon="-73.4061417106525766">
<tag k="hoot:status" v="1"/>
- <tag k="hoot:id" v="-480050"/>
+ <tag k="hoot:id" v="-479980"/>
</node>
- <node visible="true" id="-480047" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7037801836242501" lon="-73.4049962036186514">
+ <node visible="true" id="-479977" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7037801836242501" lon="-73.4049962036186514">
<tag k="hoot:status" v="1"/>
- <tag k="hoot:id" v="-480047"/>
+ <tag k="hoot:id" v="-479977"/>
</node>
- <node visible="true" id="-480040" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7297632008689128" lon="-73.4018138767622617">
+ <node visible="true" id="-479970" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7297632008689128" lon="-73.4018138767622617">
<tag k="hoot:status" v="1"/>
- <tag k="hoot:id" v="-480040"/>
+ <tag k="hoot:id" v="-479970"/>
</node>
- <node visible="true" id="-480039" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7303354766637398" lon="-73.4019535765682178">
+ <node visible="true" id="-479969" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7303354766637398" lon="-73.4019535765682178">
<tag k="hoot:status" v="1"/>
- <tag k="hoot:id" v="-480039"/>
+ <tag k="hoot:id" v="-479969"/>
</node>
- <node visible="true" id="-480032" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7236280675884785" lon="-73.3945225469524445">
+ <node visible="true" id="-479962" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7236280675884785" lon="-73.3945225469524445">
<tag k="hoot:status" v="1"/>
- <tag k="hoot:id" v="-480032"/>
+ <tag k="hoot:id" v="-479962"/>
</node>
- <node visible="true" id="-480031" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7090408726721300" lon="-73.4025535617804366">
+ <node visible="true" id="-479961" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7090408726721300" lon="-73.4025535617804366">
<tag k="hoot:status" v="1"/>
- <tag k="hoot:id" v="-480031"/>
+ <tag k="hoot:id" v="-479961"/>
</node>
- <node visible="true" id="-480017" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7170636470040925" lon="-73.4149962324569003">
+ <node visible="true" id="-479947" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7170636470040925" lon="-73.4149962324569003">
<tag k="hoot:status" v="1"/>
- <tag k="hoot:id" v="-480017"/>
+ <tag k="hoot:id" v="-479947"/>
</node>
- <node visible="true" id="-480016" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7146294318121988" lon="-73.4173628043825062">
+ <node visible="true" id="-479946" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7146294318121988" lon="-73.4173628043825062">
<tag k="hoot:status" v="1"/>
- <tag k="hoot:id" v="-480016"/>
+ <tag k="hoot:id" v="-479946"/>
</node>
- <node visible="true" id="-480015" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7217153755617360" lon="-73.4105986572024278">
+ <node visible="true" id="-479945" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7217153755617360" lon="-73.4105986572024278">
<tag k="hoot:status" v="1"/>
- <tag k="hoot:id" v="-480015"/>
+ <tag k="hoot:id" v="-479945"/>
</node>
- <node visible="true" id="-480014" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7247517848795617" lon="-73.4100104476099204">
+ <node visible="true" id="-479944" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7247517848795617" lon="-73.4100104476099204">
<tag k="hoot:status" v="1"/>
- <tag k="hoot:id" v="-480014"/>
+ <tag k="hoot:id" v="-479944"/>
</node>
<node visible="true" id="-479743" timestamp="1970-01-01T00:00:00Z" version="1" lat="19.7378081999999999" lon="-73.3945693778307344">
<tag k="hoot:status" v="2"/>
@@ -1697,7 +1697,7 @@
<tag k="hoot:status" v="1"/>
<tag k="hoot:id" v="-10142"/>
</node>
- <way visible="true" id="-13467" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13302" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-479561"/>
<nd ref="-477660"/>
<nd ref="-479562"/>
@@ -1705,7 +1705,7 @@
<tag k="source" v="CNIGS"/>
<tag k="hoot:status" v="3"/>
<tag k="river_type" v="secondary"/>
- <tag k="hoot:id" v="-13467"/>
+ <tag k="hoot:id" v="-13302"/>
<tag k="waterway" v="stream"/>
<tag k="REF1" v="000042"/>
<tag k="REF2" v="000042"/>
@@ -1713,33 +1713,33 @@
<tag k="intermittent" v="yes"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13466" timestamp="1970-01-01T00:00:00Z" version="1">
- <nd ref="-480074"/>
+ <way visible="true" id="-13301" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-480004"/>
<nd ref="-479722"/>
<nd ref="-479661"/>
<nd ref="-479615"/>
<nd ref="-479716"/>
<nd ref="-479741"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13466"/>
+ <tag k="hoot:id" v="-13301"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="0010da"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13465" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13300" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-479740"/>
<nd ref="-479650"/>
<nd ref="-479688"/>
- <nd ref="-480075"/>
+ <nd ref="-480005"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13465"/>
+ <tag k="hoot:id" v="-13300"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="0010da"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13460" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13295" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-77198"/>
<nd ref="-479576"/>
<nd ref="-479677"/>
@@ -1748,48 +1748,48 @@
<nd ref="-479743"/>
<tag k="hoot:status" v="2"/>
<tag k="name" v="Ravine Christ"/>
- <tag k="hoot:id" v="-13460"/>
+ <tag k="hoot:id" v="-13295"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="002876"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13459" timestamp="1970-01-01T00:00:00Z" version="1">
- <nd ref="-480068"/>
+ <way visible="true" id="-13294" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-479998"/>
<nd ref="-479684"/>
<nd ref="-479618"/>
<nd ref="-77199"/>
<tag k="hoot:status" v="2"/>
<tag k="name" v="Ravine Christ"/>
- <tag k="hoot:id" v="-13459"/>
+ <tag k="hoot:id" v="-13294"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="002876"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13458" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13293" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-77207"/>
<nd ref="-77204"/>
<tag k="hoot:status" v="2"/>
<tag k="name" v="Ravine Christ"/>
- <tag k="hoot:id" v="-13458"/>
+ <tag k="hoot:id" v="-13293"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="002876"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13457" timestamp="1970-01-01T00:00:00Z" version="1">
- <nd ref="-480032"/>
- <nd ref="-480067"/>
+ <way visible="true" id="-13292" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-479962"/>
+ <nd ref="-479997"/>
<tag k="hoot:status" v="2"/>
<tag k="name" v="Ravine Christ"/>
- <tag k="hoot:id" v="-13457"/>
+ <tag k="hoot:id" v="-13292"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="002876"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13450" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13285" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-479568"/>
<nd ref="-77191"/>
<nd ref="-77192"/>
@@ -1804,7 +1804,7 @@
<nd ref="-77201"/>
<nd ref="-77202"/>
<nd ref="-77203"/>
- <nd ref="-480068"/>
+ <nd ref="-479998"/>
<nd ref="-77204"/>
<nd ref="-77205"/>
<nd ref="-77206"/>
@@ -1815,7 +1815,7 @@
<nd ref="-77211"/>
<nd ref="-77212"/>
<nd ref="-77213"/>
- <nd ref="-480067"/>
+ <nd ref="-479997"/>
<nd ref="-77214"/>
<nd ref="-77215"/>
<nd ref="-77216"/>
@@ -1823,7 +1823,7 @@
<nd ref="-77218"/>
<nd ref="-77219"/>
<nd ref="-77220"/>
- <nd ref="-480065"/>
+ <nd ref="-479995"/>
<nd ref="-77221"/>
<nd ref="-77222"/>
<nd ref="-77223"/>
@@ -1864,7 +1864,7 @@
<tag k="hoot:status" v="3"/>
<tag k="name" v="Ravine Christ"/>
<tag k="river_type" v="secondary"/>
- <tag k="hoot:id" v="-13450"/>
+ <tag k="hoot:id" v="-13285"/>
<tag k="waterway" v="stream"/>
<tag k="REF1" v="002876"/>
<tag k="REF2" v="002876"/>
@@ -1872,30 +1872,30 @@
<tag k="intermittent" v="yes"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13441" timestamp="1970-01-01T00:00:00Z" version="1">
- <nd ref="-480065"/>
+ <way visible="true" id="-13276" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-479995"/>
<nd ref="-479590"/>
<nd ref="-479691"/>
- <nd ref="-480032"/>
+ <nd ref="-479962"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13441"/>
+ <tag k="hoot:id" v="-13276"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="002876"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13437" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13272" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-436829"/>
<nd ref="-479686"/>
<nd ref="-436830"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13437"/>
+ <tag k="hoot:id" v="-13272"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="000766"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13433" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13268" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-436817"/>
<nd ref="-436818"/>
<nd ref="-436819"/>
@@ -1918,7 +1918,7 @@
<tag k="river_flow" v="temporary"/>
<tag k="hoot:status" v="1"/>
<tag k="river_type" v="secondary"/>
- <tag k="hoot:id" v="-13433"/>
+ <tag k="hoot:id" v="-13268"/>
<tag k="waterway" v="stream"/>
<tag k="REF1" v="000766"/>
<tag k="REF2" v="000766"/>
@@ -1926,18 +1926,18 @@
<tag k="intermittent" v="yes"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13426" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13261" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-185968"/>
<nd ref="-479675"/>
<nd ref="-185969"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13426"/>
+ <tag k="hoot:id" v="-13261"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="001f4a"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13421" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13256" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-479566"/>
<nd ref="-185958"/>
<nd ref="-185959"/>
@@ -1973,7 +1973,7 @@
<tag k="river_flow" v="temporary"/>
<tag k="hoot:status" v="1"/>
<tag k="river_type" v="secondary"/>
- <tag k="hoot:id" v="-13421"/>
+ <tag k="hoot:id" v="-13256"/>
<tag k="waterway" v="stream"/>
<tag k="REF1" v="001f4a"/>
<tag k="REF2" v="001f4a"/>
@@ -1981,7 +1981,7 @@
<tag k="intermittent" v="yes"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13417" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13252" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-302250"/>
<nd ref="-479697"/>
<nd ref="-479638"/>
@@ -1989,27 +1989,27 @@
<nd ref="-479673"/>
<nd ref="-479607"/>
<nd ref="-479736"/>
- <nd ref="-480060"/>
+ <nd ref="-479990"/>
<tag k="hoot:status" v="2"/>
<tag k="name" v="Ravine Pichomblaise"/>
- <tag k="hoot:id" v="-13417"/>
+ <tag k="hoot:id" v="-13252"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="001952"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13416" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13251" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-302247"/>
- <nd ref="-480056"/>
+ <nd ref="-479986"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13416"/>
+ <tag k="hoot:id" v="-13251"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13410" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13245" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-185987"/>
<nd ref="-302247"/>
<nd ref="-302248"/>
- <nd ref="-480056"/>
+ <nd ref="-479986"/>
<nd ref="-302249"/>
<nd ref="-302250"/>
<nd ref="-185814"/>
@@ -2021,14 +2021,14 @@
<nd ref="-302257"/>
<nd ref="-302258"/>
<nd ref="-302259"/>
- <nd ref="-480060"/>
- <nd ref="-480061"/>
+ <nd ref="-479990"/>
+ <nd ref="-479991"/>
<nd ref="-479565"/>
<tag k="source" v="CNIGS"/>
<tag k="river_flow" v="temporary"/>
<tag k="hoot:status" v="3"/>
<tag k="name" v="Ravine Pichomblaise"/>
- <tag k="hoot:id" v="-13410"/>
+ <tag k="hoot:id" v="-13245"/>
<tag k="waterway" v="stream"/>
<tag k="REF1" v="001952"/>
<tag k="REF2" v="001952"/>
@@ -2036,9 +2036,9 @@
<tag k="intermittent" v="yes"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13403" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13238" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-53419"/>
- <nd ref="-480053"/>
+ <nd ref="-479983"/>
<nd ref="-170456"/>
<nd ref="-170457"/>
<nd ref="-170458"/>
@@ -2055,14 +2055,14 @@
<nd ref="-170469"/>
<nd ref="-170470"/>
<nd ref="-170471"/>
- <nd ref="-480054"/>
+ <nd ref="-479984"/>
<nd ref="-170472"/>
<tag k="source" v="CNIGS"/>
<tag k="river_flow" v="temporary"/>
<tag k="hoot:status" v="3"/>
<tag k="name" v="Ravine Pichomblaise"/>
<tag k="river_type" v="secondary"/>
- <tag k="hoot:id" v="-13403"/>
+ <tag k="hoot:id" v="-13238"/>
<tag k="waterway" v="stream"/>
<tag k="REF1" v="0020fa"/>
<tag k="REF2" v="001952;001f53;0020fa"/>
@@ -2070,34 +2070,34 @@
<tag k="intermittent" v="yes"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13402" timestamp="1970-01-01T00:00:00Z" version="1">
- <nd ref="-480051"/>
+ <way visible="true" id="-13237" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-479981"/>
<nd ref="-185987"/>
<tag k="hoot:status" v="2"/>
<tag k="name" v="Ravine Pichomblaise"/>
- <tag k="hoot:id" v="-13402"/>
+ <tag k="hoot:id" v="-13237"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="001952"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13401" timestamp="1970-01-01T00:00:00Z" version="1">
- <nd ref="-480050"/>
+ <way visible="true" id="-13236" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-479980"/>
<nd ref="-302243"/>
<tag k="hoot:status" v="2"/>
<tag k="name" v="Ravine Pichomblaise"/>
- <tag k="hoot:id" v="-13401"/>
+ <tag k="hoot:id" v="-13236"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="001952"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13395" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13230" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-170454"/>
- <nd ref="-480050"/>
+ <nd ref="-479980"/>
<nd ref="-302242"/>
<nd ref="-302243"/>
- <nd ref="-480051"/>
+ <nd ref="-479981"/>
<nd ref="-302244"/>
<nd ref="-302245"/>
<nd ref="-185987"/>
@@ -2105,7 +2105,7 @@
<tag k="river_flow" v="temporary"/>
<tag k="hoot:status" v="1"/>
<tag k="name" v="Ravine Pichomblaise"/>
- <tag k="hoot:id" v="-13395"/>
+ <tag k="hoot:id" v="-13230"/>
<tag k="waterway" v="stream"/>
<tag k="REF1" v="001952"/>
<tag k="REF2" v="001952"/>
@@ -2113,7 +2113,7 @@
<tag k="intermittent" v="yes"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13391" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13226" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-170454"/>
<nd ref="-53419"/>
<tag k="river_flow" v="temporary"/>
@@ -2121,7 +2121,7 @@
<tag k="hoot:status" v="3"/>
<tag k="name" v="Ravine Pichomblaise"/>
<tag k="river_type" v="secondary"/>
- <tag k="hoot:id" v="-13391"/>
+ <tag k="hoot:id" v="-13226"/>
<tag k="waterway" v="stream"/>
<tag k="REF1" v="0020fa"/>
<tag k="REF2" v="001952"/>
@@ -2129,7 +2129,7 @@
<tag k="intermittent" v="yes"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13389" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13224" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-363529"/>
<nd ref="-363530"/>
<nd ref="-363531"/>
@@ -2141,7 +2141,7 @@
<tag k="source" v="CNIGS"/>
<tag k="hoot:status" v="3"/>
<tag k="river_type" v="secondary"/>
- <tag k="hoot:id" v="-13389"/>
+ <tag k="hoot:id" v="-13224"/>
<tag k="waterway" v="stream"/>
<tag k="REF1" v="00165b"/>
<tag k="REF2" v="00165b"/>
@@ -2149,60 +2149,60 @@
<tag k="intermittent" v="yes"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13385" timestamp="1970-01-01T00:00:00Z" version="1">
- <nd ref="-480039"/>
+ <way visible="true" id="-13220" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-479969"/>
<nd ref="-479733"/>
<nd ref="-479697"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13385"/>
+ <tag k="hoot:id" v="-13220"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="001f4e"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13384" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13219" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-185819"/>
<nd ref="-479593"/>
<nd ref="-479597"/>
- <nd ref="-480040"/>
+ <nd ref="-479970"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13384"/>
+ <tag k="hoot:id" v="-13219"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="001f4e"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13383" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13218" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-185830"/>
<nd ref="-479695"/>
<nd ref="-479629"/>
<nd ref="-479728"/>
<nd ref="-185826"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13383"/>
+ <tag k="hoot:id" v="-13218"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="001f4e"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13382" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13217" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-185839"/>
<nd ref="-479646"/>
<nd ref="-185837"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13382"/>
+ <tag k="hoot:id" v="-13217"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="001f4e"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13374" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13209" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-185814"/>
<nd ref="-185815"/>
- <nd ref="-480039"/>
+ <nd ref="-479969"/>
<nd ref="-185816"/>
<nd ref="-185817"/>
- <nd ref="-480040"/>
+ <nd ref="-479970"/>
<nd ref="-185818"/>
<nd ref="-185819"/>
<nd ref="-185820"/>
@@ -2237,7 +2237,7 @@
<tag k="river_flow" v="temporary"/>
<tag k="hoot:status" v="1"/>
<tag k="river_type" v="secondary"/>
- <tag k="hoot:id" v="-13374"/>
+ <tag k="hoot:id" v="-13209"/>
<tag k="waterway" v="stream"/>
<tag k="REF1" v="001f4e"/>
<tag k="REF2" v="001f4e"/>
@@ -2245,56 +2245,56 @@
<tag k="intermittent" v="yes"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13366" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13201" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-185915"/>
<nd ref="-479704"/>
<nd ref="-479637"/>
<nd ref="-479570"/>
<nd ref="-185911"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13366"/>
+ <tag k="hoot:id" v="-13201"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="001f4b"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13365" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13200" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-185919"/>
<nd ref="-479643"/>
<nd ref="-185916"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13365"/>
+ <tag k="hoot:id" v="-13200"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="001f4b"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13364" timestamp="1970-01-01T00:00:00Z" version="1">
- <nd ref="-480031"/>
+ <way visible="true" id="-13199" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-479961"/>
<nd ref="-479732"/>
<nd ref="-479669"/>
<nd ref="-185926"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13364"/>
+ <tag k="hoot:id" v="-13199"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="001f4b"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13363" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13198" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-185934"/>
<nd ref="-479735"/>
<nd ref="-185933"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13363"/>
+ <tag k="hoot:id" v="-13198"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="001f4b"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13353" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13188" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-77215"/>
- <nd ref="-480032"/>
+ <nd ref="-479962"/>
<nd ref="-185909"/>
<nd ref="-185910"/>
<nd ref="-185911"/>
@@ -2317,7 +2317,7 @@
<nd ref="-185928"/>
<nd ref="-185929"/>
<nd ref="-185930"/>
- <nd ref="-480031"/>
+ <nd ref="-479961"/>
<nd ref="-185931"/>
<nd ref="-185932"/>
<nd ref="-185933"/>
@@ -2341,7 +2341,7 @@
<tag k="river_flow" v="temporary"/>
<tag k="hoot:status" v="3"/>
<tag k="river_type" v="secondary"/>
- <tag k="hoot:id" v="-13353"/>
+ <tag k="hoot:id" v="-13188"/>
<tag k="waterway" v="stream"/>
<tag k="REF1" v="001f4b"/>
<tag k="REF2" v="001f4b"/>
@@ -2349,17 +2349,17 @@
<tag k="intermittent" v="yes"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13347" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13182" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-10146"/>
<nd ref="-10148"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13347"/>
+ <tag k="hoot:id" v="-13182"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="002fc1"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13342" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13177" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-10142"/>
<nd ref="-10143"/>
<nd ref="-10144"/>
@@ -2372,111 +2372,111 @@
<tag k="river_flow" v="permanent"/>
<tag k="hoot:status" v="1"/>
<tag k="river_type" v="secondary"/>
- <tag k="hoot:id" v="-13342"/>
+ <tag k="hoot:id" v="-13177"/>
<tag k="waterway" v="stream"/>
<tag k="REF1" v="002fc1"/>
<tag k="REF2" v="002fc1"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13341" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13176" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-53420"/>
- <nd ref="-480053"/>
+ <nd ref="-479983"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13341"/>
+ <tag k="hoot:id" v="-13176"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="002a64"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13340" timestamp="1970-01-01T00:00:00Z" version="1">
- <nd ref="-480014"/>
+ <way visible="true" id="-13175" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-479944"/>
<nd ref="-479664"/>
<nd ref="-479619"/>
<nd ref="-53422"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13340"/>
+ <tag k="hoot:id" v="-13175"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="002a64"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13339" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13174" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-53426"/>
<nd ref="-479726"/>
<nd ref="-53424"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13339"/>
+ <tag k="hoot:id" v="-13174"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="002a64"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13338" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13173" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-53429"/>
<nd ref="-479693"/>
- <nd ref="-480015"/>
+ <nd ref="-479945"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13338"/>
+ <tag k="hoot:id" v="-13173"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="002a64"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13337" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13172" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-53432"/>
<nd ref="-53430"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13337"/>
+ <tag k="hoot:id" v="-13172"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="002a64"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13336" timestamp="1970-01-01T00:00:00Z" version="1">
- <nd ref="-480017"/>
+ <way visible="true" id="-13171" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-479947"/>
<nd ref="-479678"/>
<nd ref="-53433"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13336"/>
+ <tag k="hoot:id" v="-13171"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="002a64"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13335" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13170" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-53439"/>
<nd ref="-479644"/>
<nd ref="-53437"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13335"/>
+ <tag k="hoot:id" v="-13170"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="002a64"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13334" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13169" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-53444"/>
- <nd ref="-480016"/>
+ <nd ref="-479946"/>
<tag k="hoot:status" v="2"/>
- <tag k="hoot:id" v="-13334"/>
+ <tag k="hoot:id" v="-13169"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="002a64"/>
<tag k="z_order" v="0"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13318" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-13153" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-53419"/>
<nd ref="-53420"/>
<nd ref="-53421"/>
<nd ref="-53422"/>
<nd ref="-53423"/>
- <nd ref="-480014"/>
+ <nd ref="-479944"/>
<nd ref="-53424"/>
<nd ref="-53425"/>
<nd ref="-53426"/>
<nd ref="-53427"/>
- <nd ref="-480015"/>
+ <nd ref="-479945"/>
<nd ref="-53428"/>
<nd ref="-53429"/>
<nd ref="-53430"/>
@@ -2486,13 +2486,13 @@
<nd ref="-53434"/>
<nd ref="-53435"/>
<nd ref="-53436"/>
- <nd ref="-480017"/>
+ <nd ref="-479947"/>
<nd ref="-53437"/>
<nd ref="-53438"/>
<nd ref="-53439"/>
<nd ref="-53440"/>
<nd ref="-53441"/>
- <nd ref="-480016"/>
+ <nd ref="-479946"/>
<nd ref="-53442"/>
<nd ref="-53443"/>
<nd ref="-53444"/>
@@ -2508,7 +2508,7 @@
<tag k="river_flow" v="temporary"/>
<tag k="hoot:status" v="3"/>
<tag k="river_type" v="secondary"/>
- <tag k="hoot:id" v="-13318"/>
+ <tag k="hoot:id" v="-13153"/>
<tag k="waterway" v="stream"/>
<tag k="REF1" v="002a64"/>
<tag k="REF2" v="002a64"/>
@@ -2532,6 +2532,7 @@
<nd ref="-479589"/>
<nd ref="-170472"/>
<tag k="hoot:status" v="2"/>
+ <tag k="hoot:hash" v="sha1sum:de070bc1ef96f45dee30be2c6680cf7f95949096"/>
<tag k="hoot:id" v="-12665"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="001f53;0020fa"/>
@@ -2563,6 +2564,7 @@
<tag k="source" v="CNIGS"/>
<tag k="river_flow" v="temporary"/>
<tag k="hoot:status" v="3"/>
+ <tag k="hoot:hash" v="sha1sum:abe74aa26517d768b0ea01609d7d2d7c1a6e6869"/>
<tag k="name" v="Ravine Pichomblaise"/>
<tag k="river_type" v="secondary"/>
<tag k="hoot:id" v="-12662"/>
@@ -2584,7 +2586,7 @@
<nd ref="-479631"/>
<nd ref="-479731"/>
<nd ref="-479668"/>
- <nd ref="-480053"/>
+ <nd ref="-479983"/>
<tag k="hoot:status" v="2"/>
<tag k="name" v="Ravine Pichomblaise"/>
<tag k="hoot:id" v="-12651"/>
@@ -2639,10 +2641,10 @@
<nd ref="-391133"/>
<nd ref="-391134"/>
<nd ref="-391135"/>
- <nd ref="-480074"/>
+ <nd ref="-480004"/>
<nd ref="-391136"/>
<nd ref="-391137"/>
- <nd ref="-480075"/>
+ <nd ref="-480005"/>
<nd ref="-391138"/>
<nd ref="-391139"/>
<nd ref="-391140"/>
@@ -2663,7 +2665,7 @@
</way>
<way visible="true" id="-6733" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-355324"/>
- <nd ref="-480047"/>
+ <nd ref="-479977"/>
<nd ref="-355325"/>
<nd ref="-355326"/>
<nd ref="-355327"/>
@@ -2682,25 +2684,25 @@
<tag k="intermittent" v="yes"/>
<tag k="error:circular" v="15"/>
</way>
- <relation visible="true" id="-159" timestamp="1970-01-01T00:00:00Z" version="1">
+ <relation visible="true" id="-123" timestamp="1970-01-01T00:00:00Z" version="1">
<member type="way" ref="-12662" role="reviewee"/>
<member type="way" ref="-12665" role="reviewee"/>
<tag k="hoot:review:type" v="Highway"/>
<tag k="hoot:status" v="3"/>
<tag k="hoot:review:sort_order" v="0"/>
- <tag k="hoot:id" v="-159"/>
+ <tag k="hoot:id" v="-123"/>
<tag k="hoot:review:note" v="Complex conflict causes an empty match"/>
<tag k="hoot:review:members" v="2"/>
<tag k="hoot:review:needs" v="yes"/>
<tag k="hoot:review:score" v="-1"/>
<tag k="type" v="review"/>
</relation>
- <relation visible="true" id="-158" timestamp="1970-01-01T00:00:00Z" version="1">
- <member type="way" ref="-13416" role=""/>
- <member type="way" ref="-13417" role=""/>
+ <relation visible="true" id="-122" timestamp="1970-01-01T00:00:00Z" version="1">
+ <member type="way" ref="-13251" role=""/>
+ <member type="way" ref="-13252" role=""/>
<tag k="hoot:status" v="2"/>
<tag k="name" v="Ravine Pichomblaise"/>
- <tag k="hoot:id" v="-158"/>
+ <tag k="hoot:id" v="-122"/>
<tag k="waterway" v="stream"/>
<tag k="REF2" v="001952"/>
<tag k="z_order" v="0"/>