@artstesh/maps 1.0.9 → 1.0.10

package/dist/bundles/maps-components.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/proj'), require('@artstesh/postboy'), require('rxjs/operators'), require('ol/source'), require('ol/interaction'), require('ol/interaction/Draw'), 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', ['exports', '@angular/core', '@angular/common', 'ol', 'ol/geom', 'ol/format', 'ol/extent', 'ol/proj', '@artstesh/postboy', 'rxjs/operators', 'ol/source', 'ol/interaction', 'ol/interaction/Draw', '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.ng.core, global.ng.common, global.ol, global.geom, global.format, global.extent, global.proj, global.postboy, global.rxjs.operators, global.source, global.interaction, global.Draw, 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, proj, postboy, operators, source, interaction, Draw, 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/proj'), require('@artstesh/postboy'), require('rxjs'), require('rxjs/operators'), require('ol/source'), require('ol/interaction'), require('ol/interaction/Draw'), require('ol/layer/Tile'), require('ol/source/OSM'), require('ol/layer'), require('ol/loadingstrategy'), require('ol/geom/Polygon'), require('ol/source/Cluster'), 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', ['exports', '@angular/core', '@angular/common', 'ol', 'ol/geom', 'ol/format', 'ol/extent', 'ol/proj', '@artstesh/postboy', 'rxjs', 'rxjs/operators', 'ol/source', 'ol/interaction', 'ol/interaction/Draw', 'ol/layer/Tile', 'ol/source/OSM', 'ol/layer', 'ol/loadingstrategy', 'ol/geom/Polygon', 'ol/source/Cluster', '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.ng.core, global.ng.common, global.ol, global.geom, global.format, global.extent, global.proj, global.postboy, global.rxjs, global.rxjs.operators, global.source, global.interaction, global.Draw, global.TileLayer, global.OSM, global.layer, global.loadingstrategy, global.Polygon, global.Cluster, global.Map, global.View, global.Overlay, global.Style, global.style, global.epsg4326));
+})(this, (function (exports, i0, i6, ol, geom, format, extent, proj, postboy, rxjs, operators, source, interaction, Draw, TileLayer, OSM, layer, loadingstrategy, Polygon, Cluster, Map, View, Overlay, Style, style, epsg4326) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -684,6 +684,72 @@
         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;
+    }());
+
     var MapRenderedEvent = /** @class */ (function (_super) {
         __extends(MapRenderedEvent, _super);
         function MapRenderedEvent(map) {
@@ -796,6 +862,27 @@
     }(postboy.PostboyGenericMessage));
     CancelDrawingCommand.ID = '7d38d983-feba-4176-a66b-18175e5ecd6b';
 
+    var DrawSelectionAreaCommand = /** @class */ (function (_super) {
+        __extends(DrawSelectionAreaCommand, _super);
+        function DrawSelectionAreaCommand(type, style, ignore) {
+            if (ignore === void 0) { ignore = new Set(); }
+            var _this = _super.call(this) || this;
+            _this.type = type;
+            _this.style = style;
+            _this.ignore = ignore;
+            return _this;
+        }
+        Object.defineProperty(DrawSelectionAreaCommand.prototype, "id", {
+            get: function () {
+                return DrawSelectionAreaCommand.ID;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        return DrawSelectionAreaCommand;
+    }(postboy.PostboyCallbackMessage));
+    DrawSelectionAreaCommand.ID = '573d8a0d-f25b-42b7-9ad7-0ac6d86ac362';
+
     var AddLayerCommand = /** @class */ (function (_super) {
         __extends(AddLayerCommand, _super);
         function AddLayerCommand(layer) {
@@ -961,6 +1048,45 @@
     }(postboy.PostboyCallbackMessage));
     GenerateDrawQuery.ID = 'f01c99ba-0953-4ab5-82f9-04e6fbb678c1';
 
+    var FilterFeaturesInAreaQuery = /** @class */ (function (_super) {
+        __extends(FilterFeaturesInAreaQuery, _super);
+        function FilterFeaturesInAreaQuery(area, features) {
+            var _this = _super.call(this) || this;
+            _this.area = area;
+            _this.features = features;
+            return _this;
+        }
+        Object.defineProperty(FilterFeaturesInAreaQuery.prototype, "id", {
+            get: function () {
+                return FilterFeaturesInAreaQuery.ID;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        return FilterFeaturesInAreaQuery;
+    }(postboy.PostboyCallbackMessage));
+    FilterFeaturesInAreaQuery.ID = '36bb2d94-8028-4512-90dd-2386af3fc67c';
+
+    var GetFeaturesInAreaQuery = /** @class */ (function (_super) {
+        __extends(GetFeaturesInAreaQuery, _super);
+        function GetFeaturesInAreaQuery(area, ignore) {
+            if (ignore === void 0) { ignore = new Set(); }
+            var _this = _super.call(this) || this;
+            _this.area = area;
+            _this.ignore = ignore;
+            return _this;
+        }
+        Object.defineProperty(GetFeaturesInAreaQuery.prototype, "id", {
+            get: function () {
+                return GetFeaturesInAreaQuery.ID;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        return GetFeaturesInAreaQuery;
+    }(postboy.PostboyCallbackMessage));
+    GetFeaturesInAreaQuery.ID = 'efcf4271-a07a-40e0-9f02-d4dade40b8ac';
+
     var MapPostboyService = /** @class */ (function (_super) {
         __extends(MapPostboyService, _super);
         function MapPostboyService() {
@@ -979,7 +1105,7 @@
     var MapManagementService = /** @class */ (function () {
         function MapManagementService(postboy) {
             this.postboy = postboy;
-            this.layers = {};
+            this.layers = new Dictionary();
         }
         MapManagementService.prototype.up = function () {
             this.observeMapRender();
@@ -989,6 +1115,7 @@
             this.observeAddTile();
             this.observeRemoveTile();
             this.observeLayerQuery();
+            this.observeFeaturesInArea();
         };
         MapManagementService.prototype.observeRemoveTile = function () {
             var _this = this;
@@ -1000,7 +1127,7 @@
         };
         MapManagementService.prototype.observeLayerQuery = function () {
             var _this = this;
-            this.postboy.subscribe(GetLayerQuery.ID).subscribe(function (ev) { var _a; return ev.finish((_a = _this.layers[ev.name]) !== null && _a !== void 0 ? _a : null); });
+            this.postboy.subscribe(GetLayerQuery.ID).subscribe(function (ev) { return ev.finish(_this.layers.take(ev.name)); });
         };
         MapManagementService.prototype.observeAddTile = function () {
             var _this = this;
@@ -1021,19 +1148,19 @@
             this.postboy.subscribe(AddLayerCommand.ID).subscribe(function (c) {
                 if (!_this.map)
                     return;
-                _this.layers[c.layer.get('name')] = c.layer;
+                _this.layers.put(c.layer.get('name'), c.layer);
                 _this.map.addLayer(c.layer);
             });
         };
         MapManagementService.prototype.observePlaceFeatures = function () {
             var _this = this;
             this.postboy.subscribe(PlaceLayerFeaturesCommand.ID).subscribe(function (c) {
-                var _a, _b;
-                if (!_this.layers[c.layer])
+                var _a;
+                if (!_this.layers.has(c.layer))
                     return;
-                var source = (_a = _this.layers[c.layer]) === null || _a === void 0 ? void 0 : _a.getSource();
+                var source = _this.layers.take(c.layer).getSource();
                 if (!!source['getSource'])
-                    source = (_b = source) === null || _b === void 0 ? void 0 : _b.getSource();
+                    source = (_a = source) === null || _a === void 0 ? void 0 : _a.getSource();
                 source === null || source === void 0 ? void 0 : source.clear();
                 source === null || source === void 0 ? void 0 : source.addFeatures(c.features);
             });
@@ -1043,10 +1170,34 @@
             this.postboy.subscribe(RemoveLayerCommand.ID).subscribe(function (c) {
                 if (!_this.map)
                     return;
-                delete _this.layers[c.layer.get('name')];
+                _this.layers.rmv(c.layer.get('name'));
                 _this.map.removeLayer(c.layer);
             });
         };
+        MapManagementService.prototype.observeFeaturesInArea = function () {
+            var _this = this;
+            this.postboy.subscribe(GetFeaturesInAreaQuery.ID).subscribe(function (qr) {
+                var result = new Dictionary();
+                var queue = [];
+                var queries = [];
+                _this.layers.forEach(function (l) {
+                    var _a, _b;
+                    var layerName = l.get('name');
+                    if (qr.ignore.has(layerName) || layerName === MapConstants.DrawingLayerId)
+                        return;
+                    var source = l.getSource();
+                    if (!!source['getSource'])
+                        source = (_a = source) === null || _a === void 0 ? void 0 : _a.getSource();
+                    var query = new FilterFeaturesInAreaQuery(qr.area, (_b = source === null || source === void 0 ? void 0 : source.getFeatures()) !== null && _b !== void 0 ? _b : []);
+                    queue.push(query.result.pipe(operators.tap(function (r) {
+                        result.put(l.get('name'), r.map(function (e) { return (Object.assign({ id: e.getId() }, e.get(MapConstants.FeatureInfo))); }));
+                    })));
+                    queries.push(query);
+                });
+                rxjs.forkJoin(queue).subscribe(function () { return qr.finish(result); });
+                queries.forEach(function (q) { return _this.postboy.fire(q); });
+            });
+        };
         return MapManagementService;
     }());
     MapManagementService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: MapManagementService, deps: [{ token: MapPostboyService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
@@ -1173,6 +1324,28 @@
             this.postboy = postboy;
         }
         DrawingService.prototype.up = function () {
+            this.observeDrawing();
+            this.observeSelectArea();
+            this.observeMapRender();
+        };
+        DrawingService.prototype.observeSelectArea = function () {
+            var _this = this;
+            this.postboy.subscribe(DrawSelectionAreaCommand.ID).subscribe(function (ev) {
+                var drawingCommand = new StartDrawingCommand(ev.type, ev.style);
+                drawingCommand.result.subscribe(function (r) {
+                    if (!r) {
+                        ev.finish(new Dictionary());
+                        return;
+                    }
+                    var area = PolygonModel.fromGeoJson(1, r).feature.getGeometry();
+                    var getFeaturesCommand = new GetFeaturesInAreaQuery(area, ev.ignore);
+                    getFeaturesCommand.result.subscribe(function (result) { return ev.finish(result); });
+                    _this.postboy.fire(getFeaturesCommand);
+                });
+                _this.postboy.fire(drawingCommand);
+            });
+        };
+        DrawingService.prototype.observeDrawing = function () {
             var _this = this;
             this.postboy.subscribe(StartDrawingCommand.ID).subscribe(function (ev) {
                 _this.draw(function (l) {
@@ -1194,7 +1367,6 @@
                     _this.postboy.fire(drawQuery);
                 });
             });
-            this.observeMapRender();
         };
         DrawingService.prototype.onEnd = function (evt, command, layer) {
             command.finish(command.format === exports.FeatureOutputFormat.GeoJson
@@ -1262,11 +1434,37 @@
                 type: i0.Injectable
             }], ctorParameters: function () { return [{ type: MapPostboyService }]; } });
 
+    var FeatureService = /** @class */ (function () {
+        function FeatureService(postboy) {
+            this.postboy = postboy;
+        }
+        FeatureService.prototype.up = function () {
+            this.postboy.subscribe(FilterFeaturesInAreaQuery.ID).subscribe(function (qr) {
+                qr.finish(qr.features.filter(function (f) { return FeatureService.booleanIntersects(qr.area, f.getGeometry()); }));
+            });
+        };
+        FeatureService.booleanIntersects = function (g1, g2) {
+            if (g2.getType() === 'Point')
+                return g1.intersectsCoordinate(g2.getCoordinates());
+            if (g2.getType() === 'Circle')
+                return g1.intersectsCoordinate(g2.getCenter());
+            if (g2.getType() === 'Polygon')
+                return g1.intersectsCoordinate(g2.getInteriorPoint().getCoordinates());
+            return false;
+        };
+        return FeatureService;
+    }());
+    FeatureService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: FeatureService, deps: [{ token: MapPostboyService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    FeatureService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: FeatureService });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: FeatureService, decorators: [{
+                type: i0.Injectable
+            }], ctorParameters: function () { return [{ type: MapPostboyService }]; } });
+
     var MessageRegistratorService = /** @class */ (function (_super) {
         __extends(MessageRegistratorService, _super);
-        function MessageRegistratorService(service, management, state, feature, interaction, drawing, drawGenerator) {
+        function MessageRegistratorService(service, management, state, mapFeature, interaction, drawing, drawGenerator, feature) {
             var _this = _super.call(this, service) || this;
-            _this.registerServices([management, state, interaction, feature, drawing, drawGenerator]);
+            _this.registerServices([management, state, interaction, mapFeature, drawing, drawGenerator, feature]);
             return _this;
         }
         MessageRegistratorService.prototype._up = function () {
@@ -1285,14 +1483,17 @@
             this.registerSubject(GetLayerQuery.ID);
             this.registerSubject(DrawingFinishedEvent.ID);
             this.registerSubject(GenerateDrawQuery.ID);
+            this.registerSubject(FilterFeaturesInAreaQuery.ID);
+            this.registerSubject(GetFeaturesInAreaQuery.ID);
+            this.registerSubject(DrawSelectionAreaCommand.ID);
         };
         return MessageRegistratorService;
     }(postboy.PostboyAbstractRegistrator));
-    MessageRegistratorService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: MessageRegistratorService, deps: [{ token: MapPostboyService }, { token: MapManagementService }, { token: MapStateService }, { token: MapFeatureService }, { token: MapClickService }, { token: DrawingService }, { token: DrawingGenerationService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    MessageRegistratorService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: MessageRegistratorService, deps: [{ token: MapPostboyService }, { token: MapManagementService }, { token: MapStateService }, { token: MapFeatureService }, { token: MapClickService }, { token: DrawingService }, { token: DrawingGenerationService }, { token: FeatureService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
     MessageRegistratorService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: MessageRegistratorService });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: MessageRegistratorService, decorators: [{
                 type: i0.Injectable
-            }], ctorParameters: function () { return [{ type: MapPostboyService }, { type: MapManagementService }, { type: MapStateService }, { type: MapFeatureService }, { type: MapClickService }, { type: DrawingService }, { type: DrawingGenerationService }]; } });
+            }], ctorParameters: function () { return [{ type: MapPostboyService }, { type: MapManagementService }, { type: MapStateService }, { type: MapFeatureService }, { type: MapClickService }, { type: DrawingService }, { type: DrawingGenerationService }, { type: FeatureService }]; } });
 
     var TileLayerSettings = /** @class */ (function () {
         function TileLayerSettings() {
@@ -1933,6 +2134,7 @@
             MapFeatureService,
             DrawingService,
             DrawingGenerationService,
+            FeatureService,
         ], usesInheritance: true, ngImport: i0__namespace, template: "<ng-content></ng-content>\r\n<lib-osm-tile-layer *ngIf=\"osmUrl && map\" [map]=\"map\" [url]=\"osmUrl\"></lib-osm-tile-layer>\r\n<lib-feature-layer *ngIf=\"map\" [settings]=\"drawingLayerSettings\"></lib-feature-layer>\r\n", styles: ["lib-map-plate{position:relative;display:flex;flex-direction:column;height:100%}\n"], components: [{ type: OsmTileLayerComponent, selector: "lib-osm-tile-layer", inputs: ["url", "map"] }, { type: FeatureLayerComponent, selector: "lib-feature-layer", inputs: ["settings"] }], directives: [{ type: i6__namespace.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }], changeDetection: i0__namespace.ChangeDetectionStrategy.OnPush });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: MapPlateComponent, decorators: [{
                 type: i0.Component,
@@ -1949,6 +2151,7 @@
                             MapFeatureService,
                             DrawingService,
                             DrawingGenerationService,
+                            FeatureService,
                         ],
                     }]
             }], ctorParameters: function () { return [{ type: i0__namespace.ElementRef }, { type: MapPostboyService }, { type: MapPlateFactory }, { type: MessageRegistratorService }, { type: i0__namespace.ChangeDetectorRef }]; }, propDecorators: { settings: [{
@@ -2350,6 +2553,8 @@
     exports.CloseTooltipCommand = CloseTooltipCommand;
     exports.ClusterLayerComponent = ClusterLayerComponent;
     exports.ClusterLayerSettings = ClusterLayerSettings;
+    exports.Dictionary = Dictionary;
+    exports.DrawSelectionAreaCommand = DrawSelectionAreaCommand;
     exports.FeatureLayerComponent = FeatureLayerComponent;
     exports.FeatureLayerSettings = FeatureLayerSettings;
     exports.MapClickEvent = MapClickEvent;