Use the new disputed boundary handling also in shortbread_v1_gen

Author: joto

themes/shortbread_v1_gen/topics/boundaries.lua

@@ -19,7 +19,7 @@ local gen_config = {
 -- ---------------------------------------------------------------------------
 
 -- If anything related to boundaries changes, this expire table gets an entry.
--- It used zoom level 0, so there will always be at most one entry which
+-- It uses zoom level 0, so there will always be at most one entry which
 -- triggers re-calculation of all boundaries in the world.
 local expire_boundaries = osm2pgsql.define_expire_output({
     table = themepark.with_prefix('expire_boundaries')
@@ -101,27 +101,30 @@ end
 
 -- Storage of information from boundary relations for use by boundary ways
 -- (two-stage processing).
+
+-- Relation ids and minimum admin level of all relations that reference a way id
 local rinfos = {}
 
+-- Minimum admin level of all relations tagged boundary=disputed that
+-- reference a way id
+local min_disputed_admin_level = {}
+
 -- ---------------------------------------------------------------------------
 
--- Check if this looks like a boundary and return admin_level as number
--- Return nil if this is not a valid boundary.
-local function get_admin_level(tags)
-    local type = tags.type
+-- Shortbread is only interested in level 2 and level 4 admin boundaries.
+local function is_admin_boundary(tags)
+    return (tags.type == 'boundary' or tags.type == 'multipolygon')
+           and tags.boundary == 'administrative'
+           and (tags.admin_level == '2' or tags.admin_level == '4')
+end
 
-    if type == 'boundary' or type == 'multipolygon' then
-        local boundary = tags.boundary
-        if boundary == 'administrative' or boundary == 'disputed' then
-            return tonumber(tags.admin_level)
-        end
+-- Get numerical admin level from string, default to 1 if invalid
+local function get_admin_level(value)
+    if not value or not string.match(value, '^[1-9][0-9]?$') then
+        return 1
     end
-end
 
--- Check the (numeric) admin level. Change this depending on which admin
--- levels you want to process. Shortbread only shows 2 and 4.
-local function valid_admin_level(level)
-    return level == 2 or level == 4
+    return tonumber(value)
 end
 
 -- ---------------------------------------------------------------------------
@@ -139,11 +142,20 @@ themepark:add_proc('way', function(object, data)
     table.sort(info.rel_ids)
 
     local t = object.tags
+
+    -- Set disputed flag either from disputed tag on the way...
+    local disputed = (t.disputed == 'yes')
+
+    -- .. or from a parent relation with boundary=disputed
+    if min_disputed_admin_level[object.id] and min_disputed_admin_level[object.id] <= info.admin_level then
+        disputed = true
+    end
+
     local a = {
         relation_ids    = '{' .. table.concat(info.rel_ids, ',') .. '}',
         admin_level     = info.admin_level,
         maritime        = (t.maritime ~= nil and (t.maritime == 'yes')),
-        disputed        = (info.disputed or (t.disputed ~= nil and t.disputed == 'yes')),
+        disputed        = disputed,
         closure_segment = (t.closure_segment ~= nil and t.closure_segment == 'yes'),
         coastline       = (t.natural ~= nil and t.natural == 'coastline'),
         geom            = object:as_linestring(),
@@ -153,41 +165,52 @@ themepark:add_proc('way', function(object, data)
 end)
 
 themepark:add_proc('select_relation_members', function(relation)
-    if valid_admin_level(get_admin_level(relation.tags)) then
+    if is_admin_boundary(relation.tags) then
         return { ways = osm2pgsql.way_member_ids(relation) }
     end
 end)
 
 themepark:add_proc('relation', function(object, data)
-    local t = object.tags
+    if is_admin_boundary(object.tags) then
+        local t = object.tags
 
-    local admin_level = get_admin_level(t)
+        local admin_level = tonumber(t.admin_level)
+
+        for _, id in ipairs(osm2pgsql.way_member_ids(object)) do
+            if not rinfos[id] then
+                rinfos[id] = { admin_level = admin_level, rel_ids = {} }
+            elseif rinfos[id].admin_level > admin_level then
+                rinfos[id].admin_level = admin_level
+            end
+            table.insert(rinfos[id].rel_ids, object.id)
+        end
+
+        local a = {
+            admin_level = admin_level,
+            maritime    = (t.maritime ~= nil and t.maritime == 'yes'),
+            disputed    = (t.disputed ~= nil and t.disputed == 'yes'),
+            geom        = object:as_multilinestring(),
+        }
+
+        themepark.themes.core.add_name(a, object)
+        themepark:insert('boundaries_relations_interim', a, t)
 
-    if not valid_admin_level(admin_level) then
         return
     end
 
-    for _, member in ipairs(object.members) do
-        if member.type == 'w' then
-            if not rinfos[member.ref] then
-                rinfos[member.ref] = { admin_level = admin_level, rel_ids = {} }
-            elseif rinfos[member.ref].admin_level > admin_level then
-                rinfos[member.ref].admin_level = admin_level
+    if object.tags.boundary == 'disputed' then
+        -- Ways in relations tagged boundary=disputed are flagged as disputed
+        -- if either the relation doesn't have an admin_level tag or the
+        -- admin_level tag is <= the admin level the way got from the
+        -- boundary=administrative relation(s).
+        local admin_level = get_admin_level(object.tags.admin_level)
+
+        for _, id in ipairs(osm2pgsql.way_member_ids(object)) do
+            if not min_disputed_admin_level[id] or min_disputed_admin_level[id] > admin_level then
+                min_disputed_admin_level[id] = admin_level
             end
-            table.insert(rinfos[member.ref].rel_ids, object.id)
-            rinfos[member.ref].disputed = (t.boundary == 'disputed')
         end
     end
-
-    local a = {
-        admin_level = admin_level,
-        maritime    = (t.maritime ~= nil and t.maritime == 'yes'),
-        disputed    = (t.disputed ~= nil and t.disputed == 'yes'),
-        geom        = object:as_multilinestring(),
-    }
-
-    themepark.themes.core.add_name(a, object)
-    themepark:insert('boundaries_relations_interim', a, t)
 end)
 
 local function gen_commands(sql, level)