gridviz 3.0.8 → 3.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gridviz",
-    "version": "3.0.8",
+    "version": "3.0.10",
     "description": "Visualization tool for gridded statistics",
     "keywords": [
         "statistics",
@@ -23,7 +23,7 @@
     "license": "EUPL-1.2",
     "repository": {
         "type": "git",
-        "url": "https://github.com/eurostat/gridviz.git"
+        "url": "git+https://github.com/eurostat/gridviz.git"
     },
     "bugs": {
         "url": "https://github.com/eurostat/gridviz/issues",
@@ -40,7 +40,7 @@
         "start": "export NODE_OPTIONS=--openssl-legacy-provider && webpack --config webpack.config.dev.cjs",
         "start-dev": "webpack --config webpack.config.dev.cjs",
         "server": "webpack serve -c webpack.config.dev.cjs",
-        "doc": "./node_modules/.bin/jsdoc -c docs/jsdoc/jsdoc.conf.json",
+        "doc": "jsdoc -c docs/jsdoc/jsdoc.conf.json",
         "bp": "webpack --config webpack.config.prod.cjs",
         "test": "jest"
     },
@@ -59,16 +59,11 @@
         "jsdoc": "^4.0.2"
     },
     "devDependencies": {
-        "@babel/core": "^7.9.0",
-        "@babel/plugin-transform-runtime": "^7.12.1",
-        "@babel/preset-env": "^7.9.0",
-        "@babel/runtime": "^7.12.1",
+        "@babel/preset-env": "^7.25.4",
         "babel-loader": "^8.1.0",
-        "jest": "^26.6.1",
         "jshint": "^2.12.0",
         "prettier": "2.8.8",
-        "puppeteer": "^9.1.1",
-        "webpack": "^5.89.0",
+        "webpack": "^5.94.0",
         "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^4.15.1",
         "webpack-livereload-plugin": "^3.0.2"

package/src/button/Button.js

@@ -18,16 +18,15 @@ export class Button {
      * opts.y
      */
     constructor(opts = {}) {
-
         this.map = opts.map
         this.parentNode = opts.parentNode || opts.map.container
 
         // the div element
-        if (this.id) this.div = select('#' + this.id)
+        if (opts.id) this.div = select('#' + opts.id)
 
         if (!this.div || this.div.empty()) {
             this.div = select(document.createElement('div'))
-            if (this.id) this.div.attr('id', this.id)
+            if (opts.id) this.div.attr('id', opts.id)
         }
 
         if (opts.title) this.div.attr('title', opts.title)
@@ -37,7 +36,10 @@ export class Button {
         if (opts.onClickFunction) this.div.on('click', opts.onClickFunction)
 
         //set styles
-        this.style('box-shadow', '0 7px 8px rgba(0,47,103,.08), 0 0 22px rgba(0,47,103,.04), 0 12px 17px rgba(0,47,103,.04), 0 -4px 4px rgba(0,47,103,.04)') //.ecl-u-shadow-3
+        this.style(
+            'box-shadow',
+            '0 7px 8px rgba(0,47,103,.08), 0 0 22px rgba(0,47,103,.04), 0 12px 17px rgba(0,47,103,.04), 0 -4px 4px rgba(0,47,103,.04)'
+        ) //.ecl-u-shadow-3
         this.style('background-color', '#ffffff')
         this.style('position', 'absolute')
         this.style('cursor', 'pointer')
@@ -48,7 +50,6 @@ export class Button {
         this.style('height', '30px')
         // this.style(padding , '4px'
 
-
         // append to parent
         this.parentNode.appendChild(this.div.node())
     }

package/src/dataset/CSVGrid.js

@@ -3,7 +3,7 @@
 
 /** @typedef {{ dims: object, crs: string, tileSizeCell: number, originPoint: {x:number,y:number}, resolutionGeo: number, tilingBounds:import("../core/GeoCanvas.js").Envelope }} GridInfo */
 
-import { csv } from 'd3-fetch'
+import { dsv } from 'd3-fetch'
 import { Dataset } from '../core/Dataset.js'
 
 /**
@@ -17,7 +17,7 @@ export class CSVGrid extends Dataset {
      * @param {import("../core/Map.js").Map} map The map.
      * @param {string} url The URL of the dataset.
      * @param {number} resolution The dataset resolution in geographical unit.
-     * @param {{preprocess?:(function(import("../core/Dataset.js").Cell):boolean)}} opts
+     * @param {{preprocess?:(function(import("../core/Dataset.js").Cell):boolean),delimiter?:string}} opts
      */
     constructor(map, url, resolution, opts = {}) {
         super(map, url, resolution, opts)
@@ -27,6 +27,11 @@ export class CSVGrid extends Dataset {
          * @type {Array.<import("../core/Dataset.js").Cell>} */
         this.cells = []
 
+        /**
+         * @private
+         * @type {string} */
+         this.delimiter = opts.delimiter || ","
+
         /**
          * @type {string}
          * @private  */
@@ -48,7 +53,7 @@ export class CSVGrid extends Dataset {
         this.infoLoadingStatus = 'loading'
             ; (async () => {
                 try {
-                    const data = await csv(this.url)
+                    const data = await dsv(this.delimiter, this.url)
 
                     //convert coordinates in numbers
                     for (const c of data) {
@@ -71,7 +76,7 @@ export class CSVGrid extends Dataset {
                     //TODO check if redraw is necessary
                     //that is if the dataset belongs to a layer which is visible at the current zoom level
 
-                    //execute the callback, usually a draw function
+                    //redraw map
                     if (this.map) this.map.redraw()
 
                     this.infoLoadingStatus = 'loaded'

package/src/legend/ColorDiscreteLegend.js

@@ -82,6 +82,7 @@ export class ColorDiscreteLegend extends Legend {
 
             let label = breaks[i - 1]
             if (isNaN(label) || label == undefined) continue
+            if(this.labelFormat) label = this.labelFormat(label)
 
             //label
             svg.append('text')

package/src/style/SideCategoryStyle.js

@@ -51,6 +51,7 @@ export class SideCategoryStyle extends SideStyle {
         //draw sides
 
         geoCanvas.ctx.lineCap = 'butt'
+        const r2 = resolution*0.5
         for (let side of sides) {
 
             //get category codes for both cells
@@ -73,8 +74,8 @@ export class SideCategoryStyle extends SideStyle {
                 if (code2) {
                     geoCanvas.ctx.beginPath()
                     geoCanvas.ctx.strokeStyle = this.color[code2]
-                    geoCanvas.ctx.moveTo(side.x, side.y + w2)
-                    geoCanvas.ctx.lineTo(side.x + resolution, side.y + w2)
+                    geoCanvas.ctx.moveTo(side.x-r2, side.y + w2)
+                    geoCanvas.ctx.lineTo(side.x+r2, side.y + w2)
                     geoCanvas.ctx.stroke()
                 }
 
@@ -82,8 +83,8 @@ export class SideCategoryStyle extends SideStyle {
                 if (code1) {
                     geoCanvas.ctx.beginPath()
                     geoCanvas.ctx.strokeStyle = this.color[code1]
-                    geoCanvas.ctx.moveTo(side.x, side.y - w2)
-                    geoCanvas.ctx.lineTo(side.x + resolution, side.y - w2)
+                    geoCanvas.ctx.moveTo(side.x-r2, side.y - w2)
+                    geoCanvas.ctx.lineTo(side.x+r2, side.y - w2)
                     geoCanvas.ctx.stroke()
                 }
             } else {
@@ -91,8 +92,8 @@ export class SideCategoryStyle extends SideStyle {
                 if (code2) {
                     geoCanvas.ctx.beginPath()
                     geoCanvas.ctx.strokeStyle = this.color[code2]
-                    geoCanvas.ctx.moveTo(side.x + w2, side.y)
-                    geoCanvas.ctx.lineTo(side.x + w2, side.y + resolution)
+                    geoCanvas.ctx.moveTo(side.x + w2, side.y-r2)
+                    geoCanvas.ctx.lineTo(side.x + w2, side.y+r2)
                     geoCanvas.ctx.stroke()
                 }
 
@@ -100,8 +101,8 @@ export class SideCategoryStyle extends SideStyle {
                 if (code1) {
                     geoCanvas.ctx.beginPath()
                     geoCanvas.ctx.strokeStyle = this.color[code1]
-                    geoCanvas.ctx.moveTo(side.x - w2, side.y)
-                    geoCanvas.ctx.lineTo(side.x - w2, side.y + resolution)
+                    geoCanvas.ctx.moveTo(side.x - w2, side.y-r2)
+                    geoCanvas.ctx.lineTo(side.x - w2, side.y+r2)
                     geoCanvas.ctx.stroke()
                 }
             }