From ecfc5484eb0ec584b829f1b2855fb3429cda1673 Mon Sep 17 00:00:00 2001
From: lundkvistarn <lundkvistarn@live.se>
Date: Thu, 14 Nov 2024 15:50:08 -0500
Subject: [PATCH] changed viewline paths to use user folders

---
 .../planets/earth/aurorasaurus/northernViewline.asset         | 2 +-
 .../planets/earth/aurorasaurus/southernViewline.asset         | 2 +-
 data/profiles/aurorasaurus.profile                            | 4 ----
 modules/globebrowsing/src/geojson/geojsoncomponent.cpp        | 4 ++--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/data/assets/scene/solarsystem/planets/earth/aurorasaurus/northernViewline.asset b/data/assets/scene/solarsystem/planets/earth/aurorasaurus/northernViewline.asset
index 9cadff208f..c55ce86394 100644
--- a/data/assets/scene/solarsystem/planets/earth/aurorasaurus/northernViewline.asset
+++ b/data/assets/scene/solarsystem/planets/earth/aurorasaurus/northernViewline.asset
@@ -1,7 +1,7 @@
 
 local earth = asset.require("scene/solarsystem/planets/earth/earth")
 --TODO: Change this to user asset folder
-local geojsonPath =  asset.resource("C:/Users/alundkvi/Documents/work/OpenSpace/user/data/assets/aurorasaurus/geojson/northern_viewline_geojsons/")
+local geojsonPath =  "${USER_ASSETS}/aurorasaurus/geojson/northern_viewline_geojsons/"
 
 
 local Viewline_1 = {
diff --git a/data/assets/scene/solarsystem/planets/earth/aurorasaurus/southernViewline.asset b/data/assets/scene/solarsystem/planets/earth/aurorasaurus/southernViewline.asset
index 1281df177d..8ac7e2b2d3 100644
--- a/data/assets/scene/solarsystem/planets/earth/aurorasaurus/southernViewline.asset
+++ b/data/assets/scene/solarsystem/planets/earth/aurorasaurus/southernViewline.asset
@@ -1,7 +1,7 @@
 
 local earth = asset.require("scene/solarsystem/planets/earth/earth")
 --TODO: Change this to user asset folder
-local geojsonPath =  asset.resource("C:/Users/alundkvi/Documents/work/OpenSpace/user/data/assets/aurorasaurus/geojson/southern_viewline_geojsons/")
+local geojsonPath =  "${USER_ASSETS}/aurorasaurus/geojson/southern_viewline_geojsons/"
 
 local southern_viewline_1 = {
   Identifier = "southern_viewline_2024-05-10 15-00-00_1",
diff --git a/data/profiles/aurorasaurus.profile b/data/profiles/aurorasaurus.profile
index ac16efd9f1..32679d7820 100644
--- a/data/profiles/aurorasaurus.profile
+++ b/data/profiles/aurorasaurus.profile
@@ -55,10 +55,6 @@
       "action": "sky-camera_setup_loop",
       "key": "R"
     },
-    {
-      "action": "os.solarsystem.Toggleskycamera",
-      "key": "E"
-    },
     {
       "action": "os.disableAllAuroras",
       "key": "D"
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
index ce4bfb3274..2c80fb2977 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
@@ -201,7 +201,7 @@ namespace {
         std::optional<bool> preventHeightUpdate;
 
         // [[codegen::verbatim(FileInfo.description)]]
-        std::filesystem::path file;
+        std::string file;
 
         // [[codegen::verbatim(HeightOffsetInfo.description)]]
         std::optional<float> heightOffset;
@@ -334,7 +334,7 @@ GeoJsonComponent::GeoJsonComponent(const ghoul::Dictionary& dictionary,
     addProperty(_opacity);
     addProperty(_fade);
 
-    _geoJsonFile = p.file.string();
+    _geoJsonFile = absPath(p.file).string();
     _geoJsonFile.setReadOnly(true);
     addProperty(_geoJsonFile);