gridviz 2.1.12 → 2.1.13

package/src/style/MosaicStyle.js

@@ -1,107 +1,107 @@
-//@ts-check
-'use strict'
-
-import { Style } from '../Style.js'
-
-/**
- * @author Julien Gaffuri
- */
-export class MosaicStyle extends Style {
-    /** @param {object} opts */
-    constructor(opts) {
-        super(opts)
-        opts = opts || {}
-
-        /** The name of the column/attribute of the tabular data where to retrieve the variable for color.
-         * @type {string} */
-        this.colorCol = opts.colorCol
-
-        /** A function returning the color of the cell.
-         * @type {function(number,number,import("../Style").Stat|undefined):string} */
-        this.color = opts.color || (() => '#EA6BAC')
-
-        /** The mosaic factor, within [0,0.5]. Set to 0 for no mosaic effect. Set to 0.5 for strong mosaic effect.
-         * @type {number} */
-        this.mosaicFactor = opts.mosaicFactor || 0.15
-
-        /** The mosaic shadow factor, within [0,0.5]. Set to 0 for no mosaic shadow. Set to 0.5 for strong mosaic shadow.
-         * @type {number} */
-        this.shadowFactor = opts.shadowFactor || 0.2
-
-        /** The mosaic shadow color.
-         * @type {string} */
-        this.shadowColor = opts.shadowColor || '#555'
-    }
-
-    /**
-     *
-     * @param {Array.<import("../Dataset").Cell>} cells
-     * @param {number} resolution
-     * @param {import("../GeoCanvas").GeoCanvas} cg
-     */
-    draw(cells, resolution, cg) {
-        //filter
-        if (this.filter) cells = cells.filter(this.filter)
-
-        //zoom factor
-        const zf = cg.getZf()
-
-        let statColor
-        if (this.colorCol) {
-            //compute color variable statistics
-            statColor = Style.getStatistics(cells, (c) => c[this.colorCol], true)
-        }
-
-        //set stroke style, for shadow
-        cg.ctx.strokeStyle = this.shadowColor
-        cg.ctx.lineWidth = this.shadowFactor * resolution
-        cg.ctx.lineJoin = 'round'
-        cg.ctx.lineCap = 'butt'
-
-        //function to compute position mosaic effect
-        const d = resolution * this.mosaicFactor
-        const mosaic = () => {
-            return { x: Math.random() * d, y: Math.random() * d }
-        }
-
-        //draw with HTML canvas in geo coordinates
-        cg.setCanvasTransform()
-
-        for (let cell of cells) {
-            //set fill color
-            const col = this.color ? this.color(cell[this.colorCol], resolution, statColor) : undefined
-            if (!col || col === 'none') continue
-            cg.ctx.fillStyle = col
-
-            //get offset
-            const offset = this.offset(cell, resolution, zf)
-
-            //compute position mosaic effect
-            const ll = mosaic(),
-                ul = mosaic(),
-                lr = mosaic(),
-                ur = mosaic()
-
-            //stroke
-            if (this.shadowFactor > 0) {
-                cg.ctx.beginPath()
-                cg.ctx.moveTo(cell.x + offset.dx + ll.x, cell.y + offset.dy + ll.y)
-                cg.ctx.lineTo(cell.x + offset.dx + resolution - lr.x, cell.y + offset.dy + lr.y)
-                cg.ctx.lineTo(cell.x + offset.dx + resolution - ur.x, cell.y + offset.dy + resolution - ur.y)
-                cg.ctx.stroke()
-            }
-
-            //fill
-
-            cg.ctx.beginPath()
-            cg.ctx.moveTo(cell.x + offset.dx + ll.x, cell.y + offset.dy + ll.y)
-            cg.ctx.lineTo(cell.x + offset.dx + resolution - lr.x, cell.y + offset.dy + lr.y)
-            cg.ctx.lineTo(cell.x + offset.dx + resolution - ur.x, cell.y + offset.dy + resolution - ur.y)
-            cg.ctx.lineTo(cell.x + offset.dx + ul.x, cell.y + offset.dy + resolution - ul.y)
-            cg.ctx.fill()
-        }
-
-        //update legends
-        this.updateLegends({ style: this, r: resolution, zf: zf, sColor: statColor })
-    }
-}
+//@ts-check
+'use strict'
+
+import { Style } from '../Style.js'
+
+/**
+ * @author Julien Gaffuri
+ */
+export class MosaicStyle extends Style {
+    /** @param {object} opts */
+    constructor(opts) {
+        super(opts)
+        opts = opts || {}
+
+        /** The name of the column/attribute of the tabular data where to retrieve the variable for color.
+         * @type {string} */
+        this.colorCol = opts.colorCol
+
+        /** A function returning the color of the cell.
+         * @type {function(number,number,import("../Style").Stat|undefined):string} */
+        this.color = opts.color || (() => '#EA6BAC')
+
+        /** The mosaic factor, within [0,0.5]. Set to 0 for no mosaic effect. Set to 0.5 for strong mosaic effect.
+         * @type {number} */
+        this.mosaicFactor = opts.mosaicFactor || 0.15
+
+        /** The mosaic shadow factor, within [0,0.5]. Set to 0 for no mosaic shadow. Set to 0.5 for strong mosaic shadow.
+         * @type {number} */
+        this.shadowFactor = opts.shadowFactor || 0.2
+
+        /** The mosaic shadow color.
+         * @type {string} */
+        this.shadowColor = opts.shadowColor || '#555'
+    }
+
+    /**
+     *
+     * @param {Array.<import("../Dataset").Cell>} cells
+     * @param {number} resolution
+     * @param {import("../GeoCanvas").GeoCanvas} cg
+     */
+    draw(cells, resolution, cg) {
+        //filter
+        if (this.filter) cells = cells.filter(this.filter)
+
+        //zoom factor
+        const zf = cg.getZf()
+
+        let statColor
+        if (this.colorCol) {
+            //compute color variable statistics
+            statColor = Style.getStatistics(cells, (c) => c[this.colorCol], true)
+        }
+
+        //set stroke style, for shadow
+        cg.ctx.strokeStyle = this.shadowColor
+        cg.ctx.lineWidth = this.shadowFactor * resolution
+        cg.ctx.lineJoin = 'round'
+        cg.ctx.lineCap = 'butt'
+
+        //function to compute position mosaic effect
+        const d = resolution * this.mosaicFactor
+        const mosaic = () => {
+            return { x: Math.random() * d, y: Math.random() * d }
+        }
+
+        //draw with HTML canvas in geo coordinates
+        cg.setCanvasTransform()
+
+        for (let cell of cells) {
+            //set fill color
+            const col = this.color ? this.color(cell[this.colorCol], resolution, statColor) : undefined
+            if (!col || col === 'none') continue
+            cg.ctx.fillStyle = col
+
+            //get offset
+            const offset = this.offset(cell, resolution, zf)
+
+            //compute position mosaic effect
+            const ll = mosaic(),
+                ul = mosaic(),
+                lr = mosaic(),
+                ur = mosaic()
+
+            //stroke
+            if (this.shadowFactor > 0) {
+                cg.ctx.beginPath()
+                cg.ctx.moveTo(cell.x + offset.dx + ll.x, cell.y + offset.dy + ll.y)
+                cg.ctx.lineTo(cell.x + offset.dx + resolution - lr.x, cell.y + offset.dy + lr.y)
+                cg.ctx.lineTo(cell.x + offset.dx + resolution - ur.x, cell.y + offset.dy + resolution - ur.y)
+                cg.ctx.stroke()
+            }
+
+            //fill
+
+            cg.ctx.beginPath()
+            cg.ctx.moveTo(cell.x + offset.dx + ll.x, cell.y + offset.dy + ll.y)
+            cg.ctx.lineTo(cell.x + offset.dx + resolution - lr.x, cell.y + offset.dy + lr.y)
+            cg.ctx.lineTo(cell.x + offset.dx + resolution - ur.x, cell.y + offset.dy + resolution - ur.y)
+            cg.ctx.lineTo(cell.x + offset.dx + ul.x, cell.y + offset.dy + resolution - ul.y)
+            cg.ctx.fill()
+        }
+
+        //update legends
+        this.updateLegends({ style: this, r: resolution, zf: zf, sColor: statColor })
+    }
+}

