Consistently use object:as_*() for geometry creation functions

joto · joto · commit e32f2b604b65 · 2024-04-11T09:52:15.000+02:00
diff --git a/themes/basic/topics/generic-boundaries.lua b/themes/basic/topics/generic-boundaries.lua
@@ -24,7 +24,7 @@ themepark:add_table{
 themepark:add_proc('relation', function(object)
     if object.tags.type == 'boundary' or (object.tags.type == 'multipolygon' and object.tags.boundary) then
         themepark:insert('boundaries', {
-            geom = object.as_multilinestring(),
+            geom = object:as_multilinestring(),
             tags = object.tags
         })
     end
diff --git a/themes/basic/topics/generic-lines.lua b/themes/basic/topics/generic-lines.lua
@@ -24,7 +24,7 @@ themepark:add_table{
 themepark:add_proc('way', function(object)
     if not object.is_closed or not theme.has_area_tags(object.tags) then
         themepark:insert('lines', {
-            geom = object.as_linestring(),
+            geom = object:as_linestring(),
             tags = object.tags
         })
     end
diff --git a/themes/basic/topics/generic-points.lua b/themes/basic/topics/generic-points.lua
@@ -23,7 +23,7 @@ themepark:add_table{
 
 themepark:add_proc('node', function(object)
     themepark:insert('points', {
-        geom = object.as_point(),
+        geom = object:as_point(),
         tags = object.tags
     })
 end)
diff --git a/themes/basic/topics/generic-polygons.lua b/themes/basic/topics/generic-polygons.lua
@@ -24,7 +24,7 @@ themepark:add_table{
 themepark:add_proc('way', function(object)
     if object.is_closed and theme.has_area_tags(object.tags) then
         themepark:insert('polygons', {
-            geom = object.as_polygon(),
+            geom = object:as_polygon(),
             tags = object.tags
         })
     end
@@ -33,7 +33,7 @@ end)
 themepark:add_proc('relation', function(object)
     if themepark:relation_is_area(object) then
         themepark:insert('polygons', {
-            geom = object.as_multipolygon(),
+            geom = object:as_multipolygon(),
             tags = object.tags
         })
     end
diff --git a/themes/basic/topics/generic-routes.lua b/themes/basic/topics/generic-routes.lua
@@ -24,7 +24,7 @@ themepark:add_table{
 themepark:add_proc('relation', function(object)
     if object.tags.type == 'route' then
         themepark:insert('routes', {
-            geom = object.as_multilinestring(),
+            geom = object:as_multilinestring(),
             tags = object.tags
         })
     end
diff --git a/themes/basic/topics/nwr.lua b/themes/basic/topics/nwr.lua
@@ -49,22 +49,22 @@ themepark:add_table{
 
 themepark:add_proc('node', function(object)
     themepark:insert('nodes', {
-        geom = object.as_point(),
+        geom = object:as_point(),
         tags = object.tags
     })
 end)
 
 themepark:add_proc('way', function(object)
     themepark:insert('ways', {
-        geom = object.as_linestring(),
+        geom = object:as_linestring(),
         tags = object.tags,
         nodes = '{' .. table.concat(object.nodes, ',') .. '}'
     })
 end)
 
 themepark:add_proc('relation', function(object)
     themepark:insert('relations', {
-        geom = object.as_geometrycollection(),
+        geom = object:as_geometrycollection(),
         tags = object.tags,
         members = object.members
     })
diff --git a/themes/experimental/topics/rivers.lua b/themes/experimental/topics/rivers.lua
@@ -36,7 +36,7 @@ themepark:add_proc('relation', function(object, data)
         kind = t.waterway
     }
 
-    a.geom = object.as_multilinestring()
+    a.geom = object:as_multilinestring()
     themepark.themes.core.add_name(a, object)
     themepark:insert('rivers', a, t)
 end)
diff --git a/themes/shortbread_v1/topics/bridges.lua b/themes/shortbread_v1/topics/bridges.lua
@@ -34,7 +34,7 @@ themepark:add_proc('area', function(object, data)
             layer = data.core.layer
         }
 
-        for sgeom in object.as_area():geometries() do
+        for sgeom in object:as_area():geometries() do
             a.geom = sgeom
             themepark:insert('bridges', a, t)
         end
diff --git a/themes/shortbread_v1/topics/buildings.lua b/themes/shortbread_v1/topics/buildings.lua
@@ -28,7 +28,7 @@ themepark:add_proc('area', function(object, data)
     local t = object.tags
 
     if t.building and t.building ~= 'no' then
-        for sgeom in object.as_area():geometries() do
+        for sgeom in object:as_area():geometries() do
             local a = { geom = sgeom }
             themepark:insert('buildings', a, t)
         end
diff --git a/themes/shortbread_v1/topics/dams.lua b/themes/shortbread_v1/topics/dams.lua
@@ -49,7 +49,7 @@ themepark:add_proc('way', function(object, data)
 
     if waterway == 'dam' then
         local a = { kind = waterway }
-        a.geom = object.as_linestring()
+        a.geom = object:as_linestring()
         themepark:insert('dam_lines', a, t)
     end
 end)
@@ -61,7 +61,7 @@ themepark:add_proc('area', function(object, data)
     if waterway == 'dam' then
         local a = { kind = waterway }
 
-        for sgeom in object.as_area():geometries() do
+        for sgeom in object:as_area():geometries() do
             a.geom = sgeom
             themepark:insert('dam_polygons', a, t)
         end
diff --git a/themes/shortbread_v1/topics/land.lua b/themes/shortbread_v1/topics/land.lua
@@ -95,7 +95,7 @@ themepark:add_table{
 
 themepark:add_proc('area', function(object, data)
     local t = object.tags
-    local a = { geom = object.as_area() }
+    local a = { geom = object:as_area() }
 
     local minzoom = landuse_lookup[t.landuse]
     if minzoom then
diff --git a/themes/shortbread_v1/topics/piers.lua b/themes/shortbread_v1/topics/piers.lua
@@ -51,7 +51,7 @@ themepark:add_proc('way', function(object, data)
 
     if man_made == 'pier' or man_made == 'breakwater' or man_made == 'groyne' then
         local a = { kind = man_made }
-        a.geom = object.as_linestring()
+        a.geom = object:as_linestring()
         themepark:insert('pier_lines', a, t)
     end
 end)
@@ -63,7 +63,7 @@ themepark:add_proc('area', function(object, data)
     if man_made == 'pier' or man_made == 'breakwater' or man_made == 'groyne' then
         local a = { kind = man_made }
 
-        for sgeom in object.as_area():geometries() do
+        for sgeom in object:as_area():geometries() do
             a.geom = sgeom
             themepark:insert('pier_polygons', a, t)
         end
diff --git a/themes/shortbread_v1/topics/sites.lua b/themes/shortbread_v1/topics/sites.lua
@@ -56,7 +56,7 @@ themepark:add_proc('area', function(object, data)
         end
     end
 
-    a.geom = object.as_area()
+    a.geom = object:as_area()
     themepark.themes.core.add_name(a, object)
     themepark:add_debug_info(a, t)
     themepark:insert('sites', a)
diff --git a/themes/shortbread_v1/topics/water.lua b/themes/shortbread_v1/topics/water.lua
@@ -108,7 +108,7 @@ themepark:add_proc('way', function(object, data)
     if check_waterway(waterway) then
         local a = {
             kind = waterway,
-            geom = object.as_linestring(),
+            geom = object:as_linestring(),
             layer = data.core.layer,
             bridge = get_bridge_value(t.bridge),
             tunnel = false,
@@ -157,7 +157,7 @@ themepark:add_proc('area', function(object, data)
         return
     end
 
-    local g = object.as_area():transform(3857)
+    local g = object:as_area():transform(3857)
     local a = {
         kind = kind,
         way_area = round(g:area()),
diff --git a/themes/shortbread_v1_gen/topics/land.lua b/themes/shortbread_v1_gen/topics/land.lua
@@ -115,7 +115,7 @@ local check_leisure = osm2pgsql.make_check_values_func({
 
 themepark:add_proc('area', function(object, data)
     local t = object.tags
-    local a = { geom = object.as_area() }
+    local a = { geom = object:as_area() }
 
     local minzoom = landuse_lookup[t.landuse]
     if minzoom then
diff --git a/themes/shortbread_v1_gen/topics/water.lua b/themes/shortbread_v1_gen/topics/water.lua
@@ -173,7 +173,7 @@ themepark:add_proc('way', function(object, data)
     if check_waterway(waterway) then
         local a = {
             kind = waterway,
-            geom = object.as_linestring(),
+            geom = object:as_linestring(),
             layer = data.core.layer,
             width = parse_width(t.width),
             bridge = get_bridge_value(t.bridge),
@@ -221,7 +221,7 @@ themepark:add_proc('area', function(object, data)
         return
     end
 
-    local g = object.as_area():transform(3857)
+    local g = object:as_area():transform(3857)
     local a = {
         kind = kind,
         way_area = round(g:area()),

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ themepark:add_proc('relation', function(object, data)`
`36`	`36`	`kind = t.waterway`
`37`	`37`	`}`
`38`	`38`
`39`		`- a.geom = object.as_multilinestring()`
	`39`	`+ a.geom = object:as_multilinestring()`
`40`	`40`	`themepark.themes.core.add_name(a, object)`
`41`	`41`	`themepark:insert('rivers', a, t)`
`42`	`42`	`end)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ themepark:add_proc('area', function(object, data)`
`34`	`34`	`layer = data.core.layer`
`35`	`35`	`}`
`36`	`36`
`37`		`- for sgeom in object.as_area():geometries() do`
	`37`	`+ for sgeom in object:as_area():geometries() do`
`38`	`38`	`a.geom = sgeom`
`39`	`39`	`themepark:insert('bridges', a, t)`
`40`	`40`	`end`