@artstesh/maps 4.0.10 → 4.0.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/esm2020/map/helpers/polygon-style.helper.mjs +19 -2
- package/dist/esm2020/map/map-plate/map-plate.component.mjs +4 -1
- package/dist/esm2020/map/messages/commands/cancel-feature-modification.command.mjs +8 -0
- package/dist/esm2020/map/messages/commands/modify-feature.command.mjs +15 -0
- package/dist/esm2020/map/messages/executors/filter-features-in-area.executor.mjs +13 -0
- package/dist/esm2020/map/messages/executors/generate-draw.executor.mjs +14 -0
- package/dist/esm2020/map/messages/index.mjs +3 -1
- package/dist/esm2020/map/models/drawing-type.enum.mjs +2 -1
- package/dist/esm2020/map/services/drawing/drawing-generation.service.mjs +16 -21
- package/dist/esm2020/map/services/drawing/drawing.service.mjs +8 -12
- package/dist/esm2020/map/services/drawing/feature-modification.service.mjs +99 -0
- package/dist/esm2020/map/services/feature.service.mjs +4 -17
- package/dist/esm2020/map/services/map-management.service.mjs +5 -13
- package/dist/esm2020/map/services/message-registrator.service.mjs +19 -11
- package/dist/esm2020/src/map/helpers/polygon-style.helper.mjs +19 -2
- package/dist/esm2020/src/map/map-plate/map-plate.component.mjs +4 -1
- package/dist/esm2020/src/map/messages/commands/cancel-feature-modification.command.mjs +8 -0
- package/dist/esm2020/src/map/messages/commands/modify-feature.command.mjs +15 -0
- package/dist/esm2020/src/map/messages/executors/filter-features-in-area.executor.mjs +13 -0
- package/dist/esm2020/src/map/messages/executors/generate-draw.executor.mjs +14 -0
- package/dist/esm2020/src/map/messages/index.mjs +3 -1
- package/dist/esm2020/src/map/models/drawing-type.enum.mjs +2 -1
- package/dist/esm2020/src/map/services/drawing/drawing-generation.service.mjs +16 -21
- package/dist/esm2020/src/map/services/drawing/drawing.service.mjs +8 -12
- package/dist/esm2020/src/map/services/drawing/feature-modification.service.mjs +99 -0
- package/dist/esm2020/src/map/services/feature.service.mjs +4 -17
- package/dist/esm2020/src/map/services/map-management.service.mjs +5 -13
- package/dist/esm2020/src/map/services/message-registrator.service.mjs +19 -11
- package/dist/fesm2015/maps-components-src-map.mjs +197 -81
- package/dist/fesm2015/maps-components-src-map.mjs.map +1 -1
- package/dist/fesm2015/maps-components.mjs +197 -81
- package/dist/fesm2015/maps-components.mjs.map +1 -1
- package/dist/fesm2020/maps-components-src-map.mjs +191 -80
- package/dist/fesm2020/maps-components-src-map.mjs.map +1 -1
- package/dist/fesm2020/maps-components.mjs +191 -80
- package/dist/fesm2020/maps-components.mjs.map +1 -1
- package/dist/map/helpers/polygon-style.helper.d.ts +1 -0
- package/dist/map/messages/commands/cancel-feature-modification.command.d.ts +5 -0
- package/dist/map/messages/commands/modify-feature.command.d.ts +11 -0
- package/dist/map/messages/{queries/filter-features-in-area.query.d.ts → executors/filter-features-in-area.executor.d.ts} +2 -2
- package/dist/map/messages/{queries/generate-draw.query.d.ts → executors/generate-draw.executor.d.ts} +2 -2
- package/dist/map/messages/index.d.ts +2 -0
- package/dist/map/models/drawing-type.enum.d.ts +2 -1
- package/dist/map/services/drawing/drawing-generation.service.d.ts +5 -9
- package/dist/map/services/drawing/feature-modification.service.d.ts +22 -0
- package/dist/map/services/feature.service.d.ts +6 -9
- package/dist/map/services/message-registrator.service.d.ts +3 -3
- package/dist/package.json +1 -1
- package/dist/src/map/helpers/polygon-style.helper.d.ts +1 -0
- package/dist/src/map/messages/commands/cancel-feature-modification.command.d.ts +5 -0
- package/dist/src/map/messages/commands/modify-feature.command.d.ts +11 -0
- package/dist/src/map/messages/{queries/filter-features-in-area.query.d.ts → executors/filter-features-in-area.executor.d.ts} +2 -2
- package/dist/src/map/messages/{queries/generate-draw.query.d.ts → executors/generate-draw.executor.d.ts} +2 -2
- package/dist/src/map/messages/index.d.ts +2 -0
- package/dist/src/map/models/drawing-type.enum.d.ts +2 -1
- package/dist/src/map/services/drawing/drawing-generation.service.d.ts +5 -9
- package/dist/src/map/services/drawing/feature-modification.service.d.ts +22 -0
- package/dist/src/map/services/feature.service.d.ts +6 -9
- package/dist/src/map/services/message-registrator.service.d.ts +3 -3
- package/package.json +2 -2
- package/dist/esm2020/map/messages/queries/filter-features-in-area.query.mjs +0 -13
- package/dist/esm2020/map/messages/queries/generate-draw.query.mjs +0 -14
- package/dist/esm2020/src/map/messages/queries/filter-features-in-area.query.mjs +0 -13
- package/dist/esm2020/src/map/messages/queries/generate-draw.query.mjs +0 -14
|
@@ -8,10 +8,8 @@ import { RemoveTileCommand } from '../messages/commands/remove-tile.command';
|
|
|
8
8
|
import { GetLayerQuery } from '../messages/queries/get-layer.query';
|
|
9
9
|
import { GetFeaturesInAreaQuery } from '../messages/queries/get-features-in-area.query';
|
|
10
10
|
import { Dictionary } from '../models';
|
|
11
|
-
import { forkJoin } from 'rxjs';
|
|
12
|
-
import { FilterFeaturesInAreaQuery } from '../messages/queries/filter-features-in-area.query';
|
|
13
|
-
import { tap } from 'rxjs/operators';
|
|
14
11
|
import { MapConstants } from '../models/map.constants';
|
|
12
|
+
import { FilterFeaturesInAreaExecutor } from '../messages/executors/filter-features-in-area.executor';
|
|
15
13
|
import * as i0 from "@angular/core";
|
|
16
14
|
import * as i1 from "./map-postboy.service";
|
|
17
15
|
export class MapManagementService {
|
|
@@ -81,8 +79,6 @@ export class MapManagementService {
|
|
|
81
79
|
observeFeaturesInArea() {
|
|
82
80
|
this.postboy.subscribe(GetFeaturesInAreaQuery.ID).subscribe((qr) => {
|
|
83
81
|
let result = new Dictionary();
|
|
84
|
-
const queue = [];
|
|
85
|
-
const queries = [];
|
|
86
82
|
this.layers.forEach((l) => {
|
|
87
83
|
let layerName = l.get('name');
|
|
88
84
|
if (qr.ignore.has(layerName) || layerName === MapConstants.DrawingLayerId)
|
|
@@ -90,14 +86,10 @@ export class MapManagementService {
|
|
|
90
86
|
let source = l.getSource();
|
|
91
87
|
if (!!source['getSource'])
|
|
92
88
|
source = source?.getSource();
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
result.put(l.get('name'), r.map((e) => ({ id: e.getId(), ...e.get(MapConstants.FeatureInfo) })));
|
|
96
|
-
})));
|
|
97
|
-
queries.push(query);
|
|
89
|
+
let features = this.postboy.execute(new FilterFeaturesInAreaExecutor(qr.area, source?.getFeatures() ?? []));
|
|
90
|
+
result.put(layerName, features.map((e) => ({ id: e.getId(), ...e.get(MapConstants.FeatureInfo) })));
|
|
98
91
|
});
|
|
99
|
-
|
|
100
|
-
queries.forEach((q) => this.postboy.fire(q));
|
|
92
|
+
qr.finish(result);
|
|
101
93
|
});
|
|
102
94
|
}
|
|
103
95
|
}
|
|
@@ -106,4 +98,4 @@ MapManagementService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0",
|
|
|
106
98
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MapManagementService, decorators: [{
|
|
107
99
|
type: Injectable
|
|
108
100
|
}], ctorParameters: function () { return [{ type: i1.MapPostboyService }]; } });
|
|
109
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"map-management.service.js","sourceRoot":"","sources":["../../../../../projects/maps-components/src/map/services/map-management.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { Map } from 'ol';\nimport { MapPostboyService } from './map-postboy.service';\nimport { AddLayerCommand } from '../messages/commands/add-layer.command';\nimport { RemoveLayerCommand } from '../messages/commands/remove-layer.command';\nimport { Vector as Layer } from 'ol/layer';\nimport VectorSource from 'ol/source/Vector';\nimport { MapRenderedEvent } from '../messages';\nimport { PlaceLayerFeaturesCommand } from '../messages/commands/place-layer-features.command';\nimport { AddTileCommand } from '../messages/commands/add-tile.command';\nimport { RemoveTileCommand } from '../messages/commands/remove-tile.command';\nimport { IPostboyDependingService } from '@artstesh/postboy';\nimport Cluster from 'ol/source/Cluster';\nimport { GetLayerQuery } from '../messages/queries/get-layer.query';\nimport { GetFeaturesInAreaQuery } from '../messages/queries/get-features-in-area.query';\nimport { IIdentified } from '../models/i-identified';\nimport { Dictionary } from '../models';\nimport { combineLatest, forkJoin, Observable } from 'rxjs';\nimport { FilterFeaturesInAreaQuery } from '../messages/queries/filter-features-in-area.query';\nimport { tap } from 'rxjs/operators';\nimport { MapConstants } from '../models/map.constants';\n\n@Injectable()\nexport class MapManagementService implements IPostboyDependingService {\n  private map?: Map;\n  private layers = new Dictionary<Layer<VectorSource<any> | Cluster>>();\n\n  constructor(private postboy: MapPostboyService) {}\n\n  up(): void {\n    this.observeMapRender();\n    this.observeAddLayer();\n    this.observeRemoveLayer();\n    this.observePlaceFeatures();\n    this.observeAddTile();\n    this.observeRemoveTile();\n    this.observeLayerQuery();\n    this.observeFeaturesInArea();\n  }\n\n  private observeRemoveTile() {\n    this.postboy.subscribe<RemoveTileCommand>(RemoveTileCommand.ID).subscribe((c) => {\n      if (!this.map) return;\n      this.map.removeLayer(c.layer);\n    });\n  }\n\n  private observeLayerQuery() {\n    this.postboy.subscribe<GetLayerQuery>(GetLayerQuery.ID).subscribe((ev) => ev.finish(this.layers.take(ev.name)));\n  }\n\n  private observeAddTile() {\n    this.postboy.subscribe<AddTileCommand>(AddTileCommand.ID).subscribe((c) => {\n      if (!this.map) return;\n      this.map.addLayer(c.layer);\n    });\n  }\n\n  private observeMapRender() {\n    this.postboy.subscribe<MapRenderedEvent>(MapRenderedEvent.ID).subscribe((m) => {\n      this.map = m.map;\n    });\n  }\n\n  private observeAddLayer() {\n    this.postboy.subscribe<AddLayerCommand>(AddLayerCommand.ID).subscribe((c) => {\n      if (!this.map) return;\n      this.layers.put(c.layer.get('name'), c.layer);\n      this.map.addLayer(c.layer);\n    });\n  }\n\n  private observePlaceFeatures() {\n    this.postboy.subscribe<PlaceLayerFeaturesCommand>(PlaceLayerFeaturesCommand.ID).subscribe((c) => {\n      if (!this.layers.has(c.layer)) return;\n      let source = this.layers.take(c.layer)!.getSource();\n      if (!!(source as any)['getSource']) source = (source as any)?.getSource();\n      source?.clear();\n      source?.addFeatures(c.features);\n    });\n  }\n\n  private observeRemoveLayer() {\n    this.postboy.subscribe<RemoveLayerCommand>(RemoveLayerCommand.ID).subscribe((c) => {\n      if (!this.map) return;\n      this.layers.rmv(c.layer.get('name'));\n      this.map.removeLayer(c.layer);\n    });\n  }\n\n  private observeFeaturesInArea() {\n    this.postboy.subscribe<GetFeaturesInAreaQuery>(GetFeaturesInAreaQuery.ID).subscribe((qr) => {\n      let result = new Dictionary<IIdentified[]>();\n      const queue: Observable<any>[] = [];\n      const queries: FilterFeaturesInAreaQuery[] = [];\n      this.layers.forEach((l) => {\n        let layerName = l.get('name');\n        if (qr.ignore.has(layerName) || layerName === MapConstants.DrawingLayerId) return;\n        let source = l.getSource();\n        if (!!(source as any)['getSource']) source = (source as any)?.getSource();\n        const query = new FilterFeaturesInAreaQuery(qr.area, source?.getFeatures() ?? []);\n        queue.push(\n          query.result.pipe(\n            tap((r) => {\n              result.put(\n                l.get('name'),\n                r.map((e) => ({ id: e.getId(), ...e.get(MapConstants.FeatureInfo) })),\n              );\n            }),\n          ),\n        );\n        queries.push(query);\n      });\n      forkJoin(queue).subscribe(() => qr.finish(result));\n      queries.forEach((q) => this.postboy.fire(q));\n    });\n  }\n}\n"]}
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"map-management.service.js","sourceRoot":"","sources":["../../../../../projects/maps-components/src/map/services/map-management.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { Feature, Map } from 'ol';\nimport { MapPostboyService } from './map-postboy.service';\nimport { AddLayerCommand } from '../messages/commands/add-layer.command';\nimport { RemoveLayerCommand } from '../messages/commands/remove-layer.command';\nimport { Vector as Layer } from 'ol/layer';\nimport VectorSource from 'ol/source/Vector';\nimport { MapRenderedEvent } from '../messages';\nimport { PlaceLayerFeaturesCommand } from '../messages/commands/place-layer-features.command';\nimport { AddTileCommand } from '../messages/commands/add-tile.command';\nimport { RemoveTileCommand } from '../messages/commands/remove-tile.command';\nimport { IPostboyDependingService } from '@artstesh/postboy';\nimport Cluster from 'ol/source/Cluster';\nimport { GetLayerQuery } from '../messages/queries/get-layer.query';\nimport { GetFeaturesInAreaQuery } from '../messages/queries/get-features-in-area.query';\nimport { IIdentified } from '../models/i-identified';\nimport { Dictionary } from '../models';\nimport { MapConstants } from '../models/map.constants';\nimport { FilterFeaturesInAreaExecutor } from '../messages/executors/filter-features-in-area.executor';\nimport { Geometry } from 'ol/geom';\n\n@Injectable()\nexport class MapManagementService implements IPostboyDependingService {\n  private map?: Map;\n  private layers = new Dictionary<Layer<VectorSource<any> | Cluster>>();\n\n  constructor(private postboy: MapPostboyService) {}\n\n  up(): void {\n    this.observeMapRender();\n    this.observeAddLayer();\n    this.observeRemoveLayer();\n    this.observePlaceFeatures();\n    this.observeAddTile();\n    this.observeRemoveTile();\n    this.observeLayerQuery();\n    this.observeFeaturesInArea();\n  }\n\n  private observeRemoveTile() {\n    this.postboy.subscribe<RemoveTileCommand>(RemoveTileCommand.ID).subscribe((c) => {\n      if (!this.map) return;\n      this.map.removeLayer(c.layer);\n    });\n  }\n\n  private observeLayerQuery() {\n    this.postboy.subscribe<GetLayerQuery>(GetLayerQuery.ID).subscribe((ev) => ev.finish(this.layers.take(ev.name)));\n  }\n\n  private observeAddTile() {\n    this.postboy.subscribe<AddTileCommand>(AddTileCommand.ID).subscribe((c) => {\n      if (!this.map) return;\n      this.map.addLayer(c.layer);\n    });\n  }\n\n  private observeMapRender() {\n    this.postboy.subscribe<MapRenderedEvent>(MapRenderedEvent.ID).subscribe((m) => {\n      this.map = m.map;\n    });\n  }\n\n  private observeAddLayer() {\n    this.postboy.subscribe<AddLayerCommand>(AddLayerCommand.ID).subscribe((c) => {\n      if (!this.map) return;\n      this.layers.put(c.layer.get('name'), c.layer);\n      this.map.addLayer(c.layer);\n    });\n  }\n\n  private observePlaceFeatures() {\n    this.postboy.subscribe<PlaceLayerFeaturesCommand>(PlaceLayerFeaturesCommand.ID).subscribe((c) => {\n      if (!this.layers.has(c.layer)) return;\n      let source = this.layers.take(c.layer)!.getSource();\n      if (!!(source as any)['getSource']) source = (source as any)?.getSource();\n      source?.clear();\n      source?.addFeatures(c.features);\n    });\n  }\n\n  private observeRemoveLayer() {\n    this.postboy.subscribe<RemoveLayerCommand>(RemoveLayerCommand.ID).subscribe((c) => {\n      if (!this.map) return;\n      this.layers.rmv(c.layer.get('name'));\n      this.map.removeLayer(c.layer);\n    });\n  }\n\n  private observeFeaturesInArea() {\n    this.postboy.subscribe<GetFeaturesInAreaQuery>(GetFeaturesInAreaQuery.ID).subscribe((qr) => {\n      let result = new Dictionary<IIdentified[]>();\n      this.layers.forEach((l) => {\n        let layerName = l.get('name');\n        if (qr.ignore.has(layerName) || layerName === MapConstants.DrawingLayerId) return;\n        let source = l.getSource();\n        if (!!(source as any)['getSource']) source = (source as any)?.getSource();\n        let features = this.postboy.execute<FilterFeaturesInAreaExecutor, Feature<Geometry>[]>(\n          new FilterFeaturesInAreaExecutor(qr.area, source?.getFeatures() ?? []),\n        );\n        result.put(\n          layerName,\n          features.map((e) => ({ id: e.getId(), ...e.get(MapConstants.FeatureInfo) })),\n        );\n      });\n      qr.finish(result);\n    });\n  }\n}\n"]}
|
|
@@ -14,10 +14,14 @@ import { CancelDrawingCommand } from '../messages/commands/cancel-drawing.comman
|
|
|
14
14
|
import { StartDrawingCommand } from '../messages/commands/start-drawing.command';
|
|
15
15
|
import { GetLayerQuery } from '../messages/queries/get-layer.query';
|
|
16
16
|
import { DrawingFinishedEvent } from '../messages/events/drawing-finished.event';
|
|
17
|
-
import {
|
|
18
|
-
import {
|
|
17
|
+
import { DrawingGenerationService } from './drawing/drawing-generation.service';
|
|
18
|
+
import { FeatureService } from './feature.service';
|
|
19
19
|
import { GetFeaturesInAreaQuery } from '../messages/queries/get-features-in-area.query';
|
|
20
20
|
import { DrawSelectionAreaCommand } from '../messages/commands/draw-selection-area.command';
|
|
21
|
+
import { FilterFeaturesInAreaExecutor } from '../messages/executors/filter-features-in-area.executor';
|
|
22
|
+
import { GenerateDrawExecutor } from '../messages/executors/generate-draw.executor';
|
|
23
|
+
import { CancelFeatureModificationCommand } from '../messages/commands/cancel-feature-modification.command';
|
|
24
|
+
import { ModifyFeatureCommand } from '../messages/commands/modify-feature.command';
|
|
21
25
|
import * as i0 from "@angular/core";
|
|
22
26
|
import * as i1 from "./map-postboy.service";
|
|
23
27
|
import * as i2 from "./map-management.service";
|
|
@@ -25,12 +29,11 @@ import * as i3 from "./map-state.service";
|
|
|
25
29
|
import * as i4 from "./map-feature.service";
|
|
26
30
|
import * as i5 from "./map-click.service";
|
|
27
31
|
import * as i6 from "./drawing/drawing.service";
|
|
28
|
-
import * as i7 from "./drawing/
|
|
29
|
-
import * as i8 from "./feature.service";
|
|
32
|
+
import * as i7 from "./drawing/feature-modification.service";
|
|
30
33
|
export class MessageRegistratorService extends PostboyAbstractRegistrator {
|
|
31
|
-
constructor(service, management, state, mapFeature, interaction, drawing,
|
|
34
|
+
constructor(service, management, state, mapFeature, interaction, drawing, featureModification) {
|
|
32
35
|
super(service);
|
|
33
|
-
this.registerServices([management, state, interaction, mapFeature, drawing,
|
|
36
|
+
this.registerServices([management, state, interaction, mapFeature, drawing, featureModification]);
|
|
34
37
|
}
|
|
35
38
|
_up() {
|
|
36
39
|
this.registerReplay(MapRenderedEvent.ID);
|
|
@@ -47,15 +50,20 @@ export class MessageRegistratorService extends PostboyAbstractRegistrator {
|
|
|
47
50
|
this.registerSubject(StartDrawingCommand.ID);
|
|
48
51
|
this.registerSubject(GetLayerQuery.ID);
|
|
49
52
|
this.registerSubject(DrawingFinishedEvent.ID);
|
|
50
|
-
this.registerSubject(GenerateDrawQuery.ID);
|
|
51
|
-
this.registerSubject(FilterFeaturesInAreaQuery.ID);
|
|
52
53
|
this.registerSubject(GetFeaturesInAreaQuery.ID);
|
|
53
54
|
this.registerSubject(DrawSelectionAreaCommand.ID);
|
|
55
|
+
this.registerSubject(CancelFeatureModificationCommand.ID);
|
|
56
|
+
this.registerSubject(ModifyFeatureCommand.ID);
|
|
57
|
+
this.setExecutors();
|
|
58
|
+
}
|
|
59
|
+
setExecutors() {
|
|
60
|
+
this.registerExecutor(FilterFeaturesInAreaExecutor.ID, (e) => FeatureService.filterFeaturesInArea(e));
|
|
61
|
+
this.registerExecutor(GenerateDrawExecutor.ID, (e) => DrawingGenerationService.getDraw(e));
|
|
54
62
|
}
|
|
55
63
|
}
|
|
56
|
-
MessageRegistratorService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MessageRegistratorService, deps: [{ token: i1.MapPostboyService }, { token: i2.MapManagementService }, { token: i3.MapStateService }, { token: i4.MapFeatureService }, { token: i5.MapClickService }, { token: i6.DrawingService }, { token: i7.
|
|
64
|
+
MessageRegistratorService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MessageRegistratorService, deps: [{ token: i1.MapPostboyService }, { token: i2.MapManagementService }, { token: i3.MapStateService }, { token: i4.MapFeatureService }, { token: i5.MapClickService }, { token: i6.DrawingService }, { token: i7.FeatureModificationService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
57
65
|
MessageRegistratorService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MessageRegistratorService });
|
|
58
66
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MessageRegistratorService, decorators: [{
|
|
59
67
|
type: Injectable
|
|
60
|
-
}], ctorParameters: function () { return [{ type: i1.MapPostboyService }, { type: i2.MapManagementService }, { type: i3.MapStateService }, { type: i4.MapFeatureService }, { type: i5.MapClickService }, { type: i6.DrawingService }, { type: i7.
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
68
|
+
}], ctorParameters: function () { return [{ type: i1.MapPostboyService }, { type: i2.MapManagementService }, { type: i3.MapStateService }, { type: i4.MapFeatureService }, { type: i5.MapClickService }, { type: i6.DrawingService }, { type: i7.FeatureModificationService }]; } });
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"message-registrator.service.js","sourceRoot":"","sources":["../../../../../projects/maps-components/src/map/services/message-registrator.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { MapPostboyService } from './map-postboy.service';\nimport { MapRenderedEvent } from '../messages';\nimport { AddLayerCommand } from '../messages/commands/add-layer.command';\nimport { PlaceLayerFeaturesCommand } from '../messages/commands/place-layer-features.command';\nimport { RemoveLayerCommand } from '../messages/commands/remove-layer.command';\nimport { AddTileCommand } from '../messages/commands/add-tile.command';\nimport { RemoveTileCommand } from '../messages/commands/remove-tile.command';\nimport { PostboyAbstractRegistrator } from '@artstesh/postboy';\nimport { MapManagementService } from './map-management.service';\nimport { MapStateService } from './map-state.service';\nimport { MapClickService } from './map-click.service';\nimport { MapClickEvent } from '../messages/events/map-click.event';\nimport { CloseTooltipCommand } from '../messages/commands/close-tooltip.command';\nimport { MapFeatureService } from './map-feature.service';\nimport { FitToFeaturesCommand } from '../messages/commands/fit-to-features.command';\nimport { MapMoveEndEvent } from '../messages/events/map-move-end.event';\nimport { CancelDrawingCommand } from '../messages/commands/cancel-drawing.command';\nimport { StartDrawingCommand } from '../messages/commands/start-drawing.command';\nimport { DrawingService } from './drawing/drawing.service';\nimport { GetLayerQuery } from '../messages/queries/get-layer.query';\nimport { DrawingFinishedEvent } from '../messages/events/drawing-finished.event';\nimport { DrawingGenerationService } from './drawing/drawing-generation.service';\nimport { FeatureService } from './feature.service';\nimport { GetFeaturesInAreaQuery } from '../messages/queries/get-features-in-area.query';\nimport { DrawSelectionAreaCommand } from '../messages/commands/draw-selection-area.command';\nimport { FilterFeaturesInAreaExecutor } from '../messages/executors/filter-features-in-area.executor';\nimport { GenerateDrawExecutor } from '../messages/executors/generate-draw.executor';\nimport { FeatureModificationService } from './drawing/feature-modification.service';\nimport { CancelFeatureModificationCommand } from '../messages/commands/cancel-feature-modification.command';\nimport { ModifyFeatureCommand } from '../messages/commands/modify-feature.command';\n\n@Injectable()\nexport class MessageRegistratorService extends PostboyAbstractRegistrator {\n  constructor(\n    service: MapPostboyService,\n    management: MapManagementService,\n    state: MapStateService,\n    mapFeature: MapFeatureService,\n    interaction: MapClickService,\n    drawing: DrawingService,\n    featureModification: FeatureModificationService,\n  ) {\n    super(service);\n    this.registerServices([management, state, interaction, mapFeature, drawing, featureModification]);\n  }\n\n  protected _up(): void {\n    this.registerReplay<MapRenderedEvent>(MapRenderedEvent.ID);\n    this.registerReplay<PlaceLayerFeaturesCommand>(PlaceLayerFeaturesCommand.ID);\n    this.registerSubject<AddLayerCommand>(AddLayerCommand.ID);\n    this.registerSubject<RemoveLayerCommand>(RemoveLayerCommand.ID);\n    this.registerSubject<AddTileCommand>(AddTileCommand.ID);\n    this.registerSubject<RemoveTileCommand>(RemoveTileCommand.ID);\n    this.registerSubject<MapClickEvent>(MapClickEvent.ID);\n    this.registerSubject<CloseTooltipCommand>(CloseTooltipCommand.ID);\n    this.registerSubject<FitToFeaturesCommand>(FitToFeaturesCommand.ID);\n    this.registerSubject<MapMoveEndEvent>(MapMoveEndEvent.ID);\n    this.registerSubject<CancelDrawingCommand>(CancelDrawingCommand.ID);\n    this.registerSubject<StartDrawingCommand>(StartDrawingCommand.ID);\n    this.registerSubject<GetLayerQuery>(GetLayerQuery.ID);\n    this.registerSubject<DrawingFinishedEvent>(DrawingFinishedEvent.ID);\n    this.registerSubject<GetFeaturesInAreaQuery>(GetFeaturesInAreaQuery.ID);\n    this.registerSubject<DrawSelectionAreaCommand>(DrawSelectionAreaCommand.ID);\n    this.registerSubject<CancelFeatureModificationCommand>(CancelFeatureModificationCommand.ID);\n    this.registerSubject<ModifyFeatureCommand>(ModifyFeatureCommand.ID);\n    this.setExecutors();\n  }\n\n  private setExecutors() {\n    this.registerExecutor(FilterFeaturesInAreaExecutor.ID, (e: FilterFeaturesInAreaExecutor) =>\n      FeatureService.filterFeaturesInArea(e),\n    );\n    this.registerExecutor(GenerateDrawExecutor.ID, (e: GenerateDrawExecutor) => DrawingGenerationService.getDraw(e));\n  }\n}\n"]}
|
|
@@ -2,23 +2,23 @@ import * as i0 from '@angular/core';
|
|
|
2
2
|
import { Component, Injectable, ChangeDetectionStrategy, Input, ViewChild, NgModule } from '@angular/core';
|
|
3
3
|
import * as i4 from '@angular/common';
|
|
4
4
|
import { CommonModule } from '@angular/common';
|
|
5
|
-
import { Feature } from 'ol';
|
|
5
|
+
import { Feature, Collection } from 'ol';
|
|
6
6
|
import { Point, LineString } from 'ol/geom';
|
|
7
7
|
import { GeoJSON, WKT } from 'ol/format';
|
|
8
8
|
import { getCenter, createEmpty, extend } from 'ol/extent';
|
|
9
9
|
import { get, useGeographic, transform } from 'ol/proj';
|
|
10
|
-
import { PostboyGenericMessage, PostboyCallbackMessage, PostboyService, PostboyAbstractRegistrator } from '@artstesh/postboy';
|
|
11
|
-
import {
|
|
12
|
-
import { tap, first, filter, auditTime } from 'rxjs/operators';
|
|
13
|
-
import { Vector, XYZ } from 'ol/source';
|
|
14
|
-
import { Draw } from 'ol/interaction';
|
|
10
|
+
import { PostboyGenericMessage, PostboyCallbackMessage, PostboyExecutor, PostboyService, PostboyAbstractRegistrator } from '@artstesh/postboy';
|
|
11
|
+
import { Draw, Modify, Translate } from 'ol/interaction';
|
|
15
12
|
import { createRegularPolygon } from 'ol/interaction/Draw';
|
|
13
|
+
import { first, filter, auditTime } from 'rxjs/operators';
|
|
14
|
+
import { Vector, XYZ } from 'ol/source';
|
|
16
15
|
import TileLayer from 'ol/layer/Tile';
|
|
17
16
|
import OSM from 'ol/source/OSM';
|
|
18
17
|
import { Vector as Vector$1 } from 'ol/layer';
|
|
19
18
|
import { bbox } from 'ol/loadingstrategy';
|
|
20
19
|
import Polygon, { fromExtent } from 'ol/geom/Polygon';
|
|
21
20
|
import Cluster from 'ol/source/Cluster';
|
|
21
|
+
import { combineLatest } from 'rxjs';
|
|
22
22
|
import Map from 'ol/Map';
|
|
23
23
|
import View from 'ol/View';
|
|
24
24
|
import Overlay from 'ol/Overlay';
|
|
@@ -180,6 +180,7 @@ var DrawingType;
|
|
|
180
180
|
(function (DrawingType) {
|
|
181
181
|
DrawingType[DrawingType["Polygon"] = 1] = "Polygon";
|
|
182
182
|
DrawingType[DrawingType["Circle"] = 2] = "Circle";
|
|
183
|
+
DrawingType[DrawingType["Square"] = 3] = "Square";
|
|
183
184
|
})(DrawingType || (DrawingType = {}));
|
|
184
185
|
|
|
185
186
|
var FeatureOutputFormat;
|
|
@@ -324,6 +325,26 @@ class DrawSelectionAreaCommand extends PostboyCallbackMessage {
|
|
|
324
325
|
}
|
|
325
326
|
DrawSelectionAreaCommand.ID = '573d8a0d-f25b-42b7-9ad7-0ac6d86ac362';
|
|
326
327
|
|
|
328
|
+
class ModifyFeatureCommand extends PostboyCallbackMessage {
|
|
329
|
+
constructor(model, style, format = FeatureOutputFormat.GeoJson) {
|
|
330
|
+
super();
|
|
331
|
+
this.model = model;
|
|
332
|
+
this.style = style;
|
|
333
|
+
this.format = format;
|
|
334
|
+
}
|
|
335
|
+
get id() {
|
|
336
|
+
return ModifyFeatureCommand.ID;
|
|
337
|
+
}
|
|
338
|
+
}
|
|
339
|
+
ModifyFeatureCommand.ID = 'ead85caa-24c6-4844-a68c-2cea91774c8c';
|
|
340
|
+
|
|
341
|
+
class CancelFeatureModificationCommand extends PostboyGenericMessage {
|
|
342
|
+
get id() {
|
|
343
|
+
return CancelFeatureModificationCommand.ID;
|
|
344
|
+
}
|
|
345
|
+
}
|
|
346
|
+
CancelFeatureModificationCommand.ID = '9c9fb40f-ea95-4704-8177-0e9ecabf36fa';
|
|
347
|
+
|
|
327
348
|
class AddLayerCommand extends PostboyGenericMessage {
|
|
328
349
|
constructor(layer) {
|
|
329
350
|
super();
|
|
@@ -413,42 +434,78 @@ class DrawingFinishedEvent extends PostboyGenericMessage {
|
|
|
413
434
|
}
|
|
414
435
|
DrawingFinishedEvent.ID = 'c724b68e-b4eb-4783-90f1-a8e31973fd36';
|
|
415
436
|
|
|
416
|
-
class
|
|
417
|
-
|
|
437
|
+
class DrawingGenerationService {
|
|
438
|
+
static getDraw(ev) {
|
|
439
|
+
return new Draw({
|
|
440
|
+
source: ev.layer.getSource(),
|
|
441
|
+
type: ev.type === DrawingType.Polygon ? 'Polygon' : 'Circle',
|
|
442
|
+
style: ev.style,
|
|
443
|
+
geometryFunction: DrawingGenerationService.geometryFunc(ev.type),
|
|
444
|
+
});
|
|
445
|
+
}
|
|
446
|
+
static geometryFunc(type) {
|
|
447
|
+
switch (type) {
|
|
448
|
+
case DrawingType.Circle:
|
|
449
|
+
return createRegularPolygon(32);
|
|
450
|
+
case DrawingType.Square:
|
|
451
|
+
return createRegularPolygon(4);
|
|
452
|
+
}
|
|
453
|
+
return undefined;
|
|
454
|
+
}
|
|
455
|
+
}
|
|
456
|
+
|
|
457
|
+
class FeatureService {
|
|
458
|
+
constructor() { }
|
|
459
|
+
static filterFeaturesInArea(query) {
|
|
460
|
+
return query.features.filter((f) => FeatureService.booleanIntersects(query.area, f.getGeometry()));
|
|
461
|
+
}
|
|
462
|
+
static booleanIntersects(g1, g2) {
|
|
463
|
+
if (g2.getType() === 'Point')
|
|
464
|
+
return g1.intersectsCoordinate(g2.getCoordinates());
|
|
465
|
+
if (g2.getType() === 'Circle')
|
|
466
|
+
return g1.intersectsCoordinate(g2.getCenter());
|
|
467
|
+
if (g2.getType() === 'Polygon')
|
|
468
|
+
return g1.intersectsCoordinate(g2.getInteriorPoint().getCoordinates());
|
|
469
|
+
return false;
|
|
470
|
+
}
|
|
471
|
+
}
|
|
472
|
+
|
|
473
|
+
class GetFeaturesInAreaQuery extends PostboyCallbackMessage {
|
|
474
|
+
constructor(area, ignore = new Set()) {
|
|
418
475
|
super();
|
|
419
|
-
this.
|
|
420
|
-
this.
|
|
421
|
-
this.type = type;
|
|
476
|
+
this.area = area;
|
|
477
|
+
this.ignore = ignore;
|
|
422
478
|
}
|
|
423
479
|
get id() {
|
|
424
|
-
return
|
|
480
|
+
return GetFeaturesInAreaQuery.ID;
|
|
425
481
|
}
|
|
426
482
|
}
|
|
427
|
-
|
|
483
|
+
GetFeaturesInAreaQuery.ID = 'efcf4271-a07a-40e0-9f02-d4dade40b8ac';
|
|
428
484
|
|
|
429
|
-
class
|
|
485
|
+
class FilterFeaturesInAreaExecutor extends PostboyExecutor {
|
|
430
486
|
constructor(area, features) {
|
|
431
487
|
super();
|
|
432
488
|
this.area = area;
|
|
433
489
|
this.features = features;
|
|
434
490
|
}
|
|
435
491
|
get id() {
|
|
436
|
-
return
|
|
492
|
+
return FilterFeaturesInAreaExecutor.ID;
|
|
437
493
|
}
|
|
438
494
|
}
|
|
439
|
-
|
|
495
|
+
FilterFeaturesInAreaExecutor.ID = '36bb2d94-8028-4512-90dd-2386af3fc67c';
|
|
440
496
|
|
|
441
|
-
class
|
|
442
|
-
constructor(
|
|
497
|
+
class GenerateDrawExecutor extends PostboyExecutor {
|
|
498
|
+
constructor(layer, style, type) {
|
|
443
499
|
super();
|
|
444
|
-
this.
|
|
445
|
-
this.
|
|
500
|
+
this.layer = layer;
|
|
501
|
+
this.style = style;
|
|
502
|
+
this.type = type;
|
|
446
503
|
}
|
|
447
504
|
get id() {
|
|
448
|
-
return
|
|
505
|
+
return GenerateDrawExecutor.ID;
|
|
449
506
|
}
|
|
450
507
|
}
|
|
451
|
-
|
|
508
|
+
GenerateDrawExecutor.ID = 'f01c99ba-0953-4ab5-82f9-04e6fbb678c1';
|
|
452
509
|
|
|
453
510
|
class MapPostboyService extends PostboyService {
|
|
454
511
|
constructor() {
|
|
@@ -529,8 +586,6 @@ class MapManagementService {
|
|
|
529
586
|
observeFeaturesInArea() {
|
|
530
587
|
this.postboy.subscribe(GetFeaturesInAreaQuery.ID).subscribe((qr) => {
|
|
531
588
|
let result = new Dictionary();
|
|
532
|
-
const queue = [];
|
|
533
|
-
const queries = [];
|
|
534
589
|
this.layers.forEach((l) => {
|
|
535
590
|
var _a;
|
|
536
591
|
let layerName = l.get('name');
|
|
@@ -539,14 +594,10 @@ class MapManagementService {
|
|
|
539
594
|
let source = l.getSource();
|
|
540
595
|
if (!!source['getSource'])
|
|
541
596
|
source = source === null || source === void 0 ? void 0 : source.getSource();
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
result.put(l.get('name'), r.map((e) => (Object.assign({ id: e.getId() }, e.get(MapConstants.FeatureInfo)))));
|
|
545
|
-
})));
|
|
546
|
-
queries.push(query);
|
|
597
|
+
let features = this.postboy.execute(new FilterFeaturesInAreaExecutor(qr.area, (_a = source === null || source === void 0 ? void 0 : source.getFeatures()) !== null && _a !== void 0 ? _a : []));
|
|
598
|
+
result.put(layerName, features.map((e) => (Object.assign({ id: e.getId() }, e.get(MapConstants.FeatureInfo)))));
|
|
547
599
|
});
|
|
548
|
-
|
|
549
|
-
queries.forEach((q) => this.postboy.fire(q));
|
|
600
|
+
qr.finish(result);
|
|
550
601
|
});
|
|
551
602
|
}
|
|
552
603
|
}
|
|
@@ -689,22 +740,18 @@ class DrawingService {
|
|
|
689
740
|
observeDrawing() {
|
|
690
741
|
this.postboy.subscribe(StartDrawingCommand.ID).subscribe((ev) => {
|
|
691
742
|
this.draw((l) => {
|
|
743
|
+
var _a;
|
|
692
744
|
if (!l || !this.map) {
|
|
693
745
|
this.clearInteraction(l);
|
|
694
746
|
return;
|
|
695
747
|
}
|
|
696
|
-
const
|
|
697
|
-
|
|
698
|
-
|
|
699
|
-
|
|
700
|
-
|
|
701
|
-
|
|
702
|
-
this.drawInteraction.on('drawend', (evt) => {
|
|
703
|
-
cancelSub.unsubscribe();
|
|
704
|
-
this.onEnd(evt, ev, l);
|
|
705
|
-
});
|
|
748
|
+
const cancelSub = this.observeCancelation(ev, l);
|
|
749
|
+
this.drawInteraction = this.postboy.execute(new GenerateDrawExecutor(l, ev.style, ev.type));
|
|
750
|
+
(_a = this.map) === null || _a === void 0 ? void 0 : _a.addInteraction(this.drawInteraction);
|
|
751
|
+
this.drawInteraction.on('drawend', (evt) => {
|
|
752
|
+
cancelSub.unsubscribe();
|
|
753
|
+
this.onEnd(evt, ev, l);
|
|
706
754
|
});
|
|
707
|
-
this.postboy.fire(drawQuery);
|
|
708
755
|
});
|
|
709
756
|
});
|
|
710
757
|
}
|
|
@@ -748,56 +795,101 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
|
|
|
748
795
|
type: Injectable
|
|
749
796
|
}], ctorParameters: function () { return [{ type: MapPostboyService }]; } });
|
|
750
797
|
|
|
751
|
-
class
|
|
798
|
+
class FeatureModificationService {
|
|
752
799
|
constructor(postboy) {
|
|
753
800
|
this.postboy = postboy;
|
|
754
801
|
}
|
|
755
802
|
up() {
|
|
756
|
-
this.
|
|
757
|
-
|
|
758
|
-
|
|
759
|
-
|
|
760
|
-
|
|
761
|
-
|
|
762
|
-
|
|
803
|
+
this.observeModification();
|
|
804
|
+
this.observeMapRender();
|
|
805
|
+
}
|
|
806
|
+
observeModification() {
|
|
807
|
+
this.postboy.subscribe(ModifyFeatureCommand.ID).subscribe((ev) => {
|
|
808
|
+
this.defineLayer((l) => {
|
|
809
|
+
if (!l || !this.map) {
|
|
810
|
+
this.clearInteraction(l);
|
|
811
|
+
return;
|
|
812
|
+
}
|
|
813
|
+
this.observeCancelation(ev, l);
|
|
814
|
+
this.initFeature(l, ev.model.feature);
|
|
815
|
+
this.addModify(ev);
|
|
816
|
+
this.addDragging(ev);
|
|
817
|
+
});
|
|
763
818
|
});
|
|
764
819
|
}
|
|
765
|
-
|
|
766
|
-
|
|
767
|
-
|
|
768
|
-
|
|
769
|
-
type: Injectable
|
|
770
|
-
}], ctorParameters: function () { return [{ type: MapPostboyService }]; } });
|
|
771
|
-
|
|
772
|
-
class FeatureService {
|
|
773
|
-
constructor(postboy) {
|
|
774
|
-
this.postboy = postboy;
|
|
820
|
+
initFeature(layer, feature) {
|
|
821
|
+
var _a, _b;
|
|
822
|
+
(_a = layer.getSource()) === null || _a === void 0 ? void 0 : _a.clear();
|
|
823
|
+
(_b = layer.getSource()) === null || _b === void 0 ? void 0 : _b.addFeature(feature);
|
|
775
824
|
}
|
|
776
|
-
|
|
777
|
-
|
|
778
|
-
|
|
825
|
+
addModify(command) {
|
|
826
|
+
var _a;
|
|
827
|
+
this.modify = new Modify({
|
|
828
|
+
features: new Collection([command.model.feature]),
|
|
829
|
+
style: command.style,
|
|
830
|
+
});
|
|
831
|
+
this.modify.on('modifyend', () => {
|
|
832
|
+
this.onModified(command);
|
|
833
|
+
command.model.feature.changed();
|
|
779
834
|
});
|
|
835
|
+
(_a = this.map) === null || _a === void 0 ? void 0 : _a.addInteraction(this.modify);
|
|
780
836
|
}
|
|
781
|
-
|
|
782
|
-
|
|
783
|
-
|
|
784
|
-
|
|
785
|
-
|
|
786
|
-
|
|
787
|
-
|
|
788
|
-
|
|
837
|
+
addDragging(command) {
|
|
838
|
+
var _a;
|
|
839
|
+
this.translate = new Translate({
|
|
840
|
+
features: new Collection([command.model.feature]),
|
|
841
|
+
condition: (ev) => {
|
|
842
|
+
var _a;
|
|
843
|
+
const clone = command.model.feature.clone();
|
|
844
|
+
(_a = clone.getGeometry()) === null || _a === void 0 ? void 0 : _a.scale(0.999);
|
|
845
|
+
return clone.getGeometry().intersectsCoordinate(ev.coordinate);
|
|
846
|
+
},
|
|
847
|
+
});
|
|
848
|
+
this.translate.on('translateend', () => this.onModified(command));
|
|
849
|
+
(_a = this.map) === null || _a === void 0 ? void 0 : _a.addInteraction(this.translate);
|
|
850
|
+
}
|
|
851
|
+
onModified(command) {
|
|
852
|
+
command.next(command.format === FeatureOutputFormat.GeoJson
|
|
853
|
+
? new GeoJSON().writeFeature(command.model.feature)
|
|
854
|
+
: new WKT().writeFeature(command.model.feature));
|
|
855
|
+
}
|
|
856
|
+
observeMapRender() {
|
|
857
|
+
this.postboy.subscribe(MapRenderedEvent.ID).subscribe((m) => {
|
|
858
|
+
this.map = m.map;
|
|
859
|
+
});
|
|
860
|
+
}
|
|
861
|
+
defineLayer(action) {
|
|
862
|
+
const query = new GetLayerQuery(MapConstants.DrawingLayerId);
|
|
863
|
+
query.result.subscribe((l) => action(l));
|
|
864
|
+
this.postboy.fire(query);
|
|
865
|
+
}
|
|
866
|
+
observeCancelation(ev, layer) {
|
|
867
|
+
return this.postboy
|
|
868
|
+
.subscribe(CancelFeatureModificationCommand.ID)
|
|
869
|
+
.pipe(first())
|
|
870
|
+
.subscribe(() => {
|
|
871
|
+
ev.finish(null);
|
|
872
|
+
this.clearInteraction(layer);
|
|
873
|
+
});
|
|
874
|
+
}
|
|
875
|
+
clearInteraction(layer) {
|
|
876
|
+
var _a, _b;
|
|
877
|
+
if (this.modify)
|
|
878
|
+
(_a = this.map) === null || _a === void 0 ? void 0 : _a.removeInteraction(this.modify);
|
|
879
|
+
if (this.translate)
|
|
880
|
+
(_b = this.map) === null || _b === void 0 ? void 0 : _b.removeInteraction(this.translate);
|
|
789
881
|
}
|
|
790
882
|
}
|
|
791
|
-
|
|
792
|
-
|
|
793
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type:
|
|
883
|
+
FeatureModificationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: FeatureModificationService, deps: [{ token: MapPostboyService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
884
|
+
FeatureModificationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: FeatureModificationService });
|
|
885
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: FeatureModificationService, decorators: [{
|
|
794
886
|
type: Injectable
|
|
795
887
|
}], ctorParameters: function () { return [{ type: MapPostboyService }]; } });
|
|
796
888
|
|
|
797
889
|
class MessageRegistratorService extends PostboyAbstractRegistrator {
|
|
798
|
-
constructor(service, management, state, mapFeature, interaction, drawing,
|
|
890
|
+
constructor(service, management, state, mapFeature, interaction, drawing, featureModification) {
|
|
799
891
|
super(service);
|
|
800
|
-
this.registerServices([management, state, interaction, mapFeature, drawing,
|
|
892
|
+
this.registerServices([management, state, interaction, mapFeature, drawing, featureModification]);
|
|
801
893
|
}
|
|
802
894
|
_up() {
|
|
803
895
|
this.registerReplay(MapRenderedEvent.ID);
|
|
@@ -814,17 +906,22 @@ class MessageRegistratorService extends PostboyAbstractRegistrator {
|
|
|
814
906
|
this.registerSubject(StartDrawingCommand.ID);
|
|
815
907
|
this.registerSubject(GetLayerQuery.ID);
|
|
816
908
|
this.registerSubject(DrawingFinishedEvent.ID);
|
|
817
|
-
this.registerSubject(GenerateDrawQuery.ID);
|
|
818
|
-
this.registerSubject(FilterFeaturesInAreaQuery.ID);
|
|
819
909
|
this.registerSubject(GetFeaturesInAreaQuery.ID);
|
|
820
910
|
this.registerSubject(DrawSelectionAreaCommand.ID);
|
|
911
|
+
this.registerSubject(CancelFeatureModificationCommand.ID);
|
|
912
|
+
this.registerSubject(ModifyFeatureCommand.ID);
|
|
913
|
+
this.setExecutors();
|
|
914
|
+
}
|
|
915
|
+
setExecutors() {
|
|
916
|
+
this.registerExecutor(FilterFeaturesInAreaExecutor.ID, (e) => FeatureService.filterFeaturesInArea(e));
|
|
917
|
+
this.registerExecutor(GenerateDrawExecutor.ID, (e) => DrawingGenerationService.getDraw(e));
|
|
821
918
|
}
|
|
822
919
|
}
|
|
823
|
-
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:
|
|
920
|
+
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: FeatureModificationService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
824
921
|
MessageRegistratorService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MessageRegistratorService });
|
|
825
922
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MessageRegistratorService, decorators: [{
|
|
826
923
|
type: Injectable
|
|
827
|
-
}], ctorParameters: function () { return [{ type: MapPostboyService }, { type: MapManagementService }, { type: MapStateService }, { type: MapFeatureService }, { type: MapClickService }, { type: DrawingService }, { type:
|
|
924
|
+
}], ctorParameters: function () { return [{ type: MapPostboyService }, { type: MapManagementService }, { type: MapStateService }, { type: MapFeatureService }, { type: MapClickService }, { type: DrawingService }, { type: FeatureModificationService }]; } });
|
|
828
925
|
|
|
829
926
|
class TileLayerSettings {
|
|
830
927
|
constructor() {
|
|
@@ -1383,6 +1480,7 @@ MapPlateComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", vers
|
|
|
1383
1480
|
DrawingService,
|
|
1384
1481
|
DrawingGenerationService,
|
|
1385
1482
|
FeatureService,
|
|
1483
|
+
FeatureModificationService,
|
|
1386
1484
|
], 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 });
|
|
1387
1485
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MapPlateComponent, decorators: [{
|
|
1388
1486
|
type: Component,
|
|
@@ -1395,6 +1493,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
|
|
|
1395
1493
|
DrawingService,
|
|
1396
1494
|
DrawingGenerationService,
|
|
1397
1495
|
FeatureService,
|
|
1496
|
+
FeatureModificationService,
|
|
1398
1497
|
], 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"] }]
|
|
1399
1498
|
}], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: MapPostboyService }, { type: MapPlateFactory }, { type: MessageRegistratorService }, { type: i0.ChangeDetectorRef }]; }, propDecorators: { settings: [{
|
|
1400
1499
|
type: Input
|
|
@@ -1653,6 +1752,23 @@ class PolygonStyleHelper {
|
|
|
1653
1752
|
}),
|
|
1654
1753
|
});
|
|
1655
1754
|
}
|
|
1755
|
+
static edit(fill, stroke, strokeWidth = 1, pinRadius = 5) {
|
|
1756
|
+
return new Style({
|
|
1757
|
+
image: new Circle({
|
|
1758
|
+
fill: new Fill({
|
|
1759
|
+
color: stroke,
|
|
1760
|
+
}),
|
|
1761
|
+
radius: pinRadius,
|
|
1762
|
+
}),
|
|
1763
|
+
fill: new Fill({
|
|
1764
|
+
color: fill,
|
|
1765
|
+
}),
|
|
1766
|
+
stroke: new Stroke({
|
|
1767
|
+
color: stroke,
|
|
1768
|
+
width: strokeWidth,
|
|
1769
|
+
}),
|
|
1770
|
+
});
|
|
1771
|
+
}
|
|
1656
1772
|
}
|
|
1657
1773
|
|
|
1658
1774
|
class TextStyleHelper {
|
|
@@ -1727,5 +1843,5 @@ class StringifyFeatureHelper {
|
|
|
1727
1843
|
* Generated bundle index. Do not edit.
|
|
1728
1844
|
*/
|
|
1729
1845
|
|
|
1730
|
-
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 };
|
|
1846
|
+
export { CancelDrawingCommand, CancelFeatureModificationCommand, CloseTooltipCommand, ClusterLayerComponent, ClusterLayerSettings, Dictionary, DrawSelectionAreaCommand, DrawingType, FeatureLayerComponent, FeatureLayerSettings, FeatureOutputFormat, MapClickEvent, MapLyrs, MapLyrsLabel, MapModule, MapMoveEndEvent, MapPlateComponent, MapPostboyService, MapRenderedEvent, MapSettings, MarkerModel, MarkerStyleHelper, MarkersComponent, MessageRegistratorService, ModifyFeatureCommand, OsmTileLayerComponent, PolygonModel, PolygonStyleHelper, PolygonsComponent, StartDrawingCommand, StringifyFeatureHelper, TextStyleHelper, TileLayerComponent, TileLayerSettings, TooltipComponent, TooltipSettings };
|
|
1731
1847
|
//# sourceMappingURL=maps-components-src-map.mjs.map
|