Merge branch 'fix-classic-debug-layers' into dev-2.x

Author: optionsome

application/src/client/classic-debug/js/otp/core/Map.js

@@ -62,14 +62,14 @@ otp.core.Map = otp.Class({
         //debug layers can be enabled in config.js or as URL query:
         //?debug_layers=true
         if (otp.config.debug_layers === true) {
-            var url = otp.config.hostname + '/' + otp.config.restService + '/inspector/layers';
+            var url = otp.config.hostname + '/otp/debugrastertiles/layers';
             $.ajax(url, {
                 dataType: 'JSON',
                 success: function(data) {
                     var layers = {};
                     data.layers.map(function(layer) {
                         this.layer_control.addOverlay(new L.TileLayer(
-                            otp.config.hostname + '/' + otp.config.restService + '/inspector/tile/' + layer.key + '/{z}/{x}/{y}.png',
+                            otp.config.hostname + '/otp/debugrastertiles/' + layer.key + '/{z}/{x}/{y}.png',
                             { maxZoom : 22}), layer.name);
                     }, this_);
 

application/src/ext/java/org/opentripplanner/ext/debugrastertiles/BikeSafetyEdgeRenderer.java

@@ -52,4 +52,9 @@ public Optional<VertexVisualAttributes> renderVertex(Vertex v) {
     }
     return Optional.empty();
   }
+
+  @Override
+  public String getName() {
+    return "Bike safety";
+  }
 }

application/src/ext/java/org/opentripplanner/ext/debugrastertiles/EdgeVertexTileRenderer.java

@@ -233,6 +233,11 @@ public void renderTile(TileRenderContext context) {
     }
   }
 
+  @Override
+  public String getName() {
+    return evRenderer.getName();
+  }
+
   public interface EdgeVertexRenderer {
     Comparator<Vertex> defaultVertexComparator = Comparator
       .comparing((Vertex v) -> v instanceof StreetVertex)
@@ -253,6 +258,13 @@ public interface EdgeVertexRenderer {
      */
     Optional<VertexVisualAttributes> renderVertex(Vertex v);
 
+    /**
+     * Name of this tile Render which would be shown in frontend
+     *
+     * @return Name of tile render
+     */
+    String getName();
+
     default boolean hasEdgeSegments(Edge edge) {
       return false;
     }

application/src/ext/java/org/opentripplanner/ext/debugrastertiles/ElevationEdgeRenderer.java

@@ -48,6 +48,11 @@ public Optional<VertexVisualAttributes> renderVertex(Vertex v) {
     }
   }
 
+  @Override
+  public String getName() {
+    return "Elevation";
+  }
+
   @Override
   public boolean hasEdgeSegments(Edge edge) {
     return true;

application/src/ext/java/org/opentripplanner/ext/debugrastertiles/NoThruTrafficEdgeRenderer.java

@@ -60,4 +60,9 @@ public Optional<EdgeVisualAttributes> renderEdge(Edge e) {
   public Optional<VertexVisualAttributes> renderVertex(Vertex v) {
     return Optional.empty();
   }
+
+  @Override
+  public String getName() {
+    return "No thru traffic";
+  }
 }

application/src/ext/java/org/opentripplanner/ext/debugrastertiles/TileRenderer.java

@@ -17,6 +17,9 @@ public interface TileRenderer {
   /** Implementation of the tile rendering */
   void renderTile(TileRenderContext context);
 
+  /** Gets descriptive name of this Tile Render */
+  String getName();
+
   /**
    * Context used for rendering a tile.
    */

application/src/ext/java/org/opentripplanner/ext/debugrastertiles/TileRendererManager.java

@@ -88,4 +88,13 @@ public Envelope expandPixels(double marginXPixels, double marginYPixels) {
     LOG.debug("Rendered tile at {} in {} ms", mapTile.bbox(), System.currentTimeMillis() - start);
     return image;
   }
+
+  /**
+   * Gets all renderers
+   * <p>
+   * Used to return list of renderers to client. Could be also used to show legend.
+   */
+  public Map<String, TileRenderer> getRenderers() {
+    return renderers;
+  }
 }

application/src/ext/java/org/opentripplanner/ext/debugrastertiles/TraversalPermissionsEdgeRenderer.java

@@ -117,6 +117,11 @@ public Optional<VertexVisualAttributes> renderVertex(Vertex v) {
     return Optional.empty();
   }
 
+  @Override
+  public String getName() {
+    return "Traversal permissions";
+  }
+
   private Color getColor(StreetTraversalPermission permissions) {
     /*
      * We use the trick that there are 3 main traversal modes (WALK, BIKE and CAR) and 3 color

application/src/ext/java/org/opentripplanner/ext/debugrastertiles/WalkSafetyEdgeRenderer.java

@@ -43,4 +43,9 @@ public Optional<VertexVisualAttributes> renderVertex(Vertex v) {
     }
     return Optional.empty();
   }
+
+  @Override
+  public String getName() {
+    return "Walk safety";
+  }
 }

application/src/ext/java/org/opentripplanner/ext/debugrastertiles/WheelchairEdgeRenderer.java

@@ -64,4 +64,9 @@ public Optional<VertexVisualAttributes> renderVertex(Vertex v) {
     }
     return Optional.empty();
   }
+
+  @Override
+  public String getName() {
+    return "Wheelchair access";
+  }
 }