@hpcc-js/map 2.79.1 → 2.79.3

package/src/Choropleth.css

@@ -1,27 +1,27 @@
-.map_Layered .checkerFill {
-    fill: red;
-    stroke: red;
-    opacity: 0.5;
-}
-
-.map_Layered .checkerNoFill {
-    fill: none;
-    stroke: none;
-    opacity: 0.5;
-}
-
-.map_Layered .mesh {
-    fill: none;
-    stroke: #6D6E71;
-    stroke-width: 0.25;
-}
-
-.map_Layered .data {
-    stroke: none;
-    stroke-width: 0.25;
-}
-
-.map_Layered .data .shape.selected {
-    stroke: red;
-    stroke-width: 1.25px;
-}
+.map_Layered .checkerFill {
+    fill: red;
+    stroke: red;
+    opacity: 0.5;
+}
+
+.map_Layered .checkerNoFill {
+    fill: none;
+    stroke: none;
+    opacity: 0.5;
+}
+
+.map_Layered .mesh {
+    fill: none;
+    stroke: #6D6E71;
+    stroke-width: 0.25;
+}
+
+.map_Layered .data {
+    stroke: none;
+    stroke-width: 0.25;
+}
+
+.map_Layered .data .shape.selected {
+    stroke: red;
+    stroke-width: 1.25px;
+}

package/src/Choropleth.ts

