Merged master into NewAtmosphere.

data/scene/mars/map_service_configs/Utah/Mars_Color.xml

@@ -0,0 +1,20 @@
+<GDAL_WMS>
+    <Service name="TMS">
+        <ServerUrl>http://openspace.sci.utah.edu/Mars/mainColV007/tile/${z}/${y}/${x}</ServerUrl>
+    </Service>
+    <DataWindow>
+        <UpperLeftX>-180.0</UpperLeftX>
+        <UpperLeftY>90.0</UpperLeftY>
+        <LowerRightX>180.0</LowerRightX>
+        <LowerRightY>-90.0</LowerRightY>
+        <SizeX>92160</SizeX>
+        <SizeY>46080</SizeY>
+        <TileLevel>7</TileLevel>
+        <YOrigin>top</YOrigin>  <!-- fail: bottom -->
+    </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>
+    <BandsCount>3</BandsCount>
+    <MaxConnections>10</MaxConnections>
+</GDAL_WMS>

data/scene/mars/mars.data

@@ -2,8 +2,8 @@ return {
     FileRequest = {
         { Identifier = "mars_textures", Destination = "textures", Version = 1 }
     },
-    TorrentFiles = {
-        { File = "map_datasets.torrent", Destination = "." }
+    -- TorrentFiles = {
+    --     { File = "map_datasets.torrent", Destination = "." }
         -- { File = "MAR063.BSP.torrent", Destination = "${SPICE}" }
-    }
+    -- }
 }

data/scene/mars/mars.mod

@@ -35,7 +35,7 @@ return {
                 ColorLayers = {
                     {
                         Name = "MOC WA AMNH Color",
-                        FilePath = "map_datasets/mars_COL_v006_mars2000_rgb.vrt",
+                        FilePath = "map_service_configs/Utah/Mars_Color.xml",
                         Enabled = true
                     },
                     {