@lgv/visualization-map 0.0.3 → 0.0.5

package/.gitlab-ci.yml

@@ -6,10 +6,6 @@ stages:
 include:
   ######################################  GITLAB TEMPLATES  ######################################
   - template: Security/SAST.gitlab-ci.yml
-  
-  # overwrites
-  - project: "lgensinger/cicd-templates"
-    file: "node/module/eslint-sast.yml"
 
   - project: "lgensinger/cicd-templates"
     file: "node/module/nodejs-scan-sast.yml"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lgv/visualization-map",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "type": "module",
   "description": "ES6 d3.js core visualization scaffold object and utilities for maps.",
   "main": "src/index.js",

package/src/visualization/heatmap.js

@@ -21,10 +21,10 @@ import { configuration, configurationColor, configurationLayout } from "../confi
  */
 class Heatmap extends VisualizationMap {
 
-    constructor(data, width=configurationLayout.width, height=configurationLayout.height, HeatLayout=null, label=configuration.branding, name=configuration.name) {
+    constructor(data, width=configurationLayout.width, height=configurationLayout.height, HeatLayout=null, tileServerUrl=configurationLayout.tileserver, label=configuration.branding, name=configuration.name) {
 
         // initialize inheritance
-        super(data, width, height, HeatLayout ? HeatLayout : new HL(data), label, name);
+        super(data, width, height, HeatLayout ? HeatLayout : new HL(data), tileServerUrl, label, name);
 
         // initialize vega
         VegaDeckGl.use(vega, deck, layers, luma);

package/src/visualization/index.js

@@ -16,7 +16,7 @@ import { configuration, configurationLayout } from "../configuration.js";
  */
 class VisualizationMap extends LinearGrid {
 
-    constructor(data, width=configurationLayout.width, height=configurationLayout.height, MapData=null, label=configuration.branding, name=configuration.name) {
+    constructor(data, width=configurationLayout.width, height=configurationLayout.height, MapData=null, tileServerUrl=configurationLayout.tileserver, label=configuration.branding, name=configuration.name) {
 
         // initialize inheritance
         super(data, width, height, MapData, label, name);
@@ -32,7 +32,7 @@ class VisualizationMap extends LinearGrid {
         // update self
         this.center = [x,y];
         this.map = null;
-        this.tileserver = configurationLayout.tileserver;
+        this.tileServerUrl = tileServerUrl;
         this.zoom = 1;
 
     }
@@ -68,11 +68,32 @@ class VisualizationMap extends LinearGrid {
      * Generate main visualization, i.e. everything that sits inside the svg.
      */
     determineDataType() {
-        this.isFeatureCollection = this.data && this.data.features;
+        this.isFeatureCollection = this.data && this.Data.source.features;
         this.isPoint = this.data && this.data.coordinates && this.data.type.lower() == "point";
         this.isXY = this.data && this.data.metadata && this.data.results;
     }
 
+    /**
+     * Fit map tightly to data boundary.
+     */
+    fitToData() {
+
+        // determine bounding box
+        let bounds = (this.isFeatureCollection || this.isPoint) ? L.geoJSON(this.Data.source).getBounds() : (this.isXY ? this.data.metadata.bounds : this.map.getBounds());
+
+        // fit to bounds
+        if (this.isFeatureCollection || this.isXY) {
+            // several data points
+            this.map.fitBounds(bounds);
+        } else if (this.isPoint) {
+            // zoom out if only provided single data point
+            this.map.setView(bounds.getCenter(), this.map.getMaxZoom() / 2);
+        } else {
+            // no geo data provided so center world
+            this.map.setView(bounds.getCenter());
+        }
+    }
+
     /**
      * Generate main visualization, i.e. everything that sits inside the svg.
      */
@@ -122,22 +143,10 @@ class VisualizationMap extends LinearGrid {
         this.attachEvents();
 
         // update tile server
-        L.tileLayer(this.tileserver).addTo(this.map);
-
-        // determine bounding box
-        let bounds = (this.isFeatureCollection || this.isPoint) ? L.geoJSON(this.Data.source).getBounds() : (this.isXY ? this.data.metadata.bounds : this.map.getBounds());
+        L.tileLayer(this.tileServerUrl).addTo(this.map);
 
         // fit to bounds
-        if (this.isFeatureCollection || this.isXY) {
-            // several data points
-            this.map.fitBounds(bounds);
-        } else if (this.isPoint) {
-            // zoom out if only provided single data point
-            this.map.setView(bounds.getCenter(), this.map.getMaxZoom() / 2);
-        } else {
-            // no geo data provided so center world
-            this.map.setView(bounds.getCenter());
-        }
+        this.fitToData();
 
     }
 
@@ -186,6 +195,9 @@ class VisualizationMap extends LinearGrid {
         // generate visualization
         this.generateChart();
 
+        // fit to bounds
+        this.fitToData();
+
     }
 
 }