@hpcc-js/map 3.5.2 → 3.5.4

package/src/leaflet/US.ts

@@ -1,15 +1,15 @@
-import { LatLngBounds } from "./leaflet-shim.ts";
-import { World } from "./World.ts";
-
-export class US extends World {
-
-    constructor() {
-        super();
-    }
-
-    getBounds() {
-        const retVal = super.getBounds();
-        return new LatLngBounds([retVal.getNorth(), retVal.getWest()], [17.755278, -64.565]);
-    }
-
-}
+import { LatLngBounds } from "./leaflet-shim.ts";
+import { World } from "./World.ts";
+
+export class US extends World {
+
+    constructor() {
+        super();
+    }
+
+    getBounds() {
+        const retVal = super.getBounds();
+        return new LatLngBounds([retVal.getNorth(), retVal.getWest()], [17.755278, -64.565]);
+    }
+
+}

package/src/leaflet/USCounties.ts

@@ -1,43 +1,43 @@
-import { json as d3Json } from "d3-request";
-import * as topojson from "topojson-client";
-import { topoJsonFolder } from "../Choropleth.ts";
-import { US } from "./US.ts";
-
-let usCounties = null;
-const usCountyNames = {};
-
-export class USCounties extends US {
-
-    init(): Promise<void> {
-        if (!this._initPromise) {
-            this._initPromise = new Promise((resolve, reject) => {
-                if (usCounties) {
-                    resolve(usCounties);
-                }
-                d3Json(`${topoJsonFolder()}/us-counties.json`, function (_usCounties) {
-                    usCounties = _usCounties;
-                    resolve(usCounties);
-                });
-            }).then((usCounties: any) => {
-                this._features = topojson.feature(usCounties.topology, usCounties.topology.objects.counties).features;
-                for (const key in this._features) {
-                    if (this._features[key].id) {
-                        const code = this._features[key].id;
-                        const name = usCounties.countyNames[code];
-                        this._features[key].properties.hpccID = code;
-                        usCountyNames[code] = name;
-                    }
-                }
-
-            });
-        }
-        return this._initPromise;
-    }
-
-    tooltipHandler(l, featureID) {
-        const row = this._dataMap[featureID];
-        const value = row && row[1] || "";
-        return this.tooltipText(this.rowToObj(row), `<b>${usCountyNames[featureID]}</b>:  ${value}`);
-    }
-}
-USCounties.prototype._class += " map_USCounties";
+import { json as d3Json } from "d3-request";
+import * as topojson from "topojson-client";
+import { topoJsonFolder } from "../Choropleth.ts";
+import { US } from "./US.ts";
+
+let usCounties = null;
+const usCountyNames = {};
+
+export class USCounties extends US {
+
+    init(): Promise<void> {
+        if (!this._initPromise) {
+            this._initPromise = new Promise((resolve, reject) => {
+                if (usCounties) {
+                    resolve(usCounties);
+                }
+                d3Json(`${topoJsonFolder()}/us-counties.json`, function (_usCounties) {
+                    usCounties = _usCounties;
+                    resolve(usCounties);
+                });
+            }).then((usCounties: any) => {
+                this._features = topojson.feature(usCounties.topology, usCounties.topology.objects.counties).features;
+                for (const key in this._features) {
+                    if (this._features[key].id) {
+                        const code = this._features[key].id;
+                        const name = usCounties.countyNames[code];
+                        this._features[key].properties.hpccID = code;
+                        usCountyNames[code] = name;
+                    }
+                }
+
+            });
+        }
+        return this._initPromise;
+    }
+
+    tooltipHandler(l, featureID) {
+        const row = this._dataMap[featureID];
+        const value = row && row[1] || "";
+        return this.tooltipText(this.rowToObj(row), `<b>${usCountyNames[featureID]}</b>:  ${value}`);
+    }
+}
+USCounties.prototype._class += " map_USCounties";

package/src/leaflet/USStates.ts

