BUGFIX: Fix name-based way fragmentation in transportation_name (#1295)
I discovered this bug while investigating issues with the updates process related to #1190 #1292, and #814. The `transportation_name` layer produces slightly different `tags` hstore values in the `osm_transportation_name_linestring` table during the initial import versus when running an update. As currently written, the import code produces null-value keys in the `tags` column, while the update code suppresses them. This PR removes that difference and makes the import code use same method that is currently used in the update code. With a test case I've written, the import code produces a tags hstore that looks like this: `"name"=>"OpenMapTiles Secondary 2", "name:de"=>NULL, "name:en"=>NULL, "name_int"=>"OpenMapTiles Secondary 2", "name:latin"=>"OpenMapTiles Secondary 2"` ...while the update code produces a tags hstore that looks like this: `"name"=>"OpenMapTiles Secondary 2", "name_int"=>"OpenMapTiles Secondary 2", "name:latin"=>"OpenMapTiles Secondary 2"` Note the missing NULL values. This bug causes a small amount of space wastage after an update is run, because the update matching code detects the `tags` value as different, resulting in a duplicate copy of the tags value if that row is updated. This causes duplicate objects and breaks GROUP BY clauses that expect to group same-tagged features together. I've tested this by inspection of a generated mbtiles, database spot checks, and the unit test code included in this PR.
This commit is contained in:
Brian Sperlongano
committed by
GitHub
GitHub
parent
0cff3449b5
commit
ec74480414
@@ -16,8 +16,16 @@
|
||||
<node id="500062" visible="true" timestamp="2019-01-01T00:00:00Z" version="1" lat="33.5" lon="-90.06" />
|
||||
<node id="500071" visible="true" timestamp="2019-01-01T00:00:00Z" version="1" lat="33.0" lon="-90.07" />
|
||||
<node id="500072" visible="true" timestamp="2019-01-01T00:00:00Z" version="1" lat="33.5" lon="-90.07" />
|
||||
<node id="500081" visible="true" timestamp="2019-01-01T00:00:00Z" version="1" lat="33.0" lon="-90.07" />
|
||||
<node id="500082" visible="true" timestamp="2019-01-01T00:00:00Z" version="1" lat="33.5" lon="-90.07" />
|
||||
<node id="500081" visible="true" timestamp="2019-01-01T00:00:00Z" version="1" lat="34.0" lon="-90.07" />
|
||||
<node id="500091" visible="true" timestamp="2019-01-01T00:00:00Z" version="1" lat="34.5" lon="-90.07" />
|
||||
<node id="500101" visible="true" timestamp="2019-01-01T00:00:00Z" version="1" lat="33.0" lon="-90.08" />
|
||||
<node id="500102" visible="true" timestamp="2019-01-01T00:00:00Z" version="1" lat="33.5" lon="-90.08" />
|
||||
<node id="500111" visible="true" timestamp="2019-01-01T00:00:00Z" version="1" lat="34.0" lon="-90.08" />
|
||||
<node id="500121" visible="true" timestamp="2019-01-01T00:00:00Z" version="1" lat="34.5" lon="-90.08" />
|
||||
<node id="500131" visible="true" timestamp="2019-01-01T00:00:00Z" version="1" lat="33.0" lon="-90.09" />
|
||||
<node id="500132" visible="true" timestamp="2019-01-01T00:00:00Z" version="1" lat="33.5" lon="-90.09" />
|
||||
<node id="500141" visible="true" timestamp="2019-01-01T00:00:00Z" version="1" lat="33.0" lon="-90.10" />
|
||||
<node id="500142" visible="true" timestamp="2019-01-01T00:00:00Z" version="1" lat="33.5" lon="-90.10" />
|
||||
|
||||
<way id="5000" version="1" timestamp="2019-01-01T00:00:00Z" visible="true">
|
||||
<nd ref="500001" />
|
||||
@@ -69,27 +77,71 @@
|
||||
<tag k="highway" v="track"/>
|
||||
<tag k="name" v="OpenMapTiles Track"/>
|
||||
</way>
|
||||
|
||||
<!-- Test way stitching -->
|
||||
<way id="5007" version="1" timestamp="2019-01-01T00:00:00Z" visible="true">
|
||||
<nd ref="500071" />
|
||||
<nd ref="500072" />
|
||||
<tag k="highway" v="secondary"/>
|
||||
<tag k="name" v="OpenMapTiles Secondary 2"/>
|
||||
</way>
|
||||
<way id="5008" version="1" timestamp="2019-01-01T00:00:00Z" visible="true">
|
||||
<nd ref="500072" />
|
||||
<nd ref="500081" />
|
||||
<tag k="highway" v="secondary"/>
|
||||
<tag k="name" v="OpenMapTiles Secondary 2"/>
|
||||
</way>
|
||||
<way id="5009" version="1" timestamp="2019-01-01T00:00:00Z" visible="true">
|
||||
<nd ref="500081" />
|
||||
<nd ref="500091" />
|
||||
<tag k="highway" v="secondary"/>
|
||||
<tag k="name" v="OpenMapTiles Secondary 2"/>
|
||||
</way>
|
||||
|
||||
<!-- Test disrupted way stitching -->
|
||||
<way id="5010" version="1" timestamp="2019-01-01T00:00:00Z" visible="true">
|
||||
<nd ref="500101" />
|
||||
<nd ref="500102" />
|
||||
<tag k="highway" v="secondary"/>
|
||||
<tag k="bicycle" v="yes"/>
|
||||
<tag k="name" v="OpenMapTiles Secondary 3"/>
|
||||
</way>
|
||||
<way id="5011" version="1" timestamp="2019-01-01T00:00:00Z" visible="true">
|
||||
<nd ref="500102" />
|
||||
<nd ref="500111" />
|
||||
<tag k="highway" v="secondary"/>
|
||||
<tag k="bridge" v="yes"/>
|
||||
<tag k="layer" v="1"/>
|
||||
<tag k="toll" v="yes"/>
|
||||
<tag k="name" v="OpenMapTiles Secondary 3 (Toll)"/>
|
||||
</way>
|
||||
<way id="5012" version="1" timestamp="2019-01-01T00:00:00Z" visible="true">
|
||||
<nd ref="500111" />
|
||||
<nd ref="500121" />
|
||||
<tag k="highway" v="secondary"/>
|
||||
<tag k="name" v="OpenMapTiles Secondary 3"/>
|
||||
</way>
|
||||
<way id="5013" version="1" timestamp="2019-01-01T00:00:00Z" visible="true">
|
||||
<nd ref="500131" />
|
||||
<nd ref="500132" />
|
||||
<tag k="highway" v="path"/>
|
||||
<tag k="name" v="OpenMapTiles Path z13"/>
|
||||
</way>
|
||||
<way id="5008" version="1" timestamp="2019-01-01T00:00:00Z" visible="true">
|
||||
<nd ref="500081" />
|
||||
<nd ref="500082" />
|
||||
<way id="5014" version="1" timestamp="2019-01-01T00:00:00Z" visible="true">
|
||||
<nd ref="500141" />
|
||||
<nd ref="500142" />
|
||||
<tag k="highway" v="path"/>
|
||||
<tag k="name" v="OpenMapTiles Track z12"/>
|
||||
</way>
|
||||
|
||||
<relation id="507" visible="true" timestamp="2019-01-01T00:00:00Z" version="1" changeset="1" user="u" uid="1">
|
||||
<member type="way" ref="5007" role=""/>
|
||||
<relation id="513" visible="true" timestamp="2019-01-01T00:00:00Z" version="1" changeset="1" user="u" uid="1">
|
||||
<member type="way" ref="5013" role=""/>
|
||||
<tag k="type" v="route"/>
|
||||
<tag k="route" v="hiking"/>
|
||||
<tag k="colour" v="red"/>
|
||||
</relation>
|
||||
<relation id="508" visible="true" timestamp="2019-01-01T00:00:00Z" version="1" changeset="1" user="u" uid="1">
|
||||
<member type="way" ref="5008" role=""/>
|
||||
<relation id="514" visible="true" timestamp="2019-01-01T00:00:00Z" version="1" changeset="1" user="u" uid="1">
|
||||
<member type="way" ref="5014" role=""/>
|
||||
<tag k="type" v="route"/>
|
||||
<tag k="route" v="hiking"/>
|
||||
<tag k="network" v="nwn"/>
|
||||
|
||||
Reference in New Issue
Block a user