@hpcc-js/map 3.5.1 → 3.5.4

package/src/leaflet/Markers.ts

@@ -1,109 +1,109 @@
-import { Map, Marker, point, Direction } from "./leaflet-shim.ts";
-import { ClusterLayer } from "./FeatureLayer.ts";
-
-export class Markers extends ClusterLayer {
-
-    constructor(cluster = false) {
-        super(cluster);
-    }
-
-    hasBounds(): boolean {
-        return true;
-    }
-
-    tooltipText(row: object, tooltip: string): string {
-        return "" + tooltip;
-    }
-
-    popupText(row: object, popup: string): string {
-        return "" + popup;
-    }
-
-    private _hashSum;
-    layerUpdate(map: Map, markerOptions?: (row) => object) {
-        super.layerUpdate(map);
-        if (!markerOptions) return;
-
-        const columns = this.columns();
-        const latIdx = columns.indexOf(this.latitudeColumn());
-        const longIdx = columns.indexOf(this.longitudeColumn());
-        const tooltipIdx = columns.indexOf(this.tooltipColumn());
-        const popupIdx = columns.indexOf(this.popupColumn());
-        const dbChecksum = this._db.checksum();
-        const hashSum = this.hashSum([], {
-            dbChecksum
-        });
-
-        if (this._hashSum !== hashSum) {
-            this._hashSum = hashSum;
-            this.clear();
-            this.data().filter(row => !this.omitNullLatLong() || (!!row[latIdx] && !!row[longIdx])).forEach(row => {
-                const marker = new Marker([row[latIdx], row[longIdx]], markerOptions(row))
-                    .on("click", e => this.clickHandler(e, marker, row))
-                    ;
-                const tooltipText = this.tooltipText(this.rowToObj(row), this.propValue(tooltipIdx, row, ""));
-                if (tooltipText) {
-                    marker.bindTooltip(tooltipText, {
-                        direction: this.tooltipDirection(),
-                        offset: point(this.tooltipOffsetX(), this.tooltipOffsetY())
-                    });
-                }
-                const popupText = this.popupText(this.rowToObj(row), this.propValue(popupIdx, row, ""));
-                if (popupText) {
-                    marker.bindPopup(popupText, {
-                        offset: point(this.popupOffsetX(), this.popupOffsetY())
-                    });
-                }
-                this.add(marker);
-            });
-        }
-    }
-
-    _currSelRow;
-    clickHandler(e, marker, row) {
-        const sel = this._selection.click(marker._icon);
-        this._currSelRow = sel ? row : undefined;
-        this.click(this.rowToObj(row), "", sel);
-    }
-
-    //  Events  ---
-    click(row, col, sel) {
-    }
-}
-Markers.prototype._class += " map_Markers";
-
-export interface Markers {
-    latitudeColumn(): string;
-    latitudeColumn(_: string);
-    longitudeColumn(): string;
-    longitudeColumn(_: string);
-    omitNullLatLong(): boolean;
-    omitNullLatLong(_: boolean);
-    tooltipColumn(): string;
-    tooltipColumn(_: string);
-    tooltipColumn_exists(): boolean;
-    tooltipDirection(): Direction;
-    tooltipDirection(_: Direction);
-    tooltipOffsetX(): number;
-    tooltipOffsetX(_: number);
-    tooltipOffsetY(): number;
-    tooltipOffsetY(_: number);
-    popupColumn(): string;
-    popupColumn(_: string);
-    popupColumn_exists(): boolean;
-    popupOffsetX(): number;
-    popupOffsetX(_: number);
-    popupOffsetY(): number;
-    popupOffsetY(_: number);
-}
-
-Markers.prototype.publish("latitudeColumn", null, "set", "Latitude column", function () { return this.columns(); }, { optional: true });
-Markers.prototype.publish("longitudeColumn", null, "set", "Longitude column", function () { return this.columns(); }, { optional: true });
-Markers.prototype.publish("omitNullLatLong", true, "boolean", "Remove lat=0,lng=0 from IconsData", null, { tags: ["Basic"] });
-Markers.prototype.publish("tooltipColumn", null, "set", "Tooltip column", function () { return this.columns(); }, { optional: true });
-Markers.prototype.publish("tooltipDirection", "auto", "set", "Tooltip direction", ["auto", "left", "top", "right", "bottom", "center"]);
-Markers.prototype.publish("tooltipOffsetX", 0, "number", "Tooltip offset X");
-Markers.prototype.publish("tooltipOffsetY", 0, "number", "Tooltip offset Y");
-Markers.prototype.publish("popupColumn", null, "set", "Popup column", function () { return this.columns(); }, { optional: true });
-Markers.prototype.publish("popupOffsetX", 0, "number", "Tooltip offset X");
-Markers.prototype.publish("popupOffsetY", 0, "number", "Tooltip offset Y");
+import { Map, Marker, point, Direction } from "./leaflet-shim.ts";
+import { ClusterLayer } from "./FeatureLayer.ts";
+
+export class Markers extends ClusterLayer {
+
+    constructor(cluster = false) {
+        super(cluster);
+    }
+
+    hasBounds(): boolean {
+        return true;
+    }
+
+    tooltipText(row: object, tooltip: string): string {
+        return "" + tooltip;
+    }
+
+    popupText(row: object, popup: string): string {
+        return "" + popup;
+    }
+
+    private _hashSum;
+    layerUpdate(map: Map, markerOptions?: (row) => object) {
+        super.layerUpdate(map);
+        if (!markerOptions) return;
+
+        const columns = this.columns();
+        const latIdx = columns.indexOf(this.latitudeColumn());
+        const longIdx = columns.indexOf(this.longitudeColumn());
+        const tooltipIdx = columns.indexOf(this.tooltipColumn());
+        const popupIdx = columns.indexOf(this.popupColumn());
+        const dbChecksum = this._db.checksum();
+        const hashSum = this.hashSum([], {
+            dbChecksum
+        });
+
+        if (this._hashSum !== hashSum) {
+            this._hashSum = hashSum;
+            this.clear();
+            this.data().filter(row => !this.omitNullLatLong() || (!!row[latIdx] && !!row[longIdx])).forEach(row => {
+                const marker = new Marker([row[latIdx], row[longIdx]], markerOptions(row))
+                    .on("click", e => this.clickHandler(e, marker, row))
+                    ;
+                const tooltipText = this.tooltipText(this.rowToObj(row), this.propValue(tooltipIdx, row, ""));
+                if (tooltipText) {
+                    marker.bindTooltip(tooltipText, {
+                        direction: this.tooltipDirection(),
+                        offset: point(this.tooltipOffsetX(), this.tooltipOffsetY())
+                    });
+                }
+                const popupText = this.popupText(this.rowToObj(row), this.propValue(popupIdx, row, ""));
+                if (popupText) {
+                    marker.bindPopup(popupText, {
+                        offset: point(this.popupOffsetX(), this.popupOffsetY())
+                    });
+                }
+                this.add(marker);
+            });
+        }
+    }
+
+    _currSelRow;
+    clickHandler(e, marker, row) {
+        const sel = this._selection.click(marker._icon);
+        this._currSelRow = sel ? row : undefined;
+        this.click(this.rowToObj(row), "", sel);
+    }
+
+    //  Events  ---
+    click(row, col, sel) {
+    }
+}
+Markers.prototype._class += " map_Markers";
+
+export interface Markers {
+    latitudeColumn(): string;
+    latitudeColumn(_: string);
+    longitudeColumn(): string;
+    longitudeColumn(_: string);
+    omitNullLatLong(): boolean;
+    omitNullLatLong(_: boolean);
+    tooltipColumn(): string;
+    tooltipColumn(_: string);
+    tooltipColumn_exists(): boolean;
+    tooltipDirection(): Direction;
+    tooltipDirection(_: Direction);
+    tooltipOffsetX(): number;
+    tooltipOffsetX(_: number);
+    tooltipOffsetY(): number;
+    tooltipOffsetY(_: number);
+    popupColumn(): string;
+    popupColumn(_: string);
+    popupColumn_exists(): boolean;
+    popupOffsetX(): number;
+    popupOffsetX(_: number);
+    popupOffsetY(): number;
+    popupOffsetY(_: number);
+}
+
+Markers.prototype.publish("latitudeColumn", null, "set", "Latitude column", function () { return this.columns(); }, { optional: true });
+Markers.prototype.publish("longitudeColumn", null, "set", "Longitude column", function () { return this.columns(); }, { optional: true });
+Markers.prototype.publish("omitNullLatLong", true, "boolean", "Remove lat=0,lng=0 from IconsData", null, { tags: ["Basic"] });
+Markers.prototype.publish("tooltipColumn", null, "set", "Tooltip column", function () { return this.columns(); }, { optional: true });
+Markers.prototype.publish("tooltipDirection", "auto", "set", "Tooltip direction", ["auto", "left", "top", "right", "bottom", "center"]);
+Markers.prototype.publish("tooltipOffsetX", 0, "number", "Tooltip offset X");
+Markers.prototype.publish("tooltipOffsetY", 0, "number", "Tooltip offset Y");
+Markers.prototype.publish("popupColumn", null, "set", "Popup column", function () { return this.columns(); }, { optional: true });
+Markers.prototype.publish("popupOffsetX", 0, "number", "Tooltip offset X");
+Markers.prototype.publish("popupOffsetY", 0, "number", "Tooltip offset Y");

