gridviz 3.0.7 → 3.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gridviz",
-    "version": "3.0.7",
+    "version": "3.0.9",
     "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/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/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