diff --git a/data/assets/scene/solarsystem/planets/earth/earth.asset b/data/assets/scene/solarsystem/planets/earth/earth.asset index 938ba4c336..3293f7a6d6 100644 --- a/data/assets/scene/solarsystem/planets/earth/earth.asset +++ b/data/assets/scene/solarsystem/planets/earth/earth.asset @@ -26,7 +26,14 @@ local Earth = { TileProvider = { Name = "Temporal VIIRS SNPP", Type = "TemporalTileLayer", - FilePath = mapServiceConfigsPath .. "/GIBS/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "VIIRS_SNPP_CorrectedReflectance_TrueColor", + "2015-11-24", + "Yesterday", + "1d", + "250m", + "jpg" + ), PadTiles = false } }, @@ -56,21 +63,59 @@ local Earth = { FilePath = mapServiceConfigsPath .. "/ESRI/ESRI_Imagery_World_2D.wms" }, { - Name = "Temporal VIIRS SNPP", + Name = "VIIRS SNPP (Temporal)", Type = "TemporalTileLayer", - FilePath = mapServiceConfigsPath .. "/GIBS/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml" + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "VIIRS_SNPP_CorrectedReflectance_TrueColor", + "2015-11-24", + "Yesterday", + "1d", + "250m", + "jpg" + ) + }, + { + Name = "Aqua Modis (Temporal)", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "MODIS_Aqua_CorrectedReflectance_TrueColor", + "2012-05-08", + "Yesterday", + "1d", + "250m", + "jpg" + ) + }, + { + Name = "Terra Modis (Temporal)", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "MODIS_Terra_CorrectedReflectance_TrueColor", + "2012-05-08", + "Yesterday", + "1d", + "250m", + "jpg" + ) }, { Name = "BMNG", FilePath = mapServiceConfigsPath .. "/Utah/Bmng.wms" }, { - Name = "Temporal_AMSR2_GCOM_W1_Sea_Ice_Concentration", + Name = "AMSR2_GCOM_W1_Sea_Ice_Concentration (Temporal)", Type = "TemporalTileLayer", - FilePath = mapServiceConfigsPath .. "/GIBS/Temporal_AMSR2_GCOM_W1_Sea_Ice_Concentration.xml" + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "AMSR2_Sea_Ice_Concentration_12km", + "2012-05-08", + "Yesterday", + "1d", + "2km", + "png" + ) }, { - Name = "MODIS_Terra_Chlorophyll_A", + Name = "MODIS_Terra_Chlorophyll_A (Temporal)", Type = "TemporalTileLayer", FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( "MODIS_Terra_Chlorophyll_A", @@ -82,7 +127,7 @@ local Earth = { ) }, { - Name = "GHRSST_L4_G1SST_Sea_Surface_Temperature", + Name = "GHRSST_L4_G1SST_Sea_Surface_Temperature (Temporal)", Type = "TemporalTileLayer", FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( "GHRSST_L4_G1SST_Sea_Surface_Temperature", @@ -92,12 +137,12 @@ local Earth = { "1km", "png" ) - }, + } }, NightLayers = { { Name = "Earth at Night 2012", - FilePath = mapServiceConfigsPath .. "/GIBS/VIIRS_CityLights_2012.xml", + FilePath = mapServiceConfigsPath .. "/GIBS/night/VIIRS_CityLights_2012.wms", Enabled = true, Settings = { Opacity = 1.0, @@ -116,15 +161,22 @@ local Earth = { } }, { - Name = "Temporal Earth at Night", + Name = "Earth at Night (Temporal)", Type = "TemporalTileLayer", - FilePath = mapServiceConfigsPath .. "/GIBS/Temporal_VIIRS_SNPP_DayNightBand_ENCC.xml" + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "VIIRS_SNPP_DayNightBand_ENCC", + "2012-05-08", + "Yesterday", + "1d", + "500m", + "png" + ) } }, WaterMasks = { { Name = "MODIS_Water_Mask", - FilePath = mapServiceConfigsPath .. "/GIBS/MODIS_Water_Mask.xml", + FilePath = mapServiceConfigsPath .. "/GIBS/water/MODIS_Water_Mask.wms", Enabled = true }, { @@ -135,15 +187,15 @@ local Earth = { Overlays = { { Name = "Coastlines", - FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Coastlines.xml" + FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Coastlines.wms" }, { Name = "Reference_Features", - FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Reference_Features.xml" + FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Reference_Features.wms" }, { Name = "Reference_Labels", - FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Reference_Labels.xml" + FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Reference_Labels.wms" }, { Name = "Tile Indices", diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/GIBS_Aqua_MODIS_true.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/GIBS_Aqua_MODIS_true.xml deleted file mode 100644 index 1e5ed01815..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/GIBS_Aqua_MODIS_true.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - https://gibs.earthdata.nasa.gov/wmts/epsg4326/best/MODIS_Aqua_CorrectedReflectance_TrueColor/default/2013-08-21/250m/${z}/${y}/${x}.jpg - - - -180.0 - 90 - 396.0 - -198 - 8 - 2 - 1 - top - - EPSG:4326 - 512 - 512 - 3 - 5 - false - true - 400 - true - diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/MODIS_Terra_Brightness_Temp_Band31_Day.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/MODIS_Terra_Brightness_Temp_Band31_Day.xml deleted file mode 100644 index 7311954847..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/MODIS_Terra_Brightness_Temp_Band31_Day.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - https://gibs.earthdata.nasa.gov/wmts/epsg4326/best/MODIS_Terra_Brightness_Temp_Band31_Day/default/2013-08-21/1km/${z}/${y}/${x}.png - - - -180.0 - 90 - 396.0 - -198 - 8 - 2 - 1 - top - - EPSG:4326 - 512 - 512 - 4 - 5 - false - true - 400 - true - diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/MODIS_Terra_CorrectedReflectance_TrueColor.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/MODIS_Terra_CorrectedReflectance_TrueColor.xml deleted file mode 100644 index 3d9b24822d..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/MODIS_Terra_CorrectedReflectance_TrueColor.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - https://gibs.earthdata.nasa.gov/wmts/epsg4326/best/MODIS_Terra_CorrectedReflectance_TrueColor/default/2013-08-21/250m/${z}/${y}/${x}.jpg - - - -180.0 - 90 - 396.0 - -198 - 8 - 2 - 1 - top - - EPSG:4326 - 512 - 512 - 3 - 5 - false - true - 400 - true - diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/TERRA_CR_B143_2016-04-12.wms b/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/TERRA_CR_B143_2016-04-12.wms deleted file mode 100644 index ea8427a9a4..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/TERRA_CR_B143_2016-04-12.wms +++ /dev/null @@ -1,8 +0,0 @@ - - - https://gibs.earthdata.nasa.gov/twms/twms.cgi? - MODIS TERRA tileset - 2016-04-12 - - 20 - diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_AMSR2_GCOM_W1_Sea_Ice_Concentration.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_AMSR2_GCOM_W1_Sea_Ice_Concentration.xml deleted file mode 100644 index c838cf1667..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_AMSR2_GCOM_W1_Sea_Ice_Concentration.xml +++ /dev/null @@ -1,28 +0,0 @@ - - 2012-05-08 - - 1d - YYYY-MM-DD - - - https://gibs.earthdata.nasa.gov/wmts/epsg4326/best/AMSR2_Sea_Ice_Concentration_12km/default/${OpenSpaceTimeId}/2km/${z}/${y}/${x}.png - - - -180.0 - 90 - 396.0 - -198 - 8 - 2 - 1 - top - - EPSG:4326 - 512 - 512 - 3 - true - 400 - true - - diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_Aqua_Orbit_Asc.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_Aqua_Orbit_Asc.xml deleted file mode 100644 index a0c7ed6f8f..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_Aqua_Orbit_Asc.xml +++ /dev/null @@ -1,33 +0,0 @@ - - 2012-05-08 - - 1d - YYYY-MM-DD - - - 1.1.1 - https://gibs.earthdata.nasa.gov/wms/wms.php?TIME=${OpenSpaceTimeId} - EPSG:4326 - image/png - TRUE - Aqua_Orbit_Asc - - - -180.0 - 90 - 396.0 - -198 - 8 - 2 - 1 - top - - EPSG:4326 - 512 - 512 - 3 - true - 400 - true - - diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_GHRSST_L4_MUR_Sea_Surface_Temperature.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_GHRSST_L4_MUR_Sea_Surface_Temperature.xml deleted file mode 100644 index d28ad2d84f..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_GHRSST_L4_MUR_Sea_Surface_Temperature.xml +++ /dev/null @@ -1,28 +0,0 @@ - - 2002-06-01 - - 1d - YYYY-MM-DD - - - https://gibs.earthdata.nasa.gov/wmts/epsg4326/best/GHRSST_L4_MUR_Sea_Surface_Temperature/default/${OpenSpaceTimeId}/250m/${z}/${y}/${x}.png - - - -180.0 - 90 - 396.0 - -198 - 8 - 2 - 1 - top - - EPSG:4326 - 512 - 512 - 4 - true - 400 - true - - diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml deleted file mode 100644 index 1637409c25..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml +++ /dev/null @@ -1,28 +0,0 @@ - - 2012-05-08 - - 1d - YYYY-MM-DD - - - https://gibs.earthdata.nasa.gov/wmts/epsg4326/best/MODIS_Aqua_CorrectedReflectance_TrueColor/default/${OpenSpaceTimeId}/250m/${z}/${y}/${x}.jpg - - - -180.0 - 90 - 396.0 - -198 - 8 - 2 - 1 - top - - EPSG:4326 - 512 - 512 - 3 - true - 400 - true - - diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_MODIS_Terra_CorrectedReflectance_TrueColor.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_MODIS_Terra_CorrectedReflectance_TrueColor.xml deleted file mode 100644 index fb8ffbf297..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_MODIS_Terra_CorrectedReflectance_TrueColor.xml +++ /dev/null @@ -1,28 +0,0 @@ - - 2012-05-08 - - 1d - YYYY-MM-DD - - - https://gibs.earthdata.nasa.gov/wmts/epsg4326/best/MODIS_Terra_CorrectedReflectance_TrueColor/default/${OpenSpaceTimeId}/250m/${z}/${y}/${x}.jpg - - - -180.0 - 90 - 396.0 - -198 - 8 - 2 - 1 - top - - EPSG:4326 - 512 - 512 - 3 - true - 400 - true - - diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml rename to data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.wms diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_VIIRS_SNPP_DayNightBand_ENCC.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_VIIRS_SNPP_DayNightBand_ENCC.xml deleted file mode 100644 index d2e093a97c..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/Temporal_VIIRS_SNPP_DayNightBand_ENCC.xml +++ /dev/null @@ -1,28 +0,0 @@ - - 2012-05-08 - - 1d - YYYY-MM-DD - - - https://gibs.earthdata.nasa.gov/wmts/epsg4326/best/VIIRS_SNPP_DayNightBand_ENCC/default/${OpenSpaceTimeId}/500m/${z}/${y}/${x}.png - - - -180.0 - 90 - 396.0 - -198 - 8 - 2 - 1 - top - - EPSG:4326 - 512 - 512 - 3 - true - 400 - true - - diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/VIIRS_SNPP_CorrectedReflectance_TrueColor.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/VIIRS_SNPP_CorrectedReflectance_TrueColor.xml deleted file mode 100644 index d0ff0f3985..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/VIIRS_SNPP_CorrectedReflectance_TrueColor.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - https://gibs.earthdata.nasa.gov/wmts/epsg4326/best/VIIRS_SNPP_CorrectedReflectance_TrueColor/default/2016-08-21/250m/${z}/${y}/${x}.jpg - - - -180.0 - 90 - 396.0 - -198 - 8 - 2 - 1 - top - - EPSG:4326 - 512 - 512 - 3 - 5 - true - 400 - true - \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/VIIRS_CityLights_2012.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/night/VIIRS_CityLights_2012.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/VIIRS_CityLights_2012.xml rename to data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/night/VIIRS_CityLights_2012.wms diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/overlays/Coastlines.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/overlays/Coastlines.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/overlays/Coastlines.xml rename to data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/overlays/Coastlines.wms diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/overlays/Reference_Features.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/overlays/Reference_Features.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/overlays/Reference_Features.xml rename to data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/overlays/Reference_Features.wms diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/overlays/Reference_Labels.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/overlays/Reference_Labels.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/overlays/Reference_Labels.xml rename to data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/overlays/Reference_Labels.wms diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/MODIS_Water_Mask.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/water/MODIS_Water_Mask.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/MODIS_Water_Mask.xml rename to data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/water/MODIS_Water_Mask.wms diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/other/ASTER_GDEM_Greyscale_Shaded_Relief.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/other/ASTER_GDEM_Greyscale_Shaded_Relief.xml deleted file mode 100644 index 8666bd37cc..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/map_service_configs/other/ASTER_GDEM_Greyscale_Shaded_Relief.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - http://map1.vis.earthdata.nasa.gov/wmts-geo/ASTER_GDEM_Greyscale_Shaded_Relief/default/2016-05-16/EPSG4326_31m/${z}/${y}/${x}.jpg - - - -180.0 - 90 - 396.0 - -198 - 12 - 2 - 1 - top - - EPSG:4326 - 512 - 512 - 1 - \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/other/Landsat_WELD_CorrectedReflectance_TrueColor_Global_Monthly_v3_STD_temporal.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/other/Landsat_WELD_CorrectedReflectance_TrueColor_Global_Monthly_v3_STD_temporal.xml deleted file mode 100644 index 3dcf166656..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/map_service_configs/other/Landsat_WELD_CorrectedReflectance_TrueColor_Global_Monthly_v3_STD_temporal.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - 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/assets/scene/solarsystem/planets/earth/map_service_configs/other/MLS_O3_46hPa_Day.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/other/MLS_O3_46hPa_Day.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/earth/map_service_configs/other/MLS_O3_46hPa_Day.xml rename to data/assets/scene/solarsystem/planets/earth/map_service_configs/other/MLS_O3_46hPa_Day.wms diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/other/OpenStreetMap.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/other/OpenStreetMap.xml deleted file mode 100644 index 450aab0cd6..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/map_service_configs/other/OpenStreetMap.xml +++ /dev/null @@ -1,20 +0,0 @@ - - -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/assets/scene/solarsystem/planets/earth/map_service_configs/other/frmt_wms_virtualearth.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/other/frmt_wms_virtualearth.xml deleted file mode 100644 index 42946f0a2f..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/map_service_configs/other/frmt_wms_virtualearth.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - http://a${server_num}.ortho.tiles.virtualearth.net/tiles/a${quadkey}.jpeg?g=90 - - 4 - diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/other/noaa_rt.xml b/data/assets/scene/solarsystem/planets/earth/map_service_configs/other/noaa_rt.xml deleted file mode 100644 index 717aab0070..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/map_service_configs/other/noaa_rt.xml +++ /dev/null @@ -1,8 +0,0 @@ - - 2016-11-28T05:00:00 - 2016-12-06T04:30:00 - 30m - YYYY-MM-DDThh_mm_ssZ - - D:/NOAA/rt/imergert_composite.${OpenSpaceTimeId}.png - diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/other/test.wms b/data/assets/scene/solarsystem/planets/earth/map_service_configs/other/test.wms deleted file mode 100644 index 7ee62a7fc7..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/map_service_configs/other/test.wms +++ /dev/null @@ -1,79 +0,0 @@ - - - http://192.168.1.167/OnMars/wms.cgi? - CTX Mosaic - - - -180.0 - 90.0 - 180.0 - -90.0 - bottom - - 1 - - - - - \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/moon/map_service_configs/OnMoonColor.xml b/data/assets/scene/solarsystem/planets/earth/moon/map_service_configs/OnMoonColor.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/earth/moon/map_service_configs/OnMoonColor.xml rename to data/assets/scene/solarsystem/planets/earth/moon/map_service_configs/OnMoonColor.wms diff --git a/data/assets/scene/solarsystem/planets/earth/moon/map_service_configs/OnMoonHeight.xml b/data/assets/scene/solarsystem/planets/earth/moon/map_service_configs/OnMoonHeight.xml deleted file mode 100644 index 3f0934091c..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/moon/map_service_configs/OnMoonHeight.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - http://onmoon.lmmp.nasa.gov/raw/wms.cgi? - Lunar Elevation v2, half meters - - - - -180.0 - 90 - 180.0 - -90 - 24 - 2 - 1 - top - - true - 400 - true - \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset index de6a7725b5..6e343243ad 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset @@ -41,6 +41,11 @@ local Moon = { Name = "WAC Utah", FilePath = mapServiceConfigs .. "/Utah/Wac.wms", Enabled = true + }, + -- LMMP based servers + { + Name = "OnMoon", + FilePath = mapServiceConfigs .. "/OnMoonColor.wms" } }, HeightLayers = { diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/LiU/CTX.xml b/data/assets/scene/solarsystem/planets/mars/map_service_configs/LiU/CTX.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/mars/map_service_configs/LiU/CTX.xml rename to data/assets/scene/solarsystem/planets/mars/map_service_configs/LiU/CTX.wms diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/LiU/Mola_Elevation.xml b/data/assets/scene/solarsystem/planets/mars/map_service_configs/LiU/Mola_Elevation.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/mars/map_service_configs/LiU/Mola_Elevation.xml rename to data/assets/scene/solarsystem/planets/mars/map_service_configs/LiU/Mola_Elevation.wms diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/MARS_Viking_MDIM21.xml b/data/assets/scene/solarsystem/planets/mars/map_service_configs/MARS_Viking_MDIM21.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/mars/map_service_configs/MARS_Viking_MDIM21.xml rename to data/assets/scene/solarsystem/planets/mars/map_service_configs/MARS_Viking_MDIM21.wms diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/Mars_MGS_MOLA_DEM.xml b/data/assets/scene/solarsystem/planets/mars/map_service_configs/Mars_MGS_MOLA_DEM.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/mars/map_service_configs/Mars_MGS_MOLA_DEM.xml rename to data/assets/scene/solarsystem/planets/mars/map_service_configs/Mars_MGS_MOLA_DEM.wms diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/CTX.xml b/data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/CTX.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/CTX.xml rename to data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/CTX.wms diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Mars_Color.xml b/data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Mars_Color.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Mars_Color.xml rename to data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Mars_Color.wms diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Mdim.xml b/data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Mdim.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Mdim.xml rename to data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Mdim.wms diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/MolaCTX_Elevation.xml b/data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/MolaCTX_Elevation.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/MolaCTX_Elevation.xml rename to data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/MolaCTX_Elevation.wms diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Mola_Elevation.xml b/data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Mola_Elevation.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Mola_Elevation.xml rename to data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Mola_Elevation.wms diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Mola_HRSC.xml b/data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Mola_HRSC.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Mola_HRSC.xml rename to data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Mola_HRSC.wms diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Mola_PseudoColor.xml b/data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Mola_PseudoColor.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Mola_PseudoColor.xml rename to data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Mola_PseudoColor.wms diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Themis_IR_Day.xml b/data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Themis_IR_Day.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Themis_IR_Day.xml rename to data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Themis_IR_Day.wms diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Themis_IR_Night.xml b/data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Themis_IR_Night.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Themis_IR_Night.xml rename to data/assets/scene/solarsystem/planets/mars/map_service_configs/Utah/Themis_IR_Night.wms diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset index 20235b93e6..8efbcaf7a3 100644 --- a/data/assets/scene/solarsystem/planets/mars/mars.asset +++ b/data/assets/scene/solarsystem/planets/mars/mars.asset @@ -19,29 +19,29 @@ local mapServiceConfigs = asset.localResource("map_service_configs") local color_layers = { { Name = "MOC WA AMNH Color", - FilePath = mapServiceConfigs .. "/Utah/Mars_Color.xml", - Enabled = true - }, - { - Name = "Viking MDIM", - FilePath = mapServiceConfigs .. "/MARS_Viking_MDIM21.xml", + FilePath = mapServiceConfigs .. "/Utah/Mars_Color.wms", + Enabled = true, Fallback = { Name = "Mars Texture", FilePath = textures .. "/mars.jpg", Enabled = true } }, + { + Name = "Viking MDIM", + FilePath = mapServiceConfigs .. "/MARS_Viking_MDIM21.wms" + }, { Name = "MOLA Pseudo Color", - FilePath = mapServiceConfigs .. "/Utah/Mola_PseudoColor.xml" + FilePath = mapServiceConfigs .. "/Utah/Mola_PseudoColor.wms" }, { Name = "MOLA HRSC", - FilePath = mapServiceConfigs .. "/Utah/Mola_HRSC.xml" + FilePath = mapServiceConfigs .. "/Utah/Mola_HRSC.wms" }, { Name = "Viking MDIM [Utah]", - FilePath = mapServiceConfigs .. "/Utah/Mdim.xml" + FilePath = mapServiceConfigs .. "/Utah/Mdim.wms" }, { Name = "Viking MDIM [AWS]", @@ -53,12 +53,12 @@ local color_layers = { }, { Name = "CTX Mosaic [LiU]", - FilePath = mapServiceConfigs .. "/LiU/CTX.xml", + FilePath = mapServiceConfigs .. "/LiU/CTX.wms", BlendMode = "Color" }, { Name = "CTX Mosaic [Utah]", - FilePath = mapServiceConfigs .. "/Utah/CTX.xml", + FilePath = mapServiceConfigs .. "/Utah/CTX.wms", BlendMode = "Color" }, { @@ -68,12 +68,12 @@ local color_layers = { }, { Name = "Themis IR Day [Utah]", - FilePath = mapServiceConfigs .. "/Utah/Themis_IR_Day.xml", + FilePath = mapServiceConfigs .. "/Utah/Themis_IR_Day.wms", BlendMode = "Color" }, { Name = "Themis IR Night [Utah]", - FilePath = mapServiceConfigs .. "/Utah/Themis_IR_Night.xml", + FilePath = mapServiceConfigs .. "/Utah/Themis_IR_Night.wms", BlendMode = "Color" }, { @@ -103,18 +103,18 @@ local overlay_layers = { local height_layers = { { Name = "Mola Elevation", - FilePath = mapServiceConfigs .. "/Mars_MGS_MOLA_DEM.xml", + FilePath = mapServiceConfigs .. "/Mars_MGS_MOLA_DEM.wms", TilePixelSize = 90 }, { Name = "Mola Elevation [Europe]", - FilePath = mapServiceConfigs .. "/LiU/Mola_Elevation.xml", + FilePath = mapServiceConfigs .. "/LiU/Mola_Elevation.wms", Enabled = true, TilePixelSize = 90 }, { Name = "Mola Elevation [Utah]", - FilePath = mapServiceConfigs .. "/Utah/Mola_Elevation.xml", + FilePath = mapServiceConfigs .. "/Utah/Mola_Elevation.wms", TilePixelSize = 90 }, { diff --git a/data/assets/scene/solarsystem/planets/mercury/map_service_configs/AMNH/OnMercuryColor.xml b/data/assets/scene/solarsystem/planets/mercury/map_service_configs/AMNH/OnMercuryColor.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/mercury/map_service_configs/AMNH/OnMercuryColor.xml rename to data/assets/scene/solarsystem/planets/mercury/map_service_configs/AMNH/OnMercuryColor.wms diff --git a/data/assets/scene/solarsystem/planets/mercury/map_service_configs/AMNH/OnMercuryElevationGaskell.xml b/data/assets/scene/solarsystem/planets/mercury/map_service_configs/AMNH/OnMercuryElevationGaskell.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/mercury/map_service_configs/AMNH/OnMercuryElevationGaskell.xml rename to data/assets/scene/solarsystem/planets/mercury/map_service_configs/AMNH/OnMercuryElevationGaskell.wms diff --git a/data/assets/scene/solarsystem/planets/mercury/map_service_configs/AMNH/OnMercuryImage.xml b/data/assets/scene/solarsystem/planets/mercury/map_service_configs/AMNH/OnMercuryImage.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/mercury/map_service_configs/AMNH/OnMercuryImage.xml rename to data/assets/scene/solarsystem/planets/mercury/map_service_configs/AMNH/OnMercuryImage.wms diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp index 038882291e..37620545d7 100644 --- a/src/rendering/loadingscreen.cpp +++ b/src/rendering/loadingscreen.cpp @@ -45,7 +45,7 @@ namespace { const float MessageFontSize = 22.f; const float ItemFontSize = 8.f; - const glm::vec2 LogoCenter = { 0.f, 0.55f }; // in NDC + const glm::vec2 LogoCenter = { 0.f, 0.525f }; // in NDC const glm::vec2 LogoSize = { 0.275f, 0.275 }; // in NDC const glm::vec2 ProgressbarCenter = { 0.f, -0.75f }; // in NDC