Skip to content

Commit 82eca55

Browse files
committed
Use extra parameter to insert() function instead of add_debug_info()
1 parent 8dc73e8 commit 82eca55

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

themes/shortbread_v1/topics/pois.lua

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,27 +165,26 @@ local get_attributes = function(object)
165165
a.housenumber = t['addr:housenumber']
166166

167167
themepark.themes.core.add_name(a, object)
168-
themepark:add_debug_info(a, t)
169168

170169
return a
171170
end
172171

173172
-- ---------------------------------------------------------------------------
174173

175174
themepark:add_proc('node', function(object, data)
176-
local a = get_attributes(object)
175+
local a, t = get_attributes(object)
177176
if a then
178177
a.geom = object:as_point()
179-
themepark:insert('pois', a)
178+
themepark:insert('pois', a, object.tags)
180179
data.shortbread_in_pois = true
181180
end
182181
end)
183182

184183
themepark:add_proc('area', function(object, data)
185-
local a = get_attributes(object)
184+
local a, t = get_attributes(object)
186185
if a then
187186
a.geom = object:as_area():centroid()
188-
themepark:insert('pois', a)
187+
themepark:insert('pois', a, object.tags)
189188
data.shortbread_in_pois = true
190189
end
191190
end)

themes/shortbread_v1/topics/public_transport.lua

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ local get_attributes = function(object)
7777
end
7878

7979
themepark.themes.core.add_name(a, object)
80-
themepark:add_debug_info(a, t)
8180

8281
return a
8382
end
@@ -88,15 +87,15 @@ themepark:add_proc('node', function(object, data)
8887
local a = get_attributes(object)
8988
if a then
9089
a.geom = object:as_point()
91-
themepark:insert('public_transport', a)
90+
themepark:insert('public_transport', a, object.tags)
9291
end
9392
end)
9493

9594
themepark:add_proc('area', function(object, data)
9695
local a = get_attributes(object)
9796
if a then
9897
a.geom = object:as_area():centroid()
99-
themepark:insert('public_transport', a)
98+
themepark:insert('public_transport', a, object.tags)
10099
end
101100
end)
102101

themes/shortbread_v1/topics/sites.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ themepark:add_proc('area', function(object, data)
5858

5959
a.geom = object:as_area()
6060
themepark.themes.core.add_name(a, object)
61-
themepark:add_debug_info(a, t)
62-
themepark:insert('sites', a)
61+
themepark:insert('sites', a, t)
6362
end)
6463

6564
-- ---------------------------------------------------------------------------

themes/shortbread_v1/topics/water.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,7 @@ themepark:add_proc('way', function(object, data)
124124
a.minzoom = 9
125125
end
126126

127-
themepark:add_debug_info(a, t)
128-
themepark:insert('water_lines', a)
127+
themepark:insert('water_lines', a, t)
129128

130129
if themepark.themes.core.add_name(a, object) then
131130
themepark:insert('water_lines_labels', a)

0 commit comments

Comments
 (0)