@artstesh/maps 1.1.5 → 1.1.7

package/dist/bundles/maps-components-src-map.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('ol'), require('ol/geom'), require('ol/format'), require('ol/extent'), require('ol/control'), require('ol/proj'), require('@artstesh/postboy'), require('ol/interaction'), require('ol/interaction/Draw'), require('ol/sphere'), require('rxjs/operators'), require('ol/source'), require('ol/layer/Tile'), require('ol/source/OSM'), require('ol/layer'), require('ol/loadingstrategy'), require('ol/geom/Polygon'), require('ol/source/Cluster'), require('rxjs'), require('ol/Map'), require('ol/View'), require('ol/Overlay'), require('ol/style/Style'), require('ol/style'), require('ol/proj/epsg4326')) :
-    typeof define === 'function' && define.amd ? define('maps-components/src/map', ['exports', '@angular/core', '@angular/common', 'ol', 'ol/geom', 'ol/format', 'ol/extent', 'ol/control', 'ol/proj', '@artstesh/postboy', 'ol/interaction', 'ol/interaction/Draw', 'ol/sphere', 'rxjs/operators', 'ol/source', 'ol/layer/Tile', 'ol/source/OSM', 'ol/layer', 'ol/loadingstrategy', 'ol/geom/Polygon', 'ol/source/Cluster', 'rxjs', 'ol/Map', 'ol/View', 'ol/Overlay', 'ol/style/Style', 'ol/style', 'ol/proj/epsg4326'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global["maps-components"] = global["maps-components"] || {}, global["maps-components"].src = global["maps-components"].src || {}, global["maps-components"].src.map = {}), global.ng.core, global.ng.common, global.ol, global.geom, global.format, global.extent, global.control, global.proj, global.postboy, global.interaction, global.Draw, global.Sphere, global.rxjs.operators, global.source, global.TileLayer, global.OSM, global.layer, global.loadingstrategy, global.Polygon, global.Cluster, global.rxjs, global.Map, global.View, global.Overlay, global.Style, global.style, global.epsg4326));
-})(this, (function (exports, i0, i6, ol, geom, format, extent, control, proj, postboy, interaction, Draw, Sphere, operators, source, TileLayer, OSM, layer, loadingstrategy, Polygon, Cluster, rxjs, Map, View, Overlay, Style, style, epsg4326) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('ol'), require('ol/geom'), require('ol/format'), require('ol/extent'), require('ol/control'), require('ol/proj'), require('@artstesh/postboy'), require('ol/interaction'), require('ol/interaction/Draw'), require('ol/sphere'), require('@artstesh/collections'), require('rxjs/operators'), require('ol/source'), require('ol/layer/Tile'), require('ol/source/OSM'), require('ol/layer'), require('ol/loadingstrategy'), require('ol/geom/Polygon'), require('ol/source/Cluster'), require('rxjs'), require('ol/Map'), require('ol/View'), require('ol/Overlay'), require('ol/style/Style'), require('ol/style'), require('ol/proj/epsg4326')) :
+    typeof define === 'function' && define.amd ? define('maps-components/src/map', ['exports', '@angular/core', '@angular/common', 'ol', 'ol/geom', 'ol/format', 'ol/extent', 'ol/control', 'ol/proj', '@artstesh/postboy', 'ol/interaction', 'ol/interaction/Draw', 'ol/sphere', '@artstesh/collections', 'rxjs/operators', 'ol/source', 'ol/layer/Tile', 'ol/source/OSM', 'ol/layer', 'ol/loadingstrategy', 'ol/geom/Polygon', 'ol/source/Cluster', 'rxjs', 'ol/Map', 'ol/View', 'ol/Overlay', 'ol/style/Style', 'ol/style', 'ol/proj/epsg4326'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global["maps-components"] = global["maps-components"] || {}, global["maps-components"].src = global["maps-components"].src || {}, global["maps-components"].src.map = {}), global.ng.core, global.ng.common, global.ol, global.geom, global.format, global.extent, global.control, global.proj, global.postboy, global.interaction, global.Draw, global.Sphere, global.collections, global.rxjs.operators, global.source, global.TileLayer, global.OSM, global.layer, global.loadingstrategy, global.Polygon, global.Cluster, global.rxjs, global.Map, global.View, global.Overlay, global.Style, global.style, global.epsg4326));
+})(this, (function (exports, i0, i6, ol, geom, format, extent, control, proj, postboy, interaction, Draw, Sphere, collections, operators, source, TileLayer, OSM, layer, loadingstrategy, Polygon, Cluster, rxjs, Map, View, Overlay, Style, style, epsg4326) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -589,7 +589,7 @@
                 return false;
             if (this.language !== model.language)
                 return false;
-            return this.center.length !== model.center.length || !!this.center.filter(function (c, i) { return c !== model.center[i]; });
+            return this.center.length === model.center.length && !this.center.filter(function (c, i) { return c !== model.center[i]; }).length;
         };
         return MapSettings;
     }());
