From 95a454bb6d82234d87ba467890252da03b9688a0 Mon Sep 17 00:00:00 2001
From: konggdev <contact@konggdev.eu>
Date: Wed, 15 Apr 2026 23:59:02 +0200
Subject: [PATCH] Implement MapStyle abstraction

---
 .../strikemaps/map/layer/MapLayer.java        | 16 -----
 .../strikemaps/map/style/MapStyle.java        | 63 +++++++++++++++++++
 2 files changed, 63 insertions(+), 16 deletions(-)
 delete mode 100644 app/src/main/java/eu/konggdev/strikemaps/map/layer/MapLayer.java
 create mode 100644 app/src/main/java/eu/konggdev/strikemaps/map/style/MapStyle.java

diff --git a/app/src/main/java/eu/konggdev/strikemaps/map/layer/MapLayer.java b/app/src/main/java/eu/konggdev/strikemaps/map/layer/MapLayer.java
deleted file mode 100644
index 667338a..0000000
--- a/app/src/main/java/eu/konggdev/strikemaps/map/layer/MapLayer.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package eu.konggdev.strikemaps.map.layer;
-
-import org.maplibre.android.style.layers.Layer;
-import org.maplibre.android.style.sources.GeoJsonSource;
-
-import java.util.List;
-
-//TOOD: Make not strictly MapLibre reliant
-public class MapLayer {
-    public GeoJsonSource source;
-    public Layer layer;
-    public MapLayer(GeoJsonSource source, Layer layer) {
-        this.source = source;
-        this.layer = layer;
-    }
-}
diff --git a/app/src/main/java/eu/konggdev/strikemaps/map/style/MapStyle.java b/app/src/main/java/eu/konggdev/strikemaps/map/style/MapStyle.java
new file mode 100644
index 0000000..943bfd6
--- /dev/null
+++ b/app/src/main/java/eu/konggdev/strikemaps/map/style/MapStyle.java
@@ -0,0 +1,63 @@
+package eu.konggdev.strikemaps.map.style;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import eu.konggdev.strikemaps.app.AppController;
+import eu.konggdev.strikemaps.helper.FileHelper;
+import eu.konggdev.strikemaps.map.layer.MapLayer;
+import eu.konggdev.strikemaps.map.source.MapSource;
+import java.util.*;
+
+
+public class MapStyle {
+    public int version;
+    public String name;
+    public String icon;
+    public String description;
+
+    public Map<String, MapSource> sources;
+    public List<MapLayer> layers;
+
+    public JsonNode raw;
+
+    //FIXME
+    public static MapStyle fromMapLibreJsonFile(String filename, AppController app) {
+        String styleContents;
+        if (filename.startsWith("/storage")) styleContents = FileHelper.loadStringFromUserFile(filename);
+        else styleContents = FileHelper.loadStringFromAssetFile(filename, app);
+
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+            JsonNode root = mapper.readTree(styleContents);
+            MapStyle style = new MapStyle();
+
+            style.version = root.path("version").asInt();
+            style.name = root.path("name").asText();
+            style.icon = root.path("icon").asText();
+            style.description = root.path("description").asText();
+
+            style.sources = mapper.convertValue(
+                    root.path("sources"),
+                    new TypeReference<Map<String, MapSource>>() {}
+            );
+
+            style.layers = new ArrayList<>();
+            for (JsonNode layerNode : root.path("layers")) {
+
+                MapLayer layer = mapper.treeToValue(layerNode, MapLayer.class);
+
+                layer.raw = layerNode; // IMPORTANT
+
+                style.layers.add(layer);
+            }
+
+            style.raw = root; // full backup
+
+            return style;
+        } catch ( Exception e ) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+}