Use local copy of boundaries with fixes

This removes the bug where boundaries would be processed differently
depending on order of relations.

Ref osm2pgsql-dev/osm2pgsql-themepark#10

shortbread.lua

@@ -26,7 +26,6 @@ themepark:add_topic('spirit/buildings')
 themepark:add_topic('core/layer')
 
 themepark:add_topic('shortbread_v1/aerialways')
-themepark:add_topic('shortbread_v1/boundaries')
 themepark:add_topic('shortbread_v1/boundary_labels')
 themepark:add_topic('shortbread_v1/bridges')
 themepark:add_topic('shortbread_v1/dams')
@@ -43,5 +42,6 @@ themepark:add_topic('shortbread/pois')
 -- Must be after "pois" layer, because as per Shortbread spec addresses that
 -- are already in "pois" should not be in the "addresses" layer.
 themepark:add_topic('shortbread/addresses')
+themepark:add_topic('shortbread/boundaries')
 
 -- ---------------------------------------------------------------------------

themes/shortbread/topics/boundaries.lua

@@ -0,0 +1,119 @@
+-- ---------------------------------------------------------------------------
+--
+-- Theme: shortbread_v1
+-- Topic: boundaries
+--
+-- ---------------------------------------------------------------------------
+
+local themepark, theme, cfg = ...
+
+themepark:add_table{
+    name = 'boundaries',
+    ids_type = 'way',
+    geom = 'linestring',
+    columns = themepark:columns({
+        { column = 'admin_level', type = 'int', not_null = true },
+        { column = 'maritime', type = 'bool' },
+        { column = 'disputed', type = 'bool' },
+    }),
+    tags = {
+        { key = 'admin_level', values = { '2', '4' }, on = 'r' },
+        { key = 'boundary', values = { 'administrative', 'disputed' }, on = 'r' },
+        { key = 'disputed', value = 'yes', on = 'w' },
+        { key = 'maritime', value = 'yes', on = 'w' },
+        { key = 'natural', value = 'coastline', on = 'w' },
+        { key = 'type', value = 'boundary', on = 'r' },
+    },
+    tiles = {
+        minzoom = 2
+    }
+}
+
+local rinfos = {}
+
+-- ---------------------------------------------------------------------------
+
+-- Check the (string) admin level. Change this depending on which admin
+-- levels you want to process. Shortbread only shows 2 and 4.
+-- valid values must work with tonumber!
+local function valid_admin_level(level)
+    return level == '2' or level == '4'
+end
+
+-- Check if this looks like a boundary and return admin_level as number
+-- Return nil if this is not a valid administrative boundary.
+local function get_admin_level(tags)
+    local type = tags.type
+
+    if type == 'boundary' or type == 'multipolygon' then
+        local boundary = tags.boundary
+        if boundary == 'administrative' and valid_admin_level(tags.admin_level) then
+            return tonumber(tags.admin_level)
+        end
+    end
+end
+
+
+local function valid_disputed(tags)
+    local type = tags.type
+    return (type == 'boundary' or type == 'multipolygon') and tags.boundary == 'disputed'
+end
+
+-- ---------------------------------------------------------------------------
+
+themepark:add_proc('way', function(object, data)
+    if osm2pgsql.stage == 1 then
+        return
+    end
+
+    local info = rinfos[object.id]
+    if not info then
+        return
+    end
+
+    local t = object.tags
+    if not info.admin_level then
+        return
+    end
+    local a = {
+        admin_level = info.admin_level,
+        maritime = (t.maritime and (t.maritime == 'yes' or t.natural == 'coastline')),
+        disputed = info.disputed or (t.disputed and t.disputed == 'yes'),
+        geom = object:as_linestring()
+    }
+    themepark.themes.core.add_name(a, object)
+    themepark:insert('boundaries', a, t)
+end)
+
+themepark:add_proc('select_relation_members', function(relation)
+    -- It isn't necessary to process boundary=disputed relations separately because
+    -- if they have an admin_level from another relation they will get added anyways.
+    if valid_admin_level(relation.tags.admin_level) then
+        return { ways = osm2pgsql.way_member_ids(relation) }
+    end
+end)
+
+themepark:add_proc('relation', function(object, data)
+    local t = object.tags
+
+    local admin_level = get_admin_level(t)
+    local disputed = valid_disputed(t)
+    -- If a relation does not an admin boundary or disputed boundary it has
+    -- nothing to tell us and we don't need the ways.
+    if not admin_level and not disputed 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, disputed = false }
+            elseif rinfos[member.ref].admin_level > admin_level then
+                rinfos[member.ref].admin_level = admin_level
+            end
+            rinfos[member.ref].disputed = disputed or rinfos[member.ref].disputed
+        end
+    end
+end)
+
+-- ---------------------------------------------------------------------------