@hpcc-js/map 2.79.2 → 2.79.3

package/src/leaflet/Text.ts

@@ -1,99 +1,99 @@
-import { BeautifyIcon, Map } from "@hpcc-js/leaflet-shim";
-import { format as d3Format } from "d3-format";
-import { Markers } from "./Markers";
-
-export class Text extends Markers {
-
-    constructor(cluster = false) {
-        super(cluster);
-    }
-
-    layerUpdate(map: Map) {
-        const columns = this.columns();
-        const textIdx = columns.indexOf(this.textColumn());
-        const textColorIdx = columns.indexOf(this.textColorColumn());
-        const strokeColorIdx = columns.indexOf(this.strokeColorColumn());
-        const fillColorIdx = columns.indexOf(this.fillColorColumn());
-        super.layerUpdate(map, (row) => {
-            let text = this.propValue(textIdx, row, this.text());
-            const textSize = this.textSize(text, this.fontFamily(), this.fontSize());
-            if (this.textFormat_exists()) {
-                text = d3Format(this.textFormat())(text);
-            }
-            return {
-                icon: BeautifyIcon({
-                    iconShape: "rectangle",
-                    iconAnchor: [
-                        (textSize.width / 2) + this.textOffsetX(),
-                        (textSize.height / 2) + this.textOffsetY()
-                    ],
-                    html: `<span style="
-                        ${this.fontFamily_exists() ? `font-family:${this.fontFamily()};` : ""}
-                        font-size:${this.fontSize()}px;
-                        pointer-events: none;
-                        white-space:nowrap;
-                        ">${text}</span>`,
-                    textColor: this.propValue(textColorIdx, row, this.textColor()),
-                    borderColor: this.propValue(strokeColorIdx, row, this.strokeColor()),
-                    backgroundColor: this.propValue(fillColorIdx, row, this.fillColor()),
-                    props: {
-                        owner: this,
-                        row
-                    }
-                }),
-                draggable: false
-            };
-        });
-    }
-}
-Text.prototype._class += " map_Text";
-
-export interface Text {
-    text(): string;
-    text(_: string);
-    textColumn(): string;
-    textColumn(_: string);
-    textColumn_exists(): boolean;
-    textColor(): string;
-    textColor(_: string);
-    textColorColumn(): string;
-    textColorColumn(_: string);
-    textColorColumn_exists(): boolean;
-    strokeColor(): string;
-    strokeColor(_: string);
-    strokeColorColumn(): string;
-    strokeColorColumn(_: string);
-    strokColorColumn_exists(): boolean;
-    fillColor(): string;
-    fillColor(_: string);
-    fillColorColumn(): string;
-    fillColorColumn(_: string);
-    fillColorColumn_exists(): boolean;
-    fontFamily(): string;
-    fontFamily(_: string);
-    fontFamily_exists(): boolean;
-    fontSize(): number;
-    fontSize(_: number);
-    textOffsetX(): number;
-    textOffsetX(_: number): this;
-    textOffsetY(): number;
-    textOffsetY(_: number): this;
-    textFormat(): string;
-    textFormat(_: string): this;
-    textFormat_exists(): boolean;
-}
-
-Text.prototype.publish("textOffsetX", 0, "number", "Horizontal offset of text");
-Text.prototype.publish("textOffsetY", 0, "number", "Vertical offset of text");
-Text.prototype.publish("text", "", "string", "Default text");
-Text.prototype.publish("textColumn", null, "set", "Font awesome column", function () { return this.columns(); }, { optional: true });
-Text.prototype.publish("textColor", "#ffffff", "html-color", "Default  font awesome Color");
-Text.prototype.publish("textColorColumn", null, "set", "Text color column", function () { return this.columns(); }, { optional: true });
-Text.prototype.publish("textFontFamily", null, "set", "Text color column", function () { return this.columns(); }, { optional: true });
-Text.prototype.publish("strokeColor", "transparent", "html-color", "Default stroke Color", null, { optional: true });
-Text.prototype.publish("strokeColorColumn", null, "set", "Stroke color column", function () { return this.columns(); }, { optional: true });
-Text.prototype.publish("fillColor", "#376cea", "html-color", "Default fill Color", null, { optional: true });
-Text.prototype.publish("fillColorColumn", null, "set", "Fill color column", function () { return this.columns(); }, { optional: true });
-Text.prototype.publish("fontFamily", null, "string", "Font family", null, { optional: true });
-Text.prototype.publish("fontSize", 16, "number", "Font family", null, { optional: true });
-Text.prototype.publish("textFormat", null, "string", "Format rules for text", null, { optional: true });
+import { BeautifyIcon, Map } from "@hpcc-js/leaflet-shim";
+import { format as d3Format } from "d3-format";
+import { Markers } from "./Markers";
+
+export class Text extends Markers {
+
+    constructor(cluster = false) {
+        super(cluster);
+    }
+
+    layerUpdate(map: Map) {
+        const columns = this.columns();
+        const textIdx = columns.indexOf(this.textColumn());
+        const textColorIdx = columns.indexOf(this.textColorColumn());
+        const strokeColorIdx = columns.indexOf(this.strokeColorColumn());
+        const fillColorIdx = columns.indexOf(this.fillColorColumn());
+        super.layerUpdate(map, (row) => {
+            let text = this.propValue(textIdx, row, this.text());
+            const textSize = this.textSize(text, this.fontFamily(), this.fontSize());
+            if (this.textFormat_exists()) {
+                text = d3Format(this.textFormat())(text);
+            }
+            return {
+                icon: BeautifyIcon({
+                    iconShape: "rectangle",
+                    iconAnchor: [
+                        (textSize.width / 2) + this.textOffsetX(),
+                        (textSize.height / 2) + this.textOffsetY()
+                    ],
+                    html: `<span style="
+                        ${this.fontFamily_exists() ? `font-family:${this.fontFamily()};` : ""}
+                        font-size:${this.fontSize()}px;
+                        pointer-events: none;
+                        white-space:nowrap;
+                        ">${text}</span>`,
+                    textColor: this.propValue(textColorIdx, row, this.textColor()),
+                    borderColor: this.propValue(strokeColorIdx, row, this.strokeColor()),
+                    backgroundColor: this.propValue(fillColorIdx, row, this.fillColor()),
+                    props: {
+                        owner: this,
+                        row
+                    }
+                }),
+                draggable: false
+            };
+        });
+    }
+}
+Text.prototype._class += " map_Text";
+
+export interface Text {
+    text(): string;
+    text(_: string);
+    textColumn(): string;
+    textColumn(_: string);
+    textColumn_exists(): boolean;
+    textColor(): string;
+    textColor(_: string);
+    textColorColumn(): string;
+    textColorColumn(_: string);
+    textColorColumn_exists(): boolean;
+    strokeColor(): string;
+    strokeColor(_: string);
+    strokeColorColumn(): string;
+    strokeColorColumn(_: string);
+    strokColorColumn_exists(): boolean;
+    fillColor(): string;
+    fillColor(_: string);
+    fillColorColumn(): string;
+    fillColorColumn(_: string);
+    fillColorColumn_exists(): boolean;
+    fontFamily(): string;
+    fontFamily(_: string);
+    fontFamily_exists(): boolean;
+    fontSize(): number;
+    fontSize(_: number);
+    textOffsetX(): number;
+    textOffsetX(_: number): this;
+    textOffsetY(): number;
+    textOffsetY(_: number): this;
+    textFormat(): string;
+    textFormat(_: string): this;
+    textFormat_exists(): boolean;
+}
+
+Text.prototype.publish("textOffsetX", 0, "number", "Horizontal offset of text");
+Text.prototype.publish("textOffsetY", 0, "number", "Vertical offset of text");
+Text.prototype.publish("text", "", "string", "Default text");
+Text.prototype.publish("textColumn", null, "set", "Font awesome column", function () { return this.columns(); }, { optional: true });
+Text.prototype.publish("textColor", "#ffffff", "html-color", "Default  font awesome Color");
+Text.prototype.publish("textColorColumn", null, "set", "Text color column", function () { return this.columns(); }, { optional: true });
+Text.prototype.publish("textFontFamily", null, "set", "Text color column", function () { return this.columns(); }, { optional: true });
+Text.prototype.publish("strokeColor", "transparent", "html-color", "Default stroke Color", null, { optional: true });
+Text.prototype.publish("strokeColorColumn", null, "set", "Stroke color column", function () { return this.columns(); }, { optional: true });
+Text.prototype.publish("fillColor", "#376cea", "html-color", "Default fill Color", null, { optional: true });
+Text.prototype.publish("fillColorColumn", null, "set", "Fill color column", function () { return this.columns(); }, { optional: true });
+Text.prototype.publish("fontFamily", null, "string", "Font family", null, { optional: true });
+Text.prototype.publish("fontSize", 16, "number", "Font family", null, { optional: true });
+Text.prototype.publish("textFormat", null, "string", "Format rules for text", null, { optional: true });

