Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

data/scene/default.scene

@@ -86,59 +86,10 @@ function postInitialization()
 
     openspace.printInfo("Setting default values")
 
-    openspace.setPropertyValueSingle("SunGlare.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("SunMarker.renderable.Enabled", false)
-    
-    openspace.setPropertyValueSingle("Constellation Bounds.renderable.Enabled", false)
     openspace.setPropertyValueSingle("Global Properties.GlobeBrowsing.GdalWrapper.LogGdalErrors", false)
 
-    -- Digital Universe
-    openspace.setPropertyValueSingle("Wilkinson Microwave Anisotropy Probe (WMAP).renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Quasars.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Pulsars.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Globular Clusters.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Kepler Planetary Candidates.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Local Dwarf Galaxies.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Exoplanets.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Sloan Digital Sky Survey.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Planetary Nebulae.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("OB Associations.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Open Star Clusters.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Supernova Remnants.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("HII Regions.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Abell Galaxy Clusters.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("2MASS Galaxies.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("6dF Galaxies.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("2dF Galaxies.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Cosmic Background Explorer.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Planck.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Dwarfs.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Nearby Galaxy Groups.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Galaxy Cluster Labels.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Voids.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Galaxy Superclusters.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Stars Labels.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Stars Labels - Alternate.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Tully Galaxies.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Tully Galaxies Pics.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Constellations (Extragalactic).renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Constellations.renderable.Enabled", false)
-
-    openspace.setPropertyValueSingle("Earth.RenderableGlobe.Atmosphere", true)
     openspace.setPropertyValueSingle("Earth.RenderableGlobe.Debug.LevelByProjectedAreaElseDistance", false)
 
-    openspace.setPropertyValueSingle("Ecliptic Grid.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Ecliptic Grid Labels.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Equatorial Grid.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Equatorial Grid Labels.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Galactic Grid.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("Galactic Grid Labels.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("100kly Grid.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("1Mly Grid.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("10Mly Grid.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("100Mly Grid.renderable.Enabled", false)
-    openspace.setPropertyValueSingle("20Gly Grid.renderable.Enabled", false)
-
     openspace.globebrowsing.goToGeo(58.5877, 16.1924, 20000000)
 
     openspace.printInfo("Done setting default values")

data/scene/digitaluniverse/2dF/2dF.data

@@ -1,6 +1,6 @@
 return {
     FileRequest = {
-        { Identifier = "digitaluniverse_2df_speck", Destination = "speck", Version = 1 },
-        { Identifier = "digitaluniverse_2df_textures", Destination = "textures", Version = 1 }
+        { Identifier = "digitaluniverse_2dF_speck", Destination = "speck", Version = 1 },
+        { Identifier = "digitaluniverse_2dF_textures", Destination = "textures", Version = 1 }
     }
 }

data/scene/digitaluniverse/2dF/2dF.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = { 1.0, 1.0, 1.0 },
             Transparency = 1.0,
             File = "speck/2dF.speck",

data/scene/digitaluniverse/2mass/2mass.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = { 1.0, 0.4, 0.2 },
             Transparency = 1.0,
             File = "speck/2MASS.speck",

data/scene/digitaluniverse/6dF/6dF.data

@@ -1,6 +1,6 @@
 return {
     FileRequest = {
-        { Identifier = "digitaluniverse_6df_speck", Destination = "speck", Version = 1 },
-        { Identifier = "digitaluniverse_6df_textures", Destination = "textures", Version = 1 }
+        { Identifier = "digitaluniverse_6dF_speck", Destination = "speck", Version = 1 },
+        { Identifier = "digitaluniverse_6dF_textures", Destination = "textures", Version = 1 }
     }
 }

data/scene/digitaluniverse/6dF/6dF.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = { 1.0, 1.0, 1.0 },
             Transparency = 1.0,
             File = "speck/6dF.speck",

data/scene/digitaluniverse/abell/abell.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = { 1.0, 0.4, 0.2 },
             Transparency = 1.0,
             ScaleFactor = 525.0,

data/scene/digitaluniverse/alternatestarlabels/alternatestarlabels.mod

@@ -4,12 +4,10 @@ return {
         Name = "Stars Labels - Alternate",
         Parent = "Root",
         Renderable = {
-            --Type = "RenderablePoints",
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = {1.0, 1.0, 1.0},
             Transparency = 0.65,
-            --ScaleFactor = 10.0,
-            --File = "speck/stars.speck",
             LabelFile = "speck/stars-altlbl.label",
             TextColor = { 0.4, 0.4, 0.4, 1.0 },
             DrawLabels = true,

data/scene/digitaluniverse/backgroundradiation/backgroundradiation.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableSphere",
+            Enabled = false,
             Size = 3975.41417036064E23,
             Segments = 80,
             Alpha = 0.5,
@@ -18,6 +19,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableSphere",
+            Enabled = false,
             Size = 3975.41417036064E23,
             Segments = 80,
             Alpha = 0.5,
@@ -31,6 +33,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableSphere",
+            Enabled = false,
             Size = 3975.41417036064E23,
             Segments = 80,
             Alpha = 0.5,

data/scene/digitaluniverse/clusters/clusters.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = {1.0, 1.0, 1.0},
             Transparency = 0.65,
             LabelFile = "speck/galclust.label",

data/scene/digitaluniverse/constellationbounds/constellationbounds.mod

@@ -10,6 +10,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableConstellationBounds",
+            Enabled = false,
             File = "data/bound_20.dat",
             ConstellationFile = "data/constellations.dat"
             -- ConstellationSelection = zodiacs

data/scene/digitaluniverse/constellations/constellations.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableDUMeshes",
+            Enabled = false,
             Color = { 1.0, 0.4, 0.2 },
             Transparency = 1.0,
             ScaleFactor = 1.0,
@@ -23,6 +24,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableDUMeshes",
+            Enabled = false,
             Color = { 1.0, 0.4, 0.2 },
             Transparency = 1.0,
             ScaleFactor = 1.0,

data/scene/digitaluniverse/dwarfs/dwarfs.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = { 0.5, 1.0, 0.2 },
             Transparency = 0.999,
             File = "speck/dwarfs.speck",

data/scene/digitaluniverse/exoplanets/exoplanets.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = { 1.0, 1.0, 1.0 },
             Transparency = 0.65,
             ScaleFactor = 10.0,

data/scene/digitaluniverse/globularclusters/globularclusters.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = { 0.8, 0.8, 0.0 },
             Transparency = 0.35,
             File = "speck/gc.speck",

data/scene/digitaluniverse/grids/grids.mod

@@ -4,6 +4,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = {1.0, 1.0, 1.0},
             Transparency = 0.65,
             --ScaleFactor = 10.0,
@@ -30,6 +31,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = {1.0, 1.0, 1.0},
             Transparency = 0.65,
             --ScaleFactor = 10.0,
@@ -47,6 +49,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = {1.0, 1.0, 1.0},
             Transparency = 0.65,
             --ScaleFactor = 10.0,
@@ -64,6 +67,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableDUMeshes",
+            Enabled = false,
             Color = {1.0, 1.0, 1.0},
             Transparency = 0.4,
             ScaleFactor = 1.0,
@@ -82,6 +86,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableDUMeshes",
+            Enabled = false,
             Color = {1.0, 1.0, 1.0},
             Transparency = 0.4,
             ScaleFactor = 1.0,
@@ -100,6 +105,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableDUMeshes",
+            Enabled = false,
             Color = {1.0, 1.0, 1.0},
             Transparency = 0.4,
             ScaleFactor = 1.0,
@@ -118,6 +124,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableDUMeshes",
+            Enabled = false,
             Color = {1.0, 1.0, 1.0},
             Transparency = 0.4,
             ScaleFactor = 1.0,
@@ -136,6 +143,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableDUMeshes",
+            Enabled = false,
             Color = {1.0, 1.0, 1.0},
             Transparency = 0.4,
             ScaleFactor = 1.0,

data/scene/digitaluniverse/groups/groups.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = { 1.0, 1.0, 1.0 },
             Transparency = 0.65,
             --ScaleFactor = 10.0,

data/scene/digitaluniverse/h2regions/h2regions.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = { 0.0, 0.5, 1.0 },
             Transparency = 0.35,
             File = "speck/h2.speck",

data/scene/digitaluniverse/kepler/kepler.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = { 1.0, 1.0, 0.0 },
             Transparency = 0.99,
             ScaleFactor = 395.0,

data/scene/digitaluniverse/localdwarfs/localdwarfs.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = { 0.5, 1.0, 0.2 },
             Transparency = 0.3,
             File = "speck/localdwarfs.speck",

data/scene/digitaluniverse/obassociations/obassociations.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = { 0.0, 0.0, 1.0 },
             Transparency = 0.5,
             File = "speck/ob.speck",

data/scene/digitaluniverse/openclusters/openclusters.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = { 0.1, 0.8, 0.4 },
             Transparency = 0.5,
             File = "speck/oc.speck",

data/scene/digitaluniverse/planetarynebulae/planetarynebulae.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = {0.4, 0.4, 0.9},
             Transparency = 0.35,
             File = "speck/pn.speck",

data/scene/digitaluniverse/pulsars/pulsars.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = { 0.7, 0.0, 0.0 },
             Transparency = 0.5,
             File = "speck/pulsar.speck",

data/scene/digitaluniverse/quasars/quasars.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = { 1.0, 0.4, 0.2 },
             Transparency = 1.0,
             File = "speck/quasars.speck",

data/scene/digitaluniverse/sloandss/sloandss.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = { 0.8, 0.8, 1.0 },
             Transparency = 1.0,
             ScaleFactor = 507.88,

data/scene/digitaluniverse/starlabels/starlabels.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = { 1.0, 1.0, 1.0 },
             Transparency = 0.65,
             LabelFile = "speck/stars.label",

data/scene/digitaluniverse/superclusters/superclusters.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = { 1.0, 1.0, 1.0 },
             Transparency = 0.65,
             File = "speck/superclust.speck",

data/scene/digitaluniverse/supernovaremnants/supernovaremnants.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = { 1.0, 0.5, 0.0 },
             Transparency = 0.5,
             File = "speck/snr.speck",

data/scene/digitaluniverse/tully/tully.data

@@ -1,6 +1,6 @@
 return {
     FileRequest = {
-        { Identifier = "digitaluniverse_tully_speck", Destination = "speck", Version = 1 }
+        { Identifier = "digitaluniverse_tully_speck", Destination = "speck", Version = 1 },
         { Identifier = "digitaluniverse_tully_textures", Destination = "textures", Version = 1 }
     }
 }

data/scene/digitaluniverse/tully/tully.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = { 1.0, 0.4, 0.2 },
             Transparency = 0.99,
             ScaleFactor = 502.77,
@@ -38,6 +39,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderablePlanesCloud",
+            Enabled = false,
             Color = { 1.0, 1.0, 1.0 },
             Transparency = 0.99,
             ScaleFactor = 27.39,

data/scene/digitaluniverse/voids/voids.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableBillboardsCloud",
+            Enabled = false,
             Color = { 1.0, 1.0, 1.0 },
             Transparency = 0.65,
             --ScaleFactor = 10.0,

data/scene/examples/luatransforms/luatransforms.mod

@@ -0,0 +1,21 @@
+return {
+    -- Earth barycenter module
+    {
+        Name = "Lua Transformation",
+        Parent = "SolarSystemBarycenter",
+        Transform = {
+            Rotation = {
+                Type = "LuaRotation",
+                Script = "rotation.lua"
+            },
+            Scale = {
+                Type = "LuaScale",
+                Script = "scale.lua"
+            },
+            Translation = {
+                Type = "LuaTranslation",
+                Script = "translate.lua"
+            }
+        }
+    }
+}

data/scene/examples/luatransforms/rotation.lua

@@ -0,0 +1,6 @@
+-- t1:  Ingame seconds past the J2000 epoch
+-- t2:  Wallclock milliseconds past the J2000 epoch
+
+function rotation(t1, t2)
+    return 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0
+end

data/scene/examples/luatransforms/scale.lua

@@ -0,0 +1,6 @@
+-- t1:  Ingame seconds past the J2000 epoch
+-- t2:  Wallclock milliseconds past the J2000 epoch
+
+function scale(t1, t2)
+    return 1.0;
+end

data/scene/examples/luatransforms/translate.lua

@@ -0,0 +1,6 @@
+-- t1:  Ingame seconds past the J2000 epoch
+-- t2:  Wallclock milliseconds past the J2000 epoch
+
+function translation(t1, t2)
+    return 0.0, 0.0, 0.0
+end

data/scene/grids/grids.mod

@@ -5,6 +5,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableSphericalGrid",
+            Enabled = false,
             GridColor = { 0.7, 0.0, 0.0, 0.5},
             LineWidth = 2.0,
             Radius = 9.46377307652E17;
@@ -20,6 +21,7 @@ return {
         Parent = "Root",
         Renderable = {
             Type = "RenderableSphericalGrid",
+            Enabled = false,
             GridColor = { 0.0, 0.0, 1.0, 0.8},
             LineWidth = 2.0,
             Radius = 6.2440846E17,
@@ -35,6 +37,7 @@ return {
         Parent = "SolarSystem",
         Renderable = {
             Type = "RenderableSphericalGrid",
+            Enabled = false,
             LineWidth = 2.0,
             Radius = 9.46377307652E18;
             GridColor = { 0.0, 0.6, 0.6, 0.6}

data/scene/mars/mars.mod

@@ -79,20 +79,24 @@ return {
                     },
                     {
                         Name = "Themis IR Day [Utah]",
-                        FilePath = "map_service_configs/Utah/Themis_IR_Day.xml"
+                        FilePath = "map_service_configs/Utah/Themis_IR_Day.xml",
+                        BlendMode = "Color"
                     },
                     {
                         Name = "Themis IR Night [Utah]",
-                        FilePath = "map_service_configs/Utah/Themis_IR_Night.xml"
+                        FilePath = "map_service_configs/Utah/Themis_IR_Night.xml",
+                        BlendMode = "Color"
                     },
 
                     {
                         Name = "Themis IR Day [AWS]",
-                        FilePath = "map_service_configs/AWS/Themis_IR_Day.wms"
+                        FilePath = "map_service_configs/AWS/Themis_IR_Day.wms",
+                        BlendMode = "Color"
                     },
                     {
                         Name = "Themis IR Night [AWS]",
-                        FilePath = "map_service_configs/AWS/Themis_IR_Night.wms"
+                        FilePath = "map_service_configs/AWS/Themis_IR_Night.wms",
+                        BlendMode = "Color"
                     }
                 },
                 Overlays = {

data/scene/missions/osirisrex/bennu/bennu.mod

@@ -32,12 +32,7 @@ return {
                 Fadeable = false,
                 Ghosting = false,
             },
-            Textures = {
-                Type = "simple",
-                Color =  "textures/gray.png",
-                Project = "textures/defaultProj.png",
-                Default = "textures/defaultProj.png"
-            },
+            ColorTexture =  "textures/gray.png",
             Projection = {
                 Sequence   = "InstrumentTimes",
                 SequenceType = "instrument-times",

data/scene/moon/map_service_configs/MoonTrek/LRO WAC.wms

@@ -1,20 +0,0 @@
-<GDAL_WMS>
-        <Service name="TMS">
-                <ServerUrl>http://asgard.sci.utah.edu/Moon/Wac/tile/${z}/${y}/${x}</ServerUrl>
-        </Service>
-        <DataWindow>
-                <UpperLeftX>-180.0</UpperLeftX>
-                <UpperLeftY>90.0</UpperLeftY>
-                <LowerRightX>180.0</LowerRightX>
-                <LowerRightY>-90.0</LowerRightY>
-        <SizeX>109164</SizeX>
-        <SizeY>54582</SizeY>
-                <TileLevel>8</TileLevel>
-                <YOrigin>top</YOrigin>
-        </DataWindow>
-        <Projection>GEOGCS["GCS_Moon_2000",DATUM["D_Moon_2000",SPHEROID["Moon_2000_IAU_IAG",1737400.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]]</Projection>
-        <BlockSizeX>256</BlockSizeX>
-        <BlockSizeY>256</BlockSizeY>
-        <BandsCount>1</BandsCount>
-        <MaxConnections>10</MaxConnections>
-</GDAL_WMS>

data/scene/moon/map_service_configs/Utah/Wac.wms

@@ -1,6 +1,6 @@
 <GDAL_WMS>
         <Service name="TMS">
-                <ServerUrl>http://moontrek.jpl.nasa.gov/trektiles/Moon/EQ/LRO_WAC_Mosaic_Global_303ppd_v02/1.0.0/default/default028mm/${z}/${y}/${x}.jpg</ServerUrl>
+                <ServerUrl>http://asgard.sci.utah.edu/Moon/Wac/tile/${z}/${y}/${x}</ServerUrl>
         </Service>
         <DataWindow>
                 <UpperLeftX>-180.0</UpperLeftX>

data/scene/moon/moon.mod

@@ -24,9 +24,8 @@ return {
                 ColorLayers = {
                     -- MoonTrek based servers
                     {
-                        Name = "WAC [MoonTrek]",
-                        FilePath = "map_service_configs/MoonTrek/LRO WAC.wms",
-                        Enabled = true
+                        Name = "Apollo 16 Metric Cam Image Mosaic",
+                        FilePath = "map_service_configs/MoonTrek/Apollo16_Metric_Cam_Image_Mosaic.wms"
                     },
                     -- Utah based servers
                     {
@@ -38,9 +37,9 @@ return {
                         FilePath = "map_service_configs/Utah/Kaguya.wms"
                     },
                     {
-                        Name = "WAC [Utah]",
-                        FilePath = "map_service_configs/Utah/Wac.wms"
-                        -- Enabled = true,
+                        Name = "WAC Utah",
+                        FilePath = "map_service_configs/Utah/Wac.wms",
+                        Enabled = true
                     }
                 },
                 HeightLayers = {

data/scene/osirisrex.scene

@@ -121,7 +121,7 @@ return {
         "sun",
         "mercury",
         "venus",
-        "lodglobes/earth",
+        "earth",
         "moon",
         "mars",
         "jupiter",

data/scene/sun/sun.mod

@@ -69,6 +69,7 @@ return {
         Name = "SunMarker",
         Parent = "Sun",
         Renderable = {
+            Enabled = false,
             Type = "RenderablePlane",
             Size = 3.0E11,
             Origin = "Center",

data/web/log/script.js

@@ -9,7 +9,7 @@ function remove(node) {
   node.parentNode.removeChild(node);
 }
 
-function scrollTo(selector) {
+function scrollToPosition(selector) {
   var element = document.querySelector(selector);
   if (element && element.scrollIntoView) {
     element.scrollIntoView();
@@ -34,7 +34,7 @@ function pluralize(nItems, singular, plural) {
 }
 
 function scrollLink(content, selector) {
-  var html =  '<a onclick="scrollTo(\'' + selector + '\')">' + content + "</a>";
+  var html =  '<a onclick="scrollToPosition(\'' + selector + '\')">' + content + "</a>";
   return html;
 }
 

data/web/log/style.css

@@ -87,6 +87,7 @@ thead th:first-child {
 
 .summary {
   padding: 5px;
+  cursor: pointer;
 }
 .summary-warning {
   background-color: #fef8c3;

data/web/scenelicense/main.hbs

@@ -0,0 +1,9 @@
+<div id="page-content-wrapper">
+  <div class="container-fluid documentation-container">
+    <h1>OpenSpace Scene License Information</h1>
+    <p>Version: {{version.[0]}}.{{version.[1]}}.{{version.[2]}}</p>
+    {{#each sceneLicenses}}
+      {{> scenelicense}}
+    {{/each}}
+  </div>
+</div>

data/web/scenelicense/scenelicense.hbs

@@ -0,0 +1,16 @@
+<div class="documentation-item">
+  <div class="row">
+    <div class="col-lg-12">
+      <p>
+         <a href="#{{urlify module}}" name="{{urlify module}}">
+          <span class="documentation-key">{{module}}</span>
+        </a>
+        <p>{{name}}</p>
+        <br />
+        <p>{{attribution}}</p>
+        <p>{{url}}</p>
+        <p>{{licenseText}}</p>
+      </p>
+    </div>
+  </div>
+</div>

data/web/scenelicense/script.js

@@ -0,0 +1,28 @@
+window.onload = function () {
+  var mainTemplateElement = document.getElementById('mainTemplate');
+  var mainTemplate = Handlebars.compile(mainTemplateElement.innerHTML);
+
+  var sceneLicenseTemplate = document.getElementById('sceneLicenseTemplate');
+  Handlebars.registerPartial('scenelicense', sceneLicenseTemplate.innerHTML);
+
+  Handlebars.registerHelper('urlify', function(options, context) {  
+    var data = context.data;
+    var identifier = options.replace(" ", "-").toLowerCase();
+
+    while (data = data._parent) {
+      if (data.key !== undefined) {
+        identifier = data.key + "-" + identifier;
+      }
+    }
+
+    return identifier;
+  });
+
+  var data = {
+    sceneLicenses: sceneLicenses,
+    version: version
+  }
+
+  var contents = mainTemplate(data);
+  document.body.innerHTML = contents;
+}