Cleanup of asset files

data/assets/customization/localbookmarks.asset

@@ -1,7 +1,5 @@
-local assetHelper = asset.require("util/asset_helper")
-local bookmarkHelper = asset.require("util/generate_bookmarks")
+local assetHelper = asset.require('util/asset_helper')
+local bookmarkHelper = asset.require('util/generate_bookmarks')
 
-local nodes = bookmarkHelper.getBookmarks("Local Bookmarks",'${ASSETS}/customization/localbookmarks.csv')
+local nodes = bookmarkHelper.getBookmarks('Local Bookmarks', '${ASSETS}/customization/localbookmarks.csv')
 assetHelper.registerSceneGraphNodesAndExport(asset, nodes);
-
-

data/assets/util/generate_bookmarks.asset

@@ -6,31 +6,29 @@ local getBookmarks = function (guiPath, bookmarkfile)
   local PARSEC_CONSTANT = 3.0856776E16;
   for line in io.lines(openspace.absPath(bookmarkfile)) do
       if (notFirstLine) then
-        local matchstring = "(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-)$"
-        local group, name, globe, lat, lon, altitude, x, y, z, scale, linewitdh = line:match(matchstring)
+        local matchstring = '(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-)$'
+        local group, name, globe, lat, lon, altitude, x, y, z, scale, linewidth = line:match(matchstring)
 
         scale = (scale == '' and 75000 or scale)
-        linewitdh = (linewitdh == '' and 2.0 or tonumber(linewitdh))
-        group = (group == "" and globe or group)
+        linewidth = (linewidth == '' and 2.0 or tonumber(linewidth))
+        group = (group == '' and globe or group)
 
-        local parent = (globe == "" and 'Root' or globe)
+        local parent = (globe == '' and 'Root' or globe)
 
         local sgn = {
-          Identifier = guiPath .. "-" .. name,
+          Identifier = guiPath .. '-' .. name,
           Parent = parent,
           Transform = {
-              Translation = {
-              },
               Scale = {
-                  Type = "StaticScale",
+                  Type = 'StaticScale',
                   Scale = tonumber(scale);
               }
           },
           Renderable = {
-              Type = "RenderableSphericalGrid",
+              Type = 'RenderableSphericalGrid',
               Enabled = false,
               GridColor = { 0.3, 0.84, 1.0, 0.3},
-              LineWidth = linewitdh,
+              LineWidth = linewidth,
               GridMatrix = { -0.05487554,  0.4941095, -0.8676661   , 0.0,
                              -0.9938214 , -0.1109906, -0.0003515167, 0.0,
                              -0.09647644,  0.8622859,  0.4971472   , 0.0,
@@ -38,25 +36,29 @@ local getBookmarks = function (guiPath, bookmarkfile)
           },
           GUI = {
               Name = name,
-              Path = "/" .. guiPath
+              Path = '/' .. guiPath
           }
         }
 
-        if (group ~= "") then
-          sgn.GUI.Path  = sgn.GUI.Path .. "/" .. group
+        if (group ~= '') then
+          sgn.GUI.Path  = sgn.GUI.Path .. '/' .. group
         end
 
-        if (globe == "") then
+        if (globe == '') then
           sgn.Transform.Translation = {
-            Type = "StaticTranslation",
-            Position = {tonumber(x) * PARSEC_CONSTANT, tonumber(y) * PARSEC_CONSTANT , tonumber(z) * PARSEC_CONSTANT}
+            Type = 'StaticTranslation',
+            Position = {
+              tonumber(x) * PARSEC_CONSTANT,
+              tonumber(y) * PARSEC_CONSTANT,
+              tonumber(z) * PARSEC_CONSTANT
+            }
           }
         else
           sgn.Transform.Translation = {
-              Type = "GlobeTranslation",
+              Type = 'GlobeTranslation',
               Globe = globe,
               Latitude = tonumber(lat),
-              Longitude = tonumber(lon),            
+              Longitude = tonumber(lon)
           }
           if (altitude == nil) then
               sgn.Transform.Translation.UseHeightMap = true;
@@ -64,10 +66,8 @@ local getBookmarks = function (guiPath, bookmarkfile)
               sgn.Transform.Translation.UseHeightMap = false;
               sgn.Transform.Translation.Altitude = tonumber(altitude);
           end
-
         end
 
-
         table.insert(genBookmarks, sgn);
       else
         notFirstLine = true
@@ -76,5 +76,5 @@ local getBookmarks = function (guiPath, bookmarkfile)
   return genBookmarks
 end
 
-asset.export("getBookmarks", getBookmarks)
+asset.export('getBookmarks', getBookmarks)
 

data/assets/util/openspacebookmarks.asset

@@ -1,12 +1,12 @@
-local assetHelper = asset.require("util/asset_helper")
-local bookmarkHelper = asset.require("util/generate_bookmarks")
+local assetHelper = asset.require('util/asset_helper')
+local bookmarkHelper = asset.require('util/generate_bookmarks')
 
-local dataProvider = "http://data.openspaceproject.com/bookmarks.csv"
+local dataProvider = 'http://data.openspaceproject.com/bookmarks.csv'
 
 local bookmarksCSV = asset.syncedResource({
-    Identifier = "openspace_bookmarks",
-    Name = "OpenSpace Bookmarks",
-    Type = "UrlSynchronization",
+    Identifier = 'openspace_bookmarks',
+    Name = 'OpenSpace Bookmarks',
+    Type = 'UrlSynchronization',
     UseHash = false,
     Override = true,
     Url = dataProvider
@@ -15,14 +15,14 @@ local bookmarksCSV = asset.syncedResource({
 local nodes = {}
 
 asset.onInitialize(function ()
-  nodes = bookmarkHelper.getBookmarks("OpenSpace Bookmarks", bookmarksCSV .. '/bookmarks.csv')
-  for i, n in ipairs(nodes) do
+  nodes = bookmarkHelper.getBookmarks('OpenSpace Bookmarks', bookmarksCSV .. '/bookmarks.csv')
+  for _, n in ipairs(nodes) do
     openspace.addSceneGraphNode(n);
   end
 end)
 
 asset.onDeinitialize(function ()
-  for i, n in ipairs(nodes) do
+  for _, n in ipairs(nodes) do
     openspace.removeSceneGraphNode(n.Identifier);
   end
 end)