Sort styles for prettiness and easier testing

ngageoint · Feb 16, 2017 · 6a0a9b0 · 6a0a9b0
1 parent dbb9b2a
commit 6a0a9b0
Show file tree

Hide file tree

Showing 13 changed files with 634 additions and 231 deletions.
diff --git a/mrgeo-core/src/main/java/org/mrgeo/colorscale/ColorScaleManager.java b/mrgeo-core/src/main/java/org/mrgeo/colorscale/ColorScaleManager.java
@@ -22,15 +22,19 @@
 import org.mrgeo.data.DataProviderFactory.AccessMode;
 import org.mrgeo.data.adhoc.AdHocDataProvider;
 import org.mrgeo.utils.HadoopUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
+import java.util.TreeMap;
 
 public class ColorScaleManager
 {
+private static final Logger log = LoggerFactory.getLogger(ColorScale.class);
 
 private static Map<String, ColorScale> colorscales;
 
@@ -67,15 +71,24 @@ public static ColorScale fromName(final String colorScaleName) throws ColorScale
 
 public static ColorScale[] getColorScaleList() throws IOException
 {
-  return colorscales.values().toArray(new ColorScale[0]);
+  // for convenience and testing, we'll sort the list...
+  ColorScale[] list = new ColorScale[colorscales.size()];
+  int cnt = 0;
+  for (Map.Entry<String, ColorScale> entry: colorscales.entrySet())
+  {
+    list[cnt++] = entry.getValue();
+  }
+
+  return list;
+  //return colorscales.values().toArray(new ColorScale[0]);
 }
 
 @SuppressFBWarnings(value = "WEAK_FILENAMEUTILS", justification = "Using Java 1.7+, weak filenames are fixed")
 private static synchronized void initializeColorscales() throws ColorScale.ColorScaleException
 {
   if (colorscales == null)
   {
-    colorscales = new HashMap<>();
+    colorscales = new TreeMap<>();
 
     Properties props = MrGeoProperties.getInstance();
 
@@ -98,7 +111,7 @@ private static synchronized void initializeColorscales() throws ColorScale.Color
             {
               ColorScale cs = ColorScale.loadFromXML(fdis);
 
-              colorscales.put(FilenameUtils.getBaseName(name), cs);
+              colorscales.put(cs.getName(), cs);
             }
           }
           }
@@ -113,6 +126,15 @@ private static synchronized void initializeColorscales() throws ColorScale.Color
     {
       throw new ColorScale.ColorScaleException("No color scale base directory configured");
     }
+
+    if (log.isInfoEnabled())
+    {
+      log.info("ColorScales:");
+      for (String name : colorscales.keySet())
+      {
+        log.info("  - " + FilenameUtils.getBaseName(name));
+      }
+    }
   }
 }
 

diff --git a/...ices/mrgeo-services-tms/src/main/java/org/mrgeo/resources/tms/TileMapServiceResource.java b/...ices/mrgeo-services-tms/src/main/java/org/mrgeo/resources/tms/TileMapServiceResource.java
@@ -214,6 +214,10 @@ public Response getTile(@PathParam("version") final String version,
       if (colorScaleName != null)
       {
         cs = ColorScaleManager.fromName(colorScaleName);
+        if (cs == null)
+        {
+          throw new ColorScale.ColorScaleException("Cannot open colorscale: " + colorScaleName);
+        }
       }
       else if (colorScale != null)
       {

diff --git a/...ices-tms/src/test/java/org/mrgeo/resources/tms/TileMapServiceResourceIntegrationTest.java b/...ices-tms/src/test/java/org/mrgeo/resources/tms/TileMapServiceResourceIntegrationTest.java
@@ -569,7 +569,7 @@ public void testGetTileColorScaleNameNonExistent() throws Exception
       .request().get();
 
   Assert.assertEquals(Status.NOT_FOUND.getStatusCode(), response.getStatus());
-  Assert.assertEquals("Unable to open color scale file", response.readEntity(String.class));
+  Assert.assertEquals("Unable to open color scale", response.readEntity(String.class));
 }
 
 @Override

diff --git a/...eo-services-wms/src/main/java/org/mrgeo/resources/wms/DescribeTilesDocumentGenerator.java b/...eo-services-wms/src/main/java/org/mrgeo/resources/wms/DescribeTilesDocumentGenerator.java
@@ -164,6 +164,7 @@ private void addLayersToDescribeTiles(Element dt, Version version,
         ColorScale[] scales = ColorScaleManager.getColorScaleList();
         for (ColorScale scale : scales)
         {
+          System.out.println(scale.getName());
           XmlUtils.createTextElement2(styles, "Value", scale.getName());
         }
       }

diff --git a/...-services/mrgeo-services-wms/src/test/java/org/mrgeo/resources/wms/DescribeTilesTest.java b/...-services/mrgeo-services-wms/src/test/java/org/mrgeo/resources/wms/DescribeTilesTest.java
@@ -96,6 +96,6 @@ public void testDescribeTiles140() throws Exception
       .queryParam("VERSION", "1.4.0")
       .request().get();
 
-  processXMLResponse(response, "DescribeTiles.xml");
+  processXMLResponse(response, "DescribeTiles140.xml");
 }
 }