@@ -1,41 +1,41 @@
-import { json as d3Json } from "d3-request";
-import * as topojson from "topojson-client";
-import { topoJsonFolder } from "../Choropleth.ts";
-import { US } from "./US.ts";
-
-let usStates = null;
-const usStateNames = {};
-
-export class USStates extends US {
-
-    init(): Promise<void> {
-        if (!this._initPromise) {
-            this._initPromise = new Promise((resolve, reject) => {
-                if (usStates) {
-                    resolve(usStates);
-                }
-                d3Json(`${topoJsonFolder()}/us-states.json`, function (_usStates) {
-                    usStates = _usStates;
-                    resolve(usStates);
-                });
-            }).then((usStates: any) => {
-                this._features = topojson.feature(usStates.topology, usStates.topology.objects.states).features;
-                for (const key in this._features) {
-                    if (this._features[key].id) {
-                        const { code, name } = usStates.stateNames[this._features[key].id];
-                        this._features[key].properties.hpccID = code;
-                        usStateNames[code] = name;
-                    }
-                }
-            });
-        }
-        return this._initPromise;
-    }
-
-    tooltipHandler(l, featureID) {
-        const row = this._dataMap[featureID];
-        const value = row && row[1] || "";
-        return this.tooltipText(this.rowToObj(row), `<b>${usStateNames[featureID]}</b>:  ${value}`);
-    }
-}
-USStates.prototype._class += " map_USStates";
+import { json as d3Json } from "d3-request";
+import * as topojson from "topojson-client";
+import { topoJsonFolder } from "../Choropleth.ts";
+import { US } from "./US.ts";
+
+let usStates = null;
+const usStateNames = {};
+
+export class USStates extends US {
+
+    init(): Promise<void> {
+        if (!this._initPromise) {
+            this._initPromise = new Promise((resolve, reject) => {
+                if (usStates) {
+                    resolve(usStates);
+                }
+                d3Json(`${topoJsonFolder()}/us-states.json`, function (_usStates) {
+                    usStates = _usStates;
+                    resolve(usStates);
+                });
+            }).then((usStates: any) => {
+                this._features = topojson.feature(usStates.topology, usStates.topology.objects.states).features;
+                for (const key in this._features) {
+                    if (this._features[key].id) {
+                        const { code, name } = usStates.stateNames[this._features[key].id];
+                        this._features[key].properties.hpccID = code;
+                        usStateNames[code] = name;
+                    }
+                }
+            });
+        }
+        return this._initPromise;
+    }
+
+    tooltipHandler(l, featureID) {
+        const row = this._dataMap[featureID];
+        const value = row && row[1] || "";
+        return this.tooltipText(this.rowToObj(row), `<b>${usStateNames[featureID]}</b>:  ${value}`);
+    }
+}
+USStates.prototype._class += " map_USStates";

package/src/leaflet/World.css

