Merge pull request #3142 from steffenaxer/StringDoubleMap

Introduce StringDoubleMap and StringDoubleMapConverter

matsim/src/main/java/org/matsim/utils/objectattributes/ObjectAttributesConverter.java

@@ -64,6 +64,7 @@ public ObjectAttributesConverter() {
 		this.converters.put(PersonVehicles.class.getName(), new PersonVehiclesAttributeConverter());
 		this.converters.put(DisallowedNextLinks.class.getName(), new DisallowedNextLinksAttributeConverter());
 		this.converters.put(PersonVehicleTypes.class.getName(), new PersonVehicleTypesAttributeConverter());
+		this.converters.put(StringDoubleMap.class.getName(), new StringDoubleMapConverter());
 	}
 
 	//this is for reading

matsim/src/main/java/org/matsim/utils/objectattributes/attributeconverters/StringDoubleMap.java

@@ -0,0 +1,14 @@
+package org.matsim.utils.objectattributes.attributeconverters;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class StringDoubleMap extends LinkedHashMap<String, Double> {
+    public StringDoubleMap() {
+        super();
+    }
+
+   public StringDoubleMap(Map<String,Double> map) {
+        super(map);
+    }
+}

matsim/src/main/java/org/matsim/utils/objectattributes/attributeconverters/StringDoubleMapConverter.java

@@ -0,0 +1,37 @@
+package org.matsim.utils.objectattributes.attributeconverters;
+
+import java.util.Map;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.matsim.utils.objectattributes.AttributeConverter;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.type.MapType;
+import com.fasterxml.jackson.databind.type.TypeFactory;
+
+public class StringDoubleMapConverter implements AttributeConverter<StringDoubleMap> {
+    private static final Logger LOG = LogManager.getLogger(StringDoubleMapConverter.class);
+    private static final ObjectMapper mapper = new ObjectMapper();
+    private static final MapType mapType = TypeFactory.defaultInstance().constructMapType(Map.class, String.class,
+            Double.class);
+
+    @Override
+    public StringDoubleMap convert(String value) {
+        try {
+            return new StringDoubleMap(mapper.readValue(value, mapType));
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public String convertToString(Object o) {
+        if (!(o instanceof StringDoubleMap)) {
+            LOG.error("Object is not of type StringDoubleMap: {}", o.getClass());
+            return null;
+        }
+
+        return new StringStringMapConverter().convertToString(o);
+    }
+}

matsim/src/test/java/org/matsim/utils/objectattributes/attributeconverters/StringDoubleMapConverterTest.java

@@ -0,0 +1,16 @@
+package org.matsim.utils.objectattributes.attributeconverters;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+public class StringDoubleMapConverterTest {
+
+	@Test
+	void test() {
+		var expectedString = "{\"a\":0.1,\"b\":0.2}";
+		var converter = new StringDoubleMapConverter();
+		var serializedString = converter.convertToString(converter.convert(expectedString));
+		assertEquals(expectedString, serializedString);
+	}
+}