Merge pull request #9 from pnorman/dam

shortbread: drop incorrect dam columns, fix minzoom
osm2pgsql-dev · Mar 7, 2024 · f404aad · f404aad
2 parents a9c2f2e + 389cd56
commit f404aad
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/themes/shortbread_v1/topics/dams.lua b/themes/shortbread_v1/topics/dams.lua
@@ -18,22 +18,22 @@ themepark:add_table{
         { key = 'waterway', value = 'dam', on = 'w' },
     },
     tiles = {
-        minzoom = 14,
+        minzoom = 12,
     },
 }
 
 themepark:add_table{
     name = 'dam_polygons',
     ids_type = 'way',
     geom = 'polygon',
-    columns = themepark:columns('core/name', {
+    columns = themepark:columns({
         { column = 'kind', type = 'text', not_null = true },
     }),
     tags = {
         { key = 'waterway', value = 'dam', on = 'a' },
     },
     tiles = {
-        minzoom = 14,
+        minzoom = 12,
     },
 }
 
@@ -49,7 +49,6 @@ themepark:add_proc('way', function(object, data)
 
     if waterway == 'dam' then
         local a = { kind = waterway }
-        themepark.themes.core.add_name(a, object)
         a.geom = object.as_linestring()
         themepark:insert('dam_lines', a, t)
     end
@@ -61,7 +60,6 @@ themepark:add_proc('area', function(object, data)
 
     if waterway == 'dam' then
         local a = { kind = waterway }
-        themepark.themes.core.add_name(a, object)
 
         for sgeom in object.as_area():geometries() do
             a.geom = sgeom