hide the 'vehicle' EVs and vehicle names, related to graphhopper#2841

Author: karussell

CHANGELOG.md

@@ -1,5 +1,6 @@
 ### 8.0 [not yet released]
 
+- /info endpoint does no longer return the vehicle used per profile and won't return encoded value of vehicles like car_average_speed
 - Country rules no longer contain maxspeed handling, enable a much better alternative via `max_speed_calculator.enabled: true`. On the client side use `max_speed_estimated` to determine if max_speed is from OSM or an estimation. See #2810
 - bike routing better avoids dangerous roads, see #2796 and #2802
 - routing requests can be configured to timeout after some time, see #2795

web-bundle/src/main/java/com/graphhopper/resources/InfoResource.java

@@ -33,10 +33,7 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author Peter Karich
@@ -50,33 +47,37 @@ public class InfoResource {
     private final EncodingManager encodingManager;
     private final StorableProperties properties;
     private final boolean hasElevation;
+    private final Set<String> privateEV;
 
     @Inject
     public InfoResource(GraphHopperConfig config, GraphHopper graphHopper, @Named("hasElevation") Boolean hasElevation) {
         this.config = config;
-        this.baseGraph = graphHopper.getBaseGraph();
         this.encodingManager = graphHopper.getEncodingManager();
+        this.privateEV = new HashSet<>(Arrays.asList(config.getString("graph.encoded_values.private", "").split(",")));
+        for (String pEV : privateEV) {
+            if (!pEV.isEmpty() && !encodingManager.hasEncodedValue(pEV))
+                throw new IllegalArgumentException("A private encoded value does not exist.");
+        }
+        this.baseGraph = graphHopper.getBaseGraph();
         this.properties = graphHopper.getProperties();
         this.hasElevation = hasElevation;
     }
 
     public static class Info {
         public static class ProfileData {
+            // for deserialization in e.g. tests
             public ProfileData() {
             }
 
-            public ProfileData(String name, String vehicle) {
+            public ProfileData(String name) {
                 this.name = name;
-                this.vehicle = vehicle;
             }
 
             public String name;
-            public String vehicle;
         }
 
         public Envelope bbox;
         public final List<ProfileData> profiles = new ArrayList<>();
-        public List<String> supported_vehicles;
         public String version = Constants.VERSION;
         public boolean elevation;
         public Map<String, List<Object>> encoded_values;
@@ -88,27 +89,27 @@ public ProfileData(String name, String vehicle) {
     public Info getInfo() {
         final Info info = new Info();
         info.bbox = new Envelope(baseGraph.getBounds().minLon, baseGraph.getBounds().maxLon, baseGraph.getBounds().minLat, baseGraph.getBounds().maxLat);
+        Set<String> defaultHiddenEVs = new HashSet<>();
         for (Profile p : config.getProfiles()) {
-            Info.ProfileData profileData = new Info.ProfileData(p.getName(), p.getVehicle());
+            Info.ProfileData profileData = new Info.ProfileData(p.getName());
             info.profiles.add(profileData);
+            defaultHiddenEVs.addAll(Arrays.asList(VehiclePriority.key(p.getName()), VehicleAccess.key(p.getName()),
+                    VehicleSpeed.key(p.getName()), TurnCost.key(p.getName()), Subnetwork.key(p.getName())));
         }
         if (config.has("gtfs.file"))
-            info.profiles.add(new Info.ProfileData("pt", "pt"));
+            info.profiles.add(new Info.ProfileData("pt"));
 
         info.elevation = hasElevation;
-        info.supported_vehicles = encodingManager.getVehicles();
-        if (config.has("gtfs.file")) {
-            info.supported_vehicles.add("pt");
-        }
         info.import_date = properties.get("datareader.import.date");
         info.data_date = properties.get("datareader.data.date");
 
         List<EncodedValue> evList = encodingManager.getEncodedValues();
         info.encoded_values = new LinkedHashMap<>();
         for (EncodedValue encodedValue : evList) {
             List<Object> possibleValueList = new ArrayList<>();
-            if (encodedValue.getName().contains("turn_costs")) {
-                // skip
+            String name = encodedValue.getName();
+            if (privateEV.contains(name) || defaultHiddenEVs.contains(name)) {
+                continue;
             } else if (encodedValue instanceof EnumEncodedValue) {
                 for (Enum o : ((EnumEncodedValue) encodedValue).getValues()) {
                     possibleValueList.add(o.name());
@@ -123,7 +124,7 @@ public Info getInfo() {
                 // we only add enum, boolean and numeric encoded values to the list
                 continue;
             }
-            info.encoded_values.put(encodedValue.getName(), possibleValueList);
+            info.encoded_values.put(name, possibleValueList);
         }
         return info;
     }

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

@@ -179,7 +179,6 @@ public void testInfo() {
                 .request().buildGet().invoke();
         assertEquals(200, response.getStatus());
         InfoResource.Info info = response.readEntity(InfoResource.Info.class);
-        assertTrue(info.supported_vehicles.contains("pt"));
         assertTrue(info.profiles.stream().anyMatch(p -> p.name.equals("pt")));
     }