diff --git a/data/assets/customization/globebrowsing.asset b/data/assets/customization/globebrowsing.asset index 98ea2c0e0a..679f31166d 100644 --- a/data/assets/customization/globebrowsing.asset +++ b/data/assets/customization/globebrowsing.asset @@ -22,12 +22,13 @@ local vrt_folders = { -- example: 'C:/OpenSpace/GlobeBrowsingData/Mars/CTX' -- We recommend using this folder for CTX + openspace.absPath('${ASSETS}/scene/solarsystem/planets/mars/map_service_configs/ESRI/CTX'), openspace.absPath('${BASE}/../OpenSpaceData/Mars/CTX'), -- if not and you have a custom path for CTX layers, enter it below '', -- Our provided HiRISE layer - openspace.absPath('${ASSETS}/scene/solarsystem/planets/mars/map_service_configs/ESRI/'), + openspace.absPath('${ASSETS}/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE'), -- We recommend using this folder for HiRISE openspace.absPath('${BASE}/../OpenSpaceData/Mars/HiRISE'), -- if not and you have a custom path for HiRISE layers, enter it below diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/CTX/CTXblended.info b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/CTX/CTXblended.info new file mode 100644 index 0000000000..4f06d09ec6 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/CTX/CTXblended.info @@ -0,0 +1,5 @@ +Name = "CTX Blended beta01" +Identifier = "CTXblended" +Description = "Seam-corrected and seam-mapped mosaic of Mars CTX created by Jay Dixon at The Murray Lab" +HeightFile = nil +ColorFile = "CTXblended.vrt" diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/CTX/CTXblended.tif b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/CTX/CTXblended.tif new file mode 100644 index 0000000000..6025d7c7bd --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/CTX/CTXblended.tif @@ -0,0 +1,18 @@ + + + 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 + + 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/map_service_configs/ESRI/CTX/CTXblended.vrt b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/CTX/CTXblended.vrt new file mode 100644 index 0000000000..8b81d03b3e --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/CTX/CTXblended.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 + + CTXblended.tif + 1 + + + + 0 + + + + 0 + Alpha + + CTXblended.tif + 1 + + + + 0:0,1:255,255:255 + + + diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISELS.tif b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/HiRISELS.tif similarity index 100% rename from data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISELS.tif rename to data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/HiRISELS.tif diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISELS.vrt b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/HiRISELS.vrt similarity index 100% rename from data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISELS.vrt rename to data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/HiRISELS.vrt diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE_DEM.tif b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/HiRISE_DEM.tif similarity index 100% rename from data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE_DEM.tif rename to data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/HiRISE_DEM.tif diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE_DEM.wms b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/HiRISE_DEM.wms similarity index 100% rename from data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE_DEM.wms rename to data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/HiRISE_DEM.wms diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/OnMarsHiRISE.info b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/OnMarsHiRISE.info similarity index 100% rename from data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/OnMarsHiRISE.info rename to data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/OnMarsHiRISE.info