EncodingManager: initializer config is only needed when building

Author: easbar

core/src/main/java/com/graphhopper/routing/ev/EncodedValueSerializer.java

@@ -52,21 +52,4 @@ public static EncodedValue deserializeEncodedValue(String serializedEncodedValue
         }
     }
 
-    public static String serializeInitializerConfig(EncodedValue.InitializerConfig initializerConfig) {
-        try {
-            JsonNode tree = MAPPER.valueToTree(initializerConfig);
-            return MAPPER.writeValueAsString(tree);
-        } catch (JsonProcessingException e) {
-            throw new IllegalStateException("Could not serialize initializer config: " + e.getMessage());
-        }
-    }
-
-    public static EncodedValue.InitializerConfig deserializeInitializerConfig(String serializedInitializerConfig) {
-        try {
-            JsonNode jsonNode = MAPPER.readTree(serializedInitializerConfig);
-            return MAPPER.treeToValue(jsonNode, EncodedValue.InitializerConfig.class);
-        } catch (JsonProcessingException e) {
-            throw new IllegalStateException("Could not deserialize initializer config: " + serializedInitializerConfig + ", error: " + e.getMessage());
-        }
-    }
 }

core/src/main/java/com/graphhopper/routing/util/EncodingManager.java

@@ -43,8 +43,8 @@
  */
 public class EncodingManager implements EncodedValueLookup {
     private final LinkedHashMap<String, EncodedValue> encodedValueMap;
-    private final EncodedValue.InitializerConfig edgeConfig;
-    private final EncodedValue.InitializerConfig turnCostConfig;
+    private int intsForFlags;
+    private int intsForTurnCostFlags;
 
     /**
      * Instantiate manager with the given list of encoders. The manager knows several default
@@ -68,8 +68,8 @@ private static EncodingManager.Builder createBuilder(List<? extends VehicleEncod
 
     public static void putEncodingManagerIntoProperties(EncodingManager encodingManager, StorableProperties properties) {
         properties.put("graph.em.version", Constants.VERSION_EM);
-        properties.put("graph.em.edge_config", encodingManager.toEdgeConfigAsString());
-        properties.put("graph.em.turn_cost_config", encodingManager.toTurnCostConfigAsString());
+        properties.put("graph.em.ints_for_flags", encodingManager.intsForFlags);
+        properties.put("graph.em.ints_for_turn_cost_flags", encodingManager.intsForTurnCostFlags);
         properties.put("graph.encoded_values", encodingManager.toEncodedValuesAsString());
     }
 
@@ -91,9 +91,17 @@ public static EncodingManager fromProperties(StorableProperties properties) {
                 throw new IllegalStateException("Duplicate encoded value name: " + encodedValue.getName() + " in: graph.encoded_values=" + encodedValueStr);
         });
 
-        EncodedValue.InitializerConfig edgeConfig = EncodedValueSerializer.deserializeInitializerConfig(properties.get("graph.em.edge_config"));
-        EncodedValue.InitializerConfig turnCostConfig = EncodedValueSerializer.deserializeInitializerConfig(properties.get("graph.em.turn_cost_config"));
-        return new EncodingManager(encodedValues, edgeConfig, turnCostConfig);
+        return new EncodingManager(encodedValues,
+                getIntegerProperty(properties, "graph.em.ints_for_flags"),
+                getIntegerProperty(properties, "graph.em.ints_for_turn_cost_flags")
+        );
+    }
+
+    private static int getIntegerProperty(StorableProperties properties, String key) {
+        String str = properties.get(key);
+        if (str.isEmpty())
+            throw new IllegalStateException("Missing EncodingManager property: '" + key + "'");
+        return Integer.parseInt(str);
     }
 
     private static ArrayNode deserializeEncodedValueList(String encodedValueStr) {
@@ -111,17 +119,19 @@ public static Builder start() {
         return new Builder();
     }
 
-    public EncodingManager(LinkedHashMap<String, EncodedValue> encodedValueMap, EncodedValue.InitializerConfig edgeConfig, EncodedValue.InitializerConfig turnCostConfig) {
+    public EncodingManager(LinkedHashMap<String, EncodedValue> encodedValueMap, int intsForFlags, int intsForTurnCostFlags) {
         this.encodedValueMap = encodedValueMap;
-        this.turnCostConfig = turnCostConfig;
-        this.edgeConfig = edgeConfig;
+        this.intsForFlags = intsForFlags;
+        this.intsForTurnCostFlags = intsForTurnCostFlags;
     }
 
     private EncodingManager() {
-        this(new LinkedHashMap<>(), new EncodedValue.InitializerConfig(), new EncodedValue.InitializerConfig());
+        this(new LinkedHashMap<>(), 0, 0);
     }
 
     public static class Builder {
+        private final EncodedValue.InitializerConfig edgeConfig = new EncodedValue.InitializerConfig();
+        private final EncodedValue.InitializerConfig turnCostConfig = new EncodedValue.InitializerConfig();
         private EncodingManager em = new EncodingManager();
 
         public Builder add(VehicleEncodedValues v) {
@@ -140,7 +150,7 @@ public Builder add(EncodedValue encodedValue) {
             checkNotBuiltAlready();
             if (em.hasEncodedValue(encodedValue.getName()))
                 throw new IllegalArgumentException("EncodedValue already exists: " + encodedValue.getName());
-            encodedValue.init(em.edgeConfig);
+            encodedValue.init(edgeConfig);
             em.encodedValueMap.put(encodedValue.getName(), encodedValue);
             return this;
         }
@@ -150,7 +160,7 @@ public Builder addTurnCostEncodedValue(EncodedValue turnCostEnc) {
             if (em.hasEncodedValue(turnCostEnc.getName()))
                 throw new IllegalArgumentException("Already defined: " + turnCostEnc.getName() + ". Please note that " +
                         "EncodedValues for edges and turn costs are in the same namespace.");
-            turnCostEnc.init(em.turnCostConfig);
+            turnCostEnc.init(turnCostConfig);
             em.encodedValueMap.put(turnCostEnc.getName(), turnCostEnc);
             return this;
         }
@@ -165,6 +175,8 @@ public EncodingManager build() {
             addDefaultEncodedValues();
             if (em.encodedValueMap.isEmpty())
                 throw new IllegalStateException("No EncodedValues were added to the EncodingManager");
+            em.intsForFlags = edgeConfig.getRequiredInts();
+            em.intsForTurnCostFlags = edgeConfig.getRequiredInts();
             EncodingManager result = em;
             em = null;
             return result;
@@ -219,7 +231,7 @@ static VehicleEncodedValues parseEncoderString(VehicleEncodedValuesFactory facto
     }
 
     public int getIntsForFlags() {
-        return edgeConfig.getRequiredInts();
+        return intsForFlags;
     }
 
     public boolean hasEncodedValue(String key) {
@@ -245,14 +257,6 @@ public String toEncodedValuesAsString() {
         }
     }
 
-    public String toEdgeConfigAsString() {
-        return EncodedValueSerializer.serializeInitializerConfig(edgeConfig);
-    }
-
-    public String toTurnCostConfigAsString() {
-        return EncodedValueSerializer.serializeInitializerConfig(turnCostConfig);
-    }
-
     @Override
     public String toString() {
         return String.join(",", getVehicles());
@@ -269,7 +273,7 @@ public IntsRef createRelationFlags() {
     }
 
     public boolean needsTurnCostsSupport() {
-        return turnCostConfig.getRequiredBits() > 0;
+        return intsForTurnCostFlags > 0;
     }
 
     @Override

core/src/main/java/com/graphhopper/util/Constants.java

@@ -69,7 +69,7 @@ public class Constants {
     public static final int VERSION_NODE = 9;
     public static final int VERSION_EDGE = 21;
     // this should be increased whenever the format of the serialized EncodingManager is changed
-    public static final int VERSION_EM = 1;
+    public static final int VERSION_EM = 2;
     public static final int VERSION_SHORTCUT = 9;
     public static final int VERSION_NODE_CH = 0;
     public static final int VERSION_GEOMETRY = 6;

core/src/test/java/com/graphhopper/routing/ev/EncodedValueSerializerTest.java

@@ -91,17 +91,4 @@ void explicitString() {
         assertEquals("get_off_bike", ev2.getName());
     }
 
-    @Test
-    void initializerConfig() {
-        EncodedValue.InitializerConfig initializerConfig = new EncodedValue.InitializerConfig();
-        Lanes.create().init(initializerConfig);
-        MaxWidth.create().init(initializerConfig);
-        String s = EncodedValueSerializer.serializeInitializerConfig(initializerConfig);
-        assertEquals("{\"data_index\":0,\"shift\":3,\"next_shift\":10,\"bit_mask\":1016}", s);
-        EncodedValue.InitializerConfig deserialized = EncodedValueSerializer.deserializeInitializerConfig(s);
-        assertEquals(0, deserialized.dataIndex);
-        assertEquals(3, deserialized.shift);
-        assertEquals(10, deserialized.nextShift);
-        assertEquals(1016, deserialized.bitMask);
-    }
 }