diff --git a/...es/mrgeo-services-wms/src/test/java/org/mrgeo/resources/wms/WmsGeneratorTestAbstract.java b/...es/mrgeo-services-wms/src/test/java/org/mrgeo/resources/wms/WmsGeneratorTestAbstract.java
@@ -295,7 +295,8 @@ protected static void processXMLResponse(final Response response,
         log.info("Comparing result to baseline text in " + baselineFile + " ...");
         //Assert.assertEquals(IOUtils.toString(inputStream), content);
 
-        XMLAssert.assertXMLEqual(IOUtils.toString(inputStream), content);
+        String xml = IOUtils.toString(inputStream);
+        XMLAssert.assertXMLEqual(xml, content);
       }
       finally
       {

diff --git a/.../mrgeo-services-wms/testFiles/org.mrgeo.resources.wms/DescribeTilesTest/DescribeTiles.xml b/.../mrgeo-services-wms/testFiles/org.mrgeo.resources.wms/DescribeTilesTest/DescribeTiles.xml
@@ -65,9 +65,8 @@
     </TiledCrs>
     <TiledStyles>
       <Value>default</Value>
-      <Value>Default</Value>
+      <Value>Rainbow</Value>
       <Value>elevation</Value>
-      <Value>rainbow</Value>
     </TiledStyles>
   </Layer>
   <Layer name="IslandsElevation-v2-color-scale">
@@ -134,9 +133,8 @@
     </TiledCrs>
     <TiledStyles>
       <Value>default</Value>
-      <Value>Default</Value>
+      <Value>Rainbow</Value>
       <Value>elevation</Value>
-      <Value>rainbow</Value>
     </TiledStyles>
   </Layer>
   <Layer name="IslandsElevation-v2-no-pyramid">
@@ -158,9 +156,8 @@
     </TiledCrs>
     <TiledStyles>
       <Value>default</Value>
-      <Value>Default</Value>
+      <Value>Rainbow</Value>
       <Value>elevation</Value>
-      <Value>rainbow</Value>
     </TiledStyles>
   </Layer>
   <Layer name="IslandsElevation-v2-no-pyramid-extra-metadata">
@@ -227,9 +224,8 @@
     </TiledCrs>
     <TiledStyles>
       <Value>default</Value>
-      <Value>Default</Value>
+      <Value>Rainbow</Value>
       <Value>elevation</Value>
-      <Value>rainbow</Value>
     </TiledStyles>
   </Layer>
   <Layer name="IslandsElevation-v2-no-stats">
@@ -296,9 +292,8 @@
     </TiledCrs>
     <TiledStyles>
       <Value>default</Value>
-      <Value>Default</Value>
+      <Value>Rainbow</Value>
       <Value>elevation</Value>
-      <Value>rainbow</Value>
     </TiledStyles>
   </Layer>
   <Layer name="cost-distance">
@@ -375,9 +370,8 @@
     </TiledCrs>
     <TiledStyles>
       <Value>default</Value>
-      <Value>Default</Value>
+      <Value>Rainbow</Value>
       <Value>elevation</Value>
-      <Value>rainbow</Value>
     </TiledStyles>
   </Layer>
   <Layer name="cost-distance-shift-2">
@@ -444,9 +438,8 @@
     </TiledCrs>
     <TiledStyles>
       <Value>default</Value>
-      <Value>Default</Value>
+      <Value>Rainbow</Value>
       <Value>elevation</Value>
-      <Value>rainbow</Value>
     </TiledStyles>
   </Layer>
   <Layer name="small-3band">