gridviz 3.0.3 → 3.0.4

package/package.json

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

package/src/core/Dataset.js

@@ -17,7 +17,7 @@ export class Dataset {
      * @param {import("./Map.js").Map} map The map.
      * @param {string} url The URL of the dataset.
      * @param {number} resolution The dataset resolution, in the CRS geographical unit.
-     * @param {{preprocess?:function(Cell):boolean}} opts
+     * @param {{preprocess?:function(Cell):boolean, mixedResolution?:function(Cell):number}} opts
      * @abstract
      */
     constructor(map, url, resolution, opts = {}) {
@@ -40,6 +40,13 @@ export class Dataset {
          * @type {number} */
         this.resolution = resolution
 
+        /**
+        * In case the dataset is a dataset with cells having different resolution,
+        * this is the function returning the resolution of each cell.
+        * @protected
+        * @type {(function(Cell):number )| undefined } */
+        this.mixedResolution = opts.mixedResolution
+
         /**
          * A preprocess to run on each cell after loading. It can be used to apply some specific treatment before or compute a new column. And also to determine which cells to keep after loading.
          * @type {(function(Cell):boolean )| undefined } */
@@ -96,6 +103,22 @@ export class Dataset {
         }
         return undefined*/
 
+        //rare case of mixed resolution dataset
+        if (this.mixedResolution) {
+            for (const c of cells) {
+                /** @type {number} */
+                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
+                else if (c.y + r < posGeo.y) continue
+                else return c
+            }
+            return undefined
+        }
+
+        //common case
+
         /** @type {number} */
         const r = this.getResolution()
         for (const cell of cells) {

package/src/core/Map.js

@@ -171,7 +171,8 @@ export class Map {
 
             //set layer alpha and blend mode
             this.geoCanvas.ctx.globalAlpha = layer.alpha ? layer.alpha(z) : 1.0
-            this.geoCanvas.ctx.globalCompositeOperation = layer.blendOperation(z)
+            if (layer.blendOperation)
+                this.geoCanvas.ctx.globalCompositeOperation = layer.blendOperation(z)
 
             //set affin transform to draw with geographical coordinates
             this.geoCanvas.setCanvasTransform()
@@ -300,6 +301,15 @@ export class Map {
             const cell = dsc.getCellFromPosition(posGeo, dsc.getViewCache())
             //console.log(cell, dsc.resolution)
             if (!cell) return undefined
+
+            //rare case for a dataset with mixed resolutions
+            if (dsc.mixedResolution) {
+                const r = dsc.mixedResolution(cell)
+                const html = layer.cellInfoHTML(cell, r)
+                if (!html) return undefined
+                return { cell: cell, html: html, resolution: r }
+            }
+
             const html = layer.cellInfoHTML(cell, dsc.getResolution())
             if (!html) return undefined
             return { cell: cell, html: html, resolution: dsc.getResolution() }

package/src/core/Style.js

@@ -78,10 +78,16 @@ export class Style extends Drawable {
      * @param {object} opts
      * @returns {this} */
     updateLegends(opts) {
-        for (const lg of this.legends) lg.update(opts)
+        Style.updateLegendsRecursive(this.legends, opts)
         return this
     }
 
+    /** @private */
+    static updateLegendsRecursive(lg, opts) {
+        if (Array.isArray(lg)) for (const lg_ of lg) this.updateLegendsRecursive(lg_, opts)
+        else lg.update(opts)
+    }
+
     /**
      * @param {Array.<import("./Legend").Legend>} legends
      * @returns {this} */

package/src/layer/GridLayer.js

@@ -68,7 +68,8 @@ export class GridLayer extends Layer {
             //set style alpha and blend mode
             //TODO: multiply by layer alpha ?
             geoCanvas.ctx.globalAlpha = s.alpha ? s.alpha(z) : 1.0
-            geoCanvas.ctx.globalCompositeOperation = s.blendOperation(z)
+            if (s.blendOperation)
+                geoCanvas.ctx.globalCompositeOperation = s.blendOperation(z)
 
             //set affin transform to draw with geographical coordinates
             geoCanvas.setCanvasTransform()
@@ -86,24 +87,14 @@ export class GridLayer extends Layer {
             for (const s of this.styles) {
                 //check if style is visible
                 if (s.visible && !s.visible(z)) continue
-                for (const lg of s.legends) {
-                    //console.log(s, lg)
-                    //this.legend.append(lg.div)
-                    //s1.node().appendChild(s2.node())
-                    legend.node().append(lg.div.node())
-                }
+                GridLayer.addLegends(legend, s.legends)
 
                 //case for styles of styles, like kernel smoothing
                 //TODO do better
                 if (s['styles']) {
                     for (const s2 of s['styles']) {
                         if (s2.visible && !s2.visible(z)) continue
-                        for (const lg of s2.legends) {
-                            //console.log(s, lg)
-                            //this.legend.append(lg.div)
-                            //s1.node().appendChild(s2.node())
-                            legend.node().append(lg.div.node())
-                        }
+                        GridLayer.addLegends(legend, s2.legends)
                     }
                 }
             }
@@ -111,6 +102,11 @@ export class GridLayer extends Layer {
 
     }
 
+    /** @private */
+    static addLegends(legendComp, lg) {
+        if (Array.isArray(lg)) for (const lg_ of lg) this.addLegends(legendComp, lg_)
+        else legendComp.node().append(lg.div.node())
+    }
 
 
     /**

package/src/legend/SizeLegend.js

@@ -17,12 +17,12 @@ export class SizeLegend extends Legend {
         super(opts)
         opts = opts || {}
 
-        /** A function returning the text label
-         *  @type { function(object, Array.<import('../core/Dataset.js').Cell>):(number|string) } */
+        /** A function returning the text label, from the view scale and list of cells, resolution and zoom
+         *  @type { function(object, Array.<import('../core/Dataset.js').Cell>, number, number):(number|string) } */
         this.label = opts.label || undefined
 
-        /** A function returning the size of the legend symbol
-         *  @type { function(object):number } */
+        /** A function returning the size of the legend symbol, in geo UoM, from the viewscale, resolution and zoom
+         *  @type { function(object, number, number):number } */
         this.size = opts.size || undefined
 
         //symbol
@@ -52,12 +52,12 @@ export class SizeLegend extends Legend {
         this.makeTitle()
 
         //get label. May not be a number (!)
-        let label = this.label(opts.viewScale, opts.cells)
+        let label = this.label(opts.viewScale, opts.cells, opts.resolution, opts.z)
 
         //compute size of symbol, in pix
         let sizePix
         if (this.size)
-            sizePix = this.size(opts.viewScale) / opts.z
+            sizePix = this.size(opts.viewScale, opts.resolution, opts.z) / opts.z
         else
             sizePix = opts.viewScale(+label) / opts.z
         if (!sizePix) return

package/src/utils/chernoff.js

@@ -3,7 +3,16 @@
 
 import { loadImage } from '../utils/utils.js'
 
-//load chernoff images
+//
+
+/**
+ * Load chernoff images
+ * See for example: https://github.com/jgaffuri/chernoff-faces
+ * @param {object} out 
+ * @param {string} baseURL 
+ * @param {function|undefined} callback 
+ * @returns 
+ */
 export async function loadChernoffFacesImages(out, baseURL, callback = undefined) {
     out = out || {}
     for (let s of ["f", "m"])
@@ -11,4 +20,5 @@ export async function loadChernoffFacesImages(out, baseURL, callback = undefined
             for (let i = 0; i <= 2; i++)
                 out[s + a + i] = await loadImage(baseURL + (s + a + i) + ".png")
     if (callback) callback()
+    return out
 }