analyst fix

Author: abyrd

opentripplanner-analyst/src/main/java/org/opentripplanner/analyst/request/TileCache.java

@@ -14,6 +14,7 @@ the License, or (at your option) any later version.
 package org.opentripplanner.analyst.request;
 
 import org.opentripplanner.analyst.core.DynamicTile;
+import org.opentripplanner.analyst.core.TemplateTile;
 import org.opentripplanner.analyst.core.Tile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -51,10 +52,10 @@ public class TileCache extends CacheLoader<TileRequest, Tile>
     /** completes the abstract CacheLoader superclass */
     public Tile load(TileRequest req) throws Exception {
         LOG.debug("tile cache miss; cache size is {}", this.tileCache.size());
-        //return new TemplateTile(req, sampleFactory);
+        return new TemplateTile(req, sampleFactory);
         //return new TemplateTile(req, hashSampler);
         //return new DynamicTile(req, hashSampler);
-        return new DynamicTile(req, sampleFactory);
+        //return new DynamicTile(req, sampleFactory);
     }
 
     /** delegate to the tile LoadingCache */

opentripplanner-routing/src/main/java/org/opentripplanner/routing/core/RoutingContext.java

@@ -171,13 +171,16 @@ private RoutingContext(RoutingRequest routingRequest, Graph graph, Vertex from,
         else
             remainingWeightHeuristic = heuristicFactory.getInstanceForSearch(opt);
 
-        LOG.debug("Origin vertex {}", this.origin);
-        LOG.debug("Origin vertex inbound edges {}", this.origin.getIncoming());
-        LOG.debug("Origin vertex outbound edges {}", this.origin.getOutgoing());
-        
-        LOG.debug("Destination vertex {}", this.target);
-        LOG.debug("Destination vertex inbound edges {}", this.target.getIncoming());
-        LOG.debug("Destination vertex outbound edges {}", this.target.getOutgoing());
+        if (this.origin != null) {
+            LOG.debug("Origin vertex inbound edges {}", this.origin.getIncoming());
+            LOG.debug("Origin vertex outbound edges {}", this.origin.getOutgoing());
+        }
+        // target is where search will terminate, can be origin or destination depending on arriveBy
+        LOG.debug("Target vertex {}", this.target);
+        if (this.target!= null) {
+            LOG.debug("Destination vertex inbound edges {}", this.target.getIncoming());
+            LOG.debug("Destination vertex outbound edges {}", this.target.getOutgoing());
+        }
     }