@@ -1,195 +1,195 @@
-import { Palette, Utility } from "@hpcc-js/common";
-import { select as d3Select } from "d3-selection";
-import * as topojson from "topojson-client";
-import { Layer } from "./Layer";
-
-import "../src/Choropleth.css";
-
-declare const window: any;
-
-let _topoJsonFolder: string = window.__hpcc_topoJsonFolder || "./node_modules/@hpcc-js/map/TopoJSON";
-export function topoJsonFolder(_?: string): string {
-    if (!arguments.length) return _topoJsonFolder;
-    const retVal = _topoJsonFolder;
-    _topoJsonFolder = _;
-    return retVal;
-}
-
-export class Choropleth extends Layer {
-    _dataMap = {};
-    _path: any = d3Select(null);
-    _palette;
-    _dataMinWeight;
-    _dataMaxWeight;
-    _choroplethData;
-    _choroplethTransform;
-    _choropleth;
-    _choroTopology;
-    _choroTopologyObjects;
-    _prevProjection;
-    _prevInternalOnly;
-
-    constructor() {
-        super();
-        Utility.SimpleSelectionMixin.call(this);
-    }
-
-    data(_?) {
-        const retVal = Layer.prototype.data.apply(this, arguments);
-        if (arguments.length) {
-            this._dataMap = {};
-            this._dataMinWeight = null;
-            this._dataMaxWeight = null;
-
-            const context = this;
-            this.data().forEach(function (item) {
-                context._dataMap[item[0]] = item;
-                if (!context._dataMinWeight || item[1] < context._dataMinWeight) {
-                    context._dataMinWeight = item[1];
-                }
-                if (!context._dataMaxWeight || item[1] > context._dataMaxWeight) {
-                    context._dataMaxWeight = item[1];
-                }
-            });
-        }
-        return retVal;
-    }
-
-    getDataBounds() {
-        const bbox = this._choroplethData.node().getBBox();
-        const retVal = {
-            x: bbox.x,
-            y: bbox.y,
-            width: bbox.width,
-            height: bbox.height
-        };
-        /*
-        const scale = this._zoom.scale();
-        retVal.x *= scale;
-        retVal.y *= scale;
-        retVal.width *= scale;
-        retVal.height *= scale;
-        const translate = this._zoom.translate();
-        retVal.x += translate[0];
-        retVal.y += translate[1];
-        */
-        return retVal;
-    }
-
-    autoScale() {
-        switch (this.autoScaleMode()) {
-            case "none":
-                return;
-            case "mesh":
-                this.zoomToBBox(this.getBounds());
-                break;
-            case "data":
-                this.zoomToBBox(this.getDataBounds());
-                break;
-        }
-    }
-
-    layerEnter(base, svgElement, domElement) {
-        Layer.prototype.layerEnter.apply(this, arguments);
-        this._choroplethTransform = svgElement;
-        this._choroplethData = this._choroplethTransform.append("g")
-            .attr("class", "data")
-            ;
-        this._choropleth = this._choroplethTransform.append("path")
-            .attr("class", "mesh")
-            ;
-    }
-
-    layerUpdate(base, forcePath?) {
-        Layer.prototype.layerUpdate.apply(this, arguments);
-
-        this._palette = this._palette.switch(this.paletteID());
-        if (this.useClonedPalette()) {
-            this._palette = this._palette.cloneNotExists(this.paletteID() + "_" + this.id());
-        }
-
-        this._choroplethTransform
-            .style("stroke", this.meshColor())
-            .style("opacity", this.opacity())
-            ;
-
-        if (!this.visible() || !this.meshVisible()) {
-            this._choropleth.attr("d", "");
-            delete this._prevProjection;
-            return;
-        }
-
-        if (forcePath || this._prevProjection !== base.projection() || this._prevInternalOnly !== this.internalOnly()) {
-            this._choropleth
-                .attr("d", base._d3GeoPath(topojson.mesh(this._choroTopology, this._choroTopologyObjects, this.internalOnly() ? function (a, b) { return a !== b; } : function (a, b) { return true; })))
-                ;
-            this._prevProjection = base.projection();
-            this._prevInternalOnly = this.internalOnly();
-        }
-        this._choropleth
-            .style("stroke-width", this.meshStrokeWidth())
-            .style("stroke", this.meshColor())
-            ;
-    }
-
-    layerExit(base) {
-        delete this._prevProjection;
-        delete this._prevInternalOnly;
-    }
-
-    layerZoomed(base) {
-        super.layerZoomed.apply(this, arguments);
-        this._choroplethData
-            .style("stroke-width", this.meshVisible() ? "0px" : `${0.5 / base.zoomScale()}px`)
-            ;
-    }
-
-    //  Events  ---
-    click(row, column, selected) {
-    }
-
-    dblclick(row, column, selected) {
-    }
-}
-Choropleth.prototype._class += " map_Choropleth";
-Choropleth.prototype.mixin(Utility.SimpleSelectionMixin);
-
-Choropleth.prototype._palette = Palette.rainbow("default");
-
-export interface Choropleth {
-    autoScaleMode(): string;
-    autoScaleMode(_: string): this;
-    autoScaleMode_exists(): boolean;
-    paletteID(): string;
-    paletteID(_: string): this;
-    paletteID_exists(): boolean;
-    useClonedPalette(): boolean;
-    useClonedPalette(_: boolean): this;
-    useClonedPalette_exists(): boolean;
-    opacity(): number;
-    opacity(_: number): this;
-    opacity_exists(): boolean;
-    meshVisible(): boolean;
-    meshVisible(_: boolean): this;
-    meshVisible_exists(): boolean;
-    meshColor(): string;
-    meshColor(_: string): this;
-    meshColor_exists(): boolean;
-    meshStrokeWidth(): number;
-    meshStrokeWidth(_: number): this;
-    meshStrokeWidth_exists(): boolean;
-    internalOnly(): boolean;
-    internalOnly(_: boolean): this;
-    internalOnly_exists(): boolean;
-}
-
-Choropleth.prototype.publish("paletteID", "YlOrRd", "set", "Color palette for this widget", Choropleth.prototype._palette.switch(), { tags: ["Basic", "Shared"] });
-Choropleth.prototype.publish("useClonedPalette", false, "boolean", "Enable or disable using a cloned palette", null, { tags: ["Intermediate", "Shared"] });
-
-Choropleth.prototype.publish("opacity", 1.0, "number", "Opacity", null, { tags: ["Advanced"] });
-
-Choropleth.prototype.publish("meshVisible", true, "boolean", "Mesh Visibility");
-Choropleth.prototype.publish("meshColor", null, "html-color", "Stroke Color", null, { optional: true });
-Choropleth.prototype.publish("meshStrokeWidth", 0.25, "number", "Stroke Width");
-Choropleth.prototype.publish("internalOnly", false, "boolean", "Internal mesh only");
-Choropleth.prototype.publish("autoScaleMode", "mesh", "set", "Auto Scale", ["none", "mesh", "data"], { tags: ["Basic"], override: true });
+import { Palette, Utility } from "@hpcc-js/common";
+import { select as d3Select } from "d3-selection";
+import * as topojson from "topojson-client";
+import { Layer } from "./Layer";
+
+import "../src/Choropleth.css";
+
+declare const window: any;
+
+let _topoJsonFolder: string = window.__hpcc_topoJsonFolder || "./node_modules/@hpcc-js/map/TopoJSON";
+export function topoJsonFolder(_?: string): string {
+    if (!arguments.length) return _topoJsonFolder;
+    const retVal = _topoJsonFolder;
+    _topoJsonFolder = _;
+    return retVal;
+}
+
+export class Choropleth extends Layer {
+    _dataMap = {};
+    _path: any = d3Select(null);
+    _palette;
+    _dataMinWeight;
+    _dataMaxWeight;
+    _choroplethData;
+    _choroplethTransform;
+    _choropleth;
+    _choroTopology;
+    _choroTopologyObjects;
+    _prevProjection;
+    _prevInternalOnly;
+
+    constructor() {
+        super();
+        Utility.SimpleSelectionMixin.call(this);
+    }
+
+    data(_?) {
+        const retVal = Layer.prototype.data.apply(this, arguments);
+        if (arguments.length) {
+            this._dataMap = {};
+            this._dataMinWeight = null;
+            this._dataMaxWeight = null;
+
+            const context = this;
+            this.data().forEach(function (item) {
+                context._dataMap[item[0]] = item;
+                if (!context._dataMinWeight || item[1] < context._dataMinWeight) {
+                    context._dataMinWeight = item[1];
+                }
+                if (!context._dataMaxWeight || item[1] > context._dataMaxWeight) {
+                    context._dataMaxWeight = item[1];
+                }
+            });
+        }
+        return retVal;
+    }
+
+    getDataBounds() {
+        const bbox = this._choroplethData.node().getBBox();
+        const retVal = {
+            x: bbox.x,
+            y: bbox.y,
+            width: bbox.width,
+            height: bbox.height
+        };
+        /*
+        const scale = this._zoom.scale();
+        retVal.x *= scale;
+        retVal.y *= scale;
+        retVal.width *= scale;
+        retVal.height *= scale;
+        const translate = this._zoom.translate();
+        retVal.x += translate[0];
+        retVal.y += translate[1];
+        */
+        return retVal;
+    }
+
+    autoScale() {
+        switch (this.autoScaleMode()) {
+            case "none":
+                return;
+            case "mesh":
+                this.zoomToBBox(this.getBounds());
+                break;
+            case "data":
+                this.zoomToBBox(this.getDataBounds());
+                break;
+        }
+    }
+
+    layerEnter(base, svgElement, domElement) {
+        Layer.prototype.layerEnter.apply(this, arguments);
+        this._choroplethTransform = svgElement;
+        this._choroplethData = this._choroplethTransform.append("g")
+            .attr("class", "data")
+            ;
+        this._choropleth = this._choroplethTransform.append("path")
+            .attr("class", "mesh")
+            ;
+    }
+
+    layerUpdate(base, forcePath?) {
+        Layer.prototype.layerUpdate.apply(this, arguments);
+
+        this._palette = this._palette.switch(this.paletteID());
+        if (this.useClonedPalette()) {
+            this._palette = this._palette.cloneNotExists(this.paletteID() + "_" + this.id());
+        }
+
+        this._choroplethTransform
+            .style("stroke", this.meshColor())
+            .style("opacity", this.opacity())
+            ;
+
+        if (!this.visible() || !this.meshVisible()) {
+            this._choropleth.attr("d", "");
+            delete this._prevProjection;
+            return;
+        }
+
+        if (forcePath || this._prevProjection !== base.projection() || this._prevInternalOnly !== this.internalOnly()) {
+            this._choropleth
+                .attr("d", base._d3GeoPath(topojson.mesh(this._choroTopology, this._choroTopologyObjects, this.internalOnly() ? function (a, b) { return a !== b; } : function (a, b) { return true; })))
+                ;
+            this._prevProjection = base.projection();
+            this._prevInternalOnly = this.internalOnly();
+        }
+        this._choropleth
+            .style("stroke-width", this.meshStrokeWidth())
+            .style("stroke", this.meshColor())
+            ;
+    }
+
+    layerExit(base) {
+        delete this._prevProjection;
+        delete this._prevInternalOnly;
+    }
+
+    layerZoomed(base) {
+        super.layerZoomed.apply(this, arguments);
+        this._choroplethData
+            .style("stroke-width", this.meshVisible() ? "0px" : `${0.5 / base.zoomScale()}px`)
+            ;
+    }
+
+    //  Events  ---
+    click(row, column, selected) {
+    }
+
+    dblclick(row, column, selected) {
+    }
+}
+Choropleth.prototype._class += " map_Choropleth";
+Choropleth.prototype.mixin(Utility.SimpleSelectionMixin);
+
+Choropleth.prototype._palette = Palette.rainbow("default");
+
+export interface Choropleth {
+    autoScaleMode(): string;
+    autoScaleMode(_: string): this;
+    autoScaleMode_exists(): boolean;
+    paletteID(): string;
+    paletteID(_: string): this;
+    paletteID_exists(): boolean;
+    useClonedPalette(): boolean;
+    useClonedPalette(_: boolean): this;
+    useClonedPalette_exists(): boolean;
+    opacity(): number;
+    opacity(_: number): this;
+    opacity_exists(): boolean;
+    meshVisible(): boolean;
+    meshVisible(_: boolean): this;
+    meshVisible_exists(): boolean;
+    meshColor(): string;
+    meshColor(_: string): this;
+    meshColor_exists(): boolean;
+    meshStrokeWidth(): number;
+    meshStrokeWidth(_: number): this;
+    meshStrokeWidth_exists(): boolean;
+    internalOnly(): boolean;
+    internalOnly(_: boolean): this;
+    internalOnly_exists(): boolean;
+}
+
+Choropleth.prototype.publish("paletteID", "YlOrRd", "set", "Color palette for this widget", Choropleth.prototype._palette.switch(), { tags: ["Basic", "Shared"] });
+Choropleth.prototype.publish("useClonedPalette", false, "boolean", "Enable or disable using a cloned palette", null, { tags: ["Intermediate", "Shared"] });
+
+Choropleth.prototype.publish("opacity", 1.0, "number", "Opacity", null, { tags: ["Advanced"] });
+
+Choropleth.prototype.publish("meshVisible", true, "boolean", "Mesh Visibility");
+Choropleth.prototype.publish("meshColor", null, "html-color", "Stroke Color", null, { optional: true });
+Choropleth.prototype.publish("meshStrokeWidth", 0.25, "number", "Stroke Width");
+Choropleth.prototype.publish("internalOnly", false, "boolean", "Internal mesh only");
+Choropleth.prototype.publish("autoScaleMode", "mesh", "set", "Auto Scale", ["none", "mesh", "data"], { tags: ["Basic"], override: true });

package/src/ChoroplethContinents.ts

@@ -1,13 +1,13 @@
-import { ChoroplethCountries } from "./ChoroplethCountries";
-
-export class ChoroplethContinents extends ChoroplethCountries {
-    constructor() {
-        super();
-    }
-
-    layerEnter(base, svgElement, domElement) {
-        ChoroplethCountries.prototype.layerEnter.apply(this, arguments);
-        this._choroTopologyObjects = this._choroTopologyObjectsLand;
-    }
-}
-ChoroplethContinents.prototype._class += " map_ChoroplethContinents";
+import { ChoroplethCountries } from "./ChoroplethCountries";
+
+export class ChoroplethContinents extends ChoroplethCountries {
+    constructor() {
+        super();
+    }
+
+    layerEnter(base, svgElement, domElement) {
+        ChoroplethCountries.prototype.layerEnter.apply(this, arguments);
+        this._choroTopologyObjects = this._choroTopologyObjectsLand;
+    }
+}
+ChoroplethContinents.prototype._class += " map_ChoroplethContinents";