@hpcc-js/map 2.79.1 → 2.79.3

package/src/__package__.ts

@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/map";
-export const PKG_VERSION = "2.79.1";
-export const BUILD_VERSION = "2.108.2";
+export const PKG_NAME = "@hpcc-js/map";
+export const PKG_VERSION = "2.79.2";
+export const BUILD_VERSION = "2.108.6";

package/src/index.ts

@@ -1,34 +1,34 @@
-export * from "./__package__";
-export * from "./CanvasPinLayer";
-export * from "./CanvasPins";
-export * from "./Choropleth";
-export * from "./ChoroplethContinents";
-export * from "./ChoroplethCounties";
-export * from "./ChoroplethCountries";
-export * from "./ChoroplethStates";
-export * from "./ChoroplethStatesHeat";
-export * from "./GeoHash";
-export * from "./GMap";
-export * from "./GMapCounties";
-export * from "./GMapGraph";
-export * from "./GMapHeat";
-export * from "./GMapLayered";
-export * from "./GMapPin";
-export * from "./GMapPinLine";
-export * from "./Graph";
-export * from "./Graticule";
-export * from "./Heat";
-export * from "./IChoropleth";
-export * from "./Layer";
-export * from "./Layered";
-export * from "./Lines";
-export * from "./OpenStreet";
-export * from "./Pins";
-export * from "./Projection";
-export * from "./TestHeatMap";
-export * from "./TopoJSONChoropleth";
-
-import * as Leaflet from "./leaflet/index";
-export {
-    Leaflet
-};
+export * from "./__package__";
+export * from "./CanvasPinLayer";
+export * from "./CanvasPins";
+export * from "./Choropleth";
+export * from "./ChoroplethContinents";
+export * from "./ChoroplethCounties";
+export * from "./ChoroplethCountries";
+export * from "./ChoroplethStates";
+export * from "./ChoroplethStatesHeat";
+export * from "./GeoHash";
+export * from "./GMap";
+export * from "./GMapCounties";
+export * from "./GMapGraph";
+export * from "./GMapHeat";
+export * from "./GMapLayered";
+export * from "./GMapPin";
+export * from "./GMapPinLine";
+export * from "./Graph";
+export * from "./Graticule";
+export * from "./Heat";
+export * from "./IChoropleth";
+export * from "./Layer";
+export * from "./Layered";
+export * from "./Lines";
+export * from "./OpenStreet";
+export * from "./Pins";
+export * from "./Projection";
+export * from "./TestHeatMap";
+export * from "./TopoJSONChoropleth";
+
+import * as Leaflet from "./leaflet/index";
+export {
+    Leaflet
+};

package/src/leaflet/AlbersPR.ts

@@ -1,48 +1,48 @@
-import { CRS, LatLng, LatLngBounds, Point, Transformation, Util } from "@hpcc-js/leaflet-shim";
-import { resolve } from "../Projection";
-import { TileLayer } from "./TileLayer";
-
-const projAlbers = resolve("Albers").scale(.5);
-const projAlbersUsaPr = resolve("AlbersUsaPr").scale(.5);
-
-const AlbersProjection = {
-    project(latLng) {
-        let point = projAlbersUsaPr([latLng.lng, latLng.lat]);
-        if (!point) {
-            point = projAlbers([latLng.lng, latLng.lat]);
-        }
-        return new Point(point[0], point[1]);
-    },
-    unproject(point) {
-        if (!isNaN(point.x) && !isNaN(point.y)) {
-            const latLng = projAlbers.invert([point.x, point.y]);
-            return new LatLng(latLng[1], latLng[0]);
-        } else {
-            return new LatLng(0, 0);
-        }
-    }
-};
-
-const AlbersCRS = Util.extend({}, CRS, {
-    projection: AlbersProjection,
-    transformation: new Transformation(1, 0, 1, 0),
-    infinite: true
-});
-
-export class AlbersLayer extends TileLayer {
-
-    _crs = AlbersCRS;
-
-    constructor() {
-        super();
-    }
-
-    hasBounds() {
-        return true;
-    }
-
-    getBounds() {
-        return new LatLngBounds([20, -123], [49, -64]);
-    }
-}
-AlbersLayer.prototype._class += " map_AlbersLayer";
+import { CRS, LatLng, LatLngBounds, Point, Transformation, Util } from "@hpcc-js/leaflet-shim";
+import { resolve } from "../Projection";
+import { TileLayer } from "./TileLayer";
+
+const projAlbers = resolve("Albers").scale(.5);
+const projAlbersUsaPr = resolve("AlbersUsaPr").scale(.5);
+
+const AlbersProjection = {
+    project(latLng) {
+        let point = projAlbersUsaPr([latLng.lng, latLng.lat]);
+        if (!point) {
+            point = projAlbers([latLng.lng, latLng.lat]);
+        }
+        return new Point(point[0], point[1]);
+    },
+    unproject(point) {
+        if (!isNaN(point.x) && !isNaN(point.y)) {
+            const latLng = projAlbers.invert([point.x, point.y]);
+            return new LatLng(latLng[1], latLng[0]);
+        } else {
+            return new LatLng(0, 0);
+        }
+    }
+};
+
+const AlbersCRS = Util.extend({}, CRS, {
+    projection: AlbersProjection,
+    transformation: new Transformation(1, 0, 1, 0),
+    infinite: true
+});
+
+export class AlbersLayer extends TileLayer {
+
+    _crs = AlbersCRS;
+
+    constructor() {
+        super();
+    }
+
+    hasBounds() {
+        return true;
+    }
+
+    getBounds() {
+        return new LatLngBounds([20, -123], [49, -64]);
+    }
+}
+AlbersLayer.prototype._class += " map_AlbersLayer";

