@artstesh/maps 4.0.9 → 4.0.10

package/dist/fesm2020/maps-components-src-map.mjs

@@ -8,7 +8,8 @@ import { GeoJSON, WKT } from 'ol/format';
 import { getCenter, createEmpty, extend } from 'ol/extent';
 import { get, useGeographic, transform } from 'ol/proj';
 import { PostboyGenericMessage, PostboyCallbackMessage, PostboyService, PostboyAbstractRegistrator } from '@artstesh/postboy';
-import { first, filter, auditTime } from 'rxjs/operators';
+import { forkJoin, combineLatest } from 'rxjs';
+import { tap, first, filter, auditTime } from 'rxjs/operators';
 import { Vector, XYZ } from 'ol/source';
 import { Draw } from 'ol/interaction';
 import { createRegularPolygon } from 'ol/interaction/Draw';
@@ -18,7 +19,6 @@ import { Vector as Vector$1 } from 'ol/layer';
 import { bbox } from 'ol/loadingstrategy';
 import Polygon, { fromExtent } from 'ol/geom/Polygon';
 import Cluster from 'ol/source/Cluster';
-import { combineLatest } from 'rxjs';
 import Map from 'ol/Map';
 import View from 'ol/View';
 import Overlay from 'ol/Overlay';
@@ -187,6 +187,62 @@ var FeatureOutputFormat;
     FeatureOutputFormat[FeatureOutputFormat["WKT"] = 2] = "WKT";
 })(FeatureOutputFormat || (FeatureOutputFormat = {}));
 
