diff --git a/app/src/main/java/eu/konggdev/strikemaps/map/source/MapSource.java b/app/src/main/java/eu/konggdev/strikemaps/map/source/MapSource.java index 0aba3c4..71aed0c 100644 --- a/app/src/main/java/eu/konggdev/strikemaps/map/source/MapSource.java +++ b/app/src/main/java/eu/konggdev/strikemaps/map/source/MapSource.java @@ -1,9 +1,18 @@ package eu.konggdev.strikemaps.map.source; +import com.fasterxml.jackson.databind.JsonNode; + public class MapSource { public String url; public String type; public String schema; + + public String attribution; + + /* For raster sources */ + public JsonNode tiles; + public int minzoom; + public int maxzoom; public MapSource() { } } 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 index f3e227b..47232c1 100644 --- a/app/src/main/java/eu/konggdev/strikemaps/map/style/MapStyle.java +++ b/app/src/main/java/eu/konggdev/strikemaps/map/style/MapStyle.java @@ -13,10 +13,10 @@ import eu.konggdev.strikemaps.map.source.MapSource; import java.util.*; public class MapStyle { - //Only local data + //Only local data/ public String name; public Bitmap icon; - +/ public JsonNode metadata; // everything except layers + sources public Map sources; public JsonNode layerDefinitions; // the "layers" array @@ -31,10 +31,10 @@ public class MapStyle { try { JsonNode root = mapper.readTree(styleContents); - MapStyle style = new MapStyle(); + MapStyle style = new MapStyle(); style.name = root.path("name").asText(); style.icon = getIcon(root.path("icon").asText(), app); - +/ style.sources = mapper.convertValue( root.path("sources"), new TypeReference>() {}