Remove Fallback layers (closes #1819)

data/assets/scene/solarsystem/planets/earth/default_layers.asset

@@ -1,4 +1,5 @@
 -- Color layers
+asset.require("./layers/colorlayers/blue_marble")
 local colorLayer = asset.require("./layers/colorlayers/esri_viirs_combo")
 asset.require("./layers/colorlayers/esri_world_imagery") 
 asset.require("./layers/colorlayers/esri_imagery_world_2D")
@@ -13,9 +14,11 @@ asset.require("./layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temp
 asset.require("./layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal")
 
 -- Height layers
+asset.require("./layers/heightlayers/blue_marble_height")
 local heightLayer = asset.require("./layers/heightlayers/terrain_tileset")
 
 -- Night layers
+asset.require("./layers/nightlayers/earth_night_texture")
 local nightLayer = asset.require("./layers/nightlayers/earth_at_night_2012")
 asset.require("./layers/nightlayers/earth_at_night_temporal")
 

data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble.asset

@@ -1,4 +1,4 @@
-local globeIdentifier = asset.require("../../../earth").Earth.Identifier
+local globeIdentifier = asset.require("../../earth").Earth.Identifier
 
 local texturesPath = asset.syncedResource({
   Name = "Earth Textures",
@@ -14,6 +14,15 @@ local layer = {
   Description = [[ Earth image from Blue Marble Next Generation ]],
 }
 
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
 
 

data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset

@@ -1,7 +1,5 @@
 local globeIdentifier = asset.require("../../earth").Earth.Identifier
 
-local fallBackLayer = asset.require("./fallbacks/blue_marble").layer
-
 local layer = {
   Identifier = "ESRI_VIIRS_Combo",
   Name = "ESRI VIIRS Combo",
@@ -41,7 +39,6 @@ local layer = {
     },
   },
   PadTiles = false,
-  Fallback = fallBackLayer,
   Description = [[Level based layer combining "VIIRS SNPP (Temporal)" and ESRI World
     Imagery. "VIIRS SNPP (Temporal)" is faded out at tile level 4]]
 }

data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset

@@ -1,3 +1,5 @@
+local globeIdentifier = asset.require("../../earth").Earth.Identifier
+
 local texturesPath = asset.syncedResource({
   Name = "Earth Textures",
   Type = "HttpSynchronization",
@@ -12,6 +14,14 @@ local layer = {
   Description = [[ Topographic layer from Blue Marble Next Generation]]
 }
 
+asset.onInitialize(function()
+  openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteLayer(globeIdentifier, "HeightLayers", layer)
+end)
+
 asset.export("layer", layer)
 
 

data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset

@@ -1,12 +1,10 @@
 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 = asset.localResource("terrain_tileset.wms"),
   TilePixelSize = 64,
-  Fallback = fallBackLayer,
   Description = [[This globe layer presents elevation data at approximately 90m or 1km
     per pixel resolution for the world. The elevation data includes 90m Shuttle Radar
     Topography Mission (SRTM) elevation data from NASA and National

data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset

@@ -1,12 +1,9 @@
 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 = asset.localResource("earth_at_night_2012.wms"),
-  Fallback = fallBackLayer,
   Description = [[ The lights of cities and villages trace the outlines of civilization
     in this global view. ]],
 }

data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset

@@ -1,3 +1,5 @@
+local globeIdentifier = asset.require("../../earth").Earth.Identifier
+
 local texturesPath = asset.syncedResource({
   Name = "Earth Textures",
   Type = "HttpSynchronization",
@@ -12,6 +14,14 @@ local layer = {
   Description = [[ Earth's city lights are clearly visible from space ]]
 }
 
+asset.onInitialize(function()
+  openspace.globebrowsing.addLayer(globeIdentifier, "NightLayers", layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteLayer(globeIdentifier, "NightLayers", layer)
+end)
+
 asset.export("layer", layer)
 
 

data/assets/scene/solarsystem/planets/mars/default_layers.asset

@@ -1,6 +1,7 @@
 -- Color layer
-local colorLayer = asset.require("./layers/colorlayers/moc_wa_color_utah") -- TODO: fallback
-asset.require("./layers/colorlayers/moc_wa_color_sweden") -- TODO: fallback
+asset.require("./layers/colorlayers/mars_texture")
+local colorLayer = asset.require("./layers/colorlayers/moc_wa_color_utah")
+asset.require("./layers/colorlayers/moc_wa_color_sweden")
 asset.require("./layers/colorlayers/viking_mdim_utah") 
 asset.require("./layers/colorlayers/viking_mdim_sweden") 
 asset.require("./layers/colorlayers/mola_pseudo_color_utah") 

data/assets/scene/solarsystem/planets/mars/layers/colorlayers/fallbacks/mars_texture.asset

@@ -1,24 +0,0 @@
-local texturesPath = asset.syncedResource({
-  Name = "Mars Textures",
-  Type = "HttpSynchronization",
-  Identifier = "mars_textures",
-  Version = 1
-})
-
-local layer = {
-  Identifier = "Mars_Texture",
-  Name = "Mars Texture",
-  FilePath = texturesPath .. "mars.jpg",
-}
-
-asset.export("layer", layer)
-
-
-asset.meta = {
-  Name = "Mars Texutre",
-  Version = "1.0",
-  Description = [[ Default jpg texture for Mars]],
-  Author = "OpenSpace Team",
-  URL = "http://openspaceproject.com",
-  License = "MIT license"
-}

data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_sweden.asset

@@ -1,7 +1,5 @@
 local globeIdentifier = asset.require("../../mars").Mars.Identifier
 
-local fallbackLayer = asset.require("./fallbacks/mars_texture").layer
-
 local layer = {
   Identifier = "MOC_WA_Color_LiU",
   Name = "MOC WA Color [Sweden]",
@@ -10,7 +8,6 @@ local layer = {
     Gamma = 1.6,
     Multiplier = 1.07
   }, 
-  Fallback = fallbackLayer,
   Description = [[This map is an AMNH version of the global mossaic produced by the
     Mars Global Surveyor Wide Angle Camera. This version has color added and the
     shadows subdued based on the MOLA DTM.  Data Reference:

data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset

@@ -1,7 +1,5 @@
 local globeIdentifier = asset.require("../../mars").Mars.Identifier
 
-local fallbackLayer = asset.require("./fallbacks/mars_texture").layer
-
 local layer = {
   Identifier = "MOC_WA_Color_Utah",
   Name = "MOC WA Color [Utah]",
@@ -10,7 +8,6 @@ local layer = {
     Gamma = 1.6,
     Multiplier = 1.07
   }, 
-  Fallback = fallbackLayer,
   Description = [[This map is an AMNH version of the global mossaic produced by the
     Mars Global Surveyor Wide Angle Camera. This version has color added and the
     shadows subdued based on the MOLA DTM.  Data Reference:

data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset

@@ -13,7 +13,7 @@ local layer = {
     latitude. <br><br> Reference: * Edwards, C.S., K. J. Nowicki, P. R. Christensen,
     J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of global planetary image
     datasets: 1. Techniques and data processing for Thermal Emission Imaging System
-    (THEMIS) multi‐spectral data, J. Geophys. Res., 116, E10008,
+    (THEMIS) multi-spectral data, J. Geophys. Res., 116, E10008,
     doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 (Description from
     URL).]],
 }

data/assets/scene/solarsystem/planets/mars/layers/heightlayers/MDEM200M.asset

@@ -5,13 +5,12 @@ local layer = {
   Name = "HRSC MOLA Blended DEM Global 200m v2",
   FilePath = asset.localResource("mdem200m.wms"),
   Description = [[ Blend of data derived from the Mars Orbiter Laser Altimeter 
-    (MOLA, an instrument aboard NASA’s
-    Mars Global Surveyor spacecraft), and data derived from the High-Resolution
-    Stereo Camera (HRSC, an instrument aboard the European Space Agency’s Mars 
-    Express spacecraft). The average accuracy is ~100 meters in horizontal 
-    position and the elevation uncertainty is at least ±3 m. This
-    tiled elevation layer, hosted by Esri, is made available using
-    lossless LERC compression. (Description from URL).]],
+    (MOLA, an instrument aboard NASA's Mars Global Surveyor spacecraft), and data derived
+    from the High-Resolution Stereo Camera (HRSC, an instrument aboard the European Space
+    Agency's Mars Express spacecraft). The average accuracy is ~100 meters in horizontal 
+    position and the elevation uncertainty is at least ±3 m. This tiled elevation layer,
+    hosted by ESRI, is made available using lossless LERC compression.
+    (Description from URL).]],
 }
 
 asset.onInitialize(function()

data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset

@@ -7,11 +7,11 @@ local layer = {
   Description = [[ HiRISE (High Resolution Imaging Science Experiment) is the most
     powerful camera ever sent to another planet, one of six instruments onboard the
     Mars Reconnaissance Orbiter. We launched in 2005, arrived at Mars in 2006 and have
-    been imaging ever since. Our camera’s high resolution capability (imaging up to 30
+    been imaging ever since. Our camera's high resolution capability (imaging up to 30
     centimeters per pixel) remains unprecedented for any existing orbiter in the study
     of the Red Planet, as well as being an indispensable instrument for helping to
     select landing sites for robotic and future human exploration. In the past decade,
-    we’ve also imaged avalanches in progress, and discovered dark flows that may or
+    we've also imaged avalanches in progress, and discovered dark flows that may or
     may not be briny seeps. Hundreds of science papers have been published with our
     data. (Description from URL). This map contains a subet set of the HiRISE
     DEM where available as of 2018.]],

modules/globebrowsing/src/layergroup.cpp

@@ -34,7 +34,6 @@
 
 namespace {
     constexpr const char* _loggerCat = "LayerGroup";
-    constexpr const char* KeyFallback = "Fallback";
 
     constexpr openspace::properties::Property::PropertyInfo BlendTileInfo = {
         "BlendTileLevels",
@@ -68,18 +67,6 @@ void LayerGroup::setLayersFromDict(const ghoul::Dictionary& dict) {
         }
         catch (const ghoul::RuntimeError& e) {
             LERRORC(e.component, e.message);
-
-            if (layerDict.hasValue<ghoul::Dictionary>(KeyFallback))  {
-                LWARNING("Unable to create layer. Initializing fallback layer.");
-                ghoul::Dictionary fallbackLayerDict =
-                    layerDict.value<ghoul::Dictionary>(KeyFallback);
-                try {
-                    addLayer(fallbackLayerDict);
-                }
-                catch (const ghoul::RuntimeError& except) {
-                    LERRORC(except.component, except.message);
-                }
-            }
         }
     }
 }