@@ -1,4 +1,4 @@
-.leaflet-interactive.selected {
-    stroke: red;
-    stroke-width: 1.25px;
+.leaflet-interactive.selected {
+    stroke: red;
+    stroke-width: 1.25px;
 }

package/src/leaflet/World.ts

@@ -1,172 +1,172 @@
-import { Palette, SVGGlowFilter, Utility } from "@hpcc-js/common";
-import { LatLngBounds, Map } from "./leaflet-shim.ts";
-import { select as d3Select } from "d3-selection";
-import { FeatureLayer } from "./FeatureLayer.ts";
-import { TopoJSON } from "./TopoJSON.ts";
-
-import "../../src/leaflet/World.css";
-
-export class World extends FeatureLayer {
-
-    protected _features;
-    _palette;
-
-    protected _dataMap = {};
-    protected _dataMinWeight = null;
-    protected _dataMaxWeight = null;
-
-    constructor() {
-        super();
-        Utility.SimpleSelectionMixin.call(this);
-    }
-
-    hasBounds() {
-        return true;
-    }
-
-    getBounds() {
-        const retVal = super.getBounds();
-        if (!retVal.isValid()) {
-            return new LatLngBounds([90, -180], [-90, 180]);
-        }
-        return new LatLngBounds([retVal.getNorth(), retVal.getWest()], [retVal.getSouth(), retVal.getEast()]);
-    }
-
-    updateDataMap(_?) {
-        this._dataMap = {};
-        this._dataMinWeight = null;
-        this._dataMaxWeight = null;
-
-        const context = this;
-        _.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];
-            }
-        });
-    }
-
-    data(_?) {
-        const retVal = super.data.apply(this, arguments);
-        if (arguments.length) {
-            this.updateDataMap(_);
-        }
-        return retVal;
-    }
-
-    styleFeature(feature) {
-        const d = this._dataMap[feature.properties.hpccID];
-        const fillColor = d ? this._palette(d[1], this._dataMinWeight, this._dataMaxWeight) : "transparent";
-        return {
-            color: this.meshVisible() ? this.meshColor() : undefined,
-            opacity: 1,
-            weight: this.meshStrokeWidth(),
-            fillColor,
-            fillOpacity: this.opacity()
-        };
-    }
-
-    svgGlowID() {
-        return this.id() + "_svgGlow";
-    }
-
-    private _topoJson;
-    private _svgElement;
-    layerEnter(map: Map) {
-        super.layerEnter(map);
-        if (!this._svgElement) {
-            this._svgElement = d3Select(map.getContainer()).select(".leaflet-pane.leaflet-overlay-pane > svg");
-            const svgDefs = this._svgElement.append("defs");
-            new SVGGlowFilter(svgDefs, this.svgGlowID());
-            this._selection.widgetElement(this._svgElement);
-        }
-    }
-
-    private _prevFeatures;
-    layerUpdate(map: Map) {
-        if (this._prevFeatures !== this._features) {
-            this.clear();
-            this._topoJson = new TopoJSON(this._features, {
-                onEachFeature: (f, l) => {
-                    l.on("click", e => this.clickHandler(e, l, l.feature.properties.hpccID));
-                }
-            }).bindTooltip((l: any) => this.tooltipHandler(l, l.feature.properties.hpccID), {
-                direction: "top",
-                sticky: true
-            });
-            this.add(this._topoJson);
-        }
-        super.layerUpdate(map);
-
-        this._palette = this._palette.switch(this.paletteID());
-        if (this.useClonedPalette()) {
-            this._palette = this._palette.cloneNotExists(this.paletteID() + "_" + this.id());
-        }
-
-        this._topoJson.setStyle(feature => this.styleFeature(feature));
-    }
-
-    //  Events  ---
-    clickHandler(e, l, featureID): boolean {
-        const sel = this._selection.click(e.originalEvent.target);
-        this.click(this.rowToObj(this._dataMap[featureID]), this.columns()[0], sel);
-        return sel;
-    }
-
-    tooltipText(row: object, tooltip: string): string {
-        return tooltip;
-    }
-
-    tooltipHandler(l, featureID) {
-        const row = this._dataMap[featureID];
-        const value = row && row[1] || "";
-        return this.tooltipText(this.rowToObj(row), `<b>${featureID}</b>:  ${value}`);
-    }
-
-    //  Events  ---
-    click(row, col, sel) {
-    }
-}
-World.prototype._class += " map_World";
-World.prototype._palette = Palette.rainbow("default");
-World.prototype.mixin(Utility.SimpleSelectionMixin);
-
-export interface World {
-    paletteID(): string;
-    paletteID(_: string): this;
-    paletteID_exists(): boolean;
-    useClonedPalette(): boolean;
-    useClonedPalette(_: boolean): this;
-    useClonedPalette_exists(): boolean;
-
-    opacity(): number;
-    opacity(_: number): this;
-    opacity_default(_: 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;
-}
-
-World.prototype.publish("paletteID", "YlOrRd", "set", "Color palette for this widget", World.prototype._palette.switch(), { tags: ["Basic", "Shared"] });
-World.prototype.publish("useClonedPalette", false, "boolean", "Enable or disable using a cloned palette", null, { tags: ["Intermediate", "Shared"] });
-
-World.prototype.publish("opacity", 0.5, "number", "Opacity", null, { tags: ["Advanced"] });
-
-World.prototype.publish("meshVisible", true, "boolean", "Mesh Visibility");
-World.prototype.publish("meshColor", "black", "html-color", "Stroke Color");
-World.prototype.publish("meshStrokeWidth", 0.25, "number", "Stroke Width");
-World.prototype.publish("internalOnly", false, "boolean", "Internal mesh only");
+import { Palette, SVGGlowFilter, Utility } from "@hpcc-js/common";
+import { LatLngBounds, Map } from "./leaflet-shim.ts";
+import { select as d3Select } from "d3-selection";
+import { FeatureLayer } from "./FeatureLayer.ts";
+import { TopoJSON } from "./TopoJSON.ts";
+
+import "../../src/leaflet/World.css";
+
+export class World extends FeatureLayer {
+
+    protected _features;
+    _palette;
+
+    protected _dataMap = {};
+    protected _dataMinWeight = null;
+    protected _dataMaxWeight = null;
+
+    constructor() {
+        super();
+        Utility.SimpleSelectionMixin.call(this);
+    }
+
+    hasBounds() {
+        return true;
+    }
+
+    getBounds() {
+        const retVal = super.getBounds();
+        if (!retVal.isValid()) {
+            return new LatLngBounds([90, -180], [-90, 180]);
+        }
+        return new LatLngBounds([retVal.getNorth(), retVal.getWest()], [retVal.getSouth(), retVal.getEast()]);
+    }
+
+    updateDataMap(_?) {
+        this._dataMap = {};
+        this._dataMinWeight = null;
+        this._dataMaxWeight = null;
+
+        const context = this;
+        _.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];
+            }
+        });
+    }
+
+    data(_?) {
+        const retVal = super.data.apply(this, arguments);
+        if (arguments.length) {
+            this.updateDataMap(_);
+        }
+        return retVal;
+    }
+
+    styleFeature(feature) {
+        const d = this._dataMap[feature.properties.hpccID];
+        const fillColor = d ? this._palette(d[1], this._dataMinWeight, this._dataMaxWeight) : "transparent";
+        return {
+            color: this.meshVisible() ? this.meshColor() : undefined,
+            opacity: 1,
+            weight: this.meshStrokeWidth(),
+            fillColor,
+            fillOpacity: this.opacity()
+        };
+    }
+
+    svgGlowID() {
+        return this.id() + "_svgGlow";
+    }
+
+    private _topoJson;
+    private _svgElement;
+    layerEnter(map: Map) {
+        super.layerEnter(map);
+        if (!this._svgElement) {
+            this._svgElement = d3Select(map.getContainer()).select(".leaflet-pane.leaflet-overlay-pane > svg");
+            const svgDefs = this._svgElement.append("defs");
+            new SVGGlowFilter(svgDefs, this.svgGlowID());
+            this._selection.widgetElement(this._svgElement);
+        }
+    }
+
+    private _prevFeatures;
+    layerUpdate(map: Map) {
+        if (this._prevFeatures !== this._features) {
+            this.clear();
+            this._topoJson = new TopoJSON(this._features, {
+                onEachFeature: (f, l) => {
+                    l.on("click", e => this.clickHandler(e, l, l.feature.properties.hpccID));
+                }
+            }).bindTooltip((l: any) => this.tooltipHandler(l, l.feature.properties.hpccID), {
+                direction: "top",
+                sticky: true
+            });
+            this.add(this._topoJson);
+        }
+        super.layerUpdate(map);
+
+        this._palette = this._palette.switch(this.paletteID());
+        if (this.useClonedPalette()) {
+            this._palette = this._palette.cloneNotExists(this.paletteID() + "_" + this.id());
+        }
+
+        this._topoJson.setStyle(feature => this.styleFeature(feature));
+    }
+
+    //  Events  ---
+    clickHandler(e, l, featureID): boolean {
+        const sel = this._selection.click(e.originalEvent.target);
+        this.click(this.rowToObj(this._dataMap[featureID]), this.columns()[0], sel);
+        return sel;
+    }
+
+    tooltipText(row: object, tooltip: string): string {
+        return tooltip;
+    }
+
+    tooltipHandler(l, featureID) {
+        const row = this._dataMap[featureID];
+        const value = row && row[1] || "";
+        return this.tooltipText(this.rowToObj(row), `<b>${featureID}</b>:  ${value}`);
+    }
+
+    //  Events  ---
+    click(row, col, sel) {
+    }
+}
+World.prototype._class += " map_World";
+World.prototype._palette = Palette.rainbow("default");
+World.prototype.mixin(Utility.SimpleSelectionMixin);
+
+export interface World {
+    paletteID(): string;
+    paletteID(_: string): this;
+    paletteID_exists(): boolean;
+    useClonedPalette(): boolean;
+    useClonedPalette(_: boolean): this;
+    useClonedPalette_exists(): boolean;
+
+    opacity(): number;
+    opacity(_: number): this;
+    opacity_default(_: 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;
+}
+
+World.prototype.publish("paletteID", "YlOrRd", "set", "Color palette for this widget", World.prototype._palette.switch(), { tags: ["Basic", "Shared"] });
+World.prototype.publish("useClonedPalette", false, "boolean", "Enable or disable using a cloned palette", null, { tags: ["Intermediate", "Shared"] });
+
+World.prototype.publish("opacity", 0.5, "number", "Opacity", null, { tags: ["Advanced"] });
+
+World.prototype.publish("meshVisible", true, "boolean", "Mesh Visibility");
+World.prototype.publish("meshColor", "black", "html-color", "Stroke Color");
+World.prototype.publish("meshStrokeWidth", 0.25, "number", "Stroke Width");
+World.prototype.publish("internalOnly", false, "boolean", "Internal mesh only");

package/src/leaflet/index.ts

@@ -1,18 +1,18 @@
-export * from "./Circles.ts";
-export * from "./ClusterCircles.ts";
-export * from "./Countries.ts";
-export * from "./DrawLayer.ts";
-export * from "./FeatureLayer.ts";
-export * from "./HeatLayer.ts";
-export * from "./Icons.ts";
-export * from "./Leaflet.ts";
-export * from "./Markers.ts";
-export * from "./Polygons.ts";
-export * from "./Path.ts";
-export * from "./Pins.ts";
-export * from "./Region.ts";
-export * from "./Text.ts";
-export * from "./TileLayer.ts";
-export * from "./USCounties.ts";
-export * from "./USStates.ts";
-export * from "./World.ts";
+export * from "./Circles.ts";
+export * from "./ClusterCircles.ts";
+export * from "./Countries.ts";
+export * from "./DrawLayer.ts";
+export * from "./FeatureLayer.ts";
+export * from "./HeatLayer.ts";
+export * from "./Icons.ts";
+export * from "./Leaflet.ts";
+export * from "./Markers.ts";
+export * from "./Polygons.ts";
+export * from "./Path.ts";
+export * from "./Pins.ts";
+export * from "./Region.ts";
+export * from "./Text.ts";
+export * from "./TileLayer.ts";
+export * from "./USCounties.ts";
+export * from "./USStates.ts";
+export * from "./World.ts";

package/src/leaflet/leaflet-shim.ts

@@ -1,19 +1,19 @@
-import L, { Circle, Control, CRS, Direction, DivIcon, Draw, FeatureGroup, GeoJSON, Icon, LatLng, LatLngBounds, LatLngExpression, LeafletEvent, Map, Marker, point, Point, Polygon, Polyline, Rectangle, TileLayer, Transformation, Util } from "leaflet";
-
-import "leaflet/dist/leaflet.css";
-
-import "leaflet-draw";
-import "leaflet-draw/dist/leaflet.draw.css";
-import "leaflet.markercluster";
-import "leaflet.markercluster/dist/MarkerCluster.css";
-import "leaflet.markercluster/dist/MarkerCluster.Default.css";
-
-export { GoogleMutant } from "./plugins/Leaflet.GoogleMutant.ts";
-export { BeautifyIcon } from "./plugins/BeautifyIcon.ts";
-export { D3SvgOverlay } from "./plugins/D3SvgOverlay.ts";
-export { HeatLayer as LHeatLayer } from "./plugins/HeatLayer.ts";
-
-export type MarkerClusterGroup = L.MarkerClusterGroup;
-export const MarkerClusterGroup = L.MarkerClusterGroup;
-
+import L, { Circle, Control, CRS, Direction, DivIcon, Draw, FeatureGroup, GeoJSON, Icon, LatLng, LatLngBounds, LatLngExpression, LeafletEvent, Map, Marker, point, Point, Polygon, Polyline, Rectangle, TileLayer, Transformation, Util } from "leaflet";
+
+import "leaflet/dist/leaflet.css";
+
+import "leaflet-draw";
+import "leaflet-draw/dist/leaflet.draw.css";
+import "leaflet.markercluster";
+import "leaflet.markercluster/dist/MarkerCluster.css";
+import "leaflet.markercluster/dist/MarkerCluster.Default.css";
+
+export { GoogleMutant } from "./plugins/Leaflet.GoogleMutant.ts";
+export { BeautifyIcon } from "./plugins/BeautifyIcon.ts";
+export { D3SvgOverlay } from "./plugins/D3SvgOverlay.ts";
+export { HeatLayer as LHeatLayer } from "./plugins/HeatLayer.ts";
+
+export type MarkerClusterGroup = L.MarkerClusterGroup;
+export const MarkerClusterGroup = L.MarkerClusterGroup;
+
 export { L, Circle, Control, CRS, type Direction, DivIcon, Draw, FeatureGroup, GeoJSON, Icon, LatLng, LatLngBounds, type LatLngExpression, type LeafletEvent, Map, Marker, point, Point, Polygon, Polyline, Rectangle, TileLayer, Transformation, Util };