fix for globebrowing order, adding new mars hirise layer

2026-01-07 20:21:24 -06:00 · 2020-10-13 21:53:49 -04:00
parent 26565cf270
commit 6355da37be
9 changed files with 164 additions and 26 deletions
--- a/data/assets/base.asset
+++ b/data/assets/base.asset
@@ -25,6 +25,7 @@ local assetHelper = asset.require('util/asset_helper')
 assetHelper.requireAll(asset, 'scene/milkyway/exoplanets')
 assetHelper.requireAll(asset, 'scene/digitaluniverse')

+asset.require('customization/globebrowsing')

 asset.onInitialize(function ()
    openspace.globebrowsing.loadWMSServersFromFile(
--- a/data/assets/base_blank.asset
+++ b/data/assets/base_blank.asset
@@ -15,8 +15,6 @@ asset.require('util/default_joystick')
 -- Load web gui
 local webGui = asset.require('util/webgui')

-asset.require('customization/globebrowsing')
-
 -- Keybindings that are specific for this scene
 local Keybindings = {
    {
--- a/data/assets/customization/globebrowsing.asset
+++ b/data/assets/customization/globebrowsing.asset
@@ -25,9 +25,6 @@ local vrt_folders = {
        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/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
--- a/data/assets/scene/solarsystem/planets/mars/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mars/default_layers.asset
@@ -18,10 +18,13 @@ asset.require(colorLayersPath .. "/themis_ir_night_sweden")
 asset.require(colorLayersPath .. "/ctx_mosaic_utah") 
 asset.require(colorLayersPath .. "/ctx_mosaic_sweden") 
 asset.require(colorLayersPath .. "/ctx_blended_01")
+asset.require(colorLayersPath .. "/hirise")
+asset.require(colorLayersPath .. "/hirisels")

 -- Height layers
 asset.require(heightLayersPath .. "/mola_europe")
 local heightLayer = asset.require(heightLayersPath .. "/mola_utah")
+asset.require(heightLayersPath .. "/hirisels")

 -- Overlays
 asset.require(overlaysPath .. "/indices")
@@ -39,10 +42,10 @@ end)

 asset.meta = {
    Name = "Default Mars Layers",
-    Version = "1.0",
+    Version = "1.1",
    Description = [[ Default Mars layers are: MOC WA Color, Viking MDIM, MOLA Pseudo
-        Color, MOLA HRSC, Themis IR Day, Themis IR Night, CTX Mosaic, and CTX Blended
-        beta01]],
+        Color, MOLA HRSC, Themis IR Day, Themis IR Night, CTX Mosaic, CTX Blended
+        beta01, HiRISE, and HiRISE Local Set]],
    Author = "OpenSpace Team",
    URL = "http://openspaceproject.com",
    License = "MIT license"
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/HiRISE.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/HiRISE.asset
@@ -1,24 +1,42 @@
--todo add hirise through asset file like we do for ctx_blended.
--curretly added via globebrowsing customization
+local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier
+
+local layer = {
+    Identifier = "HiRISE-PSP",
+    Name = "HiRISE",
+    FilePath = mapServiceConfigs .. "/ESRI/HiRISE/HiRISE_PSP.vrt",
+    BlendMode = "Color",
+    Settings = {
+        Gamma = 1.0,
+        Multiplier = 1.0
+    },
+    Description = [[This layer is an equatorial uncontrolled composite mosaic of the
+        HiRISE imagery, using all available red band images released through 2018. The
+        HiRISE instrument, operated by the University of Arizona, is on board NASA's
+        2005 Mars Reconnaissance Orbiter (MRO). While the resolution of the imagery is
+        very high, the imagery is somewhat limited in spatial extent, covering only about
+        3% of the plant's surface. The images in this layer are spatially located using
+        only the initial spacecraft pointing information.  All source images used in the
+        construction of this layer were produced by the team at the University of Arizona.
+        This tiled web service, as hosted by Esri, is made available using lossy Jpeg
+        compression using an 8 bit data range, using a linear stretch from the original
+        10 bit range. (Description from URL)]],
+}
+
+asset.onInitialize(function ()
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
+asset.export("layer", layer)


 asset.meta = {
-    Name = "HiRISE Local Set",
+    Name = "HiRISE",
    Version = "1.0",
-    Description = [[ HiRISE (High Resolution Imaging Science Experiment) is the most
-        powerful camera ever sent to another planet, one of six instruments onboard the
-        Mars Reconnaissance Orbiter. We launched in 2005, arrived at Mars in 2006 and have
-        been imaging ever since. Our camera’s high resolution capability (imaging up to 30
-        centimeters per pixel) remains unprecedented for any existing orbiter in the study
-        of the Red Planet, as well as being an indispensable instrument for helping to
-        select landing sites for robotic and future human exploration. In the past decade,
-        we’ve also imaged avalanches in progress, and discovered dark flows that may or
-        may not be briny seeps. Hundreds of science papers have been published with our
-        data. (Description from URL). This map contains a subet set of the HiRISE
-        imagaery, only containing locations where a corresponding HiRISE digital terrain
-        model (DTM) was available as of 2018.]],
-    Author = "USGS",
-    URL = "https://www.uahirise.org",
+    Description = [[Updated HiRISE layer for Mars with raw unselected imagery. This map is
+        hosted by ESRI.]],
+    Author = "esri_astro",
+    URL = "https://www.arcgis.com/home/item.html?id=c1c4c750a2154842ae523c984cc14fa5",
    License = "Esri Master License Agreement",
-    Identifiers = "OnMarsHiRISELS"
+    Identifiers = "HiRISE-PSP"
 }
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset
@@ -0,0 +1,41 @@
+local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier
+
+local layer = {
+    Identifier = "HiRISE-LS",
+    Name = "HiRISE Local Set",
+    FilePath = mapServiceConfigs .. "/ESRI/HiRISE/HiRISELS.vrt",
+    BlendMode = "Color",
+    Description = [[ HiRISE (High Resolution Imaging Science Experiment) is the most
+        powerful camera ever sent to another planet, one of six instruments onboard the
+        Mars Reconnaissance Orbiter. We launched in 2005, arrived at Mars in 2006 and have
+        been imaging ever since. Our camera’s high resolution capability (imaging up to 30
+        centimeters per pixel) remains unprecedented for any existing orbiter in the study
+        of the Red Planet, as well as being an indispensable instrument for helping to
+        select landing sites for robotic and future human exploration. In the past decade,
+        we’ve also imaged avalanches in progress, and discovered dark flows that may or
+        may not be briny seeps. Hundreds of science papers have been published with our
+        data. (Description from URL). This map contains a subet set of the HiRISE
+        imagaery, only containing locations where a corresponding HiRISE digital terrain
+        model (DTM) was available as of 2018.]],
+}
+
+asset.onInitialize(function ()
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
+asset.export("layer", layer)
+
+
+asset.meta = {
+    Name = "HiRISE Local Set",
+    Version = "1.0",
+    Description = [[HiRISE layer for images with corresponding DEMs. This map is
+        hosted by ESRI.]],
+    Author = "USGS",
+    URL = "https://www.uahirise.org",
+    License = "Esri Master License Agreement",
+    Identifiers = "HiRISE-LS"
+}
+
+
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset
@@ -0,0 +1,39 @@
+local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier
+
+local layer = {
+    Identifier = "HiRISE-LS-DEM",
+    Name = "HiRISE Local Set DEM",
+    FilePath = mapServiceConfigs .. "/ESRI/HiRISE/HiRISE_DEM.wms",   
+    Description = [[ HiRISE (High Resolution Imaging Science Experiment) is the most
+        powerful camera ever sent to another planet, one of six instruments onboard the
+        Mars Reconnaissance Orbiter. We launched in 2005, arrived at Mars in 2006 and have
+        been imaging ever since. Our camera’s high resolution capability (imaging up to 30
+        centimeters per pixel) remains unprecedented for any existing orbiter in the study
+        of the Red Planet, as well as being an indispensable instrument for helping to
+        select landing sites for robotic and future human exploration. In the past decade,
+        we’ve also imaged avalanches in progress, and discovered dark flows that may or
+        may not be briny seeps. Hundreds of science papers have been published with our
+        data. (Description from URL). This map contains a subet set of the HiRISE
+        DEM where available as of 2018.]],
+}
+
+asset.onInitialize(function ()
+    openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer)
+end)
+
+asset.export("layer", layer)
+
+
+asset.meta = {
+    Name = "HiRISE Local Set DEM",
+    Version = "1.0",
+    Description = [[HiRISE DEM layer for corresponding Local Set imager. This map is
+        hosted by ESRI.]],
+    Author = "USGS",
+    URL = "https://www.uahirise.org",
+    License = "Esri Master License Agreement",
+    Identifiers = "HiRISE-LS-DEM"
+}
+
+
--- a/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/HiRISE_PSP.tif
+++ b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/HiRISE_PSP.tif
@@ -0,0 +1,16 @@
+<GDAL_WMS>
+  <Service name="TMS">
+    <ServerUrl>http://astro.arcgis.com/arcgis/rest/services/OnMars/HiRISE/MapServer/tile/${z}/${y}/${x}</ServerUrl>
+  </Service>
+  <DataWindow>
+    <UpperLeftX>-180</UpperLeftX> <UpperLeftY>90</UpperLeftY>
+    <LowerRightX>180</LowerRightX> <LowerRightY>-90</LowerRightY>
+    <SizeX>134217728</SizeX> <SizeY>67108864</SizeY>
+    <TileLevel>17</TileLevel> <YOrigin>top</YOrigin>
+  </DataWindow>
+  <Projection>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]]</Projection>
+  <BlockSizeX>512</BlockSizeX>
+  <BlockSizeY>512</BlockSizeY>
+  <MaxConnections>5</MaxConnections>
+  <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
+</GDAL_WMS>
--- a/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/HiRISE_PSP.vrt
+++ b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/HiRISE_PSP.vrt
@@ -0,0 +1,25 @@
+<VRTDataset rasterXSize="134217728" rasterYSize="67108864">
+  <SRS>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]]</SRS>
+  <GeoTransform> -180, 2.682209015e-6, 0,  90, 0, -2.682209015e-6</GeoTransform>
+  <VRTRasterBand band="1">
+    <ColorInterp>Gray</ColorInterp>
+    <ComplexSource>
+      <SourceFilename relativeToVRT="1">HiRISE_PSP.tif</SourceFilename>
+      <SourceBand>1</SourceBand>
+      <SourceProperties RasterXSize="134217728" RasterYSize="67108864" BlockXSize="512" BlockYSize="512" />
+      <SrcRect xOff="0" yOff="0" xSize="134217728" ySize="67108864"/>
+      <DstRect xOff="0" yOff="0" xSize="134217728" ySize="67108864"/>
+    </ComplexSource>
+  </VRTRasterBand>
+  <VRTRasterBand band="2">
+    <ColorInterp>Alpha</ColorInterp>
+    <ComplexSource>
+      <SourceFilename relativeToVRT="1">HiRISE_PSP.tif</SourceFilename>
+      <SourceBand>1</SourceBand>
+      <SourceProperties RasterXSize="134217728" RasterYSize="67108864" BlockXSize="512" BlockYSize="512" />
+      <SrcRect xOff="0" yOff="0" xSize="134217728" ySize="67108864" />
+      <DstRect xOff="0" yOff="0" xSize="134217728" ySize="67108864" />
+       <LUT>0:0,1:255,255:255</LUT>
+    </ComplexSource>
+  </VRTRasterBand>
+</VRTDataset>