package/src/style/NinjaStarStyle.js

@@ -1,125 +1,125 @@
-//@ts-check
-'use strict'
-
-import { Style } from '../Style.js'
-
-/**
- *
- * @author Joseph Davies, Julien Gaffuri
- */
-export class NinjaStarStyle extends Style {
-    /** @param {object} opts */
-    constructor(opts) {
-        super(opts)
-        opts = opts || {}
-
-        /** The name of the column/attribute of the tabular data where to retrieve the variable for color.
-         * @type {string} */
-        this.colorCol = opts.colorCol
-
-        /** A function returning the color of the cell.
-         * @type {function(number,number,import("../Style").Stat|undefined,number):string} */
-        this.color = opts.color || (() => '#EA6BAC') //(v,r,s,zf) => {}
-
-        /** The name of the column/attribute of the tabular data where to retrieve the variable for size.
-         * @type {string} */
-        this.sizeCol = opts.sizeCol
-
-        /** A function returning the size of a cell, within [0,1]:
-         *  - 0, nothing shown
-         *  - 1, entire square
-         * @type {function(number,number,import("../Style").Stat|undefined,number):number} */
-        this.size = opts.size
-
-        /** A function returning the shape.
-         * @type {function(import("../Dataset").Cell):string} */
-        this.shape = opts.shape || (() => 'o')
-    }
-
-    /**
-     *
-     * @param {Array.<import("../Dataset").Cell>} cells
-     * @param {number} r
-     * @param {import("../GeoCanvas").GeoCanvas} cg
-     */
-    draw(cells, r, cg) {
-        //filter
-        if (this.filter) cells = cells.filter(this.filter)
-
-        //zoom factor
-        const zf = cg.getZf()
-
-        let statSize
-        if (this.sizeCol) {
-            //if size is used, sort cells by size so that the biggest are drawn first
-            cells.sort((c1, c2) => c2[this.sizeCol] - c1[this.sizeCol])
-            //and compute size variable statistics
-            statSize = Style.getStatistics(cells, (c) => c[this.sizeCol], true)
-        }
-
-        let statColor
-        if (this.colorCol) {
-            //compute color variable statistics
-            statColor = Style.getStatistics(cells, (c) => c[this.colorCol], true)
-        }
-
-        //draw with HTML canvas
-        //in geo coordinates
-        cg.setCanvasTransform()
-
-        const r2 = r * 0.5
-        for (let cell of cells) {
-            //color
-            const col = this.color ? this.color(cell[this.colorCol], r, statColor, zf) : undefined
-            if (!col || col === 'none') continue
-            cg.ctx.fillStyle = col
-
-            //shape
-            const shape = this.shape ? this.shape(cell) : 'o'
-            if (shape === 'none') continue
-
-            //size
-            /** @type {function(number,number,import("../Style").Stat|undefined,number):number} */
-            let s_ = this.size || (() => 0.5)
-            //size - in geo unit
-            const sG2 = s_(cell[this.sizeCol], r, statSize, zf) * r2
-
-            //get offset
-            //TODO use
-            //const offset = this.offset(cell, r, zf)
-
-            //center position
-            const cx = cell.x + r2
-            const cy = cell.y + r2
-
-            if (shape === 'p') {
-                cg.ctx.beginPath()
-                cg.ctx.moveTo(cx, cy + r2)
-                cg.ctx.lineTo(cx + sG2, cy + sG2)
-                cg.ctx.lineTo(cx + r2, cy)
-                cg.ctx.lineTo(cx + sG2, cy - sG2)
-                cg.ctx.lineTo(cx, cy - r2)
-                cg.ctx.lineTo(cx - sG2, cy - sG2)
-                cg.ctx.lineTo(cx - r2, cy)
-                cg.ctx.lineTo(cx - sG2, cy + sG2)
-                cg.ctx.fill()
-            } else if (shape === 'o') {
-                cg.ctx.beginPath()
-                cg.ctx.moveTo(cx, cy + sG2)
-                cg.ctx.lineTo(cx + r2, cy + r2)
-                cg.ctx.lineTo(cx + sG2, cy)
-                cg.ctx.lineTo(cx + r2, cy - r2)
-                cg.ctx.lineTo(cx, cy - sG2)
-                cg.ctx.lineTo(cx - r2, cy - r2)
-                cg.ctx.lineTo(cx - sG2, cy)
-                cg.ctx.lineTo(cx - r2, cy + r2)
-                cg.ctx.fill()
-            } else {
-                throw new Error('Unexpected shape:' + shape)
-            }
-        }
-
-        //update legends
-        this.updateLegends({ style: this, r: r, zf: zf, sSize: statSize, sColor: statColor })
-    }
-}
+//@ts-check
+'use strict'
+
+import { Style } from '../Style.js'
+
+/**
+ *
+ * @author Joseph Davies, Julien Gaffuri
+ */
+export class NinjaStarStyle extends Style {
+    /** @param {object} opts */
+    constructor(opts) {
+        super(opts)
+        opts = opts || {}
+
+        /** The name of the column/attribute of the tabular data where to retrieve the variable for color.
+         * @type {string} */
+        this.colorCol = opts.colorCol
+
+        /** A function returning the color of the cell.
+         * @type {function(number,number,import("../Style").Stat|undefined,number):string} */
+        this.color = opts.color || (() => '#EA6BAC') //(v,r,s,zf) => {}
+
+        /** The name of the column/attribute of the tabular data where to retrieve the variable for size.
+         * @type {string} */
+        this.sizeCol = opts.sizeCol
+
+        /** A function returning the size of a cell, within [0,1]:
+         *  - 0, nothing shown
+         *  - 1, entire square
+         * @type {function(number,number,import("../Style").Stat|undefined,number):number} */
+        this.size = opts.size
+
+        /** A function returning the shape.
+         * @type {function(import("../Dataset").Cell):string} */
+        this.shape = opts.shape || (() => 'o')
+    }
+
+    /**
+     *
+     * @param {Array.<import("../Dataset").Cell>} cells
+     * @param {number} r
+     * @param {import("../GeoCanvas").GeoCanvas} cg
+     */
+    draw(cells, r, cg) {
+        //filter
+        if (this.filter) cells = cells.filter(this.filter)
+
+        //zoom factor
+        const zf = cg.getZf()
+
+        let statSize
+        if (this.sizeCol) {
+            //if size is used, sort cells by size so that the biggest are drawn first
+            cells.sort((c1, c2) => c2[this.sizeCol] - c1[this.sizeCol])
+            //and compute size variable statistics
+            statSize = Style.getStatistics(cells, (c) => c[this.sizeCol], true)
+        }
+
+        let statColor
+        if (this.colorCol) {
+            //compute color variable statistics
+            statColor = Style.getStatistics(cells, (c) => c[this.colorCol], true)
+        }
+
+        //draw with HTML canvas
+        //in geo coordinates
+        cg.setCanvasTransform()
+
+        const r2 = r * 0.5
+        for (let cell of cells) {
+            //color
+            const col = this.color ? this.color(cell[this.colorCol], r, statColor, zf) : undefined
+            if (!col || col === 'none') continue
+            cg.ctx.fillStyle = col
+
+            //shape
+            const shape = this.shape ? this.shape(cell) : 'o'
+            if (shape === 'none') continue
+
+            //size
+            /** @type {function(number,number,import("../Style").Stat|undefined,number):number} */
+            let s_ = this.size || (() => 0.5)
+            //size - in geo unit
+            const sG2 = s_(cell[this.sizeCol], r, statSize, zf) * r2
+
+            //get offset
+            //TODO use
+            //const offset = this.offset(cell, r, zf)
+
+            //center position
+            const cx = cell.x + r2
+            const cy = cell.y + r2
+
+            if (shape === 'p') {
+                cg.ctx.beginPath()
+                cg.ctx.moveTo(cx, cy + r2)
+                cg.ctx.lineTo(cx + sG2, cy + sG2)
+                cg.ctx.lineTo(cx + r2, cy)
+                cg.ctx.lineTo(cx + sG2, cy - sG2)
+                cg.ctx.lineTo(cx, cy - r2)
+                cg.ctx.lineTo(cx - sG2, cy - sG2)
+                cg.ctx.lineTo(cx - r2, cy)
+                cg.ctx.lineTo(cx - sG2, cy + sG2)
+                cg.ctx.fill()
+            } else if (shape === 'o') {
+                cg.ctx.beginPath()
+                cg.ctx.moveTo(cx, cy + sG2)
+                cg.ctx.lineTo(cx + r2, cy + r2)
+                cg.ctx.lineTo(cx + sG2, cy)
+                cg.ctx.lineTo(cx + r2, cy - r2)
+                cg.ctx.lineTo(cx, cy - sG2)
+                cg.ctx.lineTo(cx - r2, cy - r2)
+                cg.ctx.lineTo(cx - sG2, cy)
+                cg.ctx.lineTo(cx - r2, cy + r2)
+                cg.ctx.fill()
+            } else {
+                throw new Error('Unexpected shape:' + shape)
+            }
+        }
+
+        //update legends
+        this.updateLegends({ style: this, r: r, zf: zf, sSize: statSize, sColor: statColor })
+    }
+}