gridviz 3.0.31 → 3.0.32

package/package.json

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

package/src/core/Map.js

@@ -76,6 +76,7 @@ export class Map {
         this.legend = opts.legendContainer
             ? select(opts.legendContainer) // Wrap the provided HTML node in a D3 selection
             : null
+        this._legendProvidedByUser = !!opts.legendContainer
         if (!this.legend) this.initialiseLegend()
 
         //tooltip
@@ -536,7 +537,10 @@ export class Map {
         this.geoCanvas.canvas.remove()
 
         // remove legend
-        this.legend?.remove()
+        // only remove legend if gridviz created it
+        if (!this._legendProvidedByUser) {
+            this.legend?.remove()
+        }
 
         // remove tooltip
         this.tooltip.tooltip?.remove()

package/src/style/SideStyle.js

@@ -124,12 +124,17 @@ export class SideStyle extends Style {
      * @param {boolean} center Set to true so that the side coordinate are those of its center point rather than its left/bottom point (the side x,y coordinates are those of the left point for horizontal sides, and of the bottom point for vertical sides)
      * @returns { Array.<Side> }
      */
-    static buildSides(cells, resolution, withHorizontal = true, withVertical = true, center = true) {
+    static buildSides(cells, resolution, withHorizontal = true, withVertical = true, center = true, eps = 0.01) {
         /** @type { Array.<Side> } */
         const sides = []
 
+        // half resolution
         const r2 = center ? resolution / 2 : 0
 
+        // epsilon
+        eps = resolution * eps
+        const abs = Math.abs
+
         //make horizontal sides
         //sort cells by x and y
         cells.sort((c1, c2) => (c2.x == c1.x ? c1.y - c2.y : c1.x - c2.x))
@@ -137,7 +142,7 @@ export class SideStyle extends Style {
         for (let i = 1; i < cells.length; i++) {
             let c2 = cells[i]
 
-            if (c1.y + resolution == c2.y && c1.x == c2.x)
+            if (abs(c1.y + resolution - c2.y) < eps && abs(c1.x - c2.x) < eps)
                 //cells in same column and touch along horizontal side
                 //make shared side
                 sides.push({
@@ -176,7 +181,7 @@ export class SideStyle extends Style {
         for (let i = 1; i < cells.length; i++) {
             let c2 = cells[i]
 
-            if (c1.x + resolution == c2.x && c1.y == c2.y)
+            if (abs(c1.x + resolution - c2.x) < eps && abs(c1.y - c2.y) < eps)
                 //cells in same row and touch along vertical side
                 //make shared side
                 sides.push({

package/src/style/SideTanakaStyle.js

@@ -10,6 +10,8 @@ import { SideStyle } from './SideStyle.js'
  * @typedef {function(Array.<Side>,number, number):*} SideViewScale */
 
 /**
+ * @see https://manifold.net/doc/mfd9/example__tanaka_contours.htm
+ * 
  * @module style
  * @author Julien Gaffuri
  */
@@ -25,7 +27,7 @@ export class SideTanakaStyle extends Style {
 
         /** A function returning the width of a cell side, in geo unit
          * @type {function(Side, number, number, number, object):number} */
-        this.width = opts.width || ((side, sideValue, resolution, z, sidesScale) => Math.abs(sideValue) * Math.min(2 * z, resolution / 3))
+        this.width = opts.width || ((side, sideValue, resolution, z, sidesScale) => Math.abs(sideValue) * z) //Math.min(2 * z, resolution / 3))
 
         /** A function returning the length of a cell side, in geo unit
          * @type {function(Side, number, number, object):number} */

package/src/utils/scale.js

@@ -151,6 +151,28 @@ export const viewScaleColorQuantile = (opts) => {
     }
 }
 
+
+/**
+ * Generic function for view scale quantile classifier
+ *
+ * @param {{ valueFunction:function(import("../core/Dataset").Cell):number, classNumber?:number }} opts
+ * @returns {function(Array.<import("../core/Dataset").Cell>):ColorScale}
+ */
+export const viewScaleQuantileClassifer = (opts) => {
+    const valueFunction = opts.valueFunction // the function that return the cell value from a cell
+    const classNumber = opts.classNumber || 12 // the class number
+
+    const scale = scaleQuantile().range(Array.from( { length: classNumber }, (_, i) => i ))
+    return (cells) => {
+        scale.domain(cells.map(valueFunction))
+        scale.breaks = scale.quantiles()
+        return scale
+    }
+}
+
+
+
+
 /**
  * Combine view scale functions
  *

package/src/style/SideTanakaStyle___OLD.js

@@ -1,66 +0,0 @@
-//@ts-check
-'use strict'
-
-
-/**
- * @see https://manifold.net/doc/mfd9/example__tanaka_contours.htm
- *
- * @module style
- * @author Julien Gaffuri
- */
-export class TanakaStyle {
-    /**
-     * @param {function(import('../core/Dataset.js').Cell):number} value Function that returns the value of a cell
-     * @param {Array.<number>} breaks The break values
-     * @param {Array.<string>} colors The colors, one more than the break values
-     * @param {object} opts
-     * @returns {Array.<import("../core/Style.js").Style>}
-     */
-    static get(value, breaks, colors, opts = {}) {
-        //shadow colors
-        opts.colorDark = opts.colorDark || '#111'
-        opts.colorBright = opts.colorBright || '#ddd'
-
-        /** @type { function(number, number):number } */
-        opts.width =
-            opts.width ||
-            ((sideValue, resolution, z) => {
-                const minWG = 1 * z
-                const maxWG = 4 * z
-                const step = (maxWG - minWG) / 3
-                return Math.min(minWG + (sideValue - 1) * step, maxWG)
-            })
-
-        //make classifier
-        const classifier = clFun(breaks)
-        //make colors table
-        const colorsDict = {}
-        for (let i = 0; i < colors.length; i++) colorsDict[i + ''] = colors[i]
-
-        const cellStyle = new SquareColorCategoryWebGLStyle({
-            code: (cell) => classifier(value(cell)),
-            color: colorsDict,
-        })
-
-        const getSideValue = (side) => {
-            const cl1 = side.c1 ? classifier(value(side.c1)) : -1
-            const cl2 = side.c2 ? classifier(value(side.c2)) : -1
-            return cl1 - cl2
-        }
-
-        /** The side style, for the shadow effect */
-        const sideStyle = new SideStyle({
-            //white or black, depending on orientation and value
-            color: (side) => {
-                const v = getSideValue(side)
-                if (v === 0) return
-                if (side.or === 'v') return v < 0 ? opts.colorBright : opts.colorDark
-                return v < 0 ? opts.colorDark : opts.colorBright
-            },
-            //width depends on the value, that is the number of classes of difference
-            width: (side, resolution, z) => opts.width(Math.abs(getSideValue(side)), resolution, z),
-        })
-
-        return [cellStyle, sideStyle]
-    }
-}