package/src/leaflet/TileLayer.ts

@@ -1,81 +1,81 @@
-import { Widget } from "@hpcc-js/common";
-import { CRS, FeatureGroup, LatLngBounds, LeafletEvent, Map } from "@hpcc-js/leaflet-shim";
-
-export interface ILayer {
-
-    init(): Promise<void>;
-    hasBounds(): boolean;
-    getBounds(): LatLngBounds;
-
-    layerEnter(map: Map);
-    layerUpdate(map: Map);
-    layerExit(map: Map);
-
-    zoomEnd(e);
-    moveEnd(e);
-    viewReset(e);
-}
-
-export class TileLayer extends Widget implements ILayer {
-    private _layer = new FeatureGroup();
-    protected _crs: any = CRS.EPSG3857;
-
-    constructor(cluster = false) {
-        super();
-        (this._layer as any).__hpcc_layer = this;
-    }
-
-    crs() {
-        return this._crs;
-    }
-
-    attribution(): string {
-        return "";
-    }
-
-    clear() {
-        this._layer.clearLayers();
-    }
-
-    add(layer) {
-        this._layer.addLayer(layer);
-    }
-
-    //  ILayer  ---
-    protected _initPromise;
-    init(): Promise<void> {
-        if (!this._initPromise) {
-            this._initPromise = Promise.resolve();
-        }
-        return this._initPromise;
-    }
-
-    hasBounds(): boolean {
-        return false;
-    }
-
-    getBounds(): LatLngBounds {
-        return this._layer.getBounds();
-    }
-
-    layerEnter(map: Map) {
-        map.addLayer(this._layer);
-    }
-
-    layerUpdate(map: Map) {
-    }
-
-    layerExit(map: Map) {
-        this._layer.clearLayers();
-        map.removeLayer(this._layer);
-    }
-
-    zoomEnd(e: LeafletEvent) {
-    }
-
-    moveEnd(e: LeafletEvent) {
-    }
-
-    viewReset(e: LeafletEvent) {
-    }
-}
+import { Widget } from "@hpcc-js/common";
+import { CRS, FeatureGroup, LatLngBounds, LeafletEvent, Map } from "@hpcc-js/leaflet-shim";
+
+export interface ILayer {
+
+    init(): Promise<void>;
+    hasBounds(): boolean;
+    getBounds(): LatLngBounds;
+
+    layerEnter(map: Map);
+    layerUpdate(map: Map);
+    layerExit(map: Map);
+
+    zoomEnd(e);
+    moveEnd(e);
+    viewReset(e);
+}
+
+export class TileLayer extends Widget implements ILayer {
+    private _layer = new FeatureGroup();
+    protected _crs: any = CRS.EPSG3857;
+
+    constructor(cluster = false) {
+        super();
+        (this._layer as any).__hpcc_layer = this;
+    }
+
+    crs() {
+        return this._crs;
+    }
+
+    attribution(): string {
+        return "";
+    }
+
+    clear() {
+        this._layer.clearLayers();
+    }
+
+    add(layer) {
+        this._layer.addLayer(layer);
+    }
+
+    //  ILayer  ---
+    protected _initPromise;
+    init(): Promise<void> {
+        if (!this._initPromise) {
+            this._initPromise = Promise.resolve();
+        }
+        return this._initPromise;
+    }
+
+    hasBounds(): boolean {
+        return false;
+    }
+
+    getBounds(): LatLngBounds {
+        return this._layer.getBounds();
+    }
+
+    layerEnter(map: Map) {
+        map.addLayer(this._layer);
+    }
+
+    layerUpdate(map: Map) {
+    }
+
+    layerExit(map: Map) {
+        this._layer.clearLayers();
+        map.removeLayer(this._layer);
+    }
+
+    zoomEnd(e: LeafletEvent) {
+    }
+
+    moveEnd(e: LeafletEvent) {
+    }
+
+    viewReset(e: LeafletEvent) {
+    }
+}