package/src/leaflet/OpenStreet.ts

@@ -1,27 +1,27 @@
-import { Map, TileLayer as LeafletTileLayer } from "./leaflet-shim.ts";
-import { TileLayer } from "./TileLayer.ts";
-
-export class OpenStreetLayer extends TileLayer {
-
-    constructor() {
-        super();
-    }
-
-    attribution(): string {
-        return "";
-    }
-
-    getMaxZoom(): number {
-        return 18;
-    }
-
-    layerEnter(map: Map) {
-        super.layerEnter(map);
-        this.add(new LeafletTileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
-            attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
-            maxZoom: 18,
-            id: "open.streets"
-        } as any));
-    }
-}
-OpenStreetLayer.prototype._class += " map_MapBoxLayer";
+import { Map, TileLayer as LeafletTileLayer } from "./leaflet-shim.ts";
+import { TileLayer } from "./TileLayer.ts";
+
+export class OpenStreetLayer extends TileLayer {
+
+    constructor() {
+        super();
+    }
+
+    attribution(): string {
+        return "";
+    }
+
+    getMaxZoom(): number {
+        return 18;
+    }
+
+    layerEnter(map: Map) {
+        super.layerEnter(map);
+        this.add(new LeafletTileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
+            attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
+            maxZoom: 18,
+            id: "open.streets"
+        } as any));
+    }
+}
+OpenStreetLayer.prototype._class += " map_MapBoxLayer";