package/src/leaflet/Blank.ts

@@ -1,9 +1,9 @@
-import { TileLayer } from "./TileLayer";
-
-export class BlankLayer extends TileLayer {
-
-    constructor() {
-        super();
-    }
-}
-BlankLayer.prototype._class += " map_BlankLayer";
+import { TileLayer } from "./TileLayer";
+
+export class BlankLayer extends TileLayer {
+
+    constructor() {
+        super();
+    }
+}
+BlankLayer.prototype._class += " map_BlankLayer";

package/src/leaflet/Circles.ts

@@ -1,139 +1,139 @@
-import { Circle, Map } from "@hpcc-js/leaflet-shim";
-import { ClusterLayer, D3SurfaceLayer } from "./FeatureLayer";
-
-export class Circles extends ClusterLayer {
-
-    hasBounds(): boolean {
-        return true;
-    }
-
-    layerUpdate(map: Map) {
-        super.layerUpdate(map);
-        const columns = this.columns();
-        const latIdx = columns.indexOf(this.latitudeColumn());
-        const longIdx = columns.indexOf(this.longitudeColumn());
-        const strokeColorIdx = columns.indexOf(this.strokeColorColumn());
-        const fillColorIdx = columns.indexOf(this.fillColorColumn());
-        this.clear();
-        this.data().filter(row => !this.omitNullLatLong() || (!!row[latIdx] && !!row[longIdx])).forEach(row => {
-            this.add(new Circle([row[latIdx], row[longIdx]], {
-                color: this.propValue(strokeColorIdx, row, this.strokeColor()),
-                fill: true,
-                fillColor: this.propValue(fillColorIdx, row, this.fillColor()),
-                fillOpacity: this.fillOpacity(),
-                radius: this.radius(),
-                origRow: row
-            } as any).on("click", e => this.clickHandler(e, row)));
-        });
-    }
-
-    //  Events  ---
-    clickHandler(e, row) {
-    }
-}
-Circles.prototype._class += " map_Circles";
-
-export interface Circles {
-    latitudeColumn(): string;
-    latitudeColumn(_: string);
-    longitudeColumn(): string;
-    longitudeColumn(_: string);
-    radius(): number;
-    radius(_: number);
-    strokeColor(): string;
-    strokeColor(_: string);
-    strokeColorColumn(): string;
-    strokeColorColumn(_: string);
-    strokColorColumn_exists(): boolean;
-    fillColor(): string;
-    fillColor(_: string);
-    fillColorColumn(): string;
-    fillColorColumn(_: string);
-    fillColorColumn_exists(): boolean;
-    fillOpacity(): number;
-    fillOpacity(_: number);
-    omitNullLatLong(): boolean;
-    omitNullLatLong(_: boolean);
-}
-
-Circles.prototype.publish("latitudeColumn", null, "set", "Latitude column", function () { return this.columns(); }, { optional: true });
-Circles.prototype.publish("longitudeColumn", null, "set", "Longitude column", function () { return this.columns(); }, { optional: true });
-Circles.prototype.publish("radius", 50, "number", "Radius (meters)");
-Circles.prototype.publish("strokeColor", "#376cea", "html-color", "Stroke Color", null, { optional: true });
-Circles.prototype.publish("strokeColorColumn", null, "set", "Stroke color column", function () { return this.columns(); }, { optional: true });
-Circles.prototype.publish("fillColor", "#376cea", "html-color", "Fill Color", null, { optional: true });
-Circles.prototype.publish("fillColorColumn", null, "set", "Fill color column", function () { return this.columns(); }, { optional: true });
-Circles.prototype.publish("fillOpacity", 0.5, "number", "Opacity", null, { tags: ["Advanced"] });
-Circles.prototype.publish("omitNullLatLong", true, "boolean", "Remove lat=0,lng=0 from pinsData", null, { tags: ["Basic"] });
-
-//  ---------------------------------------------------------------------------
-export class D3Circles extends D3SurfaceLayer {
-
-    layerUpdate(map: Map, projection?) {
-        super.layerUpdate(map, projection);
-        const element = this._lfd3._rootGroup;
-        projection = projection || this._lfd3.projection;
-        const columns = this.columns();
-        const latIdx = columns.indexOf(this.latitudeColumn());
-        const longIdx = columns.indexOf(this.longitudeColumn());
-        const strokeColorIdx = columns.indexOf(this.strokeColorColumn());
-        const fillColorIdx = columns.indexOf(this.fillColorColumn());
-        function toLatLng(d) {
-            return {
-                lat: +d[latIdx],
-                lng: +d[longIdx]
-            };
-        }
-        const updateSelection = element.selectAll("circle").data(this.data().filter(row => !this.omitNullLatLong() || (!!row[latIdx] && !!row[longIdx])));
-        updateSelection.enter()
-            .append("circle")
-            .merge(updateSelection)
-            .attr("cx", d => projection.latLngToLayerPoint(toLatLng(d)).x)
-            .attr("cy", d => projection.latLngToLayerPoint(toLatLng(d)).y)
-            .attr("r", Math.max(3 / projection.scale, this.radius() / projection.metresPerPixel)) // d => projection.metersToPixels(toLatLng(d), this.radius()))
-            .style("fill-opacity", this.fillOpacity())
-            .style("stroke", row => this.propValue(strokeColorIdx, row, this.strokeColor()))
-            .attr("stroke-width", Math.max(1 / projection.scale, 1 / projection.metresPerPixel))
-            .style("fill", row => this.propValue(fillColorIdx, row, this.fillColor()))
-            ;
-        updateSelection.exit().remove();
-    }
-
-    //  Events  ---
-    clickHandler(e, row) {
-    }
-}
-D3Circles.prototype._class += " map_D3Circles";
-
-export interface D3Circles {
-    latitudeColumn(): string;
-    latitudeColumn(_: string);
-    longitudeColumn(): string;
-    longitudeColumn(_: string);
-    radius(): number;
-    radius(_: number);
-    strokeColor(): string;
-    strokeColor(_: string);
-    strokeColorColumn(): string;
-    strokeColorColumn(_: string);
-    strokColorColumn_exists(): boolean;
-    fillColor(): string;
-    fillColor(_: string);
-    fillColorColumn(): string;
-    fillColorColumn(_: string);
-    fillColorColumn_exists(): boolean;
-    fillOpacity(): number;
-    fillOpacity(_: number);
-    omitNullLatLong(): boolean;
-    omitNullLatLong(_: boolean);
-}
-
-D3Circles.prototype.publish("latitudeColumn", null, "set", "Latitude column", function () { return this.columns(); }, { optional: true });
-D3Circles.prototype.publish("longitudeColumn", null, "set", "Longitude column", function () { return this.columns(); }, { optional: true });
-D3Circles.prototype.publish("radius", 50, "number", "Radius (meters)");
-D3Circles.prototype.publish("strokeColor", "#376cea", "html-color", "Stroke Color", null, { optional: true });
-D3Circles.prototype.publish("strokeColorColumn", null, "set", "Stroke color column", function () { return this.columns(); }, { optional: true });
-D3Circles.prototype.publish("fillColor", "#376cea", "html-color", "Fill Color", null, { optional: true });
-D3Circles.prototype.publish("fillColorColumn", null, "set", "Fill color column", function () { return this.columns(); }, { optional: true });
-D3Circles.prototype.publish("fillOpacity", 0.5, "number", "Opacity", null, { tags: ["Advanced"] });
-D3Circles.prototype.publish("omitNullLatLong", true, "boolean", "Remove lat=0,lng=0 from pinsData", null, { tags: ["Basic"] });
+import { Circle, Map } from "@hpcc-js/leaflet-shim";
+import { ClusterLayer, D3SurfaceLayer } from "./FeatureLayer";
+
+export class Circles extends ClusterLayer {
+
+    hasBounds(): boolean {
+        return true;
+    }
+
+    layerUpdate(map: Map) {
+        super.layerUpdate(map);
+        const columns = this.columns();
+        const latIdx = columns.indexOf(this.latitudeColumn());
+        const longIdx = columns.indexOf(this.longitudeColumn());
+        const strokeColorIdx = columns.indexOf(this.strokeColorColumn());
+        const fillColorIdx = columns.indexOf(this.fillColorColumn());
+        this.clear();
+        this.data().filter(row => !this.omitNullLatLong() || (!!row[latIdx] && !!row[longIdx])).forEach(row => {
+            this.add(new Circle([row[latIdx], row[longIdx]], {
+                color: this.propValue(strokeColorIdx, row, this.strokeColor()),
+                fill: true,
+                fillColor: this.propValue(fillColorIdx, row, this.fillColor()),
+                fillOpacity: this.fillOpacity(),
+                radius: this.radius(),
+                origRow: row
+            } as any).on("click", e => this.clickHandler(e, row)));
+        });
+    }
+
+    //  Events  ---
+    clickHandler(e, row) {
+    }
+}
+Circles.prototype._class += " map_Circles";
+
+export interface Circles {
+    latitudeColumn(): string;
+    latitudeColumn(_: string);
+    longitudeColumn(): string;
+    longitudeColumn(_: string);
+    radius(): number;
+    radius(_: number);
+    strokeColor(): string;
+    strokeColor(_: string);
+    strokeColorColumn(): string;
+    strokeColorColumn(_: string);
+    strokColorColumn_exists(): boolean;
+    fillColor(): string;
+    fillColor(_: string);
+    fillColorColumn(): string;
+    fillColorColumn(_: string);
+    fillColorColumn_exists(): boolean;
+    fillOpacity(): number;
+    fillOpacity(_: number);
+    omitNullLatLong(): boolean;
+    omitNullLatLong(_: boolean);
+}
+
+Circles.prototype.publish("latitudeColumn", null, "set", "Latitude column", function () { return this.columns(); }, { optional: true });
+Circles.prototype.publish("longitudeColumn", null, "set", "Longitude column", function () { return this.columns(); }, { optional: true });
+Circles.prototype.publish("radius", 50, "number", "Radius (meters)");
+Circles.prototype.publish("strokeColor", "#376cea", "html-color", "Stroke Color", null, { optional: true });
+Circles.prototype.publish("strokeColorColumn", null, "set", "Stroke color column", function () { return this.columns(); }, { optional: true });
+Circles.prototype.publish("fillColor", "#376cea", "html-color", "Fill Color", null, { optional: true });
+Circles.prototype.publish("fillColorColumn", null, "set", "Fill color column", function () { return this.columns(); }, { optional: true });
+Circles.prototype.publish("fillOpacity", 0.5, "number", "Opacity", null, { tags: ["Advanced"] });
+Circles.prototype.publish("omitNullLatLong", true, "boolean", "Remove lat=0,lng=0 from pinsData", null, { tags: ["Basic"] });
+
+//  ---------------------------------------------------------------------------
+export class D3Circles extends D3SurfaceLayer {
+
+    layerUpdate(map: Map, projection?) {
+        super.layerUpdate(map, projection);
+        const element = this._lfd3._rootGroup;
+        projection = projection || this._lfd3.projection;
+        const columns = this.columns();
+        const latIdx = columns.indexOf(this.latitudeColumn());
+        const longIdx = columns.indexOf(this.longitudeColumn());
+        const strokeColorIdx = columns.indexOf(this.strokeColorColumn());
+        const fillColorIdx = columns.indexOf(this.fillColorColumn());
+        function toLatLng(d) {
+            return {
+                lat: +d[latIdx],
+                lng: +d[longIdx]
+            };
+        }
+        const updateSelection = element.selectAll("circle").data(this.data().filter(row => !this.omitNullLatLong() || (!!row[latIdx] && !!row[longIdx])));
+        updateSelection.enter()
+            .append("circle")
+            .merge(updateSelection)
+            .attr("cx", d => projection.latLngToLayerPoint(toLatLng(d)).x)
+            .attr("cy", d => projection.latLngToLayerPoint(toLatLng(d)).y)
+            .attr("r", Math.max(3 / projection.scale, this.radius() / projection.metresPerPixel)) // d => projection.metersToPixels(toLatLng(d), this.radius()))
+            .style("fill-opacity", this.fillOpacity())
+            .style("stroke", row => this.propValue(strokeColorIdx, row, this.strokeColor()))
+            .attr("stroke-width", Math.max(1 / projection.scale, 1 / projection.metresPerPixel))
+            .style("fill", row => this.propValue(fillColorIdx, row, this.fillColor()))
+            ;
+        updateSelection.exit().remove();
+    }
+
+    //  Events  ---
+    clickHandler(e, row) {
+    }
+}
+D3Circles.prototype._class += " map_D3Circles";
+
+export interface D3Circles {
+    latitudeColumn(): string;
+    latitudeColumn(_: string);
+    longitudeColumn(): string;
+    longitudeColumn(_: string);
+    radius(): number;
+    radius(_: number);
+    strokeColor(): string;
+    strokeColor(_: string);
+    strokeColorColumn(): string;
+    strokeColorColumn(_: string);
+    strokColorColumn_exists(): boolean;
+    fillColor(): string;
+    fillColor(_: string);
+    fillColorColumn(): string;
+    fillColorColumn(_: string);
+    fillColorColumn_exists(): boolean;
+    fillOpacity(): number;
+    fillOpacity(_: number);
+    omitNullLatLong(): boolean;
+    omitNullLatLong(_: boolean);
+}
+
+D3Circles.prototype.publish("latitudeColumn", null, "set", "Latitude column", function () { return this.columns(); }, { optional: true });
+D3Circles.prototype.publish("longitudeColumn", null, "set", "Longitude column", function () { return this.columns(); }, { optional: true });
+D3Circles.prototype.publish("radius", 50, "number", "Radius (meters)");
+D3Circles.prototype.publish("strokeColor", "#376cea", "html-color", "Stroke Color", null, { optional: true });
+D3Circles.prototype.publish("strokeColorColumn", null, "set", "Stroke color column", function () { return this.columns(); }, { optional: true });
+D3Circles.prototype.publish("fillColor", "#376cea", "html-color", "Fill Color", null, { optional: true });
+D3Circles.prototype.publish("fillColorColumn", null, "set", "Fill color column", function () { return this.columns(); }, { optional: true });
+D3Circles.prototype.publish("fillOpacity", 0.5, "number", "Opacity", null, { tags: ["Advanced"] });
+D3Circles.prototype.publish("omitNullLatLong", true, "boolean", "Remove lat=0,lng=0 from pinsData", null, { tags: ["Basic"] });

package/src/leaflet/ClusterCircles.css

@@ -1,27 +1,27 @@
-.cluster-circle {
-	background-clip: padding-box;
-    font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif;
-}
-
-.cluster-circle > div {
-    width: 40px;
-    height: 40px;
-
-    text-align: center;
-    border-radius: 20px;
-}
-
-.cluster-circle > div > div {
-    display: inline-block;
-	margin-top: 5px;
-	width: 30px;
-	height: 30px;
-
-	text-align: center;
-	border-radius: 15px;
-	font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif;
-}
-
-.cluster-circle span {
-	line-height: 30px;
+.cluster-circle {
+	background-clip: padding-box;
+    font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif;
+}
+
+.cluster-circle > div {
+    width: 40px;
+    height: 40px;
+
+    text-align: center;
+    border-radius: 20px;
+}
+
+.cluster-circle > div > div {
+    display: inline-block;
+	margin-top: 5px;
+	width: 30px;
+	height: 30px;
+
+	text-align: center;
+	border-radius: 15px;
+	font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif;
+}
+
+.cluster-circle span {
+	line-height: 30px;
 }