package/src/leaflet/TopoJSON.ts

@@ -1,146 +1,146 @@
-import { GeoJSON, Map } from "@hpcc-js/leaflet-shim";
-import { json as d3Json } from "d3-request";
-import * as topojson from "topojson-client";
-import { topoJsonFolder } from "../Choropleth";
-import { FeatureLayer } from "./FeatureLayer";
-
-export function fixDateLine(feature, layer) {
-    const latlongs = layer.getLatLngs();
-    latlongs.forEach(function (shape) {
-        shape.forEach(function (cord) {
-            if (Array.isArray(cord)) {
-                const cutoff = 165;
-                let lhs = 0;
-                let rhs = 0;
-                let vlhs = 0;
-                let vrhs = 0;
-                cord.forEach(function (pnt) {
-                    if (pnt.lat > -62) {    //  Ignore Antartica
-                        if (pnt.lng > cutoff) {
-                            ++vrhs;
-                        } else if (pnt.lng < -cutoff) {
-                            ++vlhs;
-                        }
-                        if (pnt.lng > 0) {
-                            ++rhs;
-                        } else if (pnt.lng < 0) {
-                            ++lhs;
-                        }
-                    }
-                });
-                if (vlhs > 0 && vrhs > 0) {
-                    cord.forEach(function (pnt) {
-                        if (pnt.lng > cutoff && lhs > rhs) {
-                            pnt.lng -= 360;
-                        } else if (pnt.lng < -cutoff && rhs > lhs) {
-                            pnt.lng += 360;
-                        }
-                    });
-                }
-            }
-        });
-    });
-    layer.setLatLngs(latlongs);
-}
-
-export class TopoJSON extends GeoJSON {
-
-    constructor(data, options) {
-        super(data, {
-            ...options,
-            onEachFeature: (feature, layer) => {
-                if (options.onEachFeature) {
-                    options.onEachFeature(feature, layer);
-                }
-                fixDateLine(feature, layer);
-            }
-        });
-    }
-
-    addData(data) {
-        let geojson;
-        let key;
-        if (data.type === "Topology") {
-            for (key in data.objects) {
-                if (data.objects.hasOwnProperty(key)) {
-                    geojson = topojson.feature(data, data.objects[key]);
-                    super.addData.call(this, geojson);
-                }
-            }
-            return this;
-        }
-        super.addData.call(this, data);
-        return this;
-    }
-}
-
-let usStates = null;
-let usCounties = null;
-let features = null;
-let rFeatures = null;
-export class TopoJSONLayer extends FeatureLayer {
-
-    initStates(): Promise<void> {
-        if (!this._initPromise) {
-            this._initPromise = new Promise<void>((resolve, reject) => {
-                if (usStates) {
-                    resolve();
-                }
-                d3Json(`${topoJsonFolder()}/us-states.json`, function (_usStates) {
-                    usStates = _usStates;
-                    features = topojson.feature(usStates.topology, usStates.topology.objects.states).features;
-                    rFeatures = {};
-                    for (const key in features) {
-                        if (features[key].id) {
-                            rFeatures[usStates.stateNames[features[key].id].code] = features[key];
-                        }
-                    }
-                    resolve();
-                });
-            });
-        }
-        return this._initPromise;
-    }
-
-    initCounties(): Promise<void> {
-        if (!this._initPromise) {
-            this._initPromise = new Promise<void>((resolve, reject) => {
-                if (usCounties) {
-                    resolve();
-                }
-                d3Json(`${topoJsonFolder()}/us-counties.json`, function (_usCounties) {
-                    usCounties = _usCounties;
-                    features = topojson.feature(usCounties.topology, usCounties.topology.objects.counties).features;
-                    rFeatures = {};
-                    for (const key in features) {
-                        if (features[key].id) {
-                            rFeatures[features[key].id] = features[key];
-                        }
-                    }
-                    resolve();
-                });
-            });
-        }
-        return this._initPromise;
-    }
-
-    init(): Promise<void> {
-        return this.initCounties();
-    }
-
-    layerEnter(map: Map) {
-        super.layerEnter(map);
-        const topoJSON = new TopoJSON(features, {
-            style(feature) {
-                return {
-                    color: "#000",
-                    opacity: 1,
-                    weight: 1,
-                    fillColor: "#35495d",
-                    fillOpacity: 0.2
-                };
-            }
-        });
-        this.add(topoJSON);
-    }
-}
+import { GeoJSON, Map } from "@hpcc-js/leaflet-shim";
+import { json as d3Json } from "d3-request";
+import * as topojson from "topojson-client";
+import { topoJsonFolder } from "../Choropleth";
+import { FeatureLayer } from "./FeatureLayer";
+
+export function fixDateLine(feature, layer) {
+    const latlongs = layer.getLatLngs();
+    latlongs.forEach(function (shape) {
+        shape.forEach(function (cord) {
+            if (Array.isArray(cord)) {
+                const cutoff = 165;
+                let lhs = 0;
+                let rhs = 0;
+                let vlhs = 0;
+                let vrhs = 0;
+                cord.forEach(function (pnt) {
+                    if (pnt.lat > -62) {    //  Ignore Antartica
+                        if (pnt.lng > cutoff) {
+                            ++vrhs;
+                        } else if (pnt.lng < -cutoff) {
+                            ++vlhs;
+                        }
+                        if (pnt.lng > 0) {
+                            ++rhs;
+                        } else if (pnt.lng < 0) {
+                            ++lhs;
+                        }
+                    }
+                });
+                if (vlhs > 0 && vrhs > 0) {
+                    cord.forEach(function (pnt) {
+                        if (pnt.lng > cutoff && lhs > rhs) {
+                            pnt.lng -= 360;
+                        } else if (pnt.lng < -cutoff && rhs > lhs) {
+                            pnt.lng += 360;
+                        }
+                    });
+                }
+            }
+        });
+    });
+    layer.setLatLngs(latlongs);
+}
+
+export class TopoJSON extends GeoJSON {
+
+    constructor(data, options) {
+        super(data, {
+            ...options,
+            onEachFeature: (feature, layer) => {
+                if (options.onEachFeature) {
+                    options.onEachFeature(feature, layer);
+                }
+                fixDateLine(feature, layer);
+            }
+        });
+    }
+
+    addData(data) {
+        let geojson;
+        let key;
+        if (data.type === "Topology") {
+            for (key in data.objects) {
+                if (data.objects.hasOwnProperty(key)) {
+                    geojson = topojson.feature(data, data.objects[key]);
+                    super.addData.call(this, geojson);
+                }
+            }
+            return this;
+        }
+        super.addData.call(this, data);
+        return this;
+    }
+}
+
+let usStates = null;
+let usCounties = null;
+let features = null;
+let rFeatures = null;
+export class TopoJSONLayer extends FeatureLayer {
+
+    initStates(): Promise<void> {
+        if (!this._initPromise) {
+            this._initPromise = new Promise<void>((resolve, reject) => {
+                if (usStates) {
+                    resolve();
+                }
+                d3Json(`${topoJsonFolder()}/us-states.json`, function (_usStates) {
+                    usStates = _usStates;
+                    features = topojson.feature(usStates.topology, usStates.topology.objects.states).features;
+                    rFeatures = {};
+                    for (const key in features) {
+                        if (features[key].id) {
+                            rFeatures[usStates.stateNames[features[key].id].code] = features[key];
+                        }
+                    }
+                    resolve();
+                });
+            });
+        }
+        return this._initPromise;
+    }
+
+    initCounties(): Promise<void> {
+        if (!this._initPromise) {
+            this._initPromise = new Promise<void>((resolve, reject) => {
+                if (usCounties) {
+                    resolve();
+                }
+                d3Json(`${topoJsonFolder()}/us-counties.json`, function (_usCounties) {
+                    usCounties = _usCounties;
+                    features = topojson.feature(usCounties.topology, usCounties.topology.objects.counties).features;
+                    rFeatures = {};
+                    for (const key in features) {
+                        if (features[key].id) {
+                            rFeatures[features[key].id] = features[key];
+                        }
+                    }
+                    resolve();
+                });
+            });
+        }
+        return this._initPromise;
+    }
+
+    init(): Promise<void> {
+        return this.initCounties();
+    }
+
+    layerEnter(map: Map) {
+        super.layerEnter(map);
+        const topoJSON = new TopoJSON(features, {
+            style(feature) {
+                return {
+                    color: "#000",
+                    opacity: 1,
+                    weight: 1,
+                    fillColor: "#35495d",
+                    fillOpacity: 0.2
+                };
+            }
+        });
+        this.add(topoJSON);
+    }
+}