+class Dictionary {
+    constructor() {
+        this.collection = {};
+        this._keys = new Set();
+        this.has = (key) => this._keys.has(key);
+    }
+    get keys() {
+        return Array.from(this._keys);
+    }
+    get size() {
+        return this._keys.size;
+    }
+    static clone(dic, action) {
+        return Dictionary.create(dic.collection, action);
+    }
+    static create(dic, action) {
+        let keyList = Object.keys(dic);
+        const result = new Dictionary();
+        for (let i = 0; i < keyList.length; i++) {
+            let key = keyList[i];
+            result._keys.add(key);
+            result.collection[key] = action ? action(dic[key], key) : dic[key];
+        }
+        return result;
+    }
+    find(predicate) {
+        let result = null;
+        this.forEach((e) => {
+            if (result === null && predicate(e))
+                result = e;
+        });
+        return result;
+    }
+    take(key) {
+        return this._keys.has(key) ? this.collection[key] : null;
+    }
+    put(key, value) {
+        if (value == null)
+            return;
+        this.collection[key] = value;
+        this._keys.add(key);
+    }
+    rmv(key) {
+        if (!this._keys.has(key))
+            return;
+        delete this.collection[key];
+        this._keys.delete(key);
+    }
+    forEach(callback) {
+        let keys = Object.keys(this.collection);
+        for (let i = 0; i < keys.length; i++) {
+            callback(this.collection[keys[i]], i);
+        }
+    }
+}
+
 class MapRenderedEvent extends PostboyGenericMessage {
     constructor(map) {
         super();
@@ -254,6 +310,19 @@ class CancelDrawingCommand extends PostboyGenericMessage {
 }
 CancelDrawingCommand.ID = '7d38d983-feba-4176-a66b-18175e5ecd6b';
 
+class DrawSelectionAreaCommand extends PostboyCallbackMessage {
+    constructor(type, style, ignore = new Set()) {
+        super();
+        this.type = type;
+        this.style = style;
+        this.ignore = ignore;
+    }
+    get id() {
+        return DrawSelectionAreaCommand.ID;
+    }
+}
+DrawSelectionAreaCommand.ID = '573d8a0d-f25b-42b7-9ad7-0ac6d86ac362';
+
 class AddLayerCommand extends PostboyGenericMessage {
     constructor(layer) {
         super();
@@ -356,6 +425,30 @@ class GenerateDrawQuery extends PostboyCallbackMessage {
 }
 GenerateDrawQuery.ID = 'f01c99ba-0953-4ab5-82f9-04e6fbb678c1';
 
+class FilterFeaturesInAreaQuery extends PostboyCallbackMessage {
+    constructor(area, features) {
+        super();
+        this.area = area;
+        this.features = features;
+    }
+    get id() {
+        return FilterFeaturesInAreaQuery.ID;
+    }
+}
+FilterFeaturesInAreaQuery.ID = '36bb2d94-8028-4512-90dd-2386af3fc67c';
+
+class GetFeaturesInAreaQuery extends PostboyCallbackMessage {
+    constructor(area, ignore = new Set()) {
+        super();
+        this.area = area;
+        this.ignore = ignore;
+    }
+    get id() {
+        return GetFeaturesInAreaQuery.ID;
+    }
+}
+GetFeaturesInAreaQuery.ID = 'efcf4271-a07a-40e0-9f02-d4dade40b8ac';
+
 class MapPostboyService extends PostboyService {
     constructor() {
         super();
@@ -371,7 +464,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
 class MapManagementService {
     constructor(postboy) {
         this.postboy = postboy;
-        this.layers = {};
+        this.layers = new Dictionary();
     }
     up() {
         this.observeMapRender();
@@ -381,6 +474,7 @@ class MapManagementService {
         this.observeAddTile();
         this.observeRemoveTile();
         this.observeLayerQuery();
+        this.observeFeaturesInArea();
     }
     observeRemoveTile() {
         this.postboy.subscribe(RemoveTileCommand.ID).subscribe((c) => {
@@ -390,7 +484,7 @@ class MapManagementService {
         });
     }
     observeLayerQuery() {
-        this.postboy.subscribe(GetLayerQuery.ID).subscribe((ev) => ev.finish(this.layers[ev.name] ?? null));
+        this.postboy.subscribe(GetLayerQuery.ID).subscribe((ev) => ev.finish(this.layers.take(ev.name)));
     }
     observeAddTile() {
         this.postboy.subscribe(AddTileCommand.ID).subscribe((c) => {
@@ -408,15 +502,15 @@ class MapManagementService {
         this.postboy.subscribe(AddLayerCommand.ID).subscribe((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);
         });
     }
     observePlaceFeatures() {
         this.postboy.subscribe(PlaceLayerFeaturesCommand.ID).subscribe((c) => {
-            if (!this.layers[c.layer])
+            if (!this.layers.has(c.layer))
                 return;
-            let source = this.layers[c.layer]?.getSource();
+            let source = this.layers.take(c.layer).getSource();
             if (!!source['getSource'])
                 source = source?.getSource();
             source?.clear();
@@ -427,10 +521,32 @@ class MapManagementService {
         this.postboy.subscribe(RemoveLayerCommand.ID).subscribe((c) => {
             if (!this.map)
                 return;
-            delete this.layers[c.layer.get('name')];
+            this.layers.rmv(c.layer.get('name'));
             this.map.removeLayer(c.layer);
         });
     }
+    observeFeaturesInArea() {
+        this.postboy.subscribe(GetFeaturesInAreaQuery.ID).subscribe((qr) => {
+            let result = new Dictionary();
+            const queue = [];
+            const queries = [];
+            this.layers.forEach((l) => {
+                let layerName = l.get('name');
+                if (qr.ignore.has(layerName) || layerName === MapConstants.DrawingLayerId)
+                    return;
+                let source = l.getSource();
+                if (!!source['getSource'])
+                    source = source?.getSource();
+                const query = new FilterFeaturesInAreaQuery(qr.area, source?.getFeatures() ?? []);
+                queue.push(query.result.pipe(tap((r) => {
+                    result.put(l.get('name'), r.map((e) => ({ id: e.getId(), ...e.get(MapConstants.FeatureInfo) })));
+                })));
+                queries.push(query);
+            });
+            forkJoin(queue).subscribe(() => qr.finish(result));
+            queries.forEach((q) => this.postboy.fire(q));
+        });
+    }
 }
 MapManagementService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MapManagementService, deps: [{ token: MapPostboyService }], target: i0.ɵɵFactoryTarget.Injectable });
 MapManagementService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MapManagementService });
@@ -544,6 +660,27 @@ class DrawingService {
         this.postboy = postboy;
     }
     up() {
+        this.observeDrawing();
+        this.observeSelectArea();
+        this.observeMapRender();
+    }
+    observeSelectArea() {
+        this.postboy.subscribe(DrawSelectionAreaCommand.ID).subscribe((ev) => {
+            const drawingCommand = new StartDrawingCommand(ev.type, ev.style);
+            drawingCommand.result.subscribe((r) => {
+                if (!r) {
+                    ev.finish(new Dictionary());
+                    return;
+                }
+                const area = PolygonModel.fromGeoJson(1, r).feature.getGeometry();
+                const getFeaturesCommand = new GetFeaturesInAreaQuery(area, ev.ignore);
+                getFeaturesCommand.result.subscribe((result) => ev.finish(result));
+                this.postboy.fire(getFeaturesCommand);
+            });
+            this.postboy.fire(drawingCommand);
+        });
+    }
+    observeDrawing() {
         this.postboy.subscribe(StartDrawingCommand.ID).subscribe((ev) => {
             this.draw((l) => {
                 if (!l || !this.map) {
@@ -563,7 +700,6 @@ class DrawingService {
                 this.postboy.fire(drawQuery);
             });
         });
-        this.observeMapRender();
     }
     onEnd(evt, command, layer) {
         command.finish(command.format === FeatureOutputFormat.GeoJson
@@ -625,10 +761,35 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
             type: Injectable
         }], ctorParameters: function () { return [{ type: MapPostboyService }]; } });
 
+class FeatureService {
+    constructor(postboy) {
+        this.postboy = postboy;
+    }
+    up() {
+        this.postboy.subscribe(FilterFeaturesInAreaQuery.ID).subscribe((qr) => {
+            qr.finish(qr.features.filter((f) => FeatureService.booleanIntersects(qr.area, f.getGeometry())));
+        });
+    }
+    static booleanIntersects(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;
+    }
+}
+FeatureService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: FeatureService, deps: [{ token: MapPostboyService }], target: i0.ɵɵFactoryTarget.Injectable });
+FeatureService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: FeatureService });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: FeatureService, decorators: [{
+            type: Injectable
+        }], ctorParameters: function () { return [{ type: MapPostboyService }]; } });
+
 class MessageRegistratorService extends PostboyAbstractRegistrator {
-    constructor(service, management, state, feature, interaction, drawing, drawGenerator) {
+    constructor(service, management, state, mapFeature, interaction, drawing, drawGenerator, feature) {
         super(service);
-        this.registerServices([management, state, interaction, feature, drawing, drawGenerator]);
+        this.registerServices([management, state, interaction, mapFeature, drawing, drawGenerator, feature]);
     }
     _up() {
         this.registerReplay(MapRenderedEvent.ID);
@@ -646,13 +807,16 @@ class MessageRegistratorService extends PostboyAbstractRegistrator {
         this.registerSubject(GetLayerQuery.ID);
         this.registerSubject(DrawingFinishedEvent.ID);
         this.registerSubject(GenerateDrawQuery.ID);
+        this.registerSubject(FilterFeaturesInAreaQuery.ID);
+        this.registerSubject(GetFeaturesInAreaQuery.ID);
+        this.registerSubject(DrawSelectionAreaCommand.ID);
     }
 }
-MessageRegistratorService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MessageRegistratorService, deps: [{ token: MapPostboyService }, { token: MapManagementService }, { token: MapStateService }, { token: MapFeatureService }, { token: MapClickService }, { token: DrawingService }, { token: DrawingGenerationService }], target: i0.ɵɵFactoryTarget.Injectable });
+MessageRegistratorService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MessageRegistratorService, deps: [{ token: MapPostboyService }, { token: MapManagementService }, { token: MapStateService }, { token: MapFeatureService }, { token: MapClickService }, { token: DrawingService }, { token: DrawingGenerationService }, { token: FeatureService }], target: i0.ɵɵFactoryTarget.Injectable });
 MessageRegistratorService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MessageRegistratorService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MessageRegistratorService, decorators: [{
             type: 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 }]; } });
 
 class TileLayerSettings {
     constructor() {
@@ -1205,6 +1369,7 @@ MapPlateComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", vers
         MapFeatureService,
         DrawingService,
         DrawingGenerationService,
+        FeatureService,
     ], usesInheritance: true, ngImport: i0, 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"], dependencies: [{ kind: "directive", type: i4.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: OsmTileLayerComponent, selector: "lib-osm-tile-layer", inputs: ["url", "map"] }, { kind: "component", type: FeatureLayerComponent, selector: "lib-feature-layer", inputs: ["settings"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MapPlateComponent, decorators: [{
             type: Component,
@@ -1216,6 +1381,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
                         MapFeatureService,
                         DrawingService,
                         DrawingGenerationService,
+                        FeatureService,
                     ], 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"] }]
         }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: MapPostboyService }, { type: MapPlateFactory }, { type: MessageRegistratorService }, { type: i0.ChangeDetectorRef }]; }, propDecorators: { settings: [{
                 type: Input
@@ -1544,5 +1710,5 @@ class StringifyFeatureHelper {
  * Generated bundle index. Do not edit.
  */
 
-export { CancelDrawingCommand, CloseTooltipCommand, ClusterLayerComponent, ClusterLayerSettings, DrawingType, FeatureLayerComponent, FeatureLayerSettings, FeatureOutputFormat, MapClickEvent, MapLyrs, MapLyrsLabel, MapModule, MapMoveEndEvent, MapPlateComponent, MapPostboyService, MapRenderedEvent, MapSettings, MarkerModel, MarkerStyleHelper, MarkersComponent, MessageRegistratorService, OsmTileLayerComponent, PolygonModel, PolygonStyleHelper, PolygonsComponent, StartDrawingCommand, StringifyFeatureHelper, TextStyleHelper, TileLayerComponent, TileLayerSettings, TooltipComponent, TooltipSettings };
+export { CancelDrawingCommand, CloseTooltipCommand, ClusterLayerComponent, ClusterLayerSettings, Dictionary, DrawSelectionAreaCommand, DrawingType, FeatureLayerComponent, FeatureLayerSettings, FeatureOutputFormat, MapClickEvent, MapLyrs, MapLyrsLabel, MapModule, MapMoveEndEvent, MapPlateComponent, MapPostboyService, MapRenderedEvent, MapSettings, MarkerModel, MarkerStyleHelper, MarkersComponent, MessageRegistratorService, OsmTileLayerComponent, PolygonModel, PolygonStyleHelper, PolygonsComponent, StartDrawingCommand, StringifyFeatureHelper, TextStyleHelper, TileLayerComponent, TileLayerSettings, TooltipComponent, TooltipSettings };
 //# sourceMappingURL=maps-components-src-map.mjs.map