gridviz 3.0.6 → 3.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gridviz",
-    "version": "3.0.6",
+    "version": "3.0.8",
     "description": "Visualization tool for gridded statistics",
     "keywords": [
         "statistics",

package/src/core/Dataset.js

@@ -107,7 +107,7 @@ export class Dataset {
         if (this.mixedResolution) {
             for (const c of cells) {
                 /** @type {number} */
-                const r = this.mixedResolution(c)
+                const r = +this.mixedResolution(c)
                 if (posGeo.x < c.x) continue
                 else if (c.x + r < posGeo.x) continue
                 else if (posGeo.y < c.y) continue

package/src/core/Map.js

@@ -304,7 +304,7 @@ export class Map {
 
             //rare case for a dataset with mixed resolutions
             if (dsc.mixedResolution) {
-                const r = dsc.mixedResolution(cell)
+                const r = +dsc.mixedResolution(cell)
                 const html = layer.cellInfoHTML(cell, r)
                 if (!html) return undefined
                 return { cell: cell, html: html, resolution: r }

package/src/index.js

@@ -6,6 +6,7 @@ export { Map } from './core/Map.js'
 export { GeoCanvas } from './core/GeoCanvas.js'
 export { Style } from './core/Style.js'
 export { Layer } from './core/Layer.js'
+export { Dataset } from './core/Dataset.js'
 export { MultiResolutionDataset } from './core/MultiResolutionDataset.js'
 
 // export dataset types
@@ -39,6 +40,7 @@ export { ImageStyle } from './style/ImageStyle.js'
 export { GridLayer } from './layer/GridLayer.js'
 export { BackgroundLayer } from './layer/BackgroundLayer.js'
 export { BackgroundLayerWMS } from './layer/BackgroundLayerWMS.js'
+export { BackgroundLayerImage } from './layer/BackgroundLayerImage.js'
 export { LabelLayer } from './layer/LabelLayer.js'
 export { GeoJSONLayer } from './layer/GeoJSONLayer.js'
 

package/src/layer/BackgroundLayerImage.js

@@ -0,0 +1,84 @@
+//@ts-check
+'use strict'
+
+import { Layer } from '../core/Layer.js'
+
+/**
+ *
+ * A map background layer composed of a single image file, geolocated.
+ * 
+ * @module layer
+ * @author Julien Gaffuri
+ */
+export class BackgroundLayerImage extends Layer {
+    /**
+     * @param {object} opts
+     */
+    constructor(opts) {
+        super(opts)
+        opts = opts || {}
+
+        /** The image file URL
+         * @type {string} */
+        this.url = opts.url
+
+        /** The image left coordinate
+         * @type {number} */
+        this.xMin = opts.xMin || 0;
+        /** The image top coordinate
+         *  @type {number} */
+        this.yMax = opts.yMax || 0;
+
+        /** The image width, in geo unit
+         * @type {number} */
+        this.width = opts.width || 20000
+        /** The image height, in geo unit
+         * @type {number} */
+        this.height = opts.height || 20000
+
+        /** The image object
+         * @type {HTMLImageElement|undefined} */
+        this.img = undefined;
+    }
+
+    /**
+     * @param {import("../core/GeoCanvas.js").GeoCanvas} geoCanvas The canvas where to draw the layer.
+     * @returns {void}
+     */
+    draw(geoCanvas) {
+
+        //update map extent
+        //geoCanvas.updateExtentGeo(0)
+
+        if (this.img) {
+            //the image was already downloaded: draw it
+
+            //compute screen coordinates and size ratio
+            const x = geoCanvas.geoToPixX(this.xMin)
+            const y = geoCanvas.geoToPixY(this.yMax)
+            const z = geoCanvas.getView().z
+
+            //draw image
+            geoCanvas.initCanvasTransform()
+            geoCanvas.ctx.drawImage(this.img, x, y, this.width / z, this.height / z)
+
+        } else {
+            //retrieve image
+
+            if (!this.img) {
+                this.img = new Image()
+                this.img.onload = () => {
+                    geoCanvas.redraw()
+                }
+                this.img.onerror = () => {
+                    //case when no image
+                    console.warn("Could not retrieve background image from", this.url)
+                }
+            }
+
+            //set URL to launch the download
+            this.img.src = this.url
+        }
+
+    }
+}