Furhter work on MapStyle

Accidentally left untracked by mistake earlier

app/src/main/java/eu/konggdev/strikemaps/map/layer/MapLayer.java

@@ -0,0 +1,14 @@
+package eu.konggdev.strikemaps.map.layer;
+
+import org.maplibre.android.style.layers.Layer;
+import org.maplibre.android.style.sources.GeoJsonSource;
+
+//FIXME: Get rid of MapLibre reliance
+public class MapLayer {
+    public GeoJsonSource source;
+    public Layer layer;
+    public MapLayer(GeoJsonSource source, Layer layer) {
+        this.source = source;
+        this.layer = layer;
+    }
+}

app/src/main/java/eu/konggdev/strikemaps/map/style/MapStyle.java

@@ -1,25 +1,27 @@
 package eu.konggdev.strikemaps.map.style;
 
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 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 org.json.JSONObject;
+
 import java.util.*;
 
-
 public class MapStyle {
-    public int version;
+    //Only local data
     public String name;
-    public String icon;
-    public String description;
+    public Bitmap icon;
 
+    public JsonNode metadata; // everything except layers + sources
     public Map<String, MapSource> sources;
-    public List<MapLayer> layers;
-
-    public JsonNode raw;
+    public JsonNode layerDefinitions;  // the "layers" array
 
     //FIXME
     public static MapStyle fromMapLibreJsonFile(String filename, AppController app) {
@@ -30,29 +32,22 @@ public class MapStyle {
         ObjectMapper mapper = new ObjectMapper();
         try {
             JsonNode root = mapper.readTree(styleContents);
-            MapStyle style = new MapStyle();
 
-            style.version = root.path("version").asInt();
+            MapStyle style = new MapStyle();
             style.name = root.path("name").asText();
-            style.icon = root.path("icon").asText();
-            style.description = root.path("description").asText();
+            style.icon = getIcon(root.path("icon").asText(), app);
 
             style.sources = mapper.convertValue(
                     root.path("sources"),
                     new TypeReference<Map<String, MapSource>>() {}
             );
 
-            style.layers = new ArrayList<>();
-            for (JsonNode layerNode : root.path("layers")) {
+            style.layerDefinitions = root.path("layers");
 
-                MapLayer layer = mapper.treeToValue(layerNode, MapLayer.class);
-
-                layer.raw = layerNode; // IMPORTANT
-
-                style.layers.add(layer);
-            }
-
-            style.raw = root; // full backup
+            ObjectNode metadata = root.deepCopy();
+            metadata.remove("layers");
+            metadata.remove("sources");
+            style.metadata = metadata;
 
             return style;
         } catch (Exception e) {
@@ -60,4 +55,15 @@ public class MapStyle {
         }
         return null;
     }
+
+    public static Bitmap getIcon(String iconLocator, AppController app) {
+        switch(iconLocator.split("//")[0]) {
+            //TODO: https
+            case "assets:":
+                return BitmapFactory.decodeStream(FileHelper.openAssetStream("bundled/icon/" + iconLocator.split("//")[1], app));
+            default:
+                app.logcat("Unimplemented icon locator space: " + iconLocator);
+                return null;
+        }
+    }
 }