Use 'self' inside 'themepark' methods

Author: joto

lua/themepark.lua

@@ -73,10 +73,10 @@ themepark.theme_path = { script_path(3) .. '../themes/', themepark.dir .. 'theme
 --   extent  - Set map extent for tile server (array: xmin, ymin, xmax, ymax)
 -- ---------------------------------------------------------------------------
 function themepark:set_option(name, value)
-    if themepark.debug then
+    if self.debug then
         print("Themepark: Setting option '" .. name .. "' to '" .. value .. "'.")
     end
-    themepark.options[name] = value
+    self.options[name] = value
 end
 
 -- ---------------------------------------------------------------------------
@@ -120,10 +120,10 @@ function themepark:add_theme_dir(dir)
     if string.find(dir, '/') ~= 1 then
         dir = script_path(5) .. dir .. '/'
     end
-    if themepark.debug then
+    if self.debug then
         print("Themepark: Add theme directory at '" .. dir .. "'.")
     end
-    table.insert(themepark.theme_path, dir .. '/')
+    table.insert(self.theme_path, dir .. '/')
 end
 
 -- ---------------------------------------------------------------------------
@@ -135,14 +135,14 @@ end
 -- function, the existing theme is returned.
 -- ---------------------------------------------------------------------------
 function themepark:init_theme(theme)
-    if themepark.themes[theme] then
-        return themepark.themes[theme]
+    if self.themes[theme] then
+        return self.themes[theme]
     end
 
     if theme == '' then
         local dir = script_path(2)
-        themepark.themes[''] = { dir = dir }
-        if themepark.debug then
+        self.themes[''] = { dir = dir }
+        if self.debug then
             print("Themepark: Loading theme '' with path '" .. dir .. "' ...")
         end
         return
@@ -152,14 +152,14 @@ function themepark:init_theme(theme)
         error('Missing theme argument to init_theme()')
     end
 
-    if themepark.debug then
+    if self.debug then
         print("Themepark: Loading theme '" .. theme .. "' ...")
     end
 
-    for _, dir in ipairs(themepark.theme_path) do
+    for _, dir in ipairs(self.theme_path) do
         local theme_dir = dir .. theme
         local theme_file = theme_dir .. '/init.lua'
-        if themepark.debug then
+        if self.debug then
             print("Themepark:   Trying to load from '" .. theme_file .. "' ...")
         end
         local file = io.open(theme_file)
@@ -172,21 +172,21 @@ function themepark:init_theme(theme)
                 error('Loading ' .. theme_file .. ' failed: ' .. msg)
             end
 
-            themepark.themes[theme] = func(self)
-            themepark.themes[theme].dir = theme_dir
+            self.themes[theme] = func(self)
+            self.themes[theme].dir = theme_dir
             break
         end
     end
 
-    if not themepark.themes[theme] then
+    if not self.themes[theme] then
         error("Themepark: Theme '" .. theme .. "' not found")
     end
 
-    if themepark.debug then
+    if self.debug then
         print("Themepark: Loading theme '" .. theme .. "' done.")
     end
 
-    return themepark.themes[theme]
+    return self.themes[theme]
 end
 
 -- ---------------------------------------------------------------------------
@@ -199,9 +199,9 @@ function themepark:add_topic(topic, cfg)
         topic = string.sub(topic, slash + 1)
     end
 
-    local theme = themepark:init_theme(theme_name)
+    local theme = self:init_theme(theme_name)
 
-    if themepark.debug then
+    if self.debug then
         print("Themepark: Adding topic '" .. topic .. "' from theme '" .. theme_name .. "' ...")
     end
 
@@ -222,7 +222,7 @@ function themepark:add_topic(topic, cfg)
 
     local result = func(self, theme, cfg or {})
 
-    if themepark.debug then
+    if self.debug then
         print("Themepark: Adding topic '" .. topic .. "' from theme '" .. theme_name .. "' done.")
     end
 
@@ -285,26 +285,26 @@ function themepark:add_table(data)
         data.columns = {}
     end
 
-    if themepark.debug and themepark.options.debug then
+    if self.debug and self.options.debug then
         table.insert(data.columns, {
-            column = themepark.options.debug, type = 'jsonb'
+            column = self.options.debug, type = 'jsonb'
         })
     end
 
-    if themepark.debug and themepark.options.tags then
+    if self.debug and self.options.tags then
         table.insert(data.columns, {
-            column = themepark.options.tags, type = 'jsonb'
+            column = self.options.tags, type = 'jsonb'
         })
     end
 
-    if themepark.options.unique_id then
+    if self.options.unique_id then
         table.insert(data.columns, {
-            column = themepark.options.unique_id,
+            column = self.options.unique_id,
             sql_type = 'bigint GENERATED BY DEFAULT AS IDENTITY',
             create_only = true
         })
         table.insert(data.indexes, {
-            column = themepark.options.unique_id,
+            column = self.options.unique_id,
             unique = true,
             method = 'btree'
         })
@@ -359,22 +359,22 @@ function themepark:get_table(table_name)
 end
 
 function themepark:add_debug_info(attrs, tags, dbgdata)
-    if not themepark.debug then
+    if not self.debug then
         return
     end
 
-    local opt = themepark.options.tags
+    local opt = self.options.tags
     if opt and tags then
         attrs[opt] = tags
     end
-    opt = themepark.options.debug
+    opt = self.options.debug
     if opt and dbgdata then
         attrs[opt] = dbgdata
     end
 end
 
 function themepark:insert(table_name, data, tags, dbgdata)
-    themepark:add_debug_info(data, tags, dbgdata)
+    self:add_debug_info(data, tags, dbgdata)
     return self:get_table(table_name):insert(data)
 end
 
@@ -414,9 +414,9 @@ end
 -- ---------------------------------------------------------------------------
 function themepark:plugin(name)
     self:init_layer_groups()
-    local ts = require('themepark/plugins/' .. name, themepark)
-    ts.themepark = self
-    return ts;
+    local ts = require('themepark/plugins/' .. name, self)
+    ts.self = self
+    return ts
 end
 
 -- ---------------------------------------------------------------------------