Add new Lua function to load CSV file, utilize new function to correctly load , inside field values (closes #2124)

data/assets/global/localbookmarks.asset

@@ -1,5 +1,9 @@
 local bookmarkHelper = asset.require("util/generate_bookmarks")
 
+-- Most of the local bookmarks we are loading are relative to the Earth so we should
+-- ensure that it is loaded first
+asset.require("scene/solarsystem/planets/earth/earth")
+
 local nodes = bookmarkHelper.getBookmarks("Local Bookmarks", "${ASSETS}/customization/localbookmarks.csv")
 
 

data/assets/util/generate_bookmarks.asset

@@ -1,82 +1,90 @@
 local getBookmarks = function (guiPath, bookmarkfile)
   local genBookmarks = {};
-  local notFirstLine = false;
   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, linewidth = line:match(matchstring)
 
-      local identifier = string.gsub(guiPath .. "-" .. name, " ", "_")
+  local extract_first_line = false
+  local contents = openspace.readCSVFile(openspace.absPath(bookmarkfile), extract_first_line);
+  openspace.printWarning(contents)
 
-      scale = (scale == "" and 75000 or scale)
-      linewidth = (linewidth == "" and 2.0 or tonumber(linewidth))
-      group = (group == "" and globe or group)
+  for _,v in ipairs(contents) do
+    local group = v[1]
+    local name = v[2]
+    local globe = v[3]
+    local lat = v[4]
+    local lon = v[5]
+    local altitude = v[6]
+    local x = v[7]
+    local y = v[8]
+    local z = v[9]
+    local scale = v[10]
+    local linewidth = v[11]
 
-      local parent = (globe == "" and "Root" or globe)
+    local identifier = string.gsub(guiPath .. "-" .. name, " ", "_")
 
-      local sgn = {
-        Identifier = identifier,
-        Parent = parent,
-        Transform = {
-          Scale = {
-            Type = "StaticScale",
-            Scale = tonumber(scale);
-          },
+    scale = (scale == "" and 75000 or scale)
+    linewidth = (linewidth == "" and 2.0 or tonumber(linewidth))
+
+    local parent = (globe == "" and "Root" or globe)
+
+    local sgn = {
+      Identifier = identifier,
+      Parent = parent,
+      Transform = {
+        Scale = {
+          Type = "StaticScale",
+          Scale = tonumber(scale);
+        },
+        Rotation = {
+          Type = "StaticRotation",
           Rotation = {
-            Type = "StaticRotation",
-            Rotation = {
-              -0.05487554,  0.4941095, -0.8676661,
-              -0.9938214 , -0.1109906, -0.0003515167,
-              -0.09647644,  0.8622859,  0.4971472
-            }
+            -0.05487554,  0.4941095, -0.8676661,
+            -0.9938214 , -0.1109906, -0.0003515167,
+            -0.09647644,  0.8622859,  0.4971472
           }
-        },
-        Renderable = {
-          Type = "RenderableSphericalGrid",
-          Enabled = false,
-          Opacity = 0.3,
-          Color = { 0.3, 0.84, 1.0},
-          LineWidth = linewidth
-        },
-        GUI = {
-          Name = name,
-          Path = "/" .. guiPath
+        }
+      },
+      Renderable = {
+        Type = "RenderableSphericalGrid",
+        Enabled = false,
+        Opacity = 0.3,
+        Color = { 0.3, 0.84, 1.0},
+        LineWidth = linewidth
+      },
+      GUI = {
+        Name = name,
+        Path = "/" .. guiPath
+      }
+    }
+
+    if (group ~= "") then
+      sgn.GUI.Path  = sgn.GUI.Path .. "/" .. group
+    end
+
+    if (globe == "") then
+      sgn.Transform.Translation = {
+        Type = "StaticTranslation",
+        Position = {
+          tonumber(x) * PARSEC_CONSTANT,
+          tonumber(y) * PARSEC_CONSTANT,
+          tonumber(z) * PARSEC_CONSTANT
         }
       }
-
-      if (group ~= "") then
-        sgn.GUI.Path  = sgn.GUI.Path .. "/" .. group
-      end
-
-      if (globe == "") then
-        sgn.Transform.Translation = {
-          Type = "StaticTranslation",
-          Position = {
-            tonumber(x) * PARSEC_CONSTANT,
-            tonumber(y) * PARSEC_CONSTANT,
-            tonumber(z) * PARSEC_CONSTANT
-          }
-        }
-      else
-        sgn.Transform.Translation = {
-          Type = "GlobeTranslation",
-          Globe = globe,
-          Latitude = tonumber(lat),
-          Longitude = tonumber(lon)
-        }
-        if (altitude == nil) then
-          sgn.Transform.Translation.UseHeightMap = true;
-        else
-          sgn.Transform.Translation.UseHeightMap = false;
-          sgn.Transform.Translation.Altitude = tonumber(altitude);
-        end
-      end
-
-      table.insert(genBookmarks, sgn);
     else
-      notFirstLine = true
+      sgn.Transform.Translation = {
+        Type = "GlobeTranslation",
+        Globe = globe,
+        Latitude = tonumber(lat),
+        Longitude = tonumber(lon)
+      }
+      if (altitude == nil) then
+        sgn.Transform.Translation.UseHeightMap = true;
+      else
+        sgn.Transform.Translation.UseHeightMap = false;
+        sgn.Transform.Translation.Altitude = tonumber(altitude);
+      end
     end
+
+    table.insert(genBookmarks, sgn);
   end
   return genBookmarks
 end