Add staticDataUrl property to Feature.

Add copy contructor for geojson Feature.
bertrik · Feb 16, 2024 · d3961b2 · d3961b2
1 parent 6d39a3e
commit d3961b2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/verkeersdrukte/src/main/java/nl/bertriksikken/geojson/FeatureCollection.java b/verkeersdrukte/src/main/java/nl/bertriksikken/geojson/FeatureCollection.java
@@ -38,6 +38,12 @@ public Feature(GeoJsonGeometry geometry) {
             this.geometry = geometry;
         }
 
+        // copy-constructor
+        public Feature(Feature feature) {
+            this(feature.geometry);
+            properties.putAll(feature.properties);
+        }
+
         public GeoJsonGeometry getGeometry() {
             return geometry;
         }

diff --git a/verkeersdrukte/src/main/java/nl/bertriksikken/verkeersdrukte/app/VerkeersDrukteResource.java b/verkeersdrukte/src/main/java/nl/bertriksikken/verkeersdrukte/app/VerkeersDrukteResource.java
@@ -56,12 +56,11 @@ public final class VerkeersDrukteResource {
     public FeatureCollection getStatic() {
         FeatureCollection featureCollection = new FeatureCollection();
         for (FeatureCollection.Feature f : handler.getStaticData().getFeatures()) {
-            // copy feature with all original properties
-            FeatureCollection.Feature feature = new FeatureCollection.Feature(f.getGeometry());
-            f.getProperties().forEach(feature::addProperty);
-            // add extra property with dynamic data URL
+            FeatureCollection.Feature feature = new FeatureCollection.Feature(f);
             String location = (String) f.getProperties().getOrDefault("dgl_loc", "");
             if (!location.isEmpty()) {
+                String staticDataUrl = config.getBaseUrl() + TRAFFIC_PATH + STATIC_PATH + "/" + location;
+                feature.addProperty("staticDataUrl", staticDataUrl);
                 String dynamicDataUrl = config.getBaseUrl() + TRAFFIC_PATH + DYNAMIC_PATH + "/" + location;
                 feature.addProperty("dynamicDataUrl", dynamicDataUrl);
             }