avoid 500 error for invalid point

Author: karussell

core/src/main/java/com/graphhopper/routing/Router.java

@@ -98,7 +98,7 @@ public GHResponse route(GHRequest request) {
         try {
             checkNoLegacyParameters(request);
             checkAtLeastOnePoint(request);
-            checkIfPointsAreInBounds(request.getPoints());
+            checkIfPointsAreInBoundsAndNotNull(request.getPoints());
             checkHeadings(request);
             checkPointHints(request);
             checkCurbsides(request);
@@ -147,13 +147,14 @@ private void checkAtLeastOnePoint(GHRequest request) {
             throw new IllegalArgumentException("You have to pass at least one point");
     }
 
-    private void checkIfPointsAreInBounds(List<GHPoint> points) {
+    private void checkIfPointsAreInBoundsAndNotNull(List<GHPoint> points) {
         BBox bounds = graph.getBounds();
         for (int i = 0; i < points.size(); i++) {
             GHPoint point = points.get(i);
-            if (!bounds.contains(point.getLat(), point.getLon())) {
+            if (point == null)
+                throw new IllegalArgumentException("Point " + i + " is null");
+            if (!bounds.contains(point.getLat(), point.getLon()))
                 throw new PointOutOfBoundsException("Point " + i + " is out of bounds: " + point + ", the bounds are: " + bounds, i);
-            }
         }
     }
 

web-api/src/main/java/com/graphhopper/jackson/GHPointDeserializer.java

@@ -18,6 +18,7 @@
 package com.graphhopper.jackson;
 
 import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.graphhopper.util.shapes.GHPoint;
@@ -27,7 +28,11 @@
 class GHPointDeserializer extends JsonDeserializer<GHPoint> {
     @Override
     public GHPoint deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
-        double[] bounds = jsonParser.readValueAs(double[].class);
-        return GHPoint.fromJson(bounds);
+        try {
+            double[] bounds = jsonParser.readValueAs(double[].class);
+            return GHPoint.fromJson(bounds);
+        } catch (JsonProcessingException ex) {
+            throw new IllegalArgumentException("point is invalid: " + ex.getMessage());
+        }
     }
 }