From 78aa164ccf7dcf2807eaa3e6e2fd497f9977ee18 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@me.com>
Date: Thu, 19 Oct 2017 15:14:04 -0400
Subject: [PATCH] Reset moon.mod

---
 .../map_service_configs/MoonTrek/LRO WAC.wms  | 20 -------------------
 .../moon/map_service_configs/Utah/Wac.wms     |  2 +-
 data/scene/moon/moon.mod                      | 11 +++++-----
 modules/imgui/src/gui.cpp                     |  1 -
 4 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 data/scene/moon/map_service_configs/MoonTrek/LRO WAC.wms

diff --git a/data/scene/moon/map_service_configs/MoonTrek/LRO WAC.wms b/data/scene/moon/map_service_configs/MoonTrek/LRO WAC.wms
deleted file mode 100644
index 1085bbda66..0000000000
--- a/data/scene/moon/map_service_configs/MoonTrek/LRO WAC.wms	
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/data/scene/moon/map_service_configs/Utah/Wac.wms b/data/scene/moon/map_service_configs/Utah/Wac.wms
index 141b412fe0..1085bbda66 100644
--- a/data/scene/moon/map_service_configs/Utah/Wac.wms
+++ b/data/scene/moon/map_service_configs/Utah/Wac.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>
diff --git a/data/scene/moon/moon.mod b/data/scene/moon/moon.mod
index 0cb2ec7748..50af1eccbf 100644
--- a/data/scene/moon/moon.mod
+++ b/data/scene/moon/moon.mod
@@ -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 = {
diff --git a/modules/imgui/src/gui.cpp b/modules/imgui/src/gui.cpp
index 49a17db6c0..660113928b 100644
--- a/modules/imgui/src/gui.cpp
+++ b/modules/imgui/src/gui.cpp
@@ -334,7 +334,6 @@ void GUI::initialize() {
     style.GrabMinSize = 10.f;
     style.GrabRounding = 16.f;
 
-    ImGuiStyle& style = ImGui::GetStyle();
     style.Colors[ImGuiCol_Text] = ImVec4(0.90f, 0.90f, 0.90f, 1.00f);
     style.Colors[ImGuiCol_TextDisabled] = ImVec4(0.60f, 0.60f, 0.60f, 1.00f);
     style.Colors[ImGuiCol_WindowBg] = ImVec4(0.13f, 0.13f, 0.13f, 0.96f);