use custom_models.directory consistent naming regarding custom_areas.directory

Author: karussell

config-example.yml

@@ -23,7 +23,7 @@ graphhopper:
   # - u_turn_costs: 60 (time-penalty for doing a u-turn in seconds (only possible when `turn_costs: true`)).
   #   Note that since the u-turn costs are given in seconds the weighting you use should also calculate the weight
   #   in seconds, so for example it does not work with shortest weighting.
-  # - custom_model_file: when you specified "weighting: custom" you need to set a json file inside your custom_model_folder
+  # - custom_model_file: when you specified "weighting: custom" you need to set a json file inside your custom_models.directory
   #   or working directory that defines the custom_model. If you want an empty model you can also set "custom_model_file: empty".
   #   You can also use th e`custom_model` field instead and specify your custom model in the profile directly.
   #
@@ -47,7 +47,7 @@ graphhopper:
   #   custom_model_file: bike2.json
 
   # specify the folder where to find the custom model files
-  custom_model_folder: custom_models
+  custom_models.directory: custom_models
 
   # Speed mode:
   # Its possible to speed up routing by doing a special graph preparation (Contraction Hierarchies, CH). This requires

docs/core/profiles.md

@@ -83,7 +83,7 @@ profiles:
 The name and vehicle fields are the same as for standard profiles and the vehicle field is used as the 'base' vehicle
 for the custom profile. The weighting must be always set to `custom` for custom profiles. The custom model itself goes
 into the `custom_model` property. Alternatively, you can also set a path to a custom model file using the
-`custom_model_folder` and `custom_model_file` properties.
+`custom_models.directory` and `custom_model_file` properties.
 
 Using custom profiles for your routing requests works just the same way as for standard profiles. Simply add
 `profile=my_custom_profile` as request parameter to your routing request.

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

@@ -58,7 +58,7 @@ public GraphHopperManaged(GraphHopperConfig configuration) {
 
         String customAreasDirectory = configuration.getString("custom_areas.directory", "");
         JsonFeatureCollection globalAreas = resolveCustomAreas(customAreasDirectory);
-        String customModelFolder = configuration.getString("custom_model_folder", "");
+        String customModelFolder = configuration.getString("custom_models.directory", configuration.getString("custom_model_folder", ""));
         List<Profile> newProfiles = resolveCustomModelFiles(customModelFolder, configuration.getProfiles(), globalAreas);
         configuration.setProfiles(newProfiles);
 
@@ -111,7 +111,7 @@ public static List<Profile> resolveCustomModelFiles(String customModelFolder, Li
                     newProfiles.add(new CustomProfile(profile).setCustomModel(customModel = new CustomModel()));
                 else {
                     if (customModelFileName.contains(File.separator))
-                        throw new IllegalArgumentException("Use custom_model_folder for the custom_model_file parent");
+                        throw new IllegalArgumentException("Use custom_models.directory for the custom_model_file parent");
                     if (!customModelFileName.endsWith(".json"))
                         throw new IllegalArgumentException("Yaml is no longer supported, see #2672. Use JSON with optional comments //");
                     try {

web/src/test/java/com/graphhopper/application/resources/RouteResourceCustomModelTest.java

@@ -63,7 +63,7 @@ private static GraphHopperServerConfiguration createConfig() {
                 putObject("datareader.file", "../core/files/north-bayreuth.osm.gz").
                 putObject("graph.location", DIR).
                 putObject("graph.encoded_values", "max_height,max_weight,max_width,hazmat,toll,surface,track_type,hgv").
-                putObject("custom_model_folder", "./src/test/resources/com/graphhopper/application/resources").
+                putObject("custom_models.directory", "./src/test/resources/com/graphhopper/application/resources").
                 putObject("custom_areas.directory", "./src/test/resources/com/graphhopper/application/resources/areas").
                 putObject("import.osm.ignored_highways", "").
                 setProfiles(Arrays.asList(

web/src/test/java/com/graphhopper/application/resources/RouteResourceTruckTest.java

@@ -36,7 +36,7 @@ private static GraphHopperServerConfiguration createConfig() {
                 putObject("graph.location", DIR).
                 putObject("graph.encoded_values", "max_height,max_weight,max_width,hazmat,toll,surface,hgv").
                 putObject("import.osm.ignored_highways", "").
-                putObject("custom_model_folder", "./src/test/resources/com/graphhopper/application/resources").
+                putObject("custom_models.directory", "./src/test/resources/com/graphhopper/application/resources").
                 setProfiles(Arrays.asList(new CustomProfile("truck").setVehicle("roads").putHint("custom_model_file", "truck.json"))).
                 setCHProfiles(Arrays.asList(new CHProfile("truck")));
         return config;