allow embedded custom models graphhopper#2232

Author: karussell

web-bundle/src/main/java/com/graphhopper/http/GraphHopperManaged.java

@@ -101,17 +101,29 @@ public GraphHopperManaged(GraphHopperConfig configuration, ObjectMapper objectMa
                 newProfiles.add(profile);
                 continue;
             }
+            Object cm = profile.getHints().getObject("custom_model", null);
+            if (cm != null) {
+                try {
+                    // custom_model can be an object tree (read from config) or an object (e.g. from tests)
+                    CustomModel customModel = jsonOM.readValue(jsonOM.writeValueAsBytes(cm), CustomModel.class);
+                    newProfiles.add(new CustomProfile(profile).setCustomModel(customModel));
+                    continue;
+                } catch (Exception ex) {
+                    throw new RuntimeException("Cannot load custom_model from " + cm + " for profile " + profile.getName(), ex);
+                }
+            }
             String customModelLocation = profile.getHints().getString("custom_model_file", "");
             if (customModelLocation.isEmpty())
-                throw new IllegalArgumentException("Missing 'custom_model_file' field in profile '" + profile.getName() + "' if you want an empty custom model set it to 'empty'");
+                throw new IllegalArgumentException("Missing 'custom_model' or 'custom_model_file' field in profile '"
+                        + profile.getName() + "'. To use default specify custom_model_file: empty");
             if ("empty".equals(customModelLocation))
                 newProfiles.add(new CustomProfile(profile).setCustomModel(new CustomModel()));
             else
                 try {
                     CustomModel customModel = (customModelLocation.endsWith(".json") ? jsonOM : yamlOM).readValue(new File(customModelLocation), CustomModel.class);
                     newProfiles.add(new CustomProfile(profile).setCustomModel(customModel));
                 } catch (Exception ex) {
-                    throw new RuntimeException("Cannot load custom_model from " + customModelLocation + " for profile " + profile.getName(), ex);
+                    throw new RuntimeException("Cannot load custom_model from location " + customModelLocation + " for profile " + profile.getName(), ex);
                 }
         }
         configuration.setProfiles(newProfiles);

web/src/test/java/com/graphhopper/http/resources/CustomWeightingRouteResourceTest.java

@@ -27,6 +27,9 @@
 import java.util.Collections;
 
 import static com.graphhopper.http.util.TestUtils.clientTarget;
+import static com.graphhopper.json.Statement.If;
+import static com.graphhopper.json.Statement.Op.LIMIT;
+import static com.graphhopper.json.Statement.Op.MULTIPLY;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
@@ -52,7 +55,12 @@ private static GraphHopperServerConfiguration createConfig() {
                         new CustomProfile("cargo_bike").setVehicle("bike").
                                 putHint("custom_model_file", "./src/test/resources/com/graphhopper/http/resources/cargo_bike.yml"),
                         new CustomProfile("json_bike").setVehicle("bike").
-                                putHint("custom_model_file", "./src/test/resources/com/graphhopper/http/resources/json_bike.json"))).
+                                putHint("custom_model_file", "./src/test/resources/com/graphhopper/http/resources/json_bike.json"),
+                        new CustomProfile("custom_bike").
+                            setCustomModel(new CustomModel().
+                                    addToSpeed(If("road_class == PRIMARY", LIMIT, 28)).
+                                    addToPriority(If("max_width < 1.2", MULTIPLY, 0))).
+                            setVehicle("bike"))).
                 setCHProfiles(Collections.singletonList(new CHProfile("truck")));
         return config;
     }
@@ -144,6 +152,21 @@ public void testJsonBike() {
         assertEquals(path.get("distance").asDouble(), 660, 10);
     }
 
+    @Test
+    public void customBikeShouldBeLikeJsonBike() {
+        String jsonQuery = "{" +
+                " \"points\": [[11.58199, 50.0141], [11.5865, 50.0095]]," +
+                " \"profile\": \"custom_bike\"" +
+                "}";
+        final Response response = clientTarget(app, "/route-custom").request().post(Entity.json(jsonQuery));
+        assertEquals(200, response.getStatus());
+        JsonNode json = response.readEntity(JsonNode.class);
+        JsonNode infoJson = json.get("info");
+        assertFalse(infoJson.has("errors"));
+        JsonNode path = json.get("paths").get(0);
+        assertEquals(path.get("distance").asDouble(), 660, 10);
+    }
+
     static String yamlToJson(String yaml) {
         try {
             ObjectMapper yamlReader = new ObjectMapper(new YAMLFactory());