rename Profile.extraMetadata -> extraArchiveMetdata [#795]

* simpler implementation of mergeMaps
onthegomap · Jan 16, 2024 · 021134c · 021134c
1 parent 88c0746
commit 021134c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/Profile.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/Profile.java
@@ -158,7 +158,7 @@ default boolean isOverlay() {
     return false;
   }
 
-  default Map<String,String> extraMetadata() { return Map.of(); }
+  default Map<String,String> extraArchiveMetadata() { return Map.of(); }
 
   /**
    * Defines whether {@link Wikidata} should fetch wikidata translations for the input element.

diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/archive/TileArchiveMetadata.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/archive/TileArchiveMetadata.java
@@ -17,6 +17,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.locationtech.jts.geom.Coordinate;
@@ -95,7 +96,7 @@ public TileArchiveMetadata(Profile profile, PlanetilerConfig config, List<LayerA
       config.minzoom(),
       config.maxzoom(),
       vectorLayers == null ? null : new TileArchiveMetadataJson(vectorLayers),
-      mergeMaps(mapWithBuildInfo(),profile.extraMetadata()),
+      mergeMaps(mapWithBuildInfo(),profile.extraArchiveMetadata()),
       config.tileCompression()
     );
   }
@@ -178,11 +179,9 @@ public TileArchiveMetadata withJson(TileArchiveMetadataJson json) {
    */
 
   private static Map<String,String> mergeMaps(Map<String,String> m1, Map<String,String> m2) {
-    return Stream.concat(m1.entrySet().stream(), m2.entrySet().stream())
-      .collect(Collectors.toMap(
-        Map.Entry::getKey,
-        Map.Entry::getValue,
-        (value1, value2) -> value2));
+    var result = new TreeMap<>(m1);
+    result.putAll(m2);
+    return result;
   }
 
   @JsonAnySetter

diff --git a/planetiler-core/src/test/java/com/onthegomap/planetiler/archive/TileArchiveMetadataTest.java b/planetiler-core/src/test/java/com/onthegomap/planetiler/archive/TileArchiveMetadataTest.java
@@ -204,7 +204,7 @@ public String name() {
       }
 
       @Override
-      public Map<String,String> extraMetadata() {
+      public Map<String,String> extraArchiveMetadata() {
         return Map.of("FooVersion","2.0");
       }
     }