diff --git a/data/scene/debugglobe/debugglobe.mod b/data/scene/debugglobe/debugglobe.mod index 94ab38e4e7..8214df2753 100644 --- a/data/scene/debugglobe/debugglobe.mod +++ b/data/scene/debugglobe/debugglobe.mod @@ -22,8 +22,9 @@ return { Type = "RenderableGlobe", Frame = "IAU_EARTH", Body = "EARTH", - Radii = {6378137.0, 6378137.0, 6356752.314245}, -- Earth's radii + --Radii = {6378137.0, 6378137.0, 6356752.314245}, -- Earth's radii --Radii = {3396190.0, 3396190.0, 3376200.0}, -- Mars' radii + Radii = {2439700.0, 2439700.0, 2439700.0}, CameraMinHeight = 1000, InteractionDepthBelowEllipsoid = 10000, -- Useful when having negative height map values SegmentsPerPatch = 90, @@ -37,7 +38,7 @@ return { { Type = "Temporal", Name = "Temporal VIIRS SNPP", - FilePath = "map_service_configs/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml", + FilePath = "map_service_configs/earth/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml", }, { Type = "SingleImage", @@ -48,7 +49,7 @@ return { Type = "Temporal", Name = "Temporal MODIS Aqua CorrectedRecflectance TrueColor", FilePath = "map_service_configs/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml", - },]] + }, { Name = "MODIS_Terra_CorrectedReflectance_TrueColor", FilePath = "map_service_configs/MODIS_Terra_CorrectedReflectance_TrueColor.xml", @@ -56,54 +57,73 @@ return { { Name = "ESRI Imagery World 2D", FilePath = "map_service_configs/ESRI_Imagery_World_2D.wms", - Enabled = true, + --Enabled = true, }, { Name = "MARS_Viking_MDIM21", FilePath = "map_service_configs/MARS_Viking_MDIM21.xml", + --Enabled = true, + },]] + { + Name = "Mars Viking Clr", + FilePath = "textures/Mars_Viking_ClrMosaic_global_925m_longlat.cub", + --Enabled = true, + }, + { + Name = "On Mercury Color", + FilePath = "map_service_configs/mercury/OnMercuryColor.xml", + }, + { + Name = "On Mercury Image", + FilePath = "map_service_configs/mercury/OnMercuryImage.xml", }, }, GrayScaleOverlays = { { Name = "CTX Mosaic", - FilePath = "map_service_configs/CTX_Mosaic.xml", + FilePath = "map_service_configs/mars/CTX_Mosaic.xml", }, }, NightTextures = { { Name = "Earth at Night 2012", - FilePath = "map_service_configs/VIIRS_CityLights_2012.xml", + FilePath = "map_service_configs/earth/VIIRS_CityLights_2012.xml", }, }, HeightMaps = { { Name = "Terrain tileset", - FilePath = "map_service_configs/TERRAIN.wms", - Enabled = true, + FilePath = "map_service_configs/earth/TERRAIN.wms", + --Enabled = true, }, { Name = "Mola Elevation", - FilePath = "map_service_configs/Mola_Elevation.xml", + FilePath = "map_service_configs/mars/Mola_Elevation.xml", }, + { + Name = "On Mercury Height", + FilePath = "map_service_configs/mercury/OnMercuryElevationGaskell.xml", + Enabled = true, + } }, WaterMasks = { { Name = "MODIS_Water_Mask", - FilePath = "map_service_configs/MODIS_Water_Mask.xml", + FilePath = "map_service_configs/earth/MODIS_Water_Mask.xml", }, }, Overlays = { { Name = "Coastlines", - FilePath = "map_service_configs/Coastlines.xml", + FilePath = "map_service_configs/earth/Coastlines.xml", }, { Name = "Reference_Features", - FilePath = "map_service_configs/Reference_Features.xml", + FilePath = "map_service_configs/earth/Reference_Features.xml", }, { Name = "Reference_Labels", - FilePath = "map_service_configs/Reference_Labels.xml", + FilePath = "map_service_configs/earth/Reference_Labels.xml", }, }, }, diff --git a/data/scene/debugglobe/map_service_configs/ASTER_GDEM_Greyscale_Shaded_Relief.xml b/data/scene/debugglobe/map_service_configs/earth/ASTER_GDEM_Greyscale_Shaded_Relief.xml similarity index 100% rename from data/scene/debugglobe/map_service_configs/ASTER_GDEM_Greyscale_Shaded_Relief.xml rename to data/scene/debugglobe/map_service_configs/earth/ASTER_GDEM_Greyscale_Shaded_Relief.xml diff --git a/data/scene/debugglobe/map_service_configs/Coastlines.xml b/data/scene/debugglobe/map_service_configs/earth/Coastlines.xml similarity index 100% rename from data/scene/debugglobe/map_service_configs/Coastlines.xml rename to data/scene/debugglobe/map_service_configs/earth/Coastlines.xml diff --git a/data/scene/debugglobe/map_service_configs/ESRI_Imagery_World_2D.wms b/data/scene/debugglobe/map_service_configs/earth/ESRI_Imagery_World_2D.wms similarity index 100% rename from data/scene/debugglobe/map_service_configs/ESRI_Imagery_World_2D.wms rename to data/scene/debugglobe/map_service_configs/earth/ESRI_Imagery_World_2D.wms diff --git a/data/scene/debugglobe/map_service_configs/GIBS_Aqua_MODIS_true.xml b/data/scene/debugglobe/map_service_configs/earth/GIBS_Aqua_MODIS_true.xml similarity index 100% rename from data/scene/debugglobe/map_service_configs/GIBS_Aqua_MODIS_true.xml rename to data/scene/debugglobe/map_service_configs/earth/GIBS_Aqua_MODIS_true.xml diff --git a/data/scene/debugglobe/map_service_configs/earth/Landsat_WELD_CorrectedReflectance_TrueColor_Global_Monthly_v3_STD_temporal.xml b/data/scene/debugglobe/map_service_configs/earth/Landsat_WELD_CorrectedReflectance_TrueColor_Global_Monthly_v3_STD_temporal.xml new file mode 100644 index 0000000000..3dcf166656 --- /dev/null +++ b/data/scene/debugglobe/map_service_configs/earth/Landsat_WELD_CorrectedReflectance_TrueColor_Global_Monthly_v3_STD_temporal.xml @@ -0,0 +1,10 @@ + + + https://gibs.earthdata.nasa.gov/wmts/epsg4326/std/wmts.cgi? + MODIS TERRA tileset + ${t} + Landsat_WELD_CorrectedReflectance_TrueColor_Global_Monthly_v3_STD + image/jpeg + + 20 + \ No newline at end of file diff --git a/data/scene/debugglobe/map_service_configs/MLS_O3_46hPa_Day.xml b/data/scene/debugglobe/map_service_configs/earth/MLS_O3_46hPa_Day.xml similarity index 100% rename from data/scene/debugglobe/map_service_configs/MLS_O3_46hPa_Day.xml rename to data/scene/debugglobe/map_service_configs/earth/MLS_O3_46hPa_Day.xml diff --git a/data/scene/debugglobe/map_service_configs/MODIS_Terra_Brightness_Temp_Band31_Day.xml b/data/scene/debugglobe/map_service_configs/earth/MODIS_Terra_Brightness_Temp_Band31_Day.xml similarity index 100% rename from data/scene/debugglobe/map_service_configs/MODIS_Terra_Brightness_Temp_Band31_Day.xml rename to data/scene/debugglobe/map_service_configs/earth/MODIS_Terra_Brightness_Temp_Band31_Day.xml diff --git a/data/scene/debugglobe/map_service_configs/MODIS_Terra_CorrectedReflectance_TrueColor.xml b/data/scene/debugglobe/map_service_configs/earth/MODIS_Terra_CorrectedReflectance_TrueColor.xml similarity index 100% rename from data/scene/debugglobe/map_service_configs/MODIS_Terra_CorrectedReflectance_TrueColor.xml rename to data/scene/debugglobe/map_service_configs/earth/MODIS_Terra_CorrectedReflectance_TrueColor.xml diff --git a/data/scene/debugglobe/map_service_configs/earth/MODIS_Terra_CorrectedReflectance_TrueColor_temporal.xml b/data/scene/debugglobe/map_service_configs/earth/MODIS_Terra_CorrectedReflectance_TrueColor_temporal.xml new file mode 100644 index 0000000000..36013e4a3a --- /dev/null +++ b/data/scene/debugglobe/map_service_configs/earth/MODIS_Terra_CorrectedReflectance_TrueColor_temporal.xml @@ -0,0 +1,19 @@ + + + http://map1.vis.earthdata.nasa.gov/wmts-geo/MODIS_Terra_CorrectedReflectance_TrueColor/default/${t}/EPSG4326_250m/${z}/${y}/${x}.jpg + + + -180.0 + 90 + 396.0 + -198 + 8 + 2 + 1 + top + + EPSG:4326 + 512 + 512 + 3 + \ No newline at end of file diff --git a/data/scene/debugglobe/map_service_configs/MODIS_Water_Mask.xml b/data/scene/debugglobe/map_service_configs/earth/MODIS_Water_Mask.xml similarity index 100% rename from data/scene/debugglobe/map_service_configs/MODIS_Water_Mask.xml rename to data/scene/debugglobe/map_service_configs/earth/MODIS_Water_Mask.xml diff --git a/data/scene/debugglobe/map_service_configs/earth/OpenStreetMap.xml b/data/scene/debugglobe/map_service_configs/earth/OpenStreetMap.xml new file mode 100644 index 0000000000..450aab0cd6 --- /dev/null +++ b/data/scene/debugglobe/map_service_configs/earth/OpenStreetMap.xml @@ -0,0 +1,20 @@ + + +http://tile.openstreetmap.org/${z}/${x}/${y}.png + + +-180 +90 +180 +-90 +18 +1 +1 +top + +EPSG:4326 +256 +256 +3 + + \ No newline at end of file diff --git a/data/scene/debugglobe/map_service_configs/Reference_Features.xml b/data/scene/debugglobe/map_service_configs/earth/Reference_Features.xml similarity index 100% rename from data/scene/debugglobe/map_service_configs/Reference_Features.xml rename to data/scene/debugglobe/map_service_configs/earth/Reference_Features.xml diff --git a/data/scene/debugglobe/map_service_configs/Reference_Labels.xml b/data/scene/debugglobe/map_service_configs/earth/Reference_Labels.xml similarity index 100% rename from data/scene/debugglobe/map_service_configs/Reference_Labels.xml rename to data/scene/debugglobe/map_service_configs/earth/Reference_Labels.xml diff --git a/data/scene/debugglobe/map_service_configs/TERRAIN.wms b/data/scene/debugglobe/map_service_configs/earth/TERRAIN.wms similarity index 100% rename from data/scene/debugglobe/map_service_configs/TERRAIN.wms rename to data/scene/debugglobe/map_service_configs/earth/TERRAIN.wms diff --git a/data/scene/debugglobe/map_service_configs/TERRA_CR_B143_2016-04-12.wms b/data/scene/debugglobe/map_service_configs/earth/TERRA_CR_B143_2016-04-12.wms similarity index 100% rename from data/scene/debugglobe/map_service_configs/TERRA_CR_B143_2016-04-12.wms rename to data/scene/debugglobe/map_service_configs/earth/TERRA_CR_B143_2016-04-12.wms diff --git a/data/scene/debugglobe/map_service_configs/Temporal_Aqua_Orbit_Asc.xml b/data/scene/debugglobe/map_service_configs/earth/Temporal_Aqua_Orbit_Asc.xml similarity index 100% rename from data/scene/debugglobe/map_service_configs/Temporal_Aqua_Orbit_Asc.xml rename to data/scene/debugglobe/map_service_configs/earth/Temporal_Aqua_Orbit_Asc.xml diff --git a/data/scene/debugglobe/map_service_configs/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml b/data/scene/debugglobe/map_service_configs/earth/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml similarity index 100% rename from data/scene/debugglobe/map_service_configs/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml rename to data/scene/debugglobe/map_service_configs/earth/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml diff --git a/data/scene/debugglobe/map_service_configs/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml b/data/scene/debugglobe/map_service_configs/earth/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml similarity index 100% rename from data/scene/debugglobe/map_service_configs/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml rename to data/scene/debugglobe/map_service_configs/earth/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml diff --git a/data/scene/debugglobe/map_service_configs/VIIRS_CityLights_2012.xml b/data/scene/debugglobe/map_service_configs/earth/VIIRS_CityLights_2012.xml similarity index 100% rename from data/scene/debugglobe/map_service_configs/VIIRS_CityLights_2012.xml rename to data/scene/debugglobe/map_service_configs/earth/VIIRS_CityLights_2012.xml diff --git a/data/scene/debugglobe/map_service_configs/VIIRS_SNPP_CorrectedReflectance_TrueColor.xml b/data/scene/debugglobe/map_service_configs/earth/VIIRS_SNPP_CorrectedReflectance_TrueColor.xml similarity index 100% rename from data/scene/debugglobe/map_service_configs/VIIRS_SNPP_CorrectedReflectance_TrueColor.xml rename to data/scene/debugglobe/map_service_configs/earth/VIIRS_SNPP_CorrectedReflectance_TrueColor.xml diff --git a/data/scene/debugglobe/map_service_configs/frmt_wms_virtualearth.xml b/data/scene/debugglobe/map_service_configs/earth/frmt_wms_virtualearth.xml similarity index 100% rename from data/scene/debugglobe/map_service_configs/frmt_wms_virtualearth.xml rename to data/scene/debugglobe/map_service_configs/earth/frmt_wms_virtualearth.xml diff --git a/data/scene/debugglobe/map_service_configs/CTX_Mosaic.xml b/data/scene/debugglobe/map_service_configs/mars/CTX_Mosaic.xml similarity index 100% rename from data/scene/debugglobe/map_service_configs/CTX_Mosaic.xml rename to data/scene/debugglobe/map_service_configs/mars/CTX_Mosaic.xml diff --git a/data/scene/debugglobe/map_service_configs/MARS_Viking_MDIM21.xml b/data/scene/debugglobe/map_service_configs/mars/MARS_Viking_MDIM21.xml similarity index 100% rename from data/scene/debugglobe/map_service_configs/MARS_Viking_MDIM21.xml rename to data/scene/debugglobe/map_service_configs/mars/MARS_Viking_MDIM21.xml diff --git a/data/scene/debugglobe/map_service_configs/Mola_Elevation.xml b/data/scene/debugglobe/map_service_configs/mars/Mola_Elevation.xml similarity index 100% rename from data/scene/debugglobe/map_service_configs/Mola_Elevation.xml rename to data/scene/debugglobe/map_service_configs/mars/Mola_Elevation.xml diff --git a/data/scene/debugglobe/map_service_configs/mercury/OnMercuryColor.xml b/data/scene/debugglobe/map_service_configs/mercury/OnMercuryColor.xml new file mode 100644 index 0000000000..d53cb3ad5e --- /dev/null +++ b/data/scene/debugglobe/map_service_configs/mercury/OnMercuryColor.xml @@ -0,0 +1,30 @@ + + + http://192.168.1.167/OnMercury/wms.cgi? + Color 665m + + + + -180.0 + 90 + 180.0 + -90 + 20 + 2 + 1 + top + + 512 + 512 + \ No newline at end of file diff --git a/data/scene/debugglobe/map_service_configs/mercury/OnMercuryElevationGaskell.xml b/data/scene/debugglobe/map_service_configs/mercury/OnMercuryElevationGaskell.xml new file mode 100644 index 0000000000..0563b2d018 --- /dev/null +++ b/data/scene/debugglobe/map_service_configs/mercury/OnMercuryElevationGaskell.xml @@ -0,0 +1,24 @@ + + + http://192.168.1.167/OnMercury/wms.cgi? + + Elevation 16bit, Gaskell + + + -180.0 + 90 + 180.0 + -90 + 8 + 2 + 1 + top + + 512 + 512 + \ No newline at end of file diff --git a/data/scene/debugglobe/map_service_configs/mercury/OnMercuryImage.xml b/data/scene/debugglobe/map_service_configs/mercury/OnMercuryImage.xml new file mode 100644 index 0000000000..d50931e40e --- /dev/null +++ b/data/scene/debugglobe/map_service_configs/mercury/OnMercuryImage.xml @@ -0,0 +1,31 @@ + + + http://192.168.1.167/OnMercury/wms.cgi? + Mercury Image + + + + -180.0 + 90 + 180.0 + -90 + 20 + 2 + 1 + top + + 512 + 512 + \ No newline at end of file