custom models updates

Author: caspg

core/src/main/resources/com/graphhopper/custom_models/bike.json

@@ -8,7 +8,7 @@
 {
   "priority": [
     { "if": "true",  "multiply_by": "bike_priority" },
-    { "if": "bike_road_access == PRIVATE && foot_road_access != YES", "multiply_by": "0" },
+    { "if": "bike_road_access == PRIVATE && foot_road_access != YES && bike_network == MISSING", "multiply_by": "0" },
     { "if": "mtb_rating > 2",  "multiply_by": "0" },
     { "if": "hike_rating > 1",  "multiply_by": "0" },
     { "if": "country == DEU && road_class == BRIDLEWAY && bike_road_access != YES", "multiply_by": "0" },

core/src/main/resources/com/graphhopper/custom_models/bike_touring.json

@@ -1,13 +1,15 @@
 {
   "priority": [
     { "if": "true",  "multiply_by": "bike_priority" },
-    { "if": "bike_road_access == PRIVATE && foot_road_access != YES", "multiply_by": "0" },
+    { "if": "bike_road_access == PRIVATE && foot_road_access != YES && bike_network == MISSING", "multiply_by": "0" },
     { "if": "mtb_rating > 2",  "multiply_by": "0" },
     { "if": "hike_rating > 1",  "multiply_by": "0" },
     { "if": "!bike_access && (!backward_bike_access || roundabout)",  "multiply_by": "0" },
     { "else_if": "!bike_access && backward_bike_access",  "multiply_by": "0.2" },
-    { "if": "bike_network == MISSING", "multiply_by": 0.4 },
-    { "if": "road_class != CYCLEWAY", "multiply_by": 0.8 }
+    { "if": "road_class != CYCLEWAY", "multiply_by": 0.8 },
+    { "if": "bike_network == INTERNATIONAL", "multiply_by": "4"},
+    { "else_if": "bike_network == NATIONAL", "multiply_by": "2"},
+    { "else_if": "bike_network == REGIONAL || bike_network == LOCAL", "multiply_by": "1.5"}
   ],
   "speed": [
     { "if": "true", "limit_to": "bike_average_speed" },

core/src/main/resources/com/graphhopper/custom_models/racingbike.json

@@ -8,7 +8,7 @@
 {
   "priority": [
     { "if": "true",  "multiply_by": "racingbike_priority" },
-    { "if": "bike_road_access == PRIVATE", "multiply_by": "0" },
+    { "if": "bike_road_access == PRIVATE && bike_network == MISSING", "multiply_by": "0" },
     { "if": "mtb_rating > 2",  "multiply_by": "0" },
     { "if": "mtb_rating == 2",  "multiply_by": "0.5" },
     { "if": "hike_rating > 1",  "multiply_by": "0" },