add tests for complex extra tags

Author: lonvia

src/test/java/de/komoot/photon/api/ApiIntegrationTest.java

@@ -14,6 +14,7 @@
 import java.nio.file.Path;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
 
@@ -31,6 +32,7 @@ class ApiIntegrationTest extends ApiBaseTester {
     @BeforeAll
     void setUp(@TempDir Path dataDirectory) throws Exception {
         getProperties().setSupportGeometries(true);
+        getProperties().setExtraTags(List.of("ALL"));
         getProperties().setImportDate(TEST_DATE);
         setUpES(dataDirectory);
         Importer instance = makeImporter();
@@ -60,6 +62,20 @@ void setUp(@TempDir Path dataDirectory) throws Exception {
                 .geometry(makeDocGeometry("LINESTRING (30 10, 10 30, 40 40)"))
                 .names(makeDocNames("name", "berlin"))
         ));
+        instance.add(List.of(new PhotonDoc()
+                .placeId("5100").osmType("N").osmId(105100).tagKey("highway").tagValue("bus_stop")
+                .categories(List.of("osm.highway.bus_stop"))
+                .importance(0.3).addressType(AddressType.HOUSE)
+                .centroid(makePoint(12.5, -44.345))
+                .names(makeDocNames("name", "MyBusStop"))
+                .extraTags(Map.of(
+                        "number", 56.7,
+                        "boolean", true,
+                        "array", List.of(1, 2, 3),
+                        "object", Map.of("foo", "bar"),
+                        "string", "Foo"
+                ))
+        ));
 
         instance.finish();
         refresh();
@@ -98,6 +114,22 @@ void testApi(String osmValue, String url) throws Exception {
                 .containsEntry("name", "berlin");
     }
 
+    @Test
+    void testComplexExtratags() throws Exception {
+        assertThatJson(readURL("/api?q=MyBusStop")).isObject()
+                .node("features").isArray().hasSize(1)
+                .element(0).isObject()
+                .node("properties").isObject()
+                .node("extra").isObject()
+                .hasSize(5)
+                .containsEntry("number", 56.7)
+                .containsEntry("boolean", true)
+                .containsEntry("object", Map.of("foo", "bar"))
+                .containsEntry("string", "Foo")
+                .node("array").isArray()
+                .containsExactly(1, 2, 3);
+    }
+
     @Test
     void testApiStatus() throws Exception {
         assertThatJson(readURL("/status")).isObject()

src/test/java/de/komoot/photon/json/JsonReaderTest.java

@@ -400,6 +400,29 @@ void testNullAddressIgnored() throws IOException {
 
     }
 
+    @Test
+    void testComplexExtraTags() throws IOException {
+        configExtraTags = new ConfigExtraTags(List.of("ALL"));
+        input.println(TEST_SIMPLE_STREAM.replace("\"boat\": \"no\"",
+                """
+                        "number": 56.7,
+                        "boolean": true,
+                        "array": [1, 2, 3],
+                        "object": {"foo": "bar"}
+                        """));
+
+        var importer = readJson();
+
+        assertThat(importer).singleElement()
+                .hasFieldOrPropertyWithValue("extratags", Map.of(
+                        "number", 56.7,
+                        "boolean", true,
+                        "array", List.of(1, 2, 3),
+                        "object", Map.of("foo", "bar")
+                ));
+    }
+
+
     @Test
     void testNullExtraIgnored() throws IOException {
         configExtraTags = new ConfigExtraTags(List.of("ALL"));