Abstract style model further from MapLibre

.gitignore

@@ -9,3 +9,4 @@ DS_Store
 .cxx
 local.properties
 /legacy_code/
+maptiler*

app/src/main/assets/bundled/style/satelite.style.json

@@ -5,6 +5,7 @@
   "sources": {
     "satelite": {
       "type": "raster",
+      "schema" : "raster",
       "tiles": [
         "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}"
       ],
@@ -14,8 +15,6 @@
       "tileSize": 512
     }
   },
-  "sprite": "",
-  "glyphs": "https://orangemug.github.io/font-glyphs/glyphs/{fontstack}/{range}.pbf",
   "layers": [
     {
       "id": "satelite",

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

@@ -1,16 +1,11 @@
 package eu.konggdev.strikemaps.map.layer;
 
-import org.maplibre.android.style.layers.Layer;
+import com.fasterxml.jackson.databind.JsonNode;
-import org.maplibre.android.style.sources.GeoJsonSource;
 
-
-//FIXME: Get rid of reliance on MapLibre!
-//Most likely implement an "AdditionalMapLayer" or something of that sorts (?)
 public class MapLayer {
-    public GeoJsonSource source;
+    public JsonNode layer;
-    public Layer layer;
+
-    public MapLayer(GeoJsonSource source, Layer layer) {
+    public MapLayer(JsonNode layer) {
-        this.source = source;
 	this.layer = layer;
     }
 }

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

@@ -0,0 +1,16 @@
+package eu.konggdev.strikemaps.map.layer;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import eu.konggdev.strikemaps.map.source.MapSource;
+
+public class SourcedMapLayer {
+    public String key;
+    public MapSource source;
+    public JsonNode layer;
+
+    public SourcedMapLayer(String key, MapSource source, JsonNode layer) {
+	this.key = key;
+	this.source = source;
+	this.layer = layer;
+    }
+}

app/src/main/java/eu/konggdev/strikemaps/map/overlay/MapOverlay.java

@@ -1,8 +1,8 @@
 package eu.konggdev.strikemaps.map.overlay;
 
-import eu.konggdev.strikemaps.map.layer.MapLayer;
+import eu.konggdev.strikemaps.map.layer.SourcedMapLayer;
 
 /* More or less a data-driven layer factory */
 public interface MapOverlay {
-    public MapLayer makeLayer();
+    public SourcedMapLayer makeLayer();
 }

app/src/main/java/eu/konggdev/strikemaps/map/overlay/implementation/LocationOverlay.java

@@ -6,18 +6,18 @@ import android.location.LocationListener;
 import androidx.annotation.NonNull;
 import eu.konggdev.strikemaps.app.AppController;
 import eu.konggdev.strikemaps.map.MapComponent;
-import eu.konggdev.strikemaps.map.layer.MapLayer;
+import eu.konggdev.strikemaps.map.layer.SourcedMapLayer;
-
 import eu.konggdev.strikemaps.map.overlay.MapOverlay;
+import eu.konggdev.strikemaps.map.source.MapSource;
+
 import eu.konggdev.strikemaps.data.provider.LocationDataProvider;
-import org.maplibre.android.style.layers.CircleLayer;
-import org.maplibre.android.style.layers.Property;
-import org.maplibre.android.style.sources.GeoJsonSource;
 import org.maplibre.geojson.Feature;
 import org.maplibre.geojson.FeatureCollection;
 import org.maplibre.geojson.Point;
 
-import static org.maplibre.android.style.layers.PropertyFactory.*;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
 
 public class LocationOverlay implements MapOverlay, LocationListener {
     LocationDataProvider locationDataProvider;
@@ -33,25 +33,55 @@ public class LocationOverlay implements MapOverlay, LocationListener {
     }
 
     @Override
-    public MapLayer makeLayer() {
+    public SourcedMapLayer makeLayer() {
-        GeoJsonSource source = new GeoJsonSource(
+	MapSource source = new MapSource();
-                "location",
-                FeatureCollection.fromFeatures(new Feature[]{}) // empty
-        );
 
-        if (currentLocation != null)
+	source.type = "geojson";
-            source.setGeoJson(Feature.fromGeometry(Point.fromLngLat(currentLocation.getLongitude(), currentLocation.getLatitude())));
 
-        CircleLayer layer = new CircleLayer("location", "location");
+	ObjectMapper mapper = new ObjectMapper();
-        layer.setProperties(
+	try {
-                circleRadius(5f),
+	    ObjectNode data = mapper.createObjectNode();
-                circleColor(Color.parseColor("#1E88E5")),
+	    data.put("type", "Feature");
-                circleStrokeColor(Color.WHITE),
-                circleStrokeWidth(1.5f),
-                circlePitchAlignment(Property.CIRCLE_PITCH_ALIGNMENT_MAP)
-        );
 
-        return new MapLayer(source, layer);
+	    if(currentLocation != null) {
+	       ObjectNode geometry = mapper.createObjectNode();
+               geometry.put("type", "Point");
+
+	       ArrayNode coordinates = mapper.createArrayNode();
+	       coordinates.add(currentLocation.getLongitude());
+	       coordinates.add(currentLocation.getLatitude());
+
+	       geometry.set("coordinates", coordinates);
+	       data.set("geometry", geometry);
+	       data.set("properties", mapper.createObjectNode());
+	    }
+	    source.data = data;
+	} catch (Exception e) {
+	    e.printStackTrace();
+	}
+
+	ObjectNode layer = mapper.createObjectNode();
+	layer.put("id", "location");
+	layer.put("type", "circle");
+	layer.put("source", "location");
+
+	ObjectNode paint = mapper.createObjectNode();
+	paint.put("circle-radius", 5);
+	paint.put("circle-color", "#1E88E5");
+	paint.put("circle-stroke-color", "#FFFFFF");
+	paint.put("circle-stroke-width", 1.5);
+
+	layer.set("paint", paint);
+
+	ObjectNode layout = mapper.createObjectNode();
+	layout.put("circle-pitch-alignment", "map");
+
+	layer.set("layout", layout);
+	
+	ArrayNode layers = mapper.createArrayNode();
+	layers.add(layer);
+
+        return new SourcedMapLayer("location", source, layers);
     }
 
     @Override

app/src/main/java/eu/konggdev/strikemaps/map/overlay/implementation/PointSelectionOverlay.java

@@ -1,11 +1,12 @@
 package eu.konggdev.strikemaps.map.overlay.implementation;
 
 import eu.konggdev.strikemaps.map.layer.MapLayer;
+import eu.konggdev.strikemaps.map.layer.SourcedMapLayer;
 import eu.konggdev.strikemaps.map.overlay.MapOverlay;
 
 public class PointSelectionOverlay implements MapOverlay {
     @Override
-    public MapLayer makeLayer() {
+    public SourcedMapLayer makeLayer() {
         return null;
     }
 }

app/src/main/java/eu/konggdev/strikemaps/map/renderer/MapRenderer.java

@@ -15,5 +15,6 @@ public interface MapRenderer {
 
     View getView();
 
+    //TODO: Get rid of MapLibre Feature class dependence
     List<Feature> featuresAtPoint(LatLng point);
 }

app/src/main/java/eu/konggdev/strikemaps/map/renderer/implementation/MapLibreNativeRenderer.java

@@ -4,11 +4,13 @@ import android.view.View;
 
 import androidx.annotation.NonNull;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
 import eu.konggdev.strikemaps.data.helper.UserPrefsHelper;
 import eu.konggdev.strikemaps.map.overlay.MapOverlay;
-import eu.konggdev.strikemaps.map.layer.MapLayer;
+import eu.konggdev.strikemaps.map.layer.SourcedMapLayer;
 import eu.konggdev.strikemaps.map.renderer.MapRenderer;
 import eu.konggdev.strikemaps.map.style.MapStyle;
 import org.maplibre.android.MapLibre;
@@ -39,25 +41,38 @@ public class MapLibreNativeRenderer implements MapRenderer, OnMapReadyCallback {
         mapView.getMapAsync(this);
     }
 
-    void passLayer(MapLayer layer) {
-        map.getStyle().addSource(layer.source);
-        map.getStyle().addLayer(layer.layer);
-    }
-
     @Override
     public void reload() {
         ObjectMapper mapper = new ObjectMapper();
+        mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
         MapStyle style = controller.style;
         try {
+	        /* Take metadata from MapStyle
+	        everything outside sources, layers */
             ObjectNode root = style.metadata.deepCopy();
-            root.set("sources", mapper.valueToTree(style.sources));
+            
-            root.set("layers", style.layerDefinitions);
+    	    //Sources
-            map.setStyle(new Style.Builder().fromJson(mapper.writeValueAsString(root)), intStyle -> {
+            ObjectNode sources = mapper.createObjectNode();
-                for(MapOverlay overlay : controller.overlays.values()) {
+            style.sources.forEach((k, v) -> sources.set(k, mapper.valueToTree(v)));
-                    passLayer(overlay.makeLayer());
+
+	        //Layers
+	        ArrayNode layers = mapper.createArrayNode();
+    	    layers.addAll((ArrayNode) style.layerDefinitions);
+
+	        //Overlays
+	        for (MapOverlay overlay : controller.overlays.values()) {
+                SourcedMapLayer overlayLayer = overlay.makeLayer();
+		        sources.set(overlayLayer.key, mapper.valueToTree(overlayLayer.source));
+		        layers.addAll((ArrayNode) overlayLayer.layer);
 	        }
-            });
+
+            //Set all to root
+	        root.set("sources", sources);
+  	        root.set("layers", layers);
+
+            map.setStyle(new Style.Builder().fromJson(mapper.writeValueAsString(root)));
         } catch (Exception e) {
+	    app.logcat("Failed to reload Map");
             e.printStackTrace();
         }
     }

app/src/main/java/eu/konggdev/strikemaps/map/source/MapSource.java

@@ -4,15 +4,18 @@ import com.fasterxml.jackson.databind.JsonNode;
 
 public class MapSource {
     public String url;
+    public JsonNode data;
     public String type;
     public String schema;
 
-    public String attribution;
-
-    /* For raster sources */
     public JsonNode tiles;
     public int minzoom;
     public int maxzoom;
+    public String scheme;
+    public int tileSize;
 
+    public String attribution;
+
+    public String encoding;
     public MapSource() { }
 }

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

@@ -6,6 +6,7 @@ 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 com.fasterxml.jackson.databind.node.ArrayNode;
 import eu.konggdev.strikemaps.app.AppController;
 import eu.konggdev.strikemaps.data.helper.FileHelper;
 import eu.konggdev.strikemaps.map.source.MapSource;
@@ -19,7 +20,7 @@ public class MapStyle {
 
     public JsonNode metadata; // everything except layers + sources
     public Map<String, MapSource> sources;
-    public JsonNode layerDefinitions;  // the "layers" array
+    public ArrayNode layerDefinitions;  // the "layers" array
 
     //FIXME
     public static MapStyle fromMapLibreJsonFile(String filename, AppController app) {
@@ -40,7 +41,7 @@ public class MapStyle {
                     new TypeReference<Map<String, MapSource>>() {}
             );
 
-            style.layerDefinitions = root.path("layers");
+            style.layerDefinitions = root.withArray("layers");
 
             ObjectNode metadata = root.deepCopy();
             metadata.remove("layers");