diff --git a/data/scene/mars/map_service_configs/AWS/CTX.wms b/data/scene/mars/map_service_configs/AWS/CTX.wms new file mode 100644 index 0000000000..46251f85e8 --- /dev/null +++ b/data/scene/mars/map_service_configs/AWS/CTX.wms @@ -0,0 +1,17 @@ + + + http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mars/CTX/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 + 2 + 5 + 400,204,404 + true + diff --git a/data/scene/mars/map_service_configs/AWS/Mdim.wms b/data/scene/mars/map_service_configs/AWS/Mdim.wms new file mode 100644 index 0000000000..d795931273 --- /dev/null +++ b/data/scene/mars/map_service_configs/AWS/Mdim.wms @@ -0,0 +1,22 @@ + + + http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mars/Mdim/tile/${z}/${y}/${x} + + + -180.0 + 90.0 + 180.0 + -90.0 + 92160 + 46080 + 7 + 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]] + 360 + 360 + 3 + 10 + 400,204,404 + true + diff --git a/data/scene/mars/map_service_configs/AWS/Mola_Elevation.wms b/data/scene/mars/map_service_configs/AWS/Mola_Elevation.wms new file mode 100644 index 0000000000..b53bee4210 --- /dev/null +++ b/data/scene/mars/map_service_configs/AWS/Mola_Elevation.wms @@ -0,0 +1,23 @@ + + + http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mars/MolaElevation/tile/${z}/${y}/${x} + + + -180.0 + 90.0 + 180.0 + -90.0 + 46080 + 23040 + 6 + 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]] + 360 + 360 + 1 + Int16 + 10 + 400,204,404 + true + diff --git a/data/scene/mars/map_service_configs/AWS/Mola_PseudoColor.wms b/data/scene/mars/map_service_configs/AWS/Mola_PseudoColor.wms new file mode 100644 index 0000000000..2fad1a362a --- /dev/null +++ b/data/scene/mars/map_service_configs/AWS/Mola_PseudoColor.wms @@ -0,0 +1,22 @@ + + + http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mars/MolaPseudoColor/tile/${z}/${y}/${x} + + + -180.0 + 90.0 + 180.0 + -90.0 + 46080 + 23040 + 6 + 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]] + 360 + 360 + 3 + 10 + 400,204,404 + true + diff --git a/data/scene/mars/map_service_configs/AWS/Themis_IR_Day.wms b/data/scene/mars/map_service_configs/AWS/Themis_IR_Day.wms new file mode 100644 index 0000000000..041f46e04e --- /dev/null +++ b/data/scene/mars/map_service_configs/AWS/Themis_IR_Day.wms @@ -0,0 +1,22 @@ + + + http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mars/ThemisIRDay/tile/${z}/${y}/${x} + + + -180.0 + 90.0 + 180.0 + -90.0 + 213390 + 106695 + 9 + 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]] + 256 + 256 + 1 + 10 + 400,204,404 + true + diff --git a/data/scene/mars/map_service_configs/AWS/Themis_IR_Night.wms b/data/scene/mars/map_service_configs/AWS/Themis_IR_Night.wms new file mode 100644 index 0000000000..387e06efe5 --- /dev/null +++ b/data/scene/mars/map_service_configs/AWS/Themis_IR_Night.wms @@ -0,0 +1,22 @@ + + + http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mars/ThemisIRNight/tile/${z}/${y}/${x} + + + -180.0 + 90.0 + 180.0 + -90.0 + 213388 + 71130 + 9 + 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]] + 256 + 256 + 1 + 10 + 400,204,404 + true + diff --git a/data/scene/mars/map_service_configs/CTX_Mosaic.xml b/data/scene/mars/map_service_configs/LiU/CTX.xml similarity index 100% rename from data/scene/mars/map_service_configs/CTX_Mosaic.xml rename to data/scene/mars/map_service_configs/LiU/CTX.xml diff --git a/data/scene/mars/map_service_configs/Mola_Elevation.xml b/data/scene/mars/map_service_configs/LiU/Mola_Elevation.xml similarity index 100% rename from data/scene/mars/map_service_configs/Mola_Elevation.xml rename to data/scene/mars/map_service_configs/LiU/Mola_Elevation.xml diff --git a/data/scene/mars/map_service_configs/MARS_Viking.xml b/data/scene/mars/map_service_configs/MARS_Viking.xml deleted file mode 100644 index 7197faf38e..0000000000 --- a/data/scene/mars/map_service_configs/MARS_Viking.xml +++ /dev/null @@ -1,10 +0,0 @@ - - http://webgis3.wr.usgs.gov/arcgis/rest/services/Mars_color/MapServer/WMTS/1.0.0/WMTSCapabilities.xml - - -180.0 - 90 - 180.0 - -90 - - 3 - \ No newline at end of file diff --git a/data/scene/mars/map_service_configs/MDIM21_color.xml b/data/scene/mars/map_service_configs/MDIM21_color.xml deleted file mode 100644 index caaa46437f..0000000000 --- a/data/scene/mars/map_service_configs/MDIM21_color.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - 1.3.0 - http://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/mars/mars_simp_cyl.map - EPSG:4326 - image/png - MDIM21_color - TRUE - - - -180.0 - 90.0 - 180.0 - -90.0 - 2048 - 1024 - bottom - - - \ No newline at end of file diff --git a/data/scene/mars/map_service_configs/Utah/CTX_Mosaic.xml b/data/scene/mars/map_service_configs/Utah/CTX.xml similarity index 100% rename from data/scene/mars/map_service_configs/Utah/CTX_Mosaic.xml rename to data/scene/mars/map_service_configs/Utah/CTX.xml diff --git a/data/scene/mars/map_service_configs/Utah/MolaPseudoColor.xml b/data/scene/mars/map_service_configs/Utah/Mola_PseudoColor.xml similarity index 100% rename from data/scene/mars/map_service_configs/Utah/MolaPseudoColor.xml rename to data/scene/mars/map_service_configs/Utah/Mola_PseudoColor.xml diff --git a/data/scene/mars/map_service_configs/Utah/ThemisIRDay.xml b/data/scene/mars/map_service_configs/Utah/ThemisIRDay.xml deleted file mode 100644 index 3b7641214b..0000000000 --- a/data/scene/mars/map_service_configs/Utah/ThemisIRDay.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - http://asgard.sci.utah.edu/Mars/ThemisIRDay/tile/${z}/${y}/${x} - - - -180.0 - 90.0 - 180.0 - -90.0 - 213390 - 106695 - 9 - 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]] - 256 - 256 - 1 - 10 - \ No newline at end of file diff --git a/data/scene/mars/map_service_configs/Utah/ThemisIRNight.xml b/data/scene/mars/map_service_configs/Utah/ThemisIRNight.xml deleted file mode 100644 index 3b7641214b..0000000000 --- a/data/scene/mars/map_service_configs/Utah/ThemisIRNight.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - http://asgard.sci.utah.edu/Mars/ThemisIRDay/tile/${z}/${y}/${x} - - - -180.0 - 90.0 - 180.0 - -90.0 - 213390 - 106695 - 9 - 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]] - 256 - 256 - 1 - 10 - \ No newline at end of file diff --git a/data/scene/mars/map_service_configs/Utah/Themis_IR_Day.xml b/data/scene/mars/map_service_configs/Utah/Themis_IR_Day.xml new file mode 100644 index 0000000000..a951c29e07 --- /dev/null +++ b/data/scene/mars/map_service_configs/Utah/Themis_IR_Day.xml @@ -0,0 +1,22 @@ + + + http://asgard.sci.utah.edu/Mars/ThemisIRDay/tile/${z}/${y}/${x} + + + -180.0 + 90.0 + 180.0 + -90.0 + 213390 + 106695 + 9 + 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]] + 256 + 256 + 1 + 10 + 400,204,404 + true + diff --git a/data/scene/mars/map_service_configs/Utah/Themis_IR_Night.xml b/data/scene/mars/map_service_configs/Utah/Themis_IR_Night.xml new file mode 100644 index 0000000000..7aee3a5b85 --- /dev/null +++ b/data/scene/mars/map_service_configs/Utah/Themis_IR_Night.xml @@ -0,0 +1,22 @@ + + + http://asgard.sci.utah.edu/Mars/ThemisIRNight/tile/${z}/${y}/${x} + + + -180.0 + 90.0 + 180.0 + -90.0 + 213390 + 106695 + 9 + 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]] + 256 + 256 + 1 + 10 + 400,204,404 + true + diff --git a/data/scene/mars/mars.mod b/data/scene/mars/mars.mod index 9a947b4019..8e5f786d53 100644 --- a/data/scene/mars/mars.mod +++ b/data/scene/mars/mars.mod @@ -32,7 +32,7 @@ return { Layers = { ColorLayers = { { - Name = "Viking", + Name = "Viking MDIM", FilePath = "map_service_configs/MARS_Viking_MDIM21.xml", Enabled = true, Fallback = { @@ -41,19 +41,55 @@ return { Enabled = true, }, }, + -- Linköping University based servers { - Name = "MOLA Pseudo Color", - FilePath = "map_service_configs/Utah/MolaPseudoColor.xml" - }, - { - Name = "CTX Mosaic [Europe]", - FilePath = "map_service_configs/CTX_Mosaic.xml", + Name = "CTX Mosaic [LiU]", + FilePath = "map_service_configs/LiU/CTX.xml", BlendMode = "Color" }, + -- University of Utah based servers { Name = "CTX Mosaic [Utah]", - FilePath = "map_service_configs/Utah/CTX_Mosaic.xml", + FilePath = "map_service_configs/Utah/CTX.xml", BlendMode = "Color" + }, + { + Name = "MOLA Pseudo Color", + FilePath = "map_service_configs/Utah/Mola_PseudoColor.xml" + }, + { + Name = "Themis IR Day [Utah]", + FilePath = "map_service_configs/Utah/Themis_IR_Day.xml" + }, + { + Name = "Themis IR Night [Utah]", + FilePath = "map_service_configs/Utah/Themis_IR_Night.xml" + }, + { + Name = "Viking MDIM [Utah]", + FilePath = "map_service_configs/Utah/Mdim.xml" + }, + -- AWS based servers + { + Name = "CTX Mosaic [AWS]", + FilePath = "map_service_configs/AWS/CTX.wms", + BlendMode = "Color" + }, + { + Name = "Viking MDIM [AWS]", + FilePath = "map_service_configs/AWS/Mdim.wms" + }, + { + Name = "MOLA Pseudo Color [AWS]", + FilePath = "map_service_configs/AWS/Mola_PseudoColor.wms" + }, + { + Name = "Themis IR Day [AWS]", + FilePath = "map_service_configs/AWS/Themis_IR_Day.wms" + }, + { + Name = "Themis IR Night [AWS]", + FilePath = "map_service_configs/AWS/Themis_IR_Night.wms" } }, Overlays = { @@ -69,11 +105,27 @@ return { }, HeightLayers = { { - Name = "Mola Elevation [Europe]", - FilePath = "map_service_configs/Mola_Elevation.xml", + Name = "Mola Elevation", + FilePath = "map_service_configs/Mars_MGS_MOLA_DEM.xml", Enabled = true, TilePixelSize = 90 - } + }, + { + Name = "Mola Elevation [Europe]", + FilePath = "map_service_configs/LiU/Mola_Elevation.xml", + -- Enabled = true, + TilePixelSize = 90 + }, + { + Name = "Mola Elevation [Utah]", + FilePath = "map_service_configs/Utah/Mola_Elevation.xml", + TilePixelSize = 90 + }, + { + Name = "Mola Elevation [AWS]", + FilePath = "map_service_configs/AWS/Mola_Elevation.wms", + TilePixelSize = 90 + }, } } }, diff --git a/data/scene/mercury/map_service_configs/OnMercuryColor.xml b/data/scene/mercury/map_service_configs/AMNH/OnMercuryColor.xml similarity index 100% rename from data/scene/mercury/map_service_configs/OnMercuryColor.xml rename to data/scene/mercury/map_service_configs/AMNH/OnMercuryColor.xml diff --git a/data/scene/mercury/map_service_configs/OnMercuryElevationGaskell.xml b/data/scene/mercury/map_service_configs/AMNH/OnMercuryElevationGaskell.xml similarity index 100% rename from data/scene/mercury/map_service_configs/OnMercuryElevationGaskell.xml rename to data/scene/mercury/map_service_configs/AMNH/OnMercuryElevationGaskell.xml diff --git a/data/scene/mercury/map_service_configs/OnMercuryImage.xml b/data/scene/mercury/map_service_configs/AMNH/OnMercuryImage.xml similarity index 100% rename from data/scene/mercury/map_service_configs/OnMercuryImage.xml rename to data/scene/mercury/map_service_configs/AMNH/OnMercuryImage.xml diff --git a/data/scene/mercury/map_service_configs/AWS/MessengerMdis.wms b/data/scene/mercury/map_service_configs/AWS/MessengerMdis.wms new file mode 100644 index 0000000000..bafca5ca07 --- /dev/null +++ b/data/scene/mercury/map_service_configs/AWS/MessengerMdis.wms @@ -0,0 +1,20 @@ + + + http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mercury/MessengerMdis/tile/${z}/${y}/${x} + + + -180.0 + 90.0 + 180.0 + -90.0 + 61324 + 30662 + 7 + top + + GEOGCS["GCS_Mercury_2015",DATUM["D_Mercury_2015",SPHEROID["Mercury_2015",2439400.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] + 256 + 256 + 1 + 10 + diff --git a/data/scene/mercury/map_service_configs/AWS/MessengerMosaic.wms b/data/scene/mercury/map_service_configs/AWS/MessengerMosaic.wms new file mode 100644 index 0000000000..89415f373e --- /dev/null +++ b/data/scene/mercury/map_service_configs/AWS/MessengerMosaic.wms @@ -0,0 +1,20 @@ + + + http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mercury/MessengerMosaic/tile/${z}/${y}/${x} + + + -180.0 + 90.0 + 180.0 + -90.0 + 23054 + 11527 + 6 + top + + GEOGCS["GCS_Mercury_2015",DATUM["D_Mercury_2015",SPHEROID["Mercury_2015",2439400.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] + 256 + 256 + 3 + 10 + diff --git a/data/scene/mercury/mercury.mod b/data/scene/mercury/mercury.mod index 7f825463d8..d510478baa 100644 --- a/data/scene/mercury/mercury.mod +++ b/data/scene/mercury/mercury.mod @@ -32,14 +32,24 @@ return { SegmentsPerPatch = 64, Layers = { ColorLayers = { + -- University of Utah based servers { - Name = "Messenger_MDIS", + Name = "Messenger MDIS [Utah]", FilePath = "map_service_configs/Utah/MessengerMDIS.wms", Enabled = true }, { - Name = "Messenger_Mosaic", + Name = "Messenger Mosaic [Utah]", FilePath = "map_service_configs/Utah/MessengerMosaic.wms" + }, + -- AWS based servers + { + Name = "Messenger MDIS [AWS]", + FilePath = "map_service_configs/AWS/MessengerMdis.wms", + }, + { + Name = "Messenger Mosaic [AWS]", + FilePath = "map_service_configs/AWS/MessengerMosaic.wms", } } } diff --git a/data/scene/moon/moon.mod b/data/scene/moon/moon.mod index 6c441d2b7b..2ed3aaddcf 100644 --- a/data/scene/moon/moon.mod +++ b/data/scene/moon/moon.mod @@ -22,11 +22,13 @@ return { SegmentsPerPatch = 64, Layers = { ColorLayers = { + -- LMMP based servers { - Name = "OnMoonColorGrayscale", + Name = "LRO WAC Mosaic [OnMoon]", FilePath = "map_service_configs/OnMoonColor.xml", Enabled = true, }, + -- Utah based servers { Name = "ClemUvvis", FilePath = "map_service_configs/Utah/ClemUvvis.wms" @@ -41,6 +43,15 @@ return { } }, HeightLayers = { + -- LMMP based servers + -- { + -- Name = "Lunar Elevation [OnMoon]", + -- FilePath = "map_service_configs/OnMoonHeight.xml", + -- Enabled = true, + -- TilePixelSize = 64, + -- -- Settings = { Multiplier = 0.5 }, + -- }, + -- Utah based servers { Name = "LolaDem", FilePath = "map_service_configs/Utah/LolaDem.wms",