diff --git a/data/assets/scene/solarsystem/planets/mars/default_layers.asset b/data/assets/scene/solarsystem/planets/mars/default_layers.asset index 92b856d860..f3390997c6 100644 --- a/data/assets/scene/solarsystem/planets/mars/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/mars/default_layers.asset @@ -14,7 +14,7 @@ asset.require("./layers/colorlayers/themis_ir_night_utah", false) asset.require("./layers/colorlayers/themis_ir_night_sweden", false) asset.require("./layers/colorlayers/ctx_mosaic_utah", false) asset.require("./layers/colorlayers/ctx_mosaic_sweden", false) -asset.require("./layers/colorlayers/ctx_blended_01", false) +asset.require("./layers/colorlayers/ctx_blended", false) asset.require("./layers/colorlayers/hirise", false) asset.require("./layers/colorlayers/hirisels", false) diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.asset new file mode 100644 index 0000000000..4df28544f5 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.asset @@ -0,0 +1,36 @@ +local globeIdentifier = asset.require("../../mars").Mars.Identifier + +local layer = { + Identifier = "CTX_blended", + Name = "CTX Blended", + Enabled = asset.enabled, + FilePath = asset.localResource("ctx_blended.vrt"), + BlendMode = "Color", + Description = [[The Bruce Murray Laboratory for Planetary Visualization has completed a 5.7 terapixel mosaic of the surface of Mars rendered at 5.0 m/px. Each pixel in the mosaic is about the size of a typical parking space, providing unprecedented resolution of the martian surface at the global scale. + + The mosaic covers 99.5% of Mars from 88°S to 88°N. The pixels that make up the mosaic can all be mapped back to their source data, providing full traceability for the entire mosaic. The mosaic is available to stream over the internet and to download, as described below. + + All data in the mosaic come from the Context Camera (CTX) onboard the Mars Reconnaissance Orbiter (MRO). (Description from URL)]] +} + +asset.onInitialize(function() + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + +asset.onDeinitialize(function() + openspace.globebrowsing.deleteLayer(globeIdentifier, "ColorLayers", layer) +end) + +asset.export("layer", layer) + + + +asset.meta = { + Name = "CTX Blended", + Version = "1.0", + Description = [[New blended CTX map for Mars from CalTech Murray lab. This map is + hosted by ESRI]], + Author = "Caltech Murray Lab", + URL = "http://murray-lab.caltech.edu/CTX/", + License = "Esri Master License Agreement" +} diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.vrt b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.vrt similarity index 90% rename from data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.vrt rename to data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.vrt index ed8fb78132..342a7ad608 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.vrt +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.vrt @@ -5,7 +5,7 @@ 0.00000000000000E+00 Gray - ctx_blended_01.wms + ctx_blended.wms 1 @@ -17,7 +17,7 @@ 0 Alpha - ctx_blended_01.wms + ctx_blended.wms 1 diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.wms b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.wms new file mode 100644 index 0000000000..cb5c3f9598 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.wms @@ -0,0 +1,22 @@ + + + https://astro.arcgis.com/arcgis/rest/services/OnMars/CTX1/raw/tile/${z}/${y}/${x} + + + -180.0 + 90.0 + 180.0 + -90.0 + 4194304 + 2097152 + 12 + top + + GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] + 512 + 512 + 1 + 5 + + 404,400 + diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.asset similarity index 97% rename from data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset rename to data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.asset index 884991fc0b..e4e4f48944 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.asset @@ -4,7 +4,7 @@ local layer = { Identifier = "CTX_blended_01", Name = "CTX Blended beta01", Enabled = asset.enabled, - FilePath = asset.localResource("ctx_blended_01.vrt"), + FilePath = asset.localResource("ctx_blended_beta01.vrt"), BlendMode = "Color", Settings = { Gamma = 2.14, diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.vrt b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.vrt new file mode 100644 index 0000000000..5b4b29aa85 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.vrt @@ -0,0 +1,28 @@ + + GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] + -8.1000000000000000e+02, 8.5830688476562500e-05, 0.0000000000000000e+00, 9.0000000000000000e+01, 0.0000000000000000e+00, -8.5830688476562500e-05 + + 0.00000000000000E+00 + Gray + + ctx_blended_beta01.wms + 1 + + + + 0 + + + + 0 + Alpha + + ctx_blended_beta01.wms + 1 + + + + 0:0,1:255,255:255 + + + diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.wms b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.wms similarity index 71% rename from data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.wms rename to data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.wms index 28ea11c342..fb7677b04f 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.wms +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.wms @@ -3,10 +3,14 @@ http://astro.arcgis.com/arcgis/rest/services/OnMars/CTX/MapServer/tile/${z}/${y}/${x} - -180.0 90.0 - 180.0 -90.0 - 4194304 2097152 - 12 top + -180.0 + 90.0 + 180.0 + -90.0 + 4194304 + 2097152 + 12 + top GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] 512