@@ -689,72 +689,6 @@
         FeatureOutputFormat[FeatureOutputFormat["WKT"] = 2] = "WKT";
     })(exports.FeatureOutputFormat || (exports.FeatureOutputFormat = {}));
 
-    var Dictionary = /** @class */ (function () {
-        function Dictionary() {
-            var _this = this;
-            this.collection = {};
-            this._keys = new Set();
-            this.has = function (key) { return _this._keys.has(key); };
-        }
-        Object.defineProperty(Dictionary.prototype, "keys", {
-            get: function () {
-                return Array.from(this._keys);
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(Dictionary.prototype, "size", {
-            get: function () {
-                return this._keys.size;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Dictionary.clone = function (dic, action) {
-            return Dictionary.create(dic.collection, action);
-        };
-        Dictionary.create = function (dic, action) {
-            var keyList = Object.keys(dic);
-            var result = new Dictionary();
-            for (var i = 0; i < keyList.length; i++) {
-                var key = keyList[i];
-                result._keys.add(key);
-                result.collection[key] = action ? action(dic[key], key) : dic[key];
-            }
-            return result;
-        };
-        Dictionary.prototype.find = function (predicate) {
-            var result = null;
-            this.forEach(function (e) {
-                if (result === null && predicate(e))
-                    result = e;
-            });
-            return result;
-        };
-        Dictionary.prototype.take = function (key) {
-            return this._keys.has(key) ? this.collection[key] : null;
-        };
-        Dictionary.prototype.put = function (key, value) {
-            if (value == null)
-                return;
-            this.collection[key] = value;
-            this._keys.add(key);
-        };
-        Dictionary.prototype.rmv = function (key) {
-            if (!this._keys.has(key))
-                return;
-            delete this.collection[key];
-            this._keys.delete(key);
-        };
-        Dictionary.prototype.forEach = function (callback) {
-            var keys = Object.keys(this.collection);
-            for (var i = 0; i < keys.length; i++) {
-                callback(this.collection[keys[i]], i);
-            }
-        };
-        return Dictionary;
-    }());
-
     /**
      *
      * A control is a visible widget with a DOM element in a fixed position on the screen. They can involve user input (buttons), or be informational only; the position is determined using CSS. By default these are placed in the container with CSS class name ol-overlaycontainer-stopevent, but can use any outside DOM element.
@@ -1024,6 +958,26 @@
     }(postboy.PostboyExecutor));
     CalculateAreaExecutor.ID = '172ecf46-86b5-4f46-a5f1-96ba2cbb1694';
 
+    var FitToPolygonsCommand = /** @class */ (function (_super) {
+        __extends(FitToPolygonsCommand, _super);
+        function FitToPolygonsCommand(features, zoomAfter) {
+            if (zoomAfter === void 0) { zoomAfter = 0; }
+            var _this = _super.call(this) || this;
+            _this.features = features;
+            _this.zoomAfter = zoomAfter;
+            return _this;
+        }
+        Object.defineProperty(FitToPolygonsCommand.prototype, "id", {
+            get: function () {
+                return FitToPolygonsCommand.ID;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        return FitToPolygonsCommand;
+    }(postboy.PostboyGenericMessage));
+    FitToPolygonsCommand.ID = 'a9e42b23-ffaf-4c46-8370-e0432cd14d60';
+
     var AddLayerCommand = /** @class */ (function (_super) {
         __extends(AddLayerCommand, _super);
         function AddLayerCommand(layer) {
@@ -1327,7 +1281,7 @@
     var MapManagementService = /** @class */ (function () {
         function MapManagementService(postboy) {
             this.postboy = postboy;
-            this.layers = new Dictionary();
+            this.layers = new collections.Dictionary();
         }
         MapManagementService.prototype.up = function () {
             this.observeMapRender();
@@ -1399,7 +1353,7 @@
         MapManagementService.prototype.observeFeaturesInArea = function () {
             var _this = this;
             this.postboy.subscribe(GetFeaturesInAreaQuery.ID).subscribe(function (qr) {
-                var result = new Dictionary();
+                var result = new collections.Dictionary();
                 _this.layers.forEach(function (l) {
                     var _a, _b;
                     var layerName = l.get('name');
@@ -1470,17 +1424,31 @@
         MapFeatureService.prototype.up = function () {
             this.observeMapRender();
             this.observeFitToFeatures();
+            this.observeFitToPolygons();
         };
         MapFeatureService.prototype.observeMapRender = function () {
             var _this = this;
             this.postboy.subscribe(MapRenderedEvent.ID).subscribe(function (m) {
                 _this.map = m.map;
+                if (_this.fitPolygonsWaiting)
+                    _this.postboy.fire(_this.fitPolygonsWaiting);
             });
         };
         MapFeatureService.prototype.observeFitToFeatures = function () {
             var _this = this;
-            this.postboy.subscribe(FitToFeaturesCommand.ID).subscribe(function (m) {
-                _this.fitToGeometries(m.features.map(function (f) { return f.getGeometry(); }), m.zoomAfter);
+            this.postboy.subscribe(FitToFeaturesCommand.ID).subscribe(function (cmd) {
+                _this.fitToGeometries(cmd.features.map(function (f) { return f.getGeometry(); }), cmd.zoomAfter);
+            });
+        };
+        MapFeatureService.prototype.observeFitToPolygons = function () {
+            var _this = this;
+            this.postboy.subscribe(FitToPolygonsCommand.ID).subscribe(function (cmd) {
+                if (!_this.map) {
+                    _this.fitPolygonsWaiting = cmd;
+                    return;
+                }
+                _this.fitPolygonsWaiting = undefined;
+                _this.fitToGeometries(cmd.features.map(function (f) { return f.feature.getGeometry(); }), cmd.zoomAfter);
             });
         };
         MapFeatureService.prototype.fitToGeometries = function (geometries, zoomAfter) {
@@ -1566,7 +1534,7 @@
                 var drawingCommand = new StartDrawingCommand(ev.type, ev.style);
                 drawingCommand.result.subscribe(function (r) {
                     if (!r) {
-                        ev.finish(new Dictionary());
+                        ev.finish(new collections.Dictionary());
                         return;
                     }
                     var area = PolygonModel.fromGeoJson(1, r).feature.getGeometry();
@@ -1793,6 +1761,7 @@
             this.registerSubject(MapClickEvent.ID);
             this.registerSubject(CloseTooltipCommand.ID);
             this.registerSubject(FitToFeaturesCommand.ID);
+            this.registerSubject(FitToPolygonsCommand.ID);
             this.registerSubject(MapMoveEndEvent.ID);
             this.registerSubject(CancelDrawingCommand.ID);
             this.registerSubject(StartDrawingCommand.ID);
@@ -3046,10 +3015,10 @@
     exports.CloseTooltipCommand = CloseTooltipCommand;
     exports.ClusterLayerComponent = ClusterLayerComponent;
     exports.ClusterLayerSettings = ClusterLayerSettings;
-    exports.Dictionary = Dictionary;
     exports.DrawSelectionAreaCommand = DrawSelectionAreaCommand;
     exports.FeatureLayerComponent = FeatureLayerComponent;
     exports.FeatureLayerSettings = FeatureLayerSettings;
+    exports.FitToPolygonsCommand = FitToPolygonsCommand;
     exports.MapClickEvent = MapClickEvent;
     exports.MapControl = MapControl;
     exports.MapControlZoomComponent = MapControlZoomComponent;