Add layers to globe on layer asset initialization

2026-01-05 03:00:58 -06:00 · 2020-08-17 14:01:30 +02:00
parent db65ef0363
commit 2d33a0f554
159 changed files with 846 additions and 761 deletions
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset
@@ -1,13 +1,9 @@
-local layerHelper = asset.require('util/layer_helper')
-local globeAsset = asset.require('./charon')
-local globeIdentifier = globeAsset.Charon.Identifier
+local colorLayersPath = "./layers/colorlayers"

-- set enabled and fallback layers
-local defaultLayers = asset.require('./layers/default_layers')
+local colorLayer = asset.require(colorLayersPath .. "/greyscale_usgs")

-local colorLayer = asset.require('./layers/colorlayers/greyscale_usgs').layer
-colorLayer.Enabled = true
-
-asset.onInitialize(function ()
-    layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
+-- Set enabled layers (temporary solution)
+-- @TODO: do this using a boolean that's passed to the 'asset.require' instead 
+asset.onInitialize(function () 
+    openspace.setPropertyValueSingle("Scene.Charon.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true)
 end)
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset
@@ -1,7 +1,13 @@
+local globeIdentifier = asset.require("./../../charon").Charon.Identifier
+
 local layer = {
    Identifier = "Greyscale_USGS",
    Name = "Black & White [USGS]",
    FilePath = "WMS:https://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/pluto/charon_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=NEWHORIZONS_CHARON_MOSAIC&SRS=EPSG:4326&BBOX=-180,-90.0003,359.972,90",
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/default_layers.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/default_layers.asset
@@ -1,15 +0,0 @@
-local colorLayersPath = "./colorlayers"
-local colorLayers = {
-    asset.require(colorLayersPath .. "/greyscale_usgs").layer, 
-}
-
-local heightLayers = {}
-local nightLayers = {}
-local overlays = {}
-local waterMasks = {}
-
-asset.export("colorLayers", colorLayers)
-asset.export("heightLayers", heightLayers)
-asset.export("nightLayers", nightLayers)
-asset.export("overlays", overlays)
-asset.export("waterMasks", waterMasks)
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset
@@ -1,13 +1,9 @@
-local layerHelper = asset.require('util/layer_helper')
-local globeAsset = asset.require('./pluto')
-local globeIdentifier = globeAsset.Pluto.Identifier
+local colorLayersPath = "./layers/colorlayers"

-- set enabled and fallback layers
-local defaultLayers = asset.require('./layers/default_layers')
+local colorLayer = asset.require(colorLayersPath .. "/greyscale_usgs")

-local colorLayer = asset.require('./layers/colorlayers/greyscale_usgs').layer
-colorLayer.Enabled = true
-
-asset.onInitialize(function ()
-    layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
+-- Set enabled layers (temporary solution)
+-- @TODO: do this using a boolean that's passed to the 'asset.require' instead 
+asset.onInitialize(function () 
+    openspace.setPropertyValueSingle("Scene.Pluto.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true)
 end)
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset
@@ -1,7 +1,13 @@
+local globeIdentifier = asset.require("./../../pluto").Pluto.Identifier
+
 local layer = {
    Identifier = "Greyscale_USGS",
    Name = "Black & White [USGS]",
    FilePath = "WMS:https://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/pluto/pluto_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=NEWHORIZONS_PLUTO_MOSAIC&SRS=EPSG:4326&BBOX=-180,-90,360,90",
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/default_layers.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/default_layers.asset
@@ -1,15 +0,0 @@
-local colorLayersPath = "./colorlayers"
-local colorLayers = {
-    asset.require(colorLayersPath .. "/greyscale_usgs").layer, 
-}
-
-local heightLayers = {}
-local nightLayers = {}
-local overlays = {}
-local waterMasks = {}
-
-asset.export("colorLayers", colorLayers)
-asset.export("heightLayers", heightLayers)
-asset.export("nightLayers", nightLayers)
-asset.export("overlays", overlays)
-asset.export("waterMasks", waterMasks)
--- a/data/assets/scene/solarsystem/planets/earth/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/default_layers.asset
@@ -1,33 +1,47 @@
-local layerHelper = asset.require('util/layer_helper')
-local globeAsset = asset.require('./earth')
-local globeIdentifier = globeAsset.Earth.Identifier
+local colorLayersPath = "./layers/colorlayers"
+local heightLayersPath = "./layers/heightlayers"
+local nightLayersPath = "./layers/nightlayers"
+local overlaysPath = "./layers/overlays"
+local waterMasksPath = "./layers/watermasks"

-- set enabled and fallback layers
-local defaultLayers = asset.require('./layers/default_layers')
-local colorFallbackLayer = asset.require('./layers/colorlayers/blue_marble_fallback').layer
-local nightFallbackLayer = asset.require('./layers/nightlayers/earth_night_texture').layer
-local heightFallbackLayer = asset.require('./layers/heightlayers/blue_marble_height_fallback').layer
+-- Color layers
+local colorLayer = asset.require(colorLayersPath .. "/esri_viirs_combo")
+asset.require(colorLayersPath .. "/esri_world_imagery") 
+asset.require(colorLayersPath .. "/esri_imagery_world_2d")
+asset.require(colorLayersPath .. "/viirs_snpp_temporal")
+asset.require(colorLayersPath .. "/aqua_modis_temporal")
+asset.require(colorLayersPath .. "/terra_modis_temporal")
+asset.require(colorLayersPath .. "/bmng_utah")
+asset.require(colorLayersPath .. "/bmng_sweden")
+asset.require(colorLayersPath .. "/amsr2_gcom_w1_sea_ice_concentration_temporal") 
+asset.require(colorLayersPath .. "/modis_terra_chlorophyll_a_temporal")
+asset.require(colorLayersPath .. "/ghrsst_l4_g1sst_sea_surface_temperature_temporal")
+asset.require(colorLayersPath .. "/ghrsst_l4_mur_sea_surface_temperature_temporal")

-colorFallbackLayer.Enabled = true
-heightFallbackLayer.Enabled = true
-nightFallbackLayer.Enabled = true
+-- Height layers
+local heightLayer = asset.require(heightLayersPath .. "/terrain_tileset")

-local colorLayer = asset.require('./layers/colorlayers/esri_viirs_combo').layer
-local heightLayer = asset.require('./layers/heightlayers/terrain_tileset').layer
-local nightLayer = asset.require('./layers/nightlayers/earth_at_night_2012').layer
-local waterMask = asset.require('./layers/watermasks/modis_water_mask').layer
+-- Night layers
+local nightLayer = asset.require(nightLayersPath .. "/earth_at_night_2012")
+asset.require(nightLayersPath .. "/earth_at_night_temporal")

-colorLayer.Enabled = true
-colorLayer.Fallback = colorFallbackLayer
+-- Overlays
+asset.require(overlaysPath .. "/coastlines")
+asset.require(overlaysPath .. "/reference_features")
+asset.require(overlaysPath .. "/reference_labels")
+asset.require(overlaysPath .. "/tile_indices")
+asset.require(overlaysPath .. "/size_reference")

-heightLayer.Enabled = true
-heightLayer.Fallback = heightFallbackLayer
+-- Watermasks
+asset.require(waterMasksPath .. "/gebco_sweden")
+asset.require(waterMasksPath .. "/gebco_utah") 
+local watermask = asset.require(waterMasksPath .. "/modis_water_mask")

-nightLayer.Enabled = true
-nightLayer.Fallback = nightFallbackLayer
-
-waterMask.Enabled = true
-
-asset.onInitialize(function ()
-    layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
+-- Set enabled layers (temporary solution)
+-- @TODO: do this using a boolean that's passed to the 'asset.require' instead 
+asset.onInitialize(function () 
+    openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true)
+    openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.HeightLayers." .. heightLayer.layer.Identifier .. ".Enabled", true)
+    openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.NightLayers." .. nightLayer.layer.Identifier .. ".Enabled", true)
+    openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.WaterMasks." .. watermask.layer.Identifier .. ".Enabled", true)
 end)
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset
@@ -1,3 +1,5 @@
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier
+
 local layer = {
    Identifier = "AMSR2_GCOM_W1_Sea_Ice_Concentration_Temporal",
    Name = "AMSR2 GCOM W1 Sea Ice Concentration (Temporal)",
@@ -12,4 +14,8 @@ local layer = {
    )
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset
@@ -1,3 +1,5 @@
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier
+
 local layer = {
    Identifier = "Aqua_Modis_Temporal",
    Name = "Aqua Modis (Temporal)",
@@ -12,4 +14,8 @@ local layer = {
    )
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier

 local layer = {
    Identifier = "BMNG_Sweden",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = mapServiceConfigsPath .. "/LiU/Bmng.wms"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier

 local layer = {
    Identifier = "BMNG_Utah",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = mapServiceConfigsPath .. "/Utah/Bmng.wms"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier

 local layer = {
    Identifier = "ESRI_Imagery_World_2D",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = mapServiceConfigsPath .. "/ESRI/ESRI_Imagery_World_2D.wms"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset
@@ -1,4 +1,7 @@
 local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier
+
+local fallBackLayer = asset.require("./fallbacks/blue_marble").layer

 local layer = {
    Identifier = "ESRI_VIIRS_Combo",
@@ -33,6 +36,11 @@ local layer = {
        },
    },
    PadTiles = false,
+    Fallback = fallBackLayer
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier

 local layer = {
    Identifier = "ESRI_World_Imagery",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = mapServiceConfigsPath .. "/ESRI/World_Imagery.wms"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset
@@ -1,4 +1,5 @@
-local texturesPath = asset.require("./../../earth_textures").TexturesPath
+local texturesPath = asset.require("./../../../earth_textures").TexturesPath
+local globeIdentifier = asset.require("./../../../earth").Earth.Identifier

 local layer = {
    Identifier = "Blue_Marble",
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset
@@ -1,3 +1,5 @@
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier
+
 local layer =  {
    Identifier = "GHRSST_L4_MUR_Sea_Surface_Temperature_Temporal",
    Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)",
@@ -12,4 +14,8 @@ local layer =  {
    )
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset
@@ -1,3 +1,5 @@
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier
+
 local layer = {
    Identifier = "Terra_Modis_Temporal",
    Name = "Terra Modis (Temporal)",
@@ -12,4 +14,8 @@ local layer = {
    )
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset
@@ -1,3 +1,5 @@
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier
+
 local layer = {
    Identifier = "MODIS_Terra_Chlorophyll_A_Temporal",
    Name = "MODIS Terra Chlorophyll A (Temporal)",
@@ -12,4 +14,8 @@ local layer = {
    )
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset
@@ -1,3 +1,5 @@
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier
+
 local layer = {
    Identifier = "Terra_Modis_Temporal",
    Name = "Terra Modis (Temporal)",
@@ -12,4 +14,8 @@ local layer = {
    )
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset
@@ -1,3 +1,5 @@
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier
+
 local layer = {
    Identifier = "VIIRS_SNPP_Temporal",
    Name = "VIIRS SNPP (Temporal)",
@@ -12,4 +14,8 @@ local layer = {
    )
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/default_layers.asset
@@ -1,48 +0,0 @@
-local colorLayersPath = "./colorlayers"
-local colorLayers = {
-    asset.require(colorLayersPath .. "/esri_viirs_combo").layer, 
-    asset.require(colorLayersPath .. "/esri_world_imagery").layer, 
-    asset.require(colorLayersPath .. "/esri_imagery_world_2d").layer, 
-    asset.require(colorLayersPath .. "/viirs_snpp_temporal").layer, 
-    asset.require(colorLayersPath .. "/aqua_modis_temporal").layer, 
-    asset.require(colorLayersPath .. "/terra_modis_temporal").layer, 
-    asset.require(colorLayersPath .. "/bmng_utah").layer, 
-    asset.require(colorLayersPath .. "/bmng_sweden").layer, 
-    asset.require(colorLayersPath .. "/amsr2_gcom_w1_sea_ice_concentration_temporal").layer, 
-    asset.require(colorLayersPath .. "/modis_terra_chlorophyll_a_temporal").layer, 
-    asset.require(colorLayersPath .. "/ghrsst_l4_g1sst_sea_surface_temperature_temporal").layer, 
-    asset.require(colorLayersPath .. "/ghrsst_l4_mur_sea_surface_temperature_temporal").layer
-}
-
-local heightLayersPath = "./heightlayers"
-local heightLayers = {
-    asset.require(heightLayersPath .. "/terrain_tileset").layer 
-}
-
-local nightLayersPath = "./nightlayers"
-local nightLayers = {
-    asset.require(nightLayersPath .. "/earth_at_night_2012").layer, 
-    asset.require(nightLayersPath .. "/earth_at_night_temporal").layer 
-}
-
-local overlaysPath = "./overlays"
-local overlays = {
-    asset.require(overlaysPath .. "/coastlines").layer,
-    asset.require(overlaysPath .. "/reference_features").layer,
-    asset.require(overlaysPath .. "/reference_labels").layer,
-    asset.require(overlaysPath .. "/tile_indices").layer,
-    asset.require(overlaysPath .. "/size_reference").layer
-}
-
-local waterMasksPath = "./watermasks"
-local waterMasks = {
-    asset.require(waterMasksPath .. "/gebco_sweden").layer, 
-    asset.require(waterMasksPath .. "/gebco_utah").layer, 
-    asset.require(waterMasksPath .. "/modis_water_mask").layer 
-}
-
-asset.export("colorLayers", colorLayers)
-asset.export("heightLayers", heightLayers)
-asset.export("nightLayers", nightLayers)
-asset.export("overlays", overlays)
-asset.export("waterMasks", waterMasks)
--- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset
@@ -1,4 +1,4 @@
-local texturesPath = asset.require("./../../earth_textures").TexturesPath
+local texturesPath = asset.require("./../../../earth_textures").TexturesPath

 local layer = {
    Name = "Earth Bluemarble Height",
--- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset
@@ -1,10 +1,18 @@
 local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier
+
+local fallBackLayer = asset.require("./fallbacks/blue_marble_height").layer

 local layer = {
    Identifier = "Terrain_tileset",
    Name = "Terrain tileset",
    FilePath = mapServiceConfigsPath .. "/ESRI/Terrain.wms",
    TilePixelSize = 64,
+    Fallback = fallBackLayer
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset
@@ -1,9 +1,17 @@
 local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier
+
+local fallBackLayer = asset.require("./fallbacks/earth_night_texture").layer

 local layer = {
    Identifier = "Earth_at_Night_2012",
    Name = "Earth at Night 2012",
    FilePath = mapServiceConfigsPath .. "/GIBS/night/VIIRS_CityLights_2012.wms",
+    Fallback = fallBackLayer
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "NightLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset
@@ -1,3 +1,5 @@
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier
+
 local layer =  {
    Identifier = "Earth_at_Night_Temporal",
    Name = "Earth at Night (Temporal)",
@@ -12,4 +14,8 @@ local layer =  {
    )
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "NightLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset
@@ -1,9 +0,0 @@
-local texturesPath = asset.require("./../../earth_textures").TexturesPath
-
-local layer = {
-    Identifier = "Earth_Night",
-    Name = "Earth Night",
-    FilePath = texturesPath .. "/earth_night.jpg",
-}
-
-asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset
@@ -0,0 +1,9 @@
+local texturesPath = asset.require("./../../../earth_textures").TexturesPath
+
+local layer = {
+    Identifier = "Earth_Night Texture",
+    Name = "Earth Night Texture",
+    FilePath = texturesPath .. "/earth_night.jpg",
+}
+
+asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset
@@ -1,8 +1,13 @@
 local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier

 local layer = {
    Identifier = "Coastlines",
    FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Coastlines.wms"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines_enabled.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines_enabled.asset
@@ -0,0 +1,10 @@
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier
+
+local layer = asset.require("./coastlines").layer
+layer.Enabled = true
+
+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer)
+end)
+
+asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier

 local layer = {
    Identifier = "Reference_Features",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Reference_Features.wms"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier

 local layer = {
    Identifier = "Reference_Labels",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Reference_Labels.wms"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset
@@ -1,10 +1,15 @@
-local earthAsset = asset.require("./../../earth")
+local earthAsset = asset.require("./../../earth").Earth
+local globeIdentifier = earthAsset.Identifier

 local layer ={
    Identifier = "Size_Reference",
    Name = "Size Reference",
    Type = "SizeReferenceTileLayer",
-    Radii = earthAsset.Earth.Renderable.Radii
+    Radii = earthAsset.Renderable.Radii
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier

 local layer = {
    Identifier = "Tile_Indices",
@@ -6,4 +7,8 @@ local layer = {
    Type = "TileIndexTileLayer"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier

 local layer = {
    Name = "Gebco [Sweden]",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = mapServiceConfigsPath .. "/LiU/Gebco.wms"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "WaterMasks", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier

 local layer = {
    Name = "Gebco [Utah]",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = mapServiceConfigsPath .. "/Utah/Gebco.wms"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "WaterMasks", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../earth").Earth.Identifier

 local layer = {
    Identifier = "MODIS_Water_Mask",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = mapServiceConfigsPath .. "/GIBS/water/MODIS_Water_Mask.wms",
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "WaterMasks", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset
@@ -1,16 +1,27 @@
-local layerHelper = asset.require('util/layer_helper')
-local globeAsset = asset.require('./moon')
-local globeIdentifier = globeAsset.Moon.Identifier
+local colorLayersPath = "./layers/colorlayers"
+local heightLayersPath = "./layers/heightlayers"

-- set enabled and fallback layers
-local defaultLayers = asset.require('./layers/default_layers')
+-- Color layers
+local colorLayer = asset.require(colorLayersPath .. "/wac_utah")
+asset.require(colorLayersPath .. "/wac_sweden")
+asset.require(colorLayersPath .. "/clemuvvis_utah")
+asset.require(colorLayersPath .. "/clemuvvis_sweden")
+asset.require(colorLayersPath .. "/uvvishybrid_utah")
+asset.require(colorLayersPath .. "/uvvishybrid_sweden")
+asset.require(colorLayersPath .. "/kaguya_utah")
+asset.require(colorLayersPath .. "/kaguya_sweden")
+asset.require(colorLayersPath .. "/lola_clr_shade_utah")
+asset.require(colorLayersPath .. "/lola_clr_shade_sweden")
+asset.require(colorLayersPath .. "/lola_shade_utah")
+asset.require(colorLayersPath .. "/lola_shade_sweden")

-local colorLayer = asset.require('./layers/colorlayers/wac_utah').layer
-local heightLayer = asset.require('./layers/heightlayers/loladem_utah').layer
+-- Height layers
+local heightLayer = asset.require(heightLayersPath .. "/loladem_utah")
+asset.require(heightLayersPath .. "/loladem_sweden")

-colorLayer.Enabled = true
-heightLayer.Enabled = true
-
-asset.onInitialize(function ()
-    layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
+-- Set enabled layers (temporary solution)
+-- @TODO: do this using a boolean that's passed to the 'asset.require' instead 
+asset.onInitialize(function () 
+    openspace.setPropertyValueSingle("Scene.Moon.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true)
+    openspace.setPropertyValueSingle("Scene.Moon.Renderable.Layers.HeightLayers." .. heightLayer.layer.Identifier .. ".Enabled", true)
 end)
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../moon").Moon.Identifier

 local layer = {
    Identifier = "ClemUvvis_Sweden",
@@ -10,4 +11,8 @@ local layer = {
    }
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../moon").Moon.Identifier

 local layer = {
    Identifier = "ClemUvvis_Utah",
@@ -10,4 +11,8 @@ local layer = {
    }
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../moon").Moon.Identifier

 local layer = {
    Identifier = "Kaguya_Sweden",
@@ -10,4 +11,8 @@ local layer = {
    }
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../moon").Moon.Identifier

 local layer = {
    Identifier = "Kaguya_Utah",
@@ -10,4 +11,8 @@ local layer = {
    }
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../moon").Moon.Identifier

 local layer = {
    Identifier = "Lola_Clr_Shade_Sweden",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = mapServiceConfigs .. "/LiU/Lola_Clr_Shade.wms"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../moon").Moon.Identifier

 local layer = {
    Identifier = "Lola_Clr_Shade_Utah",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = mapServiceConfigs .. "/Utah/LolaClrShade.wms"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../moon").Moon.Identifier

 local layer = {
    Identifier = "Lola_Shade_Sweden",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = mapServiceConfigs .. "/LiU/Lola_Shade.wms"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../moon").Moon.Identifier

 local layer = {
    Identifier = "Lola_Shade_Utah",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = mapServiceConfigs .. "/Utah/LolaShade.wms"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../moon").Moon.Identifier

 local layer = {
    Identifier = "UvvisHybrid_Sweden",
@@ -10,4 +11,8 @@ local layer = {
    }
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../moon").Moon.Identifier

 local layer = {
    Identifier = "UvvisHybrid_Utah",
@@ -10,4 +11,8 @@ local layer = {
    }
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../moon").Moon.Identifier

 local layer = {
    Identifier = "WAC_Sweden",
@@ -7,4 +8,8 @@ local layer = {
    Settings = { Gamma = 0.84 }
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../moon").Moon.Identifier

 local layer = {
    Identifier = "WAC_Utah",
@@ -7,4 +8,8 @@ local layer = {
    Settings = { Gamma = 0.84 }
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/default_layers.asset
@@ -1,31 +0,0 @@
-local colorLayersPath = "./colorlayers"
-local colorLayers = {
-    asset.require(colorLayersPath .. "/wac_utah").layer, 
-    asset.require(colorLayersPath .. "/wac_sweden").layer,
-    asset.require(colorLayersPath .. "/clemuvvis_utah").layer,
-    asset.require(colorLayersPath .. "/clemuvvis_sweden").layer,
-    asset.require(colorLayersPath .. "/uvvishybrid_utah").layer,
-    asset.require(colorLayersPath .. "/uvvishybrid_sweden").layer,
-    asset.require(colorLayersPath .. "/kaguya_utah").layer,
-    asset.require(colorLayersPath .. "/kaguya_sweden").layer,
-    asset.require(colorLayersPath .. "/lola_clr_shade_utah").layer,
-    asset.require(colorLayersPath .. "/lola_clr_shade_sweden").layer,
-    asset.require(colorLayersPath .. "/lola_shade_utah").layer,
-    asset.require(colorLayersPath .. "/lola_shade_sweden").layer
-}
-
-local heightLayersPath = "./heightlayers"
-local heightLayers = {
-    asset.require(heightLayersPath .. "/loladem_utah").layer, 
-    asset.require(heightLayersPath .. "/loladem_sweden").layer
-}
-
-local nightLayers = {}
-local overlays = {}
-local waterMasks = {}
-
-asset.export("colorLayers", colorLayers)
-asset.export("heightLayers", heightLayers)
-asset.export("nightLayers", nightLayers)
-asset.export("overlays", overlays)
-asset.export("waterMasks", waterMasks)
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../moon").Moon.Identifier

 local layer = {
    Identifier = "LolaDem_Sweden",
@@ -8,4 +9,8 @@ local layer = {
    Settings = { Multiplier = 0.5 }
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../moon").Moon.Identifier

 local layer = {
    Identifier = "LolaDem_Utah",
@@ -8,4 +9,8 @@ local layer = {
    Settings = { Multiplier = 0.5 }
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset
@@ -1,13 +1,9 @@
-local layerHelper = asset.require('util/layer_helper')
-local globeAsset = asset.require('./callisto')
-local globeIdentifier = globeAsset.Callisto.Identifier
+local colorLayersPath = "./layers/colorlayers"

-- set enabled and fallback layers
-local defaultLayers = asset.require('./layers/default_layers')
+local colorLayer = asset.require(colorLayersPath .. "/callisto_texture")

-local colorLayer = asset.require('./layers/colorlayers/callisto_texture').layer
-colorLayer.Enabled = true
-
-asset.onInitialize(function ()
-    layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
+-- Set enabled layers (temporary solution)
+-- @TODO: do this using a boolean that's passed to the 'asset.require' instead 
+asset.onInitialize(function () 
+    openspace.setPropertyValueSingle("Scene.Callisto.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true)
 end)
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset
@@ -1,8 +1,13 @@
 local texturesPath = asset.require("./../../callisto_textures").TexturesPath
+local globeIdentifier = asset.require("./../../callisto").Callisto.Identifier

 local layer = {
    Identifier = "Texture",
    FilePath = texturesPath .. "/callisto.jpg",
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/default_layers.asset
@@ -1,15 +0,0 @@
-local colorLayersPath = "./colorlayers"
-local colorLayers = {
-    asset.require(colorLayersPath .. "/callisto_texture").layer, 
-}
-
-local heightLayers = {}
-local nightLayers = {}
-local overlays = {}
-local waterMasks = {}
-
-asset.export("colorLayers", colorLayers)
-asset.export("heightLayers", heightLayers)
-asset.export("nightLayers", nightLayers)
-asset.export("overlays", overlays)
-asset.export("waterMasks", waterMasks)
--- a/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset
@@ -1,13 +1,9 @@
-local layerHelper = asset.require('util/layer_helper')
-local globeAsset = asset.require('./jupiter')
-local globeIdentifier = globeAsset.Jupiter.Identifier
+local colorLayersPath = "./layers/colorlayers"

-- set enabled and fallback layers
-local defaultLayers = asset.require('./layers/default_layers')
+local colorLayer = asset.require(colorLayersPath .. "/jupiter_texture")

-local colorLayer = asset.require('./layers/colorlayers/jupiter_texture').layer
-colorLayer.Enabled = true
-
-asset.onInitialize(function ()
-    layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
+-- Set enabled layers (temporary solution)
+-- @TODO: do this using a boolean that's passed to the 'asset.require' instead 
+asset.onInitialize(function () 
+    openspace.setPropertyValueSingle("Scene.Jupiter.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true)
 end)
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset
@@ -1,13 +1,10 @@
-local layerHelper = asset.require('util/layer_helper')
-local globeAsset = asset.require('./europa')
-local globeIdentifier = globeAsset.Europa.Identifier
+local colorLayersPath = "./layers/colorlayers"

-- set enabled and fallback layers
-local defaultLayers = asset.require('./layers/default_layers')
+asset.require(colorLayersPath .. "/europa_texture")
+local colorLayer = asset.require(colorLayersPath .. "/voyager_global_mosaic")

-local colorLayer = asset.require('./layers/colorlayers/voyager_global_mosaic').layer
-colorLayer.Enabled = true
-
-asset.onInitialize(function ()
-    layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
+-- Set enabled layers (temporary solution)
+-- @TODO: do this using a boolean that's passed to the 'asset.require' instead 
+asset.onInitialize(function () 
+    openspace.setPropertyValueSingle("Scene.Europa.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true)
 end)
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset
@@ -1,8 +1,13 @@
 local texturesPath = asset.require("./../../europa_textures").TexturesPath
+local globeIdentifier = asset.require("./../../europa").Europa.Identifier

 local layer = {
    Identifier = "Texture",
    FilePath = texturesPath .. "/europa.jpg",
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset
@@ -1,4 +1,5 @@
 local map_service_configs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../europa").Europa.Identifier

 local layer = {
    Identifier = "Voyager_Global_Mosaic",
@@ -7,4 +8,8 @@ local layer = {
    BlendMode = "Color",
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/default_layers.asset
@@ -1,16 +0,0 @@
-local colorLayersPath = "./colorlayers"
-local colorLayers = {
-    asset.require(colorLayersPath .. "/europa_texture").layer, 
-    asset.require(colorLayersPath .. "/voyager_global_mosaic").layer
-}
-
-local heightLayers = {}
-local nightLayers = {}
-local overlays = {}
-local waterMasks = {}
-
-asset.export("colorLayers", colorLayers)
-asset.export("heightLayers", heightLayers)
-asset.export("nightLayers", nightLayers)
-asset.export("overlays", overlays)
-asset.export("waterMasks", waterMasks)
--- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset
@@ -1,13 +1,9 @@
-local layerHelper = asset.require('util/layer_helper')
-local globeAsset = asset.require('./ganymede')
-local globeIdentifier = globeAsset.Ganymede.Identifier
+local colorLayersPath = "./layers/colorlayers"

-- set enabled and fallback layers
-local defaultLayers = asset.require('./layers/default_layers')
+local colorLayer = asset.require(colorLayersPath .. "/ganymede_texture")

-local colorLayer = asset.require('./layers/colorlayers/ganymede_texture').layer
-colorLayer.Enabled = true
-
-asset.onInitialize(function ()
-    layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
+-- Set enabled layers (temporary solution)
+-- @TODO: do this using a boolean that's passed to the 'asset.require' instead 
+asset.onInitialize(function () 
+    openspace.setPropertyValueSingle("Scene.Ganymede.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true)
 end)
--- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset
@@ -1,8 +1,13 @@
 local texturesPath = asset.require("./../../ganymede_textures").TexturesPath
+local globeIdentifier = asset.require("./../../ganymede").Ganymede.Identifier

 local layer = {
    Identifier = "Texture",
    FilePath = texturesPath .. "/ganymede.jpg",
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/default_layers.asset
@@ -1,15 +0,0 @@
-local colorLayersPath = "./colorlayers"
-local colorLayers = {
-    asset.require(colorLayersPath .. "/ganymede_texture").layer, 
-}
-
-local heightLayers = {}
-local nightLayers = {}
-local overlays = {}
-local waterMasks = {}
-
-asset.export("colorLayers", colorLayers)
-asset.export("heightLayers", heightLayers)
-asset.export("nightLayers", nightLayers)
-asset.export("overlays", overlays)
-asset.export("waterMasks", waterMasks)
--- a/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset
@@ -1,13 +1,9 @@
-local layerHelper = asset.require('util/layer_helper')
-local globeAsset = asset.require('./io')
-local globeIdentifier = globeAsset.Io.Identifier
+local colorLayersPath = "./layers/colorlayers"

-- set enabled and fallback layers
-local defaultLayers = asset.require('./layers/default_layers')
+local colorLayer = asset.require(colorLayersPath .. "/io_texture")

-local colorLayer = asset.require('./layers/colorlayers/io_texture').layer
-colorLayer.Enabled = true
-
-asset.onInitialize(function ()
-    layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
+-- Set enabled layers (temporary solution)
+-- @TODO: do this using a boolean that's passed to the 'asset.require' instead 
+asset.onInitialize(function () 
+    openspace.setPropertyValueSingle("Scene.Io.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true)
 end)
--- a/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset
@@ -1,8 +1,13 @@
 local texturesPath = asset.require("./../../io_textures").TexturesPath
+local globeIdentifier = asset.require("./../../io").Io.Identifier

 local layer = {
    Identifier = "Texture",
    FilePath = texturesPath .. "/io.jpg",
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/jupiter/io/layers/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/io/layers/default_layers.asset
@@ -1,15 +0,0 @@
-local colorLayersPath = "./colorlayers"
-local colorLayers = {
-    asset.require(colorLayersPath .. "/io_texture").layer, 
-}
-
-local heightLayers = {}
-local nightLayers = {}
-local overlays = {}
-local waterMasks = {}
-
-asset.export("colorLayers", colorLayers)
-asset.export("heightLayers", heightLayers)
-asset.export("nightLayers", nightLayers)
-asset.export("overlays", overlays)
-asset.export("waterMasks", waterMasks)
--- a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset
@@ -1,8 +1,13 @@
 local texturesPath = asset.require("./../../jupiter_textures").TexturesPath
+local globeIdentifier = asset.require("./../../jupiter").Jupiter.Identifier

 local layer = {
    Identifier = "Texture",
    FilePath = texturesPath .. "/jupiter.jpg",
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/jupiter/layers/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/layers/default_layers.asset
@@ -1,15 +0,0 @@
-local colorLayersPath = "./colorlayers"
-local colorLayers = {
-    asset.require(colorLayersPath .. "/jupiter_texture").layer, 
-}
-
-local heightLayers = {}
-local nightLayers = {}
-local overlays = {}
-local waterMasks = {}
-
-asset.export("colorLayers", colorLayers)
-asset.export("heightLayers", heightLayers)
-asset.export("nightLayers", nightLayers)
-asset.export("overlays", overlays)
-asset.export("waterMasks", waterMasks)
--- a/data/assets/scene/solarsystem/planets/mars/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mars/default_layers.asset
@@ -1,21 +1,36 @@
-local layerHelper = asset.require('util/layer_helper')
-local globeAsset = asset.require('./mars')
-local globeIdentifier = globeAsset.Mars.Identifier
+local colorLayersPath = "./layers/colorlayers"
+local heightLayersPath = "./layers/heightlayers"
+local overlaysPath = "./layers/overlays"
+    
+-- Color layer
+local colorLayer = asset.require(colorLayersPath .. "/moc_wa_color_utah") -- TODO: fallback
+asset.require(colorLayersPath .. "/moc_wa_color_liu") -- TODO: fallback
+asset.require(colorLayersPath .. "/viking_mdim_utah") 
+asset.require(colorLayersPath .. "/viking_mdim_sweden") 
+asset.require(colorLayersPath .. "/mola_pseudo_color_utah") 
+asset.require(colorLayersPath .. "/mola_pseudo_color_sweden") 
+asset.require(colorLayersPath .. "/mola_hrsc_utah") 
+asset.require(colorLayersPath .. "/mola_hrsc_sweden") 
+asset.require(colorLayersPath .. "/themis_ir_day_utah") 
+asset.require(colorLayersPath .. "/themis_ir_day_sweden") 
+asset.require(colorLayersPath .. "/themis_ir_night_utah") 
+asset.require(colorLayersPath .. "/themis_ir_night_sweden")
+asset.require(colorLayersPath .. "/ctx_mosaic_utah") 
+asset.require(colorLayersPath .. "/ctx_mosaic_sweden") 
+asset.require(colorLayersPath .. "/ctx_blended_01")

-- set enabled and fallback layers
-local defaultLayers = asset.require('./layers/default_layers')
+-- Height layers
+asset.require(heightLayersPath .. "/mola")
+asset.require(heightLayersPath .. "/mola_europe")
+local heightLayer = asset.require(heightLayersPath .. "/mola_utah")

-local colorFallbackLayer = asset.require('./layers/colorlayers/mars_texture').layer
-colorFallbackLayer.Enabled = true
+-- Overlays
+asset.require(overlaysPath .. "/indices")
+asset.require(overlaysPath .. "/size_reference")

-local colorLayer = asset.require('./layers/colorlayers/moc_wa_color_utah').layer
-local heightLayer = asset.require('./layers/heightlayers/mola_utah').layer
-
-colorLayer.Enabled = true
-colorLayer.Fallback = colorFallbackLayer
-
-heightLayer.Enabled = true
-
-asset.onInitialize(function ()
-    layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
+-- Set enabled layers (temporary solution)
+-- @TODO: do this using a boolean that's passed to the 'asset.require' instead 
+asset.onInitialize(function () 
+    openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true)
+    openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers." .. heightLayer.layer.Identifier .. ".Enabled", true)
 end)
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier

 local layer = {
    Identifier = "CTX_blended_01",
@@ -11,4 +12,8 @@ local layer = {
    }
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier

 local layer = {
    Identifier = "CTX_Mosaic_Sweden",
@@ -7,4 +8,8 @@ local layer = {
    BlendMode = "Color"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier

 local layer = {
    Identifier = "CTX_Mosaic_Utah",
@@ -7,4 +8,8 @@ local layer = {
    BlendMode = "Color"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/fallbacks/mars_texture.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/fallbacks/mars_texture.asset
@@ -0,0 +1,9 @@
+local texturesPath = asset.require("./../../../mars_textures").TexturesPath
+
+local layer = {
+    Identifier = "Mars_Texture",
+    Name = "Mars Texture",
+    FilePath = texturesPath .. "/mars.jpg",
+}
+
+asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset
@@ -1,4 +1,5 @@
 local texturesPath = asset.require("./../../mars_textures").TexturesPath
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier

 local layer = {
    Identifier = "Mars_Texture",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = texturesPath .. "/mars.jpg",
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset
@@ -1,4 +1,7 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier
+
+local fallbackLayer = asset.require("./fallbacks/mars_texture").layer

 local layer = {
    Identifier = "MOC_WA_Color_LiU",
@@ -7,7 +10,12 @@ local layer = {
    Settings = {
        Gamma = 1.6,
        Multiplier = 1.07
-    }
+    }, 
+    Fallback = fallbackLayer
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset
@@ -1,6 +1,7 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier

-local texturesPath = asset.require("./../../mars_textures").TexturesPath
+local fallbackLayer = asset.require("./fallbacks/mars_texture").layer

 local layer = {
    Identifier = "MOC_WA_Color_Utah",
@@ -9,7 +10,12 @@ local layer = {
    Settings = {
        Gamma = 1.6,
        Multiplier = 1.07
-    }
+    }, 
+    Fallback = fallbackLayer
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier

 local layer = {
    Identifier = "MOLA_HRSC_Sweden",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = mapServiceConfigs .. "/LiU/Mola_HRSC.wms"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier

 local layer = {
    Identifier = "MOLA_HRSC_Utah",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = mapServiceConfigs .. "/Utah/Mola_HRSC.wms"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier

 local layer = {
    Identifier = "MOLA_Pseudo_Color_Sweden",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = mapServiceConfigs .. "/LiU/Mola_PseudoColor.wms"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier

 local layer = {
    Identifier = "MOLA_Pseudo_Color_Utah",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = mapServiceConfigs .. "/Utah/Mola_PseudoColor.wms"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier

 local layer = {
    Identifier = "Themis_IR_Day_Sweden",
@@ -7,4 +8,8 @@ local layer = {
    BlendMode = "Color"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier

 local layer = {
    Identifier = "Themis_IR_Day_Utah",
@@ -7,4 +8,8 @@ local layer = {
    BlendMode = "Color"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier

 local layer = {
    Identifier = "Themis_IR_Night_Sweden",
@@ -7,4 +8,8 @@ local layer = {
    BlendMode = "Color"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier

 local layer = {
    Identifier = "Themis_IR_Night_Utah",
@@ -7,4 +8,8 @@ local layer = {
    BlendMode = "Color"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier

 local layer = {
    Identifier = "Viking_MDIM_Sweden",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = mapServiceConfigs .. "/LiU/MDIM.wms"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier

 local layer = {
    Identifier = "Viking_MDIM_Utah",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = mapServiceConfigs .. "/Utah/Mdim.wms"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mars/layers/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/default_layers.asset
@@ -1,41 +0,0 @@
-local colorLayersPath = "./colorlayers"
-local colorLayers = {
-    asset.require(colorLayersPath .. "/moc_wa_color_utah").layer, 
-    asset.require(colorLayersPath .. "/moc_wa_color_liu").layer, 
-    asset.require(colorLayersPath .. "/viking_mdim_utah").layer, 
-    asset.require(colorLayersPath .. "/viking_mdim_sweden").layer, 
-    asset.require(colorLayersPath .. "/mola_pseudo_color_utah").layer, 
-    asset.require(colorLayersPath .. "/mola_pseudo_color_sweden").layer, 
-    asset.require(colorLayersPath .. "/mola_hrsc_utah").layer, 
-    asset.require(colorLayersPath .. "/mola_hrsc_sweden").layer, 
-    asset.require(colorLayersPath .. "/themis_ir_day_utah").layer, 
-    asset.require(colorLayersPath .. "/themis_ir_day_sweden").layer, 
-    asset.require(colorLayersPath .. "/themis_ir_night_utah").layer, 
-    asset.require(colorLayersPath .. "/themis_ir_night_sweden").layer,
-    asset.require(colorLayersPath .. "/ctx_mosaic_utah").layer, 
-    asset.require(colorLayersPath .. "/ctx_mosaic_sweden").layer, 
-    asset.require(colorLayersPath .. "/ctx_blended_01").layer
-}
-
-local heightLayersPath = "./heightlayers"
-local heightLayers = {
-    asset.require(heightLayersPath .. "/mola").layer,
-    asset.require(heightLayersPath .. "/mola_europe").layer,
-    asset.require(heightLayersPath .. "/mola_utah").layer,
-}
-
-local nightLayers = {}
-
-local overlaysPath = "./overlays"
-local overlays = {
-    asset.require(overlaysPath .. "/indices").layer,
-    asset.require(overlaysPath .. "/size_reference").layer,
-}
-
-local waterMasks = {}
-
-asset.export("colorLayers", colorLayers)
-asset.export("heightLayers", heightLayers)
-asset.export("nightLayers", nightLayers)
-asset.export("overlays", overlays)
-asset.export("waterMasks", waterMasks)
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier

 local layer = {
    Identifier = "Mola",
@@ -7,4 +8,8 @@ local layer = {
    TilePixelSize = 90
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier

 local layer = {
    Identifier = "Mola_Europe",
@@ -7,4 +8,8 @@ local layer = {
    TilePixelSize = 90
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier

 local layer = {
    Identifier = "Mola_Utah",
@@ -7,4 +8,8 @@ local layer = {
    TilePixelSize = 90
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset
@@ -1,6 +1,12 @@
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier
+
 local layer = {
    Identifier = "Indices",
    Type = "TileIndexTileLayer"
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset
@@ -1,10 +1,15 @@
-local marsAsset = asset.require("./../../mars")
+local marsAsset = asset.require("./../../mars").Mars
+local globeIdentifier = marsAsset.Identifier

 local layer ={
    Identifier = "Size_Reference",
    Name = "Size Reference",
    Type = "SizeReferenceTileLayer",
-    Radii = marsAsset.Mars.Renderable.Radii
+    Radii = marsAsset.Renderable.Radii
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mercury/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/default_layers.asset
@@ -1,13 +1,42 @@
-local layerHelper = asset.require('util/layer_helper')
-local globeAsset = asset.require('./mercury')
-local globeIdentifier = globeAsset.Mercury.Identifier
+local colorLayersPath = "./layers/colorlayers"

-- set enabled and fallback layers
-local defaultLayers = asset.require('./layers/default_layers')
+--mdis
+asset.require(colorLayersPath .. "/messenger_mdis_utah") 
+asset.require(colorLayersPath .. "/messenger_mdis_sweden") 
+--mossaic
+asset.require(colorLayersPath .. "/messenger_mosaic_utah") 
+asset.require(colorLayersPath .. "/messenger_mosaic_sweden") 
+--mosaic2 aka 8 color
+asset.require(colorLayersPath .. "/messenger_mosaic2_utah")
+asset.require(colorLayersPath .. "/messenger_mosaic2_sweden")
+--bdr
+local colorLayer = asset.require(colorLayersPath .. "/messenger_bdr_utah") -- TODO enabled
+asset.require(colorLayersPath .. "/messenger_bdr_sweden") 
+--mdr
+asset.require(colorLayersPath .. "/messenger_mdr_utah") 
+--mp3
+asset.require(colorLayersPath .. "/messenger_mp3_utah") 
+--hie
+asset.require(colorLayersPath .. "/messenger_hie_utah") 
+asset.require(colorLayersPath .. "/messenger_hie_sweden") 
+--hiw
+asset.require(colorLayersPath .. "/messenger_hiw_utah") 
+asset.require(colorLayersPath .. "/messenger_hiw_sweden")
+--loi
+asset.require(colorLayersPath .. "/messenger_loi_utah") 
+asset.require(colorLayersPath .. "/messenger_loi_sweden") 
+--shade
+asset.require(colorLayersPath .. "/messenger_shade_utah")
+asset.require(colorLayersPath .. "/messenger_shade_sweden")
+--local textures, these are mineral abundance maps
+asset.require(colorLayersPath .. "/alsimap_02122015")
+asset.require(colorLayersPath .. "/casimap_02122015")
+asset.require(colorLayersPath .. "/fesimap_02122015")
+asset.require(colorLayersPath .. "/mgsimap_02122015")
+asset.require(colorLayersPath .. "/ssimap_02122015")

-local colorLayer = asset.require('./layers/colorlayers/messenger_bdr_utah').layer
-colorLayer.Enabled = true
-
-asset.onInitialize(function ()
-    layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
+-- Set enabled layers (temporary solution)
+-- @TODO: do this using a boolean that's passed to the 'asset.require' instead 
+asset.onInitialize(function () 
+    openspace.setPropertyValueSingle("Scene.Mercury.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true)
 end)
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset
@@ -1,4 +1,5 @@
 local texturesPath = asset.require("./../../mercury_textures").TexturesPath
+local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier

 local layer = {
    Identifier = "alsimap_02122015",
@@ -6,4 +7,8 @@ local layer = {
    BlendMode = "Multiply",
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset
@@ -1,4 +1,5 @@
 local texturesPath = asset.require("./../../mercury_textures").TexturesPath
+local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier

 local layer = {
    Identifier = "casimap_02122015",
@@ -6,4 +7,8 @@ local layer = {
    BlendMode = "Multiply",
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset
@@ -1,4 +1,5 @@
 local texturesPath = asset.require("./../../mercury_textures").TexturesPath
+local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier

 local layer = {
    Identifier = "fesimap_02122015",
@@ -6,4 +7,8 @@ local layer = {
    BlendMode = "Multiply",
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier

 local layer = {
    Identifier = "Messenger_BDR_Sweden",
@@ -7,4 +8,8 @@ local layer = {
    TilePixelSize = 360,
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier

 local layer = {
    Identifier = "Messenger_BDR_Utah",
@@ -7,4 +8,8 @@ local layer = {
    TilePixelSize = 360,
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier

 local layer = {
    Identifier = "Messenger_HIE_Sweden",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = mapServiceConfigs .. "/LiU/Messenger_HIE.wms",
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset
@@ -1,4 +1,5 @@
 local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier

 local layer = {
    Identifier = "Messenger_HIE_Utah",
@@ -6,4 +7,8 @@ local layer = {
    FilePath = mapServiceConfigs .. "/Utah/MessengerHIE.wms",
 }

+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
--- a/Show More
+++ b/Show More