Support more mbtiles metadata

Author: jericks

src/main/groovy/geoscript/layer/MBTiles.groovy

@@ -88,29 +88,17 @@ class MBTiles extends ImageTileLayer {
      * @param description The description of the layer
      */
     MBTiles(java.util.Map options = [:], File file, String name, String description) {
-
         this.file = file
         this.tiles = new MBTilesFile(file)
         this.bounds = mercatorBounds
         this.proj = mercatorProj
         this.name = name
 
-        String type = options.get("type", "base_layer")
-        String version = options.get("version", "1.0")
-        String format = options.get("format", "png")
-        String attribution = options.get("attribution","Created with GeoScript")
-        Bounds metadataBounds = options.get("bounds", latLonBounds)
-
         tiles.init()
-        MBTilesMetadata metadata = new MBTilesMetadata()
-        metadata.name = name
-        metadata.description = description
-        metadata.formatStr = format
-        metadata.version = version
-        metadata.typeStr = type
-        metadata.bounds = metadataBounds.env
-        metadata.attribution = attribution
-        tiles.saveMetaData(metadata)
+
+        Map metadataOptions = [name: name, description: description]
+        metadataOptions.putAll(options)
+        setMetadata(metadataOptions)
     }
 
     /**
@@ -201,10 +189,52 @@ class MBTiles extends ImageTileLayer {
                 format: metadata.formatStr,
                 version: metadata.version,
                 attribution: metadata.attribution,
-                bounds: metadata.boundsStr
+                bounds: metadata.boundsStr,
+                minZoom: metadata.minZoom,
+                maxZoom: metadata.maxZoom
         ]
     }
 
+    MBTiles setMetadata(Map values) {
+
+        MBTilesMetadata existingMetadata = tiles.loadMetaData()
+
+        String name = values.get("name", existingMetadata.name ?: this.name)
+        String description = values.get("description", existingMetadata.description ?: "MBTiles")
+        String type = values.get("type", existingMetadata.typeStr ?: "base_layer")
+        String version = values.get("version", existingMetadata.version ?: "1.0")
+        String format = values.get("format", existingMetadata.formatStr ?: "png")
+        String attribution = values.get("attribution", existingMetadata.attribution ?: "Created with GeoScript")
+        String minZoom = values.get("minZoom", existingMetadata.minZoom ?: "0")
+        String maxZoom = values.get("maxZoom", existingMetadata.maxZoom ?: "19")
+        Bounds metadataBounds = getBounds(values.get("bounds", existingMetadata.bounds ? new Bounds(existingMetadata.bounds) : latLonBounds))
+        if (!metadataBounds.proj) {
+            metadataBounds.proj = new Projection("EPSG:4326")
+        }
+
+        MBTilesMetadata metadata = new MBTilesMetadata()
+        metadata.name = name
+        metadata.description = description
+        metadata.formatStr = format
+        metadata.version = version
+        metadata.typeStr = type
+        metadata.bounds = metadataBounds.env
+        metadata.attribution = attribution
+        metadata.minZoomStr = minZoom
+        metadata.maxZoomStr = maxZoom
+        tiles.saveMetaData(metadata)
+
+        this
+    }
+
+    private Bounds getBounds(def value) {
+        if (value instanceof Bounds) {
+            value
+        } else {
+            Bounds.fromString(value)
+        }
+    }
+
     /**
      * Get the number of tiles per zoom level.
      * @return A List of Maps with zoom, tiles, total, and percent keys
@@ -274,7 +304,9 @@ class MBTiles extends ImageTileLayer {
                 File file = params.get("file") instanceof File ? params.get("file") as File : new File(params.get("file"))
                 if (!file.exists() || file.length() == 0 || (params.get("name") && params.get("description"))) {
                     String name = file.name.replaceAll(".mbtiles","")
-                    new MBTiles(file, params.get("name", name), params.get("description", name))
+                    Map options = params.findAll { String key, value -> !(key in ["file","name","description","type"]) }
+                    options.type = params.mbtilesType ?: "base_layer"
+                    new MBTiles(options, file, params.get("name", name), params.get("description", name))
                 } else {
                     new MBTiles(file)
                 }

src/test/groovy/geoscript/layer/MBTilesTest.groovy

@@ -343,6 +343,79 @@ class MBTilesTest {
         assertEquals "-180.0,-85.0511,180.0,85.0511", metadata.bounds
     }
 
+    @Test
+    void setMetadata() {
+        // Create a new MBTiles
+        File file = new File(folder, "world.mbtiles")
+        MBTiles layer = new MBTiles(file, "World", "The world in tiles")
+        Map metadata = layer.metadata
+        assertEquals "base_layer", metadata.type
+        assertEquals "World", metadata.name
+        assertEquals "The world in tiles", metadata.description
+        assertEquals "png", metadata.format
+        assertEquals "1.0", metadata.version
+        assertEquals "Created with GeoScript", metadata.attribution
+        assertEquals "-179.99,-85.0511,179.99,85.0511", metadata.bounds
+        assertEquals 0, metadata.minZoom
+        assertEquals 19, metadata.maxZoom
+
+        // Opening the same file shouldn't change the metadata
+        layer = new MBTiles(file)
+        metadata = layer.metadata
+        assertEquals "base_layer", metadata.type
+        assertEquals "World", metadata.name
+        assertEquals "The world in tiles", metadata.description
+        assertEquals "png", metadata.format
+        assertEquals "1.0", metadata.version
+        assertEquals "Created with GeoScript", metadata.attribution
+        assertEquals "-179.99,-85.0511,179.99,85.0511", metadata.bounds
+        assertEquals 0, metadata.minZoom
+        assertEquals 19, metadata.maxZoom
+
+        // Change the metadata
+        layer.setMetadata([
+                name: "world",
+                version: "2.0",
+                attribution: "GeoScript",
+                minZoom: 1,
+                maxZoom: 6
+        ])
+        metadata = layer.metadata
+        assertEquals "base_layer", metadata.type
+        assertEquals "world", metadata.name
+        assertEquals "The world in tiles", metadata.description
+        assertEquals "png", metadata.format
+        assertEquals "2.0", metadata.version
+        assertEquals "GeoScript", metadata.attribution
+        assertEquals "-179.99,-85.0511,179.99,85.0511", metadata.bounds
+        assertEquals 1, metadata.minZoom
+        assertEquals 6, metadata.maxZoom
+    }
+
+    @Test
+    void createWithMetadata() {
+        File file = new File(folder, "test.mbtiles")
+        MBTiles layer = new MBTiles.Factory().create([
+                type: "mbtiles",
+                file: file,
+                name: "states",
+                mbtilesType: "overlay",
+                description: "USA States",
+                attribution: "Groovy",
+                version: "3.0",
+                format: "JPEG",
+                bounds: "-135.648049,20.93138,-56.898049,52.355946"
+        ])
+        Map metadata = layer.metadata
+        assertEquals "overlay", metadata.type
+        assertEquals "states", metadata.name
+        assertEquals "USA States", metadata.description
+        assertEquals "jpeg", metadata.format
+        assertEquals "3.0", metadata.version
+        assertEquals "Groovy", metadata.attribution
+        assertEquals "-135.648049,20.93138,-56.898049,52.355946", metadata.bounds
+    }
+
     @Test
     void tileCounts() {
         File file = new File(getClass().getClassLoader().getResource("states.mbtiles").toURI())