mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-17 01:10:59 -06:00
Merge branch 'master' into feature/NewAtmosphere
This commit is contained in:
@@ -1,20 +0,0 @@
|
||||
<GDAL_WMS>
|
||||
<Service name="TMS">
|
||||
<ServerUrl>http://asgard.sci.utah.edu/Moon/Wac/tile/${z}/${y}/${x}</ServerUrl>
|
||||
</Service>
|
||||
<DataWindow>
|
||||
<UpperLeftX>-180.0</UpperLeftX>
|
||||
<UpperLeftY>90.0</UpperLeftY>
|
||||
<LowerRightX>180.0</LowerRightX>
|
||||
<LowerRightY>-90.0</LowerRightY>
|
||||
<SizeX>109164</SizeX>
|
||||
<SizeY>54582</SizeY>
|
||||
<TileLevel>8</TileLevel>
|
||||
<YOrigin>top</YOrigin>
|
||||
</DataWindow>
|
||||
<Projection>GEOGCS["GCS_Moon_2000",DATUM["D_Moon_2000",SPHEROID["Moon_2000_IAU_IAG",1737400.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]]</Projection>
|
||||
<BlockSizeX>256</BlockSizeX>
|
||||
<BlockSizeY>256</BlockSizeY>
|
||||
<BandsCount>1</BandsCount>
|
||||
<MaxConnections>10</MaxConnections>
|
||||
</GDAL_WMS>
|
||||
@@ -1,6 +1,6 @@
|
||||
<GDAL_WMS>
|
||||
<Service name="TMS">
|
||||
<ServerUrl>http://moontrek.jpl.nasa.gov/trektiles/Moon/EQ/LRO_WAC_Mosaic_Global_303ppd_v02/1.0.0/default/default028mm/${z}/${y}/${x}.jpg</ServerUrl>
|
||||
<ServerUrl>http://asgard.sci.utah.edu/Moon/Wac/tile/${z}/${y}/${x}</ServerUrl>
|
||||
</Service>
|
||||
<DataWindow>
|
||||
<UpperLeftX>-180.0</UpperLeftX>
|
||||
|
||||
@@ -24,9 +24,8 @@ return {
|
||||
ColorLayers = {
|
||||
-- MoonTrek based servers
|
||||
{
|
||||
Name = "WAC [MoonTrek]",
|
||||
FilePath = "map_service_configs/MoonTrek/LRO WAC.wms",
|
||||
Enabled = true
|
||||
Name = "Apollo 16 Metric Cam Image Mosaic",
|
||||
FilePath = "map_service_configs/MoonTrek/Apollo16_Metric_Cam_Image_Mosaic.wms"
|
||||
},
|
||||
-- Utah based servers
|
||||
{
|
||||
@@ -38,9 +37,9 @@ return {
|
||||
FilePath = "map_service_configs/Utah/Kaguya.wms"
|
||||
},
|
||||
{
|
||||
Name = "WAC [Utah]",
|
||||
FilePath = "map_service_configs/Utah/Wac.wms"
|
||||
-- Enabled = true,
|
||||
Name = "WAC Utah",
|
||||
FilePath = "map_service_configs/Utah/Wac.wms",
|
||||
Enabled = true
|
||||
}
|
||||
},
|
||||
HeightLayers = {
|
||||
|
||||
Reference in New Issue
Block a user