package/src/leaflet/Path.ts

@@ -1,138 +1,138 @@
-import { Map } from "./leaflet-shim.ts";
-import { geoPath as d3GeoPath } from "d3-geo";
-import { resolve } from "../Projection.ts";
-import { D3SurfaceLayer } from "./FeatureLayer.ts";
-
-const projectionFactor = (1 << 12) / 2 / Math.PI;
-
-export type Coordinate = [number, number];
-export type Coordinates = [Coordinate, Coordinate];
-
-export class Path extends D3SurfaceLayer {
-
-    lineData(): Array<{ type: string, coordinates: Coordinates }> {
-        const columns = this.columns();
-        const latIdx = columns.indexOf(this.latitudeColumn());
-        const longIdx = columns.indexOf(this.longitudeColumn());
-        const retVal = [];
-        let prevLatLng;
-        this.data().forEach(row => {
-            const currLatLng: Coordinate = [row[longIdx], row[latIdx]];
-            if (prevLatLng) {
-                retVal.push({
-                    type: "LineString",
-                    coordinates: [currLatLng, prevLatLng]
-                });
-            }
-            prevLatLng = currLatLng;
-        });
-        return retVal;
-    }
-
-    isNull(coord: Coordinate) {
-        return !coord[0] && !coord[1];
-    }
-
-    isNull2(coords: Coordinates) {
-        if (!this.omitNullLatLong()) return false;
-        return this.isNull(coords[0]) || this.isNull(coords[1]);
-    }
-
-    layerUpdate(map: Map, projection?) {
-        super.layerUpdate(map, projection);
-        const element = this._lfd3._rootGroup;
-        projection = projection || this._lfd3.projection;
-
-        const updateDefs = this._lfd3.svg().selectAll("defs").data([undefined]);
-        updateDefs.enter().append("defs").append("marker")
-            .attr("class", "marker")
-            .attr("id", this._id + "_arrowHead")
-            .attr("viewBox", "0 0 10 10")
-            .attr("refX", 10)
-            .attr("refY", 5)
-            .attr("markerWidth", 12)
-            .attr("markerHeight", 12)
-            .attr("markerUnits", "strokeWidth")
-            .attr("orient", "auto")
-            .append("polyline")
-            .attr("points", "0,0 10,5 0,10 1,5")
-            ;
-        this._lfd3.svg().select("defs > marker")
-            .style("fill", this.strokeColor())
-            .style("stroke", null)
-            ;
-
-        const center = projection.latLngToLayerPoint({ lat: 0, lng: 0 });
-        const geoTransform = resolve("Mercator")
-            .scale(projectionFactor)
-            .translate([center.x, center.y])
-            ;
-        const geoPath = d3GeoPath().projection(geoTransform);
-
-        const updateSelection = element.selectAll(".dataEdge").data(this.lineData().filter(row => !this.isNull2(row.coordinates)));
-        updateSelection.enter().append("path")
-            .attr("class", "dataEdge")
-            .attr("marker-end", "url(#" + this._id + "_arrowHead)")
-            .merge(updateSelection)
-            .attr("d", geoPath)
-            .style("stroke", this.strokeColor())
-            .style("fill", "none")
-            .attr("stroke-width", 1 / projection.scale)
-            ;
-        updateSelection.exit().remove();
-    }
-
-    //  Events  ---
-    clickHandler(e, row) {
-    }
-
-}
-Path.prototype._class += " map_Path";
-
-export interface Path {
-    latitudeColumn(): string;
-    latitudeColumn(_: string): this;
-    longitudeColumn(): string;
-    longitudeColumn(_: string): this;
-    strokeColor(): string;
-    strokeColor(_: string): this;
-    omitNullLatLong(): boolean;
-    omitNullLatLong(_: boolean): this;
-}
-
-Path.prototype.publish("latitudeColumn", null, "set", "Latitude column", function () { return this.columns(); }, { optional: true });
-Path.prototype.publish("longitudeColumn", null, "set", "Longitude column", function () { return this.columns(); }, { optional: true });
-Path.prototype.publish("strokeColor", " #666666", "html-color", "Stroke Color", null, { optional: true });
-Path.prototype.publish("omitNullLatLong", true, "boolean", "Remove lat=0,lng=0 from pinsData", null, { tags: ["Basic"] });
-
-//  ---------------------------------------------------------------------------
-export class Lines extends Path {
-
-    lineData(): Array<{ type: string, coordinates: Coordinates }> {
-        const columns = this.columns();
-        const latIdx = columns.indexOf(this.latitudeColumn());
-        const longIdx = columns.indexOf(this.longitudeColumn());
-        const lat2Idx = columns.indexOf(this.latitude2Column());
-        const long2Idx = columns.indexOf(this.longitude2Column());
-        const retVal = [];
-        this.data().forEach(row => {
-            const currLatLng: Coordinate = [row[longIdx], row[latIdx]];
-            const currLatLng2: Coordinate = [row[long2Idx], row[lat2Idx]];
-            retVal.push({
-                type: "LineString",
-                coordinates: [currLatLng, currLatLng2]
-            });
-        });
-        return retVal;
-    }
-}
-Lines.prototype._class += " map_Lines";
-
-export interface Lines {
-    latitude2Column(): string;
-    latitude2Column(_: string): this;
-    longitude2Column(): string;
-    longitude2Column(_: string): this;
-}
-Lines.prototype.publish("latitude2Column", null, "set", "Latitude column", function () { return this.columns(); }, { optional: true });
-Lines.prototype.publish("longitude2Column", null, "set", "Longitude column", function () { return this.columns(); }, { optional: true });
+import { Map } from "./leaflet-shim.ts";
+import { geoPath as d3GeoPath } from "d3-geo";
+import { resolve } from "../Projection.ts";
+import { D3SurfaceLayer } from "./FeatureLayer.ts";
+
+const projectionFactor = (1 << 12) / 2 / Math.PI;
+
+export type Coordinate = [number, number];
+export type Coordinates = [Coordinate, Coordinate];
+
+export class Path extends D3SurfaceLayer {
+
+    lineData(): Array<{ type: string, coordinates: Coordinates }> {
+        const columns = this.columns();
+        const latIdx = columns.indexOf(this.latitudeColumn());
+        const longIdx = columns.indexOf(this.longitudeColumn());
+        const retVal = [];
+        let prevLatLng;
+        this.data().forEach(row => {
+            const currLatLng: Coordinate = [row[longIdx], row[latIdx]];
+            if (prevLatLng) {
+                retVal.push({
+                    type: "LineString",
+                    coordinates: [currLatLng, prevLatLng]
+                });
+            }
+            prevLatLng = currLatLng;
+        });
+        return retVal;
+    }
+
+    isNull(coord: Coordinate) {
+        return !coord[0] && !coord[1];
+    }
+
+    isNull2(coords: Coordinates) {
+        if (!this.omitNullLatLong()) return false;
+        return this.isNull(coords[0]) || this.isNull(coords[1]);
+    }
+
+    layerUpdate(map: Map, projection?) {
+        super.layerUpdate(map, projection);
+        const element = this._lfd3._rootGroup;
+        projection = projection || this._lfd3.projection;
+
+        const updateDefs = this._lfd3.svg().selectAll("defs").data([undefined]);
+        updateDefs.enter().append("defs").append("marker")
+            .attr("class", "marker")
+            .attr("id", this._id + "_arrowHead")
+            .attr("viewBox", "0 0 10 10")
+            .attr("refX", 10)
+            .attr("refY", 5)
+            .attr("markerWidth", 12)
+            .attr("markerHeight", 12)
+            .attr("markerUnits", "strokeWidth")
+            .attr("orient", "auto")
+            .append("polyline")
+            .attr("points", "0,0 10,5 0,10 1,5")
+            ;
+        this._lfd3.svg().select("defs > marker")
+            .style("fill", this.strokeColor())
+            .style("stroke", null)
+            ;
+
+        const center = projection.latLngToLayerPoint({ lat: 0, lng: 0 });
+        const geoTransform = resolve("Mercator")
+            .scale(projectionFactor)
+            .translate([center.x, center.y])
+            ;
+        const geoPath = d3GeoPath().projection(geoTransform);
+
+        const updateSelection = element.selectAll(".dataEdge").data(this.lineData().filter(row => !this.isNull2(row.coordinates)));
+        updateSelection.enter().append("path")
+            .attr("class", "dataEdge")
+            .attr("marker-end", "url(#" + this._id + "_arrowHead)")
+            .merge(updateSelection)
+            .attr("d", geoPath)
+            .style("stroke", this.strokeColor())
+            .style("fill", "none")
+            .attr("stroke-width", 1 / projection.scale)
+            ;
+        updateSelection.exit().remove();
+    }
+
+    //  Events  ---
+    clickHandler(e, row) {
+    }
+
+}
+Path.prototype._class += " map_Path";
+
+export interface Path {
+    latitudeColumn(): string;
+    latitudeColumn(_: string): this;
+    longitudeColumn(): string;
+    longitudeColumn(_: string): this;
+    strokeColor(): string;
+    strokeColor(_: string): this;
+    omitNullLatLong(): boolean;
+    omitNullLatLong(_: boolean): this;
+}
+
+Path.prototype.publish("latitudeColumn", null, "set", "Latitude column", function () { return this.columns(); }, { optional: true });
+Path.prototype.publish("longitudeColumn", null, "set", "Longitude column", function () { return this.columns(); }, { optional: true });
+Path.prototype.publish("strokeColor", " #666666", "html-color", "Stroke Color", null, { optional: true });
+Path.prototype.publish("omitNullLatLong", true, "boolean", "Remove lat=0,lng=0 from pinsData", null, { tags: ["Basic"] });
+
+//  ---------------------------------------------------------------------------
+export class Lines extends Path {
+
+    lineData(): Array<{ type: string, coordinates: Coordinates }> {
+        const columns = this.columns();
+        const latIdx = columns.indexOf(this.latitudeColumn());
+        const longIdx = columns.indexOf(this.longitudeColumn());
+        const lat2Idx = columns.indexOf(this.latitude2Column());
+        const long2Idx = columns.indexOf(this.longitude2Column());
+        const retVal = [];
+        this.data().forEach(row => {
+            const currLatLng: Coordinate = [row[longIdx], row[latIdx]];
+            const currLatLng2: Coordinate = [row[long2Idx], row[lat2Idx]];
+            retVal.push({
+                type: "LineString",
+                coordinates: [currLatLng, currLatLng2]
+            });
+        });
+        return retVal;
+    }
+}
+Lines.prototype._class += " map_Lines";
+
+export interface Lines {
+    latitude2Column(): string;
+    latitude2Column(_: string): this;
+    longitude2Column(): string;
+    longitude2Column(_: string): this;
+}
+Lines.prototype.publish("latitude2Column", null, "set", "Latitude column", function () { return this.columns(); }, { optional: true });
+Lines.prototype.publish("longitude2Column", null, "set", "Longitude column", function () { return this.columns(); }, { optional: true });