@@ -30,8 +30,6 @@ local plugin = {}
3030
3131local utils = require ' themepark/utils'
3232
33- local plugin = {}
34-
3533local min_max_zoom_columns = function (columns )
3634 local column_names = {}
3735 local minzoom
@@ -141,8 +139,8 @@ local function build_layer_config(info)
141139 minzoom , maxzoom , columns = min_max_zoom_columns (sublayer .columns )
142140
143141 local conditions = assemble_conditions (minzoom , maxzoom , sublayer .tiles .xycondition )
144- local from = schema_prefix .. group_table .name
145- local sql = utils .build_select_query (columns , from ,
142+ local subfrom = schema_prefix .. group_table .name
143+ local sql = utils .build_select_query (columns , subfrom ,
146144 conditions , sublayer .tiles .order_by ,
147145 sublayer .tiles .order_dir )
148146 table.insert (data .query , {
@@ -182,7 +180,7 @@ local function build_tileset_config(extra_layers)
182180 return layers
183181end
184182
185- function ordered_keys (o )
183+ local function ordered_keys (o )
186184 local keys1 = {}
187185 local keys2 = {}
188186 for k , v in pairs (o ) do
@@ -194,13 +192,13 @@ function ordered_keys(o)
194192 end
195193 table.sort (keys1 )
196194 table.sort (keys2 )
197- for _ ,v in ipairs (keys2 ) do
195+ for _ ,v in ipairs (keys2 ) do
198196 table.insert (keys1 , v )
199197 end
200198 return keys1
201199end
202200
203- function dump_toml (o , indent_size , parents )
201+ local function dump_toml (o , indent_size , parents )
204202 indent_size = indent_size or 2
205203 parents = parents or {}
206204 if type (o ) == ' table' then
0 commit comments