diff --git a/data/assets/base.asset b/data/assets/base.asset index 989f888df3..60d4e207e7 100644 --- a/data/assets/base.asset +++ b/data/assets/base.asset @@ -10,8 +10,6 @@ asset.require('scene/solarsystem/sun/glare') asset.require('scene/solarsystem/sun/default_layers') asset.require('scene/solarsystem/planets/planets') asset.require('scene/solarsystem/planets/default_layers') -asset.require('scene/solarsystem/planets/mars/moons/phobos') -asset.require('scene/solarsystem/planets/mars/moons/deimos') asset.require('scene/solarsystem/dwarf_planets/pluto/system') asset.require('scene/solarsystem/dwarf_planets/pluto/default_layers') asset.require('scene/solarsystem/dwarf_planets/pluto/charon/default_layers') diff --git a/data/assets/scene/solarsystem/planets/default_layers.asset b/data/assets/scene/solarsystem/planets/default_layers.asset index 4fc2b0ada0..37649a9ed0 100644 --- a/data/assets/scene/solarsystem/planets/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/default_layers.asset @@ -8,6 +8,8 @@ asset.require('./jupiter/ganymede/default_layers') asset.require('./jupiter/io/default_layers') asset.require('./mars/default_layers') +asset.require('./mars/moons/layers/colorlayers/deimos_viking') +asset.require('./mars/moons/layers/colorlayers/phobos_viking') asset.require('./mercury/default_layers') diff --git a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset new file mode 100644 index 0000000000..a339e5b425 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset @@ -0,0 +1,29 @@ +local globeIdentifier = asset.require("./../../deimos").Deimos.Identifier + +local layer = { + Identifier = "Deimos_Global_Mosaic_USGS", + Name = "Deimos Global Mosaic [USGS]", + Enabled = true, + FilePath = "WMS:https://wms.wr.usgs.gov/cgi-bin/mapserv?map=/maps/mars/deimos_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=Deimos_Simple_Cylindrical_Rasters&SRS=EPSG:4326&BBOX=-180,-90,360,90", + Description = [[ This Viking-based cylindrical map of Deimos was created by Philip + Stooke with the assistance of Chris Jongkind and Megan Arntz. Control is based on a + shape model and mosaic by Peter Thomas and colleagues at Cornell University. Date + released 26 October 2001. (Description from URL)]] +} + +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + +asset.export("layer", layer) + + +asset.meta = { + Name = "Deimos Global Mosaic [USGS]", + Version = "1.0", + Author = "Philip Stooke/NASA", + URL = "https://astrowebmaps.wr.usgs.gov/webmapatlas/Layers/maps.html", + License = "NASA/PDS", + Identifiers = {'Deimos_Global_Mosaic_USGS'} + +} diff --git a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset new file mode 100644 index 0000000000..6a0c5b8d9a --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset @@ -0,0 +1,26 @@ +local globeIdentifier = asset.require("./../../phobos").Phobos.Identifier + +local layer = { + Identifier = "Phobos_Global_Shaded_Relief_USGS", + Name = "Phobos Global Shaded Relief [USGS]", + Enabled = true, + FilePath = "WMS:https://wms.wr.usgs.gov/cgi-bin/mapserv?map=/maps/mars/phobos_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=Phobos_Simple_Cylindrical_Rasters&SRS=EPSG:4326&BBOX=-180,-90,360,90", + Description = [[ Viking-base Phobos shaded relief created by USGS.]] +} + +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + +asset.export("layer", layer) + + +asset.meta = { + Name = "Phobos Global Shaded Relief [USGS]", + Version = "1.0", + Author = "USGS/NASA", + URL = "https://astrowebmaps.wr.usgs.gov/webmapatlas/Layers/maps.html", + License = "NASA/PDS", + Identifiers = {'Phobos_Global_Shaded_Relief_USGS'} + +} diff --git a/data/assets/scene/solarsystem/planets/planets.asset b/data/assets/scene/solarsystem/planets/planets.asset index d7ea310c0b..2c80f258c5 100644 --- a/data/assets/scene/solarsystem/planets/planets.asset +++ b/data/assets/scene/solarsystem/planets/planets.asset @@ -14,6 +14,8 @@ asset.require('./earth/moon/trail') asset.require('./mars/mars') asset.require('./mars/atmosphere') +asset.require('./mars/moons/phobos') +asset.require('./mars/moons/deimos') asset.require('./jupiter/jupiter') asset.require('./jupiter/major_moons')