@hpcc-js/map 2.79.0 → 3.1.0

package/src/leaflet/GMap.ts

@@ -1,8 +1,8 @@
 import * as _GoogleMapsLoader from "google-maps";
 
-import { GoogleMutant, Map } from "@hpcc-js/leaflet-shim";
-import { requireGoogleMap } from "../GMap";
-import { TileLayer } from "./TileLayer";
+import { GoogleMutant, Map } from "./leaflet-shim.ts";
+import { requireGoogleMap } from "../GMap.ts";
+import { TileLayer } from "./TileLayer.ts";
 
 declare const window: any;
 

package/src/leaflet/HeatLayer.ts

@@ -1,5 +1,5 @@
-import { HeatLayer as LHeatLayer, LatLngBounds, Map } from "@hpcc-js/leaflet-shim";
-import { FeatureLayer } from "./FeatureLayer";
+import { LHeatLayer, LatLngBounds, Map } from "./leaflet-shim.ts";
+import { FeatureLayer } from "./FeatureLayer.ts";
 
 export class HeatLayer extends FeatureLayer {
 

package/src/leaflet/Icons.ts

@@ -1,5 +1,5 @@
-import { Icon, Map } from "@hpcc-js/leaflet-shim";
-import { Markers } from "./Markers";
+import { Icon, Map } from "./leaflet-shim.ts";
+import { Markers } from "./Markers.ts";
 
 export class Icons extends Markers {
 

package/src/leaflet/Leaflet.ts

@@ -1,11 +1,11 @@
-import { Button, HTMLWidget, IconBar, publish, Spacer, Widget } from "@hpcc-js/common";
-import { LatLngBounds, Map } from "@hpcc-js/leaflet-shim";
-import { AlbersLayer } from "./AlbersPR";
-import { BlankLayer } from "./Blank";
-import { GMapLayer } from "./GMap";
-import { MapBoxLayer } from "./MapBox";
-import { OpenStreetLayer } from "./OpenStreet";
-import { ILayer, TileLayer } from "./TileLayer";
+import { Button, HTMLWidget, IconBar, Spacer, Widget } from "@hpcc-js/common";
+import { LatLngBounds, Map } from "./leaflet-shim.ts";
+import { AlbersLayer } from "./AlbersPR.ts";
+import { BlankLayer } from "./Blank.ts";
+import { GMapLayer } from "./GMap.ts";
+import { MapBoxLayer } from "./MapBox.ts";
+import { OpenStreetLayer } from "./OpenStreet.ts";
+import { ILayer, TileLayer } from "./TileLayer.ts";
 
 import "../../src/leaflet/Leaflet.css";
 
@@ -225,7 +225,8 @@ export interface Leaflet {
     defaultLong(_: number): this;
     defaultZoom(): number;
     defaultZoom(_: number): this;
-    autoZoomToFit: publish<this, boolean>;
+    autoZoomToFit(): boolean;
+    autoZoomToFit(_: boolean): this;
 }
 
 Leaflet.prototype.publish("showToolbar", true, "boolean", "Show toolbar", undefined, { hidden: (w: Leaflet) => w.isLayer() });

package/src/leaflet/MapBox.ts

@@ -1,5 +1,5 @@
-import { Map, TileLayer as LeafletTileLayer } from "@hpcc-js/leaflet-shim";
-import { TileLayer } from "./TileLayer";
+import { Map, TileLayer as LeafletTileLayer } from "./leaflet-shim.ts";
+import { TileLayer } from "./TileLayer.ts";
 
 declare const window: any;
 

package/src/leaflet/Markers.ts

@@ -1,5 +1,5 @@
-import { Map, Marker, point, Direction } from "@hpcc-js/leaflet-shim";
-import { ClusterLayer } from "./FeatureLayer";
+import { Map, Marker, point, Direction } from "./leaflet-shim.ts";
+import { ClusterLayer } from "./FeatureLayer.ts";
 
 export class Markers extends ClusterLayer {
 

package/src/leaflet/OpenStreet.ts

@@ -1,5 +1,5 @@
-import { Map, TileLayer as LeafletTileLayer } from "@hpcc-js/leaflet-shim";
-import { TileLayer } from "./TileLayer";
+import { Map, TileLayer as LeafletTileLayer } from "./leaflet-shim.ts";
+import { TileLayer } from "./TileLayer.ts";
 
 export class OpenStreetLayer extends TileLayer {
 

package/src/leaflet/Path.ts

@@ -1,7 +1,7 @@
-import { Map } from "@hpcc-js/leaflet-shim";
+import { Map } from "./leaflet-shim.ts";
 import { geoPath as d3GeoPath } from "d3-geo";
-import { resolve } from "../Projection";
-import { D3SurfaceLayer } from "./FeatureLayer";
+import { resolve } from "../Projection.ts";
+import { D3SurfaceLayer } from "./FeatureLayer.ts";
 
 const projectionFactor = (1 << 12) / 2 / Math.PI;
 

package/src/leaflet/Pins.ts

@@ -1,5 +1,5 @@
-import { BeautifyIcon, Map } from "@hpcc-js/leaflet-shim";
-import { Markers } from "./Markers";
+import { BeautifyIcon, Map } from "./leaflet-shim.ts";
+import { Markers } from "./Markers.ts";
 
 export class Pins extends Markers {
 

package/src/leaflet/Polygons.ts

@@ -1,6 +1,6 @@
 import { extent as d3Extent, Palette } from "@hpcc-js/common";
-import { LeafletEvent, Map, Polygon } from "@hpcc-js/leaflet-shim";
-import { FeatureLayer } from "./FeatureLayer";
+import { LeafletEvent, Map, Polygon } from "./leaflet-shim.ts";
+import { FeatureLayer } from "./FeatureLayer.ts";
 
 function lngLat2LatLng(d: [number, number]): [number, number] {
     return [d[1], d[0]];

package/src/leaflet/Region.ts

@@ -1,7 +1,7 @@
 import { json as d3Json } from "d3-request";
 import * as topojson from "topojson-client";
-import { topoJsonFolder } from "../Choropleth";
-import { World } from "./World";
+import { topoJsonFolder } from "../Choropleth.ts";
+import { World } from "./World.ts";
 
 const topo_indexes = {
     "GB": ["administrative_area_level_3", "administrative_area_level_2", "administrative_area_level_1"],

package/src/leaflet/Text.ts

@@ -1,6 +1,6 @@
-import { BeautifyIcon, Map } from "@hpcc-js/leaflet-shim";
+import { BeautifyIcon, Map } from "./leaflet-shim.ts";
 import { format as d3Format } from "d3-format";
-import { Markers } from "./Markers";
+import { Markers } from "./Markers.ts";
 
 export class Text extends Markers {
 

package/src/leaflet/TileLayer.ts

@@ -1,5 +1,5 @@
 import { Widget } from "@hpcc-js/common";
-import { CRS, FeatureGroup, LatLngBounds, LeafletEvent, Map } from "@hpcc-js/leaflet-shim";
+import { CRS, FeatureGroup, LatLngBounds, LeafletEvent, Map } from "./leaflet-shim.ts";
 
 export interface ILayer {
 

package/src/leaflet/TopoJSON.ts

@@ -1,8 +1,8 @@
-import { GeoJSON, Map } from "@hpcc-js/leaflet-shim";
+import { GeoJSON, Map } from "./leaflet-shim.ts";
 import { json as d3Json } from "d3-request";
 import * as topojson from "topojson-client";
-import { topoJsonFolder } from "../Choropleth";
-import { FeatureLayer } from "./FeatureLayer";
+import { topoJsonFolder } from "../Choropleth.ts";
+import { FeatureLayer } from "./FeatureLayer.ts";
 
 export function fixDateLine(feature, layer) {
     const latlongs = layer.getLatLngs();

package/src/leaflet/US.ts

@@ -1,5 +1,5 @@
-import { LatLngBounds } from "@hpcc-js/leaflet-shim";
-import { World } from "./World";
+import { LatLngBounds } from "./leaflet-shim.ts";
+import { World } from "./World.ts";
 
 export class US extends World {
 

package/src/leaflet/USCounties.ts

@@ -1,7 +1,7 @@
 import { json as d3Json } from "d3-request";
 import * as topojson from "topojson-client";
-import { topoJsonFolder } from "../Choropleth";
-import { US } from "./US";
+import { topoJsonFolder } from "../Choropleth.ts";
+import { US } from "./US.ts";
 
 let usCounties = null;
 const usCountyNames = {};

package/src/leaflet/USStates.ts

@@ -1,7 +1,7 @@
 import { json as d3Json } from "d3-request";
 import * as topojson from "topojson-client";
-import { topoJsonFolder } from "../Choropleth";
-import { US } from "./US";
+import { topoJsonFolder } from "../Choropleth.ts";
+import { US } from "./US.ts";
 
 let usStates = null;
 const usStateNames = {};

package/src/leaflet/World.ts

@@ -1,15 +1,14 @@
 import { Palette, SVGGlowFilter, Utility } from "@hpcc-js/common";
-import { LatLngBounds, Map } from "@hpcc-js/leaflet-shim";
+import { LatLngBounds, Map } from "./leaflet-shim.ts";
 import { select as d3Select } from "d3-selection";
-import { FeatureLayer } from "./FeatureLayer";
-import { TopoJSON } from "./TopoJSON";
+import { FeatureLayer } from "./FeatureLayer.ts";
+import { TopoJSON } from "./TopoJSON.ts";
 
 import "../../src/leaflet/World.css";
 
 export class World extends FeatureLayer {
 
     protected _features;
-    protected _selection: Utility.SimpleSelection;
     _palette;
 
     protected _dataMap = {};
@@ -136,19 +135,18 @@ World.prototype._palette = Palette.rainbow("default");
 World.prototype.mixin(Utility.SimpleSelectionMixin);
 
 export interface World {
-    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_default(_: number): this;
     opacity_exists(): boolean;
+
     meshVisible(): boolean;
     meshVisible(_: boolean): this;
     meshVisible_exists(): boolean;
@@ -158,6 +156,9 @@ export interface World {
     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"] });

package/src/leaflet/index.ts

@@ -1,18 +1,18 @@
-export * from "./Circles";
-export * from "./ClusterCircles";
-export * from "./Countries";
-export * from "./DrawLayer";
-export * from "./FeatureLayer";
-export * from "./HeatLayer";
-export * from "./Icons";
-export * from "./Leaflet";
-export * from "./Markers";
-export * from "./Polygons";
-export * from "./Path";
-export * from "./Pins";
-export * from "./Region";
-export * from "./Text";
-export * from "./TileLayer";
-export * from "./USCounties";
-export * from "./USStates";
-export * from "./World";
+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

@@ -0,0 +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;
+
+export { L, Circle, Control, CRS, Direction, DivIcon, Draw, FeatureGroup, GeoJSON, Icon, LatLng, LatLngBounds, LatLngExpression, LeafletEvent, Map, Marker, point, Point, Polygon, Polyline, Rectangle, TileLayer, Transformation, Util };

package/src/leaflet/plugins/BeautifyIcon.css

@@ -0,0 +1,44 @@
+/*
+  Leaflet.BeautifyIcon, a plugin that adds colorful iconic markers for Leaflet by giving full control of style to end user, It has also ability to adjust font awesome
+  and glyphicon icons
+  (c) 2016-2017, Muhammad Arslan Sajid
+  http://leafletjs.com
+*/
+.beautify-marker {
+    text-align: center;
+    font-weight: 700;
+    font-family: monospace;
+    position:absolute;
+     -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+}
+
+.beautify-marker.selected > div {
+    outline: none;
+    border-color: red;
+    box-shadow: 0 0 10px red;
+}
+
+.beautify-marker.circle {
+    border-radius: 100%;
+}
+
+.beautify-marker.circle-dot, .beautify-marker.doughnut {
+    border-radius: 100%;
+}
+
+.beautify-marker.marker {
+    border-top-left-radius: 50%;
+    border-top-right-radius: 50% 100%;
+    border-bottom-left-radius: 100% 50%;
+    border-bottom-right-radius: 0%;
+    /* rotating 45deg clockwise to get the corner bottom center */
+    transform: rotate(45deg); 
+    
+}
+
+.beautify-marker.marker > * {
+    /* rotating 45deg counterclock to adjust marker content back to normal */
+    transform: rotate(-45deg);
+}

package/src/leaflet/plugins/BeautifyIcon.ts

@@ -0,0 +1,190 @@
+import { Icon, point, Util } from "leaflet";
+
+import "./BeautifyIcon.css";
+
+/*  Ported from https://github.com/marslan390/BeautifyMarker
+    Changes:
+        * Ported to TypeScript
+        * Added @hpcc-js "selection" support
+*/
+
+const defaults = {
+
+    iconColor: "#1EB300",
+
+    iconAnchor: {
+        "marker": [14, 34]
+        , "circle": [11, 10]
+        , "circle-dot": [5, 5]
+        , "rectangle-dot": [5, 6]
+        , "doughnut": [8, 8]
+    },
+
+    popupAnchor: {
+        "marker": [0, -25]
+        , "circle": [-3, -76]
+        , "circle-dot": [0, -2]
+        , "rectangle-dot": [0, -2]
+        , "doughnut": [0, -2]
+    },
+
+    innerIconAnchor: {
+        marker: [-2, 5]
+        , circle: [0, 2]
+    },
+
+    iconSize: {
+        "marker": [28, 28]
+        , "circle": [22, 22]
+        , "circle-dot": [2, 2]
+        , "rectangle-dot": [2, 2]
+        , "doughnut": [15, 15]
+    }
+};
+
+const IconClass = Icon.extend({
+
+    options: {
+        icon: "leaf"
+        , iconSize: defaults.iconSize.circle
+        , iconAnchor: defaults.iconAnchor.marker
+        , iconShape: "marker"
+        , iconStyle: ""
+        , innerIconAnchor: [0, 3] // circle with fa or glyphicon or marker with text
+        , innerIconStyle: ""
+        , isAlphaNumericIcon: false
+        , text: 1
+        , borderColor: defaults.iconColor
+        , borderWidth: 2
+        , borderStyle: "solid"
+        , backgroundColor: "white"
+        , textColor: defaults.iconColor
+        , customClasses: ""
+        , spin: false
+        , prefix: "fa"
+        , html: ""
+    },
+
+    initialize(options) {
+
+        this.applyDefaults(options);
+        this.options = (!options || !options.html) ? Util.setOptions(this, options) : options;
+    },
+
+    applyDefaults(options) {
+
+        if (options) {
+            if (!options.iconSize && options.iconShape) {
+                options.iconSize = defaults.iconSize[options.iconShape];
+            }
+
+            if (!options.iconAnchor && options.iconShape) {
+                options.iconAnchor = defaults.iconAnchor[options.iconShape];
+            }
+
+            if (!options.popupAnchor && options.iconShape) {
+                options.popupAnchor = defaults.popupAnchor[options.iconShape];
+            }
+
+            if (!options.innerIconAnchor) {
+                // if icon is type of circle or marker
+                if (options.iconShape === "circle" || options.iconShape === "marker") {
+                    if (options.iconShape === "circle" && options.isAlphaNumericIcon) { // if circle with text
+                        options.innerIconAnchor = [0, -1];
+                    } else if (options.iconShape === "marker" && !options.isAlphaNumericIcon) {// marker with icon
+                        options.innerIconAnchor = defaults.innerIconAnchor[options.iconShape];
+                    }
+                }
+            }
+        }
+    },
+
+    createIcon() {
+
+        const iconDiv = document.createElement("div");
+        const options = this.options;
+
+        iconDiv.innerHTML = !options.html ? this.createIconInnerHtml() : options.html;
+        this._setIconStyles(iconDiv);
+
+        // having a marker requires an extra parent div for rotation correction
+        if (this.options.iconShape === "marker") {
+            const wrapperDiv = document.createElement("div");
+            wrapperDiv.className = "beautify-marker" + (options.props.owner._currSelRow === options.props.row ? " selected" : "");
+            wrapperDiv.appendChild(iconDiv);
+            return wrapperDiv;
+        }
+
+        return iconDiv;
+    },
+
+    createIconInnerHtml() {
+
+        const options = this.options;
+
+        if (options.iconShape === "circle-dot" || options.iconShape === "rectangle-dot" || options.iconShape === "doughnut") {
+            return "";
+        }
+
+        const innerIconStyle = this.getInnerIconStyle(options);
+        if (options.isAlphaNumericIcon) {
+            return '<div style="' + innerIconStyle + '">' + options.text + "</div>";
+        }
+
+        let spinClass = "";
+        if (options.spin) {
+            spinClass = " fa-spin";
+        }
+
+        return '<i class="' + options.prefix + " " + options.icon + spinClass + '" style="' + innerIconStyle + '"></i>';
+    },
+
+    getInnerIconStyle(options) {
+
+        const innerAnchor = point(options.innerIconAnchor);
+        return "color:" + options.textColor + ";margin-top:" + innerAnchor.y + "px; margin-left:" + innerAnchor.x + "px;" + options.innerIconStyle;
+    },
+
+    _setIconStyles(iconDiv) {
+
+        const options = this.options;
+        const size = point(options.iconSize);
+        const anchor = point(options.iconAnchor);
+
+        iconDiv.className = "beautify-marker ";
+
+        if (options.iconShape) {
+            iconDiv.className += options.iconShape;
+        }
+
+        if (options.customClasses) {
+            iconDiv.className += " " + options.customClasses;
+        }
+
+        iconDiv.style.backgroundColor = options.backgroundColor;
+        iconDiv.style.color = options.textColor;
+        iconDiv.style.borderColor = options.borderColor;
+        iconDiv.style.borderWidth = options.borderWidth + "px";
+        iconDiv.style.borderStyle = options.borderStyle;
+
+        if (size) {
+            iconDiv.style.width = size.x + "px";
+            iconDiv.style.height = size.y + "px";
+        }
+
+        if (anchor) {
+            iconDiv.style.marginLeft = (-anchor.x) + "px";
+            iconDiv.style.marginTop = (-anchor.y) + "px";
+        }
+
+        if (options.iconStyle) {
+            let cStyle = iconDiv.getAttribute("style");
+            cStyle += options.iconStyle;
+            iconDiv.setAttribute("style", cStyle);
+        }
+    }
+});
+
+export function BeautifyIcon(options) {
+    return new (IconClass as any)(options);
+}

package/src/leaflet/plugins/BeutifyIcon.licence

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Muhammad Arslan Sajid
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/src/leaflet/plugins/D3SvgOverlay.css

@@ -0,0 +1,3 @@
+g.d3-overlay * {
+    pointer-events: visiblePainted;
+}

package/src/leaflet/plugins/D3SvgOverlay.licence

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Teralytics AG
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.