@artstesh/maps 5.0.0 → 5.0.2
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/esm2022/map/map-plate/layers/tile-layer/tile-layer.component.mjs +42 -7
- package/dist/esm2022/map/map-plate/layers/tile-layer/tile-layer.factory.mjs +50 -0
- package/dist/esm2022/map/map-plate/layers/tile-layer/tile-layer.settings.mjs +14 -8
- package/dist/esm2022/map/map.module.mjs +3 -3
- package/dist/esm2022/map/messages/commands/add-tile.command.mjs +13 -0
- package/dist/esm2022/map/messages/commands/remove-tile.command.mjs +13 -0
- package/dist/esm2022/map/services/map-management.service.mjs +19 -8
- package/dist/esm2022/map/services/message-registrator.service.mjs +5 -3
- package/dist/esm2022/src/map/map-plate/layers/tile-layer/tile-layer.component.mjs +42 -7
- package/dist/esm2022/src/map/map-plate/layers/tile-layer/tile-layer.factory.mjs +50 -0
- package/dist/esm2022/src/map/map-plate/layers/tile-layer/tile-layer.settings.mjs +14 -8
- package/dist/esm2022/src/map/map.module.mjs +3 -3
- package/dist/esm2022/src/map/messages/commands/add-tile.command.mjs +13 -0
- package/dist/esm2022/src/map/messages/commands/remove-tile.command.mjs +13 -0
- package/dist/esm2022/src/map/services/map-management.service.mjs +19 -8
- package/dist/esm2022/src/map/services/message-registrator.service.mjs +5 -3
- package/dist/fesm2022/maps-components-src-map.mjs +160 -58
- package/dist/fesm2022/maps-components-src-map.mjs.map +1 -1
- package/dist/fesm2022/maps-components.mjs +160 -58
- package/dist/fesm2022/maps-components.mjs.map +1 -1
- package/dist/map/map-plate/layers/tile-layer/tile-layer.component.d.ts +14 -5
- package/dist/map/map-plate/layers/tile-layer/tile-layer.factory.d.ts +11 -0
- package/dist/map/map-plate/layers/tile-layer/tile-layer.settings.d.ts +3 -2
- package/dist/map/map.module.d.ts +1 -1
- package/dist/map/messages/commands/add-tile.command.d.ts +9 -0
- package/dist/map/messages/commands/remove-tile.command.d.ts +9 -0
- package/dist/map/services/map-management.service.d.ts +2 -1
- package/dist/src/map/map-plate/layers/tile-layer/tile-layer.component.d.ts +14 -5
- package/dist/src/map/map-plate/layers/tile-layer/tile-layer.factory.d.ts +11 -0
- package/dist/src/map/map-plate/layers/tile-layer/tile-layer.settings.d.ts +3 -2
- package/dist/src/map/map.module.d.ts +1 -1
- package/dist/src/map/messages/commands/add-tile.command.d.ts +9 -0
- package/dist/src/map/messages/commands/remove-tile.command.d.ts +9 -0
- package/dist/src/map/services/map-management.service.d.ts +2 -1
- package/package.json +1 -1
- package/dist/esm2022/map/messages/commands/clear-layer.command.mjs +0 -13
- package/dist/esm2022/src/map/messages/commands/clear-layer.command.mjs +0 -13
- package/dist/map/messages/commands/clear-layer.command.d.ts +0 -7
- package/dist/src/map/messages/commands/clear-layer.command.d.ts +0 -7
|
@@ -14,7 +14,7 @@ export class MapModule {
|
|
|
14
14
|
TileLayerComponent,
|
|
15
15
|
OsmTileLayerComponent,
|
|
16
16
|
FeatureLayerComponent,
|
|
17
|
-
MarkersComponent], imports: [CommonModule], exports: [MapPlateComponent, FeatureLayerComponent, MarkersComponent] });
|
|
17
|
+
MarkersComponent], imports: [CommonModule], exports: [MapPlateComponent, FeatureLayerComponent, MarkersComponent, TileLayerComponent] });
|
|
18
18
|
static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MapModule, imports: [CommonModule] });
|
|
19
19
|
}
|
|
20
20
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MapModule, decorators: [{
|
|
@@ -29,7 +29,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
|
|
|
29
29
|
FeatureLayerComponent,
|
|
30
30
|
MarkersComponent,
|
|
31
31
|
],
|
|
32
|
-
exports: [MapPlateComponent, FeatureLayerComponent, MarkersComponent],
|
|
32
|
+
exports: [MapPlateComponent, FeatureLayerComponent, MarkersComponent, TileLayerComponent],
|
|
33
33
|
}]
|
|
34
34
|
}] });
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFwLm1vZHVsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL21hcHMtY29tcG9uZW50cy9zcmMvbWFwL21hcC5tb2R1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUN6QyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDL0MsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDeEUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDcEUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sb0RBQW9ELENBQUM7QUFDeEYsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sNERBQTRELENBQUM7QUFDbkcsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sMERBQTBELENBQUM7QUFDakcsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sZ0RBQWdELENBQUM7O0FBY2xGLE1BQU0sT0FBTyxTQUFTO3dHQUFULFNBQVM7eUdBQVQsU0FBUyxpQkFUbEIscUJBQXFCO1lBQ3JCLGlCQUFpQjtZQUNqQixrQkFBa0I7WUFDbEIscUJBQXFCO1lBQ3JCLHFCQUFxQjtZQUNyQixnQkFBZ0IsYUFQUixZQUFZLGFBU1osaUJBQWlCLEVBQUUscUJBQXFCLEVBQUUsZ0JBQWdCLEVBQUUsa0JBQWtCO3lHQUU3RSxTQUFTLFlBWFYsWUFBWTs7NEZBV1gsU0FBUztrQkFackIsUUFBUTttQkFBQztvQkFDUixPQUFPLEVBQUUsQ0FBQyxZQUFZLENBQUM7b0JBQ3ZCLFlBQVksRUFBRTt3QkFDWixxQkFBcUI7d0JBQ3JCLGlCQUFpQjt3QkFDakIsa0JBQWtCO3dCQUNsQixxQkFBcUI7d0JBQ3JCLHFCQUFxQjt3QkFDckIsZ0JBQWdCO3FCQUNqQjtvQkFDRCxPQUFPLEVBQUUsQ0FBQyxpQkFBaUIsRUFBRSxxQkFBcUIsRUFBRSxnQkFBZ0IsRUFBRSxrQkFBa0IsQ0FBQztpQkFDMUYiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBOZ01vZHVsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgQ29tbW9uTW9kdWxlIH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uJztcbmltcG9ydCB7IERlc3RydWN0aWJsZUNvbXBvbmVudCB9IGZyb20gJy4vY29tbW9uL2Rlc3RydWN0aWJsZS5jb21wb25lbnQnO1xuaW1wb3J0IHsgTWFwUGxhdGVDb21wb25lbnQgfSBmcm9tICcuL21hcC1wbGF0ZS9tYXAtcGxhdGUuY29tcG9uZW50JztcbmltcG9ydCB7IFRpbGVMYXllckNvbXBvbmVudCB9IGZyb20gJy4vbWFwLXBsYXRlL2xheWVycy90aWxlLWxheWVyL3RpbGUtbGF5ZXIuY29tcG9uZW50JztcbmltcG9ydCB7IE9zbVRpbGVMYXllckNvbXBvbmVudCB9IGZyb20gJy4vbWFwLXBsYXRlL2xheWVycy9vc20tdGlsZS1sYXllci9vc20tdGlsZS1sYXllci5jb21wb25lbnQnO1xuaW1wb3J0IHsgRmVhdHVyZUxheWVyQ29tcG9uZW50IH0gZnJvbSAnLi9tYXAtcGxhdGUvbGF5ZXJzL2ZlYXR1cmUtbGF5ZXIvZmVhdHVyZS1sYXllci5jb21wb25lbnQnO1xuaW1wb3J0IHsgTWFya2Vyc0NvbXBvbmVudCB9IGZyb20gJy4vbWFwLXBsYXRlL2ZlYXR1cmVzL21hcmtlcnMvbWFya2Vycy5jb21wb25lbnQnO1xuXG5ATmdNb2R1bGUoe1xuICBpbXBvcnRzOiBbQ29tbW9uTW9kdWxlXSxcbiAgZGVjbGFyYXRpb25zOiBbXG4gICAgRGVzdHJ1Y3RpYmxlQ29tcG9uZW50LFxuICAgIE1hcFBsYXRlQ29tcG9uZW50LFxuICAgIFRpbGVMYXllckNvbXBvbmVudCxcbiAgICBPc21UaWxlTGF5ZXJDb21wb25lbnQsXG4gICAgRmVhdHVyZUxheWVyQ29tcG9uZW50LFxuICAgIE1hcmtlcnNDb21wb25lbnQsXG4gIF0sXG4gIGV4cG9ydHM6IFtNYXBQbGF0ZUNvbXBvbmVudCwgRmVhdHVyZUxheWVyQ29tcG9uZW50LCBNYXJrZXJzQ29tcG9uZW50LCBUaWxlTGF5ZXJDb21wb25lbnRdLFxufSlcbmV4cG9ydCBjbGFzcyBNYXBNb2R1bGUge31cbiJdfQ==
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { GenericMessage } from '../generic-message';
|
|
2
|
+
export class AddTileCommand extends GenericMessage {
|
|
3
|
+
layer;
|
|
4
|
+
static ID = '25b7df28-72ce-4453-9fe6-54285a2fdc57';
|
|
5
|
+
constructor(layer) {
|
|
6
|
+
super();
|
|
7
|
+
this.layer = layer;
|
|
8
|
+
}
|
|
9
|
+
get id() {
|
|
10
|
+
return AddTileCommand.ID;
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWRkLXRpbGUuY29tbWFuZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21hcHMtY29tcG9uZW50cy9zcmMvbWFwL21lc3NhZ2VzL2NvbW1hbmRzL2FkZC10aWxlLmNvbW1hbmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBTXBELE1BQU0sT0FBTyxjQUFlLFNBQVEsY0FBYztJQUc3QjtJQUZaLE1BQU0sQ0FBVSxFQUFFLEdBQUcsc0NBQXNDLENBQUM7SUFFbkUsWUFBbUIsS0FBcUI7UUFDdEMsS0FBSyxFQUFFLENBQUM7UUFEUyxVQUFLLEdBQUwsS0FBSyxDQUFnQjtJQUV4QyxDQUFDO0lBRUQsSUFBVyxFQUFFO1FBQ1gsT0FBTyxjQUFjLENBQUMsRUFBRSxDQUFDO0lBQzNCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBHZW5lcmljTWVzc2FnZSB9IGZyb20gJy4uL2dlbmVyaWMtbWVzc2FnZSc7XG5pbXBvcnQgeyBWZWN0b3IgYXMgTGF5ZXIgfSBmcm9tICdvbC9sYXllcic7XG5pbXBvcnQgVmVjdG9yU291cmNlIGZyb20gJ29sL3NvdXJjZS9WZWN0b3InO1xuaW1wb3J0IFRpbGVMYXllciBmcm9tICdvbC9sYXllci9UaWxlJztcbmltcG9ydCB7IFhZWiB9IGZyb20gJ29sL3NvdXJjZSc7XG5cbmV4cG9ydCBjbGFzcyBBZGRUaWxlQ29tbWFuZCBleHRlbmRzIEdlbmVyaWNNZXNzYWdlIHtcbiAgcHVibGljIHN0YXRpYyByZWFkb25seSBJRCA9ICcyNWI3ZGYyOC03MmNlLTQ0NTMtOWZlNi01NDI4NWEyZmRjNTcnO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyBsYXllcjogVGlsZUxheWVyPFhZWj4pIHtcbiAgICBzdXBlcigpO1xuICB9XG5cbiAgcHVibGljIGdldCBpZCgpOiBzdHJpbmcge1xuICAgIHJldHVybiBBZGRUaWxlQ29tbWFuZC5JRDtcbiAgfVxufVxuIl19
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { GenericMessage } from '../generic-message';
|
|
2
|
+
export class RemoveTileCommand extends GenericMessage {
|
|
3
|
+
layer;
|
|
4
|
+
static ID = 'c36ccc0b-5638-4819-b148-2de57a59a5b7';
|
|
5
|
+
constructor(layer) {
|
|
6
|
+
super();
|
|
7
|
+
this.layer = layer;
|
|
8
|
+
}
|
|
9
|
+
get id() {
|
|
10
|
+
return RemoveTileCommand.ID;
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVtb3ZlLXRpbGUuY29tbWFuZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21hcHMtY29tcG9uZW50cy9zcmMvbWFwL21lc3NhZ2VzL2NvbW1hbmRzL3JlbW92ZS10aWxlLmNvbW1hbmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBS3BELE1BQU0sT0FBTyxpQkFBa0IsU0FBUSxjQUFjO0lBR2hDO0lBRlosTUFBTSxDQUFVLEVBQUUsR0FBRyxzQ0FBc0MsQ0FBQztJQUVuRSxZQUFtQixLQUFxQjtRQUN0QyxLQUFLLEVBQUUsQ0FBQztRQURTLFVBQUssR0FBTCxLQUFLLENBQWdCO0lBRXhDLENBQUM7SUFFRCxJQUFXLEVBQUU7UUFDWCxPQUFPLGlCQUFpQixDQUFDLEVBQUUsQ0FBQztJQUM5QixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgR2VuZXJpY01lc3NhZ2UgfSBmcm9tICcuLi9nZW5lcmljLW1lc3NhZ2UnO1xuaW1wb3J0IEJhc2VMYXllciBmcm9tICdvbC9sYXllci9CYXNlJztcbmltcG9ydCBUaWxlTGF5ZXIgZnJvbSAnb2wvbGF5ZXIvVGlsZSc7XG5pbXBvcnQgeyBYWVogfSBmcm9tICdvbC9zb3VyY2UnO1xuXG5leHBvcnQgY2xhc3MgUmVtb3ZlVGlsZUNvbW1hbmQgZXh0ZW5kcyBHZW5lcmljTWVzc2FnZSB7XG4gIHB1YmxpYyBzdGF0aWMgcmVhZG9ubHkgSUQgPSAnYzM2Y2NjMGItNTYzOC00ODE5LWIxNDgtMmRlNTdhNTlhNWI3JztcblxuICBjb25zdHJ1Y3RvcihwdWJsaWMgbGF5ZXI6IFRpbGVMYXllcjxYWVo+KSB7XG4gICAgc3VwZXIoKTtcbiAgfVxuXG4gIHB1YmxpYyBnZXQgaWQoKTogc3RyaW5nIHtcbiAgICByZXR1cm4gUmVtb3ZlVGlsZUNvbW1hbmQuSUQ7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -3,7 +3,8 @@ import { AddLayerCommand } from '../messages/commands/add-layer.command';
|
|
|
3
3
|
import { RemoveLayerCommand } from '../messages/commands/remove-layer.command';
|
|
4
4
|
import { MapRenderedEvent } from '../messages';
|
|
5
5
|
import { PlaceLayerFeaturesCommand } from '../messages/commands/place-layer-features.command';
|
|
6
|
-
import {
|
|
6
|
+
import { AddTileCommand } from '../messages/commands/add-tile.command';
|
|
7
|
+
import { RemoveTileCommand } from '../messages/commands/remove-tile.command';
|
|
7
8
|
import * as i0 from "@angular/core";
|
|
8
9
|
import * as i1 from "./map-postboy.service";
|
|
9
10
|
export class MapManagementService {
|
|
@@ -16,18 +17,28 @@ export class MapManagementService {
|
|
|
16
17
|
this.observeAddLayer();
|
|
17
18
|
this.observeRemoveLayer();
|
|
18
19
|
this.observePlaceFeatures();
|
|
19
|
-
this.
|
|
20
|
+
this.observeAddTile();
|
|
21
|
+
this.observeRemoveTile();
|
|
22
|
+
}
|
|
23
|
+
observeRemoveTile() {
|
|
24
|
+
this.postboy.subscribe(RemoveTileCommand.ID).subscribe((c) => {
|
|
25
|
+
if (!this.map)
|
|
26
|
+
return;
|
|
27
|
+
this.map.removeLayer(c.layer);
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
observeAddTile() {
|
|
31
|
+
this.postboy.subscribe(AddTileCommand.ID).subscribe((c) => {
|
|
32
|
+
if (!this.map)
|
|
33
|
+
return;
|
|
34
|
+
this.map.addLayer(c.layer);
|
|
35
|
+
});
|
|
20
36
|
}
|
|
21
37
|
observeMapRender() {
|
|
22
38
|
this.postboy.subscribe(MapRenderedEvent.ID).subscribe((m) => {
|
|
23
39
|
this.map = m.map;
|
|
24
40
|
});
|
|
25
41
|
}
|
|
26
|
-
observeClearLayer() {
|
|
27
|
-
this.postboy.subscribe(ClearLayerCommand.ID).subscribe((c) => {
|
|
28
|
-
this.layers[c.layer]?.getSource()?.clear();
|
|
29
|
-
});
|
|
30
|
-
}
|
|
31
42
|
observeAddLayer() {
|
|
32
43
|
this.postboy.subscribe(AddLayerCommand.ID).subscribe((c) => {
|
|
33
44
|
if (!this.map)
|
|
@@ -58,4 +69,4 @@ export class MapManagementService {
|
|
|
58
69
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MapManagementService, decorators: [{
|
|
59
70
|
type: Injectable
|
|
60
71
|
}], ctorParameters: function () { return [{ type: i1.MapPostboyService }]; } });
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFwLW1hbmFnZW1lbnQuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21hcHMtY29tcG9uZW50cy9zcmMvbWFwL3NlcnZpY2VzL21hcC1tYW5hZ2VtZW50LnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUczQyxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0NBQXdDLENBQUM7QUFDekUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFHL0UsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQy9DLE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxNQUFNLG1EQUFtRCxDQUFDO0FBQzlGLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUN2RSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwwQ0FBMEMsQ0FBQzs7O0FBRzdFLE1BQU0sT0FBTyxvQkFBb0I7SUFJWDtJQUhaLEdBQUcsQ0FBTztJQUNWLE1BQU0sR0FBaUQsRUFBRSxDQUFDO0lBRWxFLFlBQW9CLE9BQTBCO1FBQTFCLFlBQU8sR0FBUCxPQUFPLENBQW1CO1FBQzVDLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO1FBQ3hCLElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztRQUN2QixJQUFJLENBQUMsa0JBQWtCLEVBQUUsQ0FBQztRQUMxQixJQUFJLENBQUMsb0JBQW9CLEVBQUUsQ0FBQztRQUM1QixJQUFJLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDdEIsSUFBSSxDQUFDLGlCQUFpQixFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUVPLGlCQUFpQjtRQUN2QixJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBb0IsaUJBQWlCLENBQUMsRUFBRSxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7WUFDOUUsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHO2dCQUFFLE9BQU87WUFDdEIsSUFBSSxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ2hDLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVPLGNBQWM7UUFDcEIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQWlCLGNBQWMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtZQUN4RSxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUc7Z0JBQUUsT0FBTztZQUN0QixJQUFJLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDN0IsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRU8sZ0JBQWdCO1FBQ3RCLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFtQixnQkFBZ0IsQ0FBQyxFQUFFLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtZQUM1RSxJQUFJLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQyxHQUFHLENBQUM7UUFDbkIsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRU8sZUFBZTtRQUNyQixJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBa0IsZUFBZSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO1lBQzFFLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRztnQkFBRSxPQUFPO1lBQ3RCLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDO1lBQzNDLElBQUksQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUM3QixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFTyxvQkFBb0I7UUFDMUIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQTRCLHlCQUF5QixDQUFDLEVBQUUsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO1lBQzlGLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7Z0JBQUUsT0FBTztZQUNsQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsRUFBRSxTQUFTLEVBQUUsRUFBRSxLQUFLLEVBQUUsQ0FBQztZQUMzQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxTQUFTLEVBQUUsRUFBRSxXQUFXLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQzVELENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVPLGtCQUFrQjtRQUN4QixJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBcUIsa0JBQWtCLENBQUMsRUFBRSxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7WUFDaEYsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHO2dCQUFFLE9BQU87WUFDdEIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDeEMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ2hDLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQzt3R0F2RFUsb0JBQW9COzRHQUFwQixvQkFBb0I7OzRGQUFwQixvQkFBb0I7a0JBRGhDLFVBQVUiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBNYXAgfSBmcm9tICdvbCc7XG5pbXBvcnQgeyBNYXBQb3N0Ym95U2VydmljZSB9IGZyb20gJy4vbWFwLXBvc3Rib3kuc2VydmljZSc7XG5pbXBvcnQgeyBBZGRMYXllckNvbW1hbmQgfSBmcm9tICcuLi9tZXNzYWdlcy9jb21tYW5kcy9hZGQtbGF5ZXIuY29tbWFuZCc7XG5pbXBvcnQgeyBSZW1vdmVMYXllckNvbW1hbmQgfSBmcm9tICcuLi9tZXNzYWdlcy9jb21tYW5kcy9yZW1vdmUtbGF5ZXIuY29tbWFuZCc7XG5pbXBvcnQgeyBWZWN0b3IgYXMgTGF5ZXIgfSBmcm9tICdvbC9sYXllcic7XG5pbXBvcnQgVmVjdG9yU291cmNlIGZyb20gJ29sL3NvdXJjZS9WZWN0b3InO1xuaW1wb3J0IHsgTWFwUmVuZGVyZWRFdmVudCB9IGZyb20gJy4uL21lc3NhZ2VzJztcbmltcG9ydCB7IFBsYWNlTGF5ZXJGZWF0dXJlc0NvbW1hbmQgfSBmcm9tICcuLi9tZXNzYWdlcy9jb21tYW5kcy9wbGFjZS1sYXllci1mZWF0dXJlcy5jb21tYW5kJztcbmltcG9ydCB7IEFkZFRpbGVDb21tYW5kIH0gZnJvbSAnLi4vbWVzc2FnZXMvY29tbWFuZHMvYWRkLXRpbGUuY29tbWFuZCc7XG5pbXBvcnQgeyBSZW1vdmVUaWxlQ29tbWFuZCB9IGZyb20gJy4uL21lc3NhZ2VzL2NvbW1hbmRzL3JlbW92ZS10aWxlLmNvbW1hbmQnO1xuXG5ASW5qZWN0YWJsZSgpXG5leHBvcnQgY2xhc3MgTWFwTWFuYWdlbWVudFNlcnZpY2Uge1xuICBwcml2YXRlIG1hcD86IE1hcDtcbiAgcHJpdmF0ZSBsYXllcnM6IHsgW25hbWU6IHN0cmluZ106IExheWVyPFZlY3RvclNvdXJjZTxhbnk+PiB9ID0ge307XG5cbiAgY29uc3RydWN0b3IocHJpdmF0ZSBwb3N0Ym95OiBNYXBQb3N0Ym95U2VydmljZSkge1xuICAgIHRoaXMub2JzZXJ2ZU1hcFJlbmRlcigpO1xuICAgIHRoaXMub2JzZXJ2ZUFkZExheWVyKCk7XG4gICAgdGhpcy5vYnNlcnZlUmVtb3ZlTGF5ZXIoKTtcbiAgICB0aGlzLm9ic2VydmVQbGFjZUZlYXR1cmVzKCk7XG4gICAgdGhpcy5vYnNlcnZlQWRkVGlsZSgpO1xuICAgIHRoaXMub2JzZXJ2ZVJlbW92ZVRpbGUoKTtcbiAgfVxuXG4gIHByaXZhdGUgb2JzZXJ2ZVJlbW92ZVRpbGUoKSB7XG4gICAgdGhpcy5wb3N0Ym95LnN1YnNjcmliZTxSZW1vdmVUaWxlQ29tbWFuZD4oUmVtb3ZlVGlsZUNvbW1hbmQuSUQpLnN1YnNjcmliZSgoYykgPT4ge1xuICAgICAgaWYgKCF0aGlzLm1hcCkgcmV0dXJuO1xuICAgICAgdGhpcy5tYXAucmVtb3ZlTGF5ZXIoYy5sYXllcik7XG4gICAgfSk7XG4gIH1cblxuICBwcml2YXRlIG9ic2VydmVBZGRUaWxlKCkge1xuICAgIHRoaXMucG9zdGJveS5zdWJzY3JpYmU8QWRkVGlsZUNvbW1hbmQ+KEFkZFRpbGVDb21tYW5kLklEKS5zdWJzY3JpYmUoKGMpID0+IHtcbiAgICAgIGlmICghdGhpcy5tYXApIHJldHVybjtcbiAgICAgIHRoaXMubWFwLmFkZExheWVyKGMubGF5ZXIpO1xuICAgIH0pO1xuICB9XG5cbiAgcHJpdmF0ZSBvYnNlcnZlTWFwUmVuZGVyKCkge1xuICAgIHRoaXMucG9zdGJveS5zdWJzY3JpYmU8TWFwUmVuZGVyZWRFdmVudD4oTWFwUmVuZGVyZWRFdmVudC5JRCkuc3Vic2NyaWJlKChtKSA9PiB7XG4gICAgICB0aGlzLm1hcCA9IG0ubWFwO1xuICAgIH0pO1xuICB9XG5cbiAgcHJpdmF0ZSBvYnNlcnZlQWRkTGF5ZXIoKSB7XG4gICAgdGhpcy5wb3N0Ym95LnN1YnNjcmliZTxBZGRMYXllckNvbW1hbmQ+KEFkZExheWVyQ29tbWFuZC5JRCkuc3Vic2NyaWJlKChjKSA9PiB7XG4gICAgICBpZiAoIXRoaXMubWFwKSByZXR1cm47XG4gICAgICB0aGlzLmxheWVyc1tjLmxheWVyLmdldCgnbmFtZScpXSA9IGMubGF5ZXI7XG4gICAgICB0aGlzLm1hcC5hZGRMYXllcihjLmxheWVyKTtcbiAgICB9KTtcbiAgfVxuXG4gIHByaXZhdGUgb2JzZXJ2ZVBsYWNlRmVhdHVyZXMoKSB7XG4gICAgdGhpcy5wb3N0Ym95LnN1YnNjcmliZTxQbGFjZUxheWVyRmVhdHVyZXNDb21tYW5kPihQbGFjZUxheWVyRmVhdHVyZXNDb21tYW5kLklEKS5zdWJzY3JpYmUoKGMpID0+IHtcbiAgICAgIGlmICghdGhpcy5sYXllcnNbYy5sYXllcl0pIHJldHVybjtcbiAgICAgIHRoaXMubGF5ZXJzW2MubGF5ZXJdPy5nZXRTb3VyY2UoKT8uY2xlYXIoKTtcbiAgICAgIHRoaXMubGF5ZXJzW2MubGF5ZXJdLmdldFNvdXJjZSgpPy5hZGRGZWF0dXJlcyhjLmZlYXR1cmVzKTtcbiAgICB9KTtcbiAgfVxuXG4gIHByaXZhdGUgb2JzZXJ2ZVJlbW92ZUxheWVyKCkge1xuICAgIHRoaXMucG9zdGJveS5zdWJzY3JpYmU8UmVtb3ZlTGF5ZXJDb21tYW5kPihSZW1vdmVMYXllckNvbW1hbmQuSUQpLnN1YnNjcmliZSgoYykgPT4ge1xuICAgICAgaWYgKCF0aGlzLm1hcCkgcmV0dXJuO1xuICAgICAgZGVsZXRlIHRoaXMubGF5ZXJzW2MubGF5ZXIuZ2V0KCduYW1lJyldO1xuICAgICAgdGhpcy5tYXAucmVtb3ZlTGF5ZXIoYy5sYXllcik7XG4gICAgfSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -4,7 +4,8 @@ import { MapRenderedEvent } from '../messages';
|
|
|
4
4
|
import { AddLayerCommand } from '../messages/commands/add-layer.command';
|
|
5
5
|
import { PlaceLayerFeaturesCommand } from '../messages/commands/place-layer-features.command';
|
|
6
6
|
import { RemoveLayerCommand } from '../messages/commands/remove-layer.command';
|
|
7
|
-
import {
|
|
7
|
+
import { AddTileCommand } from '../messages/commands/add-tile.command';
|
|
8
|
+
import { RemoveTileCommand } from '../messages/commands/remove-tile.command';
|
|
8
9
|
import * as i0 from "@angular/core";
|
|
9
10
|
import * as i1 from "./map-postboy.service";
|
|
10
11
|
export class MessageRegistratorService {
|
|
@@ -13,7 +14,8 @@ export class MessageRegistratorService {
|
|
|
13
14
|
service.register(AddLayerCommand.ID, new Subject());
|
|
14
15
|
service.register(PlaceLayerFeaturesCommand.ID, new ReplaySubject(1));
|
|
15
16
|
service.register(RemoveLayerCommand.ID, new Subject());
|
|
16
|
-
service.register(
|
|
17
|
+
service.register(AddTileCommand.ID, new Subject());
|
|
18
|
+
service.register(RemoveTileCommand.ID, new Subject());
|
|
17
19
|
}
|
|
18
20
|
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MessageRegistratorService, deps: [{ token: i1.MapPostboyService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
19
21
|
static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MessageRegistratorService });
|
|
@@ -21,4 +23,4 @@ export class MessageRegistratorService {
|
|
|
21
23
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MessageRegistratorService, decorators: [{
|
|
22
24
|
type: Injectable
|
|
23
25
|
}], ctorParameters: function () { return [{ type: i1.MapPostboyService }]; } });
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVzc2FnZS1yZWdpc3RyYXRvci5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbWFwcy1jb21wb25lbnRzL3NyYy9tYXAvc2VydmljZXMvbWVzc2FnZS1yZWdpc3RyYXRvci5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFM0MsT0FBTyxFQUFFLGFBQWEsRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDOUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQy9DLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx3Q0FBd0MsQ0FBQztBQUN6RSxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxtREFBbUQsQ0FBQztBQUM5RixPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUMvRSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDdkUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMENBQTBDLENBQUM7OztBQUc3RSxNQUFNLE9BQU8seUJBQXlCO0lBQ3BDLFlBQVksT0FBMEI7UUFDcEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLEVBQUUsSUFBSSxhQUFhLENBQW1CLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDOUUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxlQUFlLENBQUMsRUFBRSxFQUFFLElBQUksT0FBTyxFQUFtQixDQUFDLENBQUM7UUFDckUsT0FBTyxDQUFDLFFBQVEsQ0FBQyx5QkFBeUIsQ0FBQyxFQUFFLEVBQUUsSUFBSSxhQUFhLENBQTRCLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDaEcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsQ0FBQyxFQUFFLEVBQUUsSUFBSSxPQUFPLEVBQXNCLENBQUMsQ0FBQztRQUMzRSxPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQyxFQUFFLEVBQUUsSUFBSSxPQUFPLEVBQWtCLENBQUMsQ0FBQztRQUNuRSxPQUFPLENBQUMsUUFBUSxDQUFDLGlCQUFpQixDQUFDLEVBQUUsRUFBRSxJQUFJLE9BQU8sRUFBcUIsQ0FBQyxDQUFDO0lBQzNFLENBQUM7d0dBUlUseUJBQXlCOzRHQUF6Qix5QkFBeUI7OzRGQUF6Qix5QkFBeUI7a0JBRHJDLFVBQVUiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBNYXBQb3N0Ym95U2VydmljZSB9IGZyb20gJy4vbWFwLXBvc3Rib3kuc2VydmljZSc7XG5pbXBvcnQgeyBSZXBsYXlTdWJqZWN0LCBTdWJqZWN0IH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBNYXBSZW5kZXJlZEV2ZW50IH0gZnJvbSAnLi4vbWVzc2FnZXMnO1xuaW1wb3J0IHsgQWRkTGF5ZXJDb21tYW5kIH0gZnJvbSAnLi4vbWVzc2FnZXMvY29tbWFuZHMvYWRkLWxheWVyLmNvbW1hbmQnO1xuaW1wb3J0IHsgUGxhY2VMYXllckZlYXR1cmVzQ29tbWFuZCB9IGZyb20gJy4uL21lc3NhZ2VzL2NvbW1hbmRzL3BsYWNlLWxheWVyLWZlYXR1cmVzLmNvbW1hbmQnO1xuaW1wb3J0IHsgUmVtb3ZlTGF5ZXJDb21tYW5kIH0gZnJvbSAnLi4vbWVzc2FnZXMvY29tbWFuZHMvcmVtb3ZlLWxheWVyLmNvbW1hbmQnO1xuaW1wb3J0IHsgQWRkVGlsZUNvbW1hbmQgfSBmcm9tICcuLi9tZXNzYWdlcy9jb21tYW5kcy9hZGQtdGlsZS5jb21tYW5kJztcbmltcG9ydCB7IFJlbW92ZVRpbGVDb21tYW5kIH0gZnJvbSAnLi4vbWVzc2FnZXMvY29tbWFuZHMvcmVtb3ZlLXRpbGUuY29tbWFuZCc7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBNZXNzYWdlUmVnaXN0cmF0b3JTZXJ2aWNlIHtcbiAgY29uc3RydWN0b3Ioc2VydmljZTogTWFwUG9zdGJveVNlcnZpY2UpIHtcbiAgICBzZXJ2aWNlLnJlZ2lzdGVyKE1hcFJlbmRlcmVkRXZlbnQuSUQsIG5ldyBSZXBsYXlTdWJqZWN0PE1hcFJlbmRlcmVkRXZlbnQ+KDEpKTtcbiAgICBzZXJ2aWNlLnJlZ2lzdGVyKEFkZExheWVyQ29tbWFuZC5JRCwgbmV3IFN1YmplY3Q8QWRkTGF5ZXJDb21tYW5kPigpKTtcbiAgICBzZXJ2aWNlLnJlZ2lzdGVyKFBsYWNlTGF5ZXJGZWF0dXJlc0NvbW1hbmQuSUQsIG5ldyBSZXBsYXlTdWJqZWN0PFBsYWNlTGF5ZXJGZWF0dXJlc0NvbW1hbmQ+KDEpKTtcbiAgICBzZXJ2aWNlLnJlZ2lzdGVyKFJlbW92ZUxheWVyQ29tbWFuZC5JRCwgbmV3IFN1YmplY3Q8UmVtb3ZlTGF5ZXJDb21tYW5kPigpKTtcbiAgICBzZXJ2aWNlLnJlZ2lzdGVyKEFkZFRpbGVDb21tYW5kLklELCBuZXcgU3ViamVjdDxBZGRUaWxlQ29tbWFuZD4oKSk7XG4gICAgc2VydmljZS5yZWdpc3RlcihSZW1vdmVUaWxlQ29tbWFuZC5JRCwgbmV3IFN1YmplY3Q8UmVtb3ZlVGlsZUNvbW1hbmQ+KCkpO1xuICB9XG59XG4iXX0=
|
|
@@ -4,14 +4,14 @@ import * as i4 from '@angular/common';
|
|
|
4
4
|
import { CommonModule } from '@angular/common';
|
|
5
5
|
import { Feature } from 'ol';
|
|
6
6
|
import { Point } from 'ol/geom';
|
|
7
|
-
import { useGeographic } from 'ol/proj';
|
|
7
|
+
import { useGeographic, get } from 'ol/proj';
|
|
8
8
|
import { Subject, ReplaySubject } from 'rxjs';
|
|
9
9
|
import Map from 'ol/Map';
|
|
10
10
|
import View from 'ol/View';
|
|
11
11
|
import TileLayer from 'ol/layer/Tile';
|
|
12
12
|
import OSM from 'ol/source/OSM';
|
|
13
13
|
import { filter, first } from 'rxjs/operators';
|
|
14
|
-
import { Vector } from 'ol/source';
|
|
14
|
+
import { XYZ, Vector } from 'ol/source';
|
|
15
15
|
import { Vector as Vector$1 } from 'ol/layer';
|
|
16
16
|
import Style from 'ol/style/Style';
|
|
17
17
|
import { Icon, Circle, Fill, Stroke } from 'ol/style';
|
|
@@ -204,15 +204,27 @@ class RemoveLayerCommand extends GenericMessage {
|
|
|
204
204
|
}
|
|
205
205
|
}
|
|
206
206
|
|
|
207
|
-
class
|
|
207
|
+
class AddTileCommand extends GenericMessage {
|
|
208
208
|
layer;
|
|
209
|
-
static ID = '
|
|
209
|
+
static ID = '25b7df28-72ce-4453-9fe6-54285a2fdc57';
|
|
210
210
|
constructor(layer) {
|
|
211
211
|
super();
|
|
212
212
|
this.layer = layer;
|
|
213
213
|
}
|
|
214
214
|
get id() {
|
|
215
|
-
return
|
|
215
|
+
return AddTileCommand.ID;
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
|
|
219
|
+
class RemoveTileCommand extends GenericMessage {
|
|
220
|
+
layer;
|
|
221
|
+
static ID = 'c36ccc0b-5638-4819-b148-2de57a59a5b7';
|
|
222
|
+
constructor(layer) {
|
|
223
|
+
super();
|
|
224
|
+
this.layer = layer;
|
|
225
|
+
}
|
|
226
|
+
get id() {
|
|
227
|
+
return RemoveTileCommand.ID;
|
|
216
228
|
}
|
|
217
229
|
}
|
|
218
230
|
|
|
@@ -244,7 +256,8 @@ class MessageRegistratorService {
|
|
|
244
256
|
service.register(AddLayerCommand.ID, new Subject());
|
|
245
257
|
service.register(PlaceLayerFeaturesCommand.ID, new ReplaySubject(1));
|
|
246
258
|
service.register(RemoveLayerCommand.ID, new Subject());
|
|
247
|
-
service.register(
|
|
259
|
+
service.register(AddTileCommand.ID, new Subject());
|
|
260
|
+
service.register(RemoveTileCommand.ID, new Subject());
|
|
248
261
|
}
|
|
249
262
|
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MessageRegistratorService, deps: [{ token: MapPostboyService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
250
263
|
static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MessageRegistratorService });
|
|
@@ -277,18 +290,28 @@ class MapManagementService {
|
|
|
277
290
|
this.observeAddLayer();
|
|
278
291
|
this.observeRemoveLayer();
|
|
279
292
|
this.observePlaceFeatures();
|
|
280
|
-
this.
|
|
293
|
+
this.observeAddTile();
|
|
294
|
+
this.observeRemoveTile();
|
|
295
|
+
}
|
|
296
|
+
observeRemoveTile() {
|
|
297
|
+
this.postboy.subscribe(RemoveTileCommand.ID).subscribe((c) => {
|
|
298
|
+
if (!this.map)
|
|
299
|
+
return;
|
|
300
|
+
this.map.removeLayer(c.layer);
|
|
301
|
+
});
|
|
302
|
+
}
|
|
303
|
+
observeAddTile() {
|
|
304
|
+
this.postboy.subscribe(AddTileCommand.ID).subscribe((c) => {
|
|
305
|
+
if (!this.map)
|
|
306
|
+
return;
|
|
307
|
+
this.map.addLayer(c.layer);
|
|
308
|
+
});
|
|
281
309
|
}
|
|
282
310
|
observeMapRender() {
|
|
283
311
|
this.postboy.subscribe(MapRenderedEvent.ID).subscribe((m) => {
|
|
284
312
|
this.map = m.map;
|
|
285
313
|
});
|
|
286
314
|
}
|
|
287
|
-
observeClearLayer() {
|
|
288
|
-
this.postboy.subscribe(ClearLayerCommand.ID).subscribe((c) => {
|
|
289
|
-
this.layers[c.layer]?.getSource()?.clear();
|
|
290
|
-
});
|
|
291
|
-
}
|
|
292
315
|
observeAddLayer() {
|
|
293
316
|
this.postboy.subscribe(AddLayerCommand.ID).subscribe((c) => {
|
|
294
317
|
if (!this.map)
|
|
@@ -453,19 +476,137 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
|
|
|
453
476
|
type: Input
|
|
454
477
|
}] } });
|
|
455
478
|
|
|
479
|
+
class TileLayerSettings {
|
|
480
|
+
maxZoom = 19;
|
|
481
|
+
minZoom = 0;
|
|
482
|
+
opacity = 0.6;
|
|
483
|
+
url = '';
|
|
484
|
+
projection = 'EPSG:3857';
|
|
485
|
+
static copy(model) {
|
|
486
|
+
const result = new TileLayerSettings();
|
|
487
|
+
result.maxZoom = model.maxZoom;
|
|
488
|
+
result.minZoom = model.minZoom;
|
|
489
|
+
result.projection = model.projection;
|
|
490
|
+
result.opacity = model.opacity;
|
|
491
|
+
result.url = model.url;
|
|
492
|
+
return result;
|
|
493
|
+
}
|
|
494
|
+
setUrl(url) {
|
|
495
|
+
return TileLayerSettings.copy({ ...this, url });
|
|
496
|
+
}
|
|
497
|
+
setMaxZoom(maxZoom) {
|
|
498
|
+
return TileLayerSettings.copy({ ...this, maxZoom });
|
|
499
|
+
}
|
|
500
|
+
setMinZoom(minZoom) {
|
|
501
|
+
return TileLayerSettings.copy({ ...this, minZoom });
|
|
502
|
+
}
|
|
503
|
+
setOpacity(opacity) {
|
|
504
|
+
return TileLayerSettings.copy({ ...this, opacity });
|
|
505
|
+
}
|
|
506
|
+
setProjection(projection) {
|
|
507
|
+
return TileLayerSettings.copy({ ...this, projection });
|
|
508
|
+
}
|
|
509
|
+
isSame(model) {
|
|
510
|
+
if (this.maxZoom !== model.maxZoom)
|
|
511
|
+
return false;
|
|
512
|
+
if (this.minZoom !== model.minZoom)
|
|
513
|
+
return false;
|
|
514
|
+
if (this.url !== model.url)
|
|
515
|
+
return false;
|
|
516
|
+
if (this.projection !== model.projection)
|
|
517
|
+
return false;
|
|
518
|
+
if (this.opacity !== model.opacity)
|
|
519
|
+
return false;
|
|
520
|
+
return true;
|
|
521
|
+
}
|
|
522
|
+
}
|
|
523
|
+
|
|
524
|
+
class TileLayerFactory {
|
|
525
|
+
build(settings) {
|
|
526
|
+
const source = new XYZ({
|
|
527
|
+
tileSize: 256,
|
|
528
|
+
maxZoom: settings.maxZoom || 14,
|
|
529
|
+
minZoom: settings.minZoom || 1,
|
|
530
|
+
projection: get(settings.projection),
|
|
531
|
+
tileUrlFunction: this.getTileFunc(settings),
|
|
532
|
+
crossOrigin: 'Anonymous',
|
|
533
|
+
});
|
|
534
|
+
return new TileLayer({ source, opacity: settings.opacity });
|
|
535
|
+
}
|
|
536
|
+
getTileFunc(settings) {
|
|
537
|
+
return (tileCoord) => {
|
|
538
|
+
const zoom = tileCoord[0];
|
|
539
|
+
const x = tileCoord[1];
|
|
540
|
+
const y = tileCoord[2];
|
|
541
|
+
const normalizedCoord = this.getNormalizedCoord({ x: x, y: y }, zoom);
|
|
542
|
+
const bound = 1 << zoom;
|
|
543
|
+
return settings.url
|
|
544
|
+
.replace('{x}', String(normalizedCoord?.x || x))
|
|
545
|
+
.replace('{z}', String(zoom))
|
|
546
|
+
.replace('{y}', String(bound - (normalizedCoord?.y || y) - 1));
|
|
547
|
+
};
|
|
548
|
+
}
|
|
549
|
+
getNormalizedCoord(coord, zoom) {
|
|
550
|
+
const y = coord.y;
|
|
551
|
+
let x = coord.x;
|
|
552
|
+
const tileRange = 1 << zoom;
|
|
553
|
+
if (y < 0 || y >= tileRange)
|
|
554
|
+
return null;
|
|
555
|
+
if (x < 0 || x >= tileRange)
|
|
556
|
+
x = ((x % tileRange) + tileRange) % tileRange;
|
|
557
|
+
return { x: x, y: y };
|
|
558
|
+
}
|
|
559
|
+
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TileLayerFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
560
|
+
static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TileLayerFactory, providedIn: 'root' });
|
|
561
|
+
}
|
|
562
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TileLayerFactory, decorators: [{
|
|
563
|
+
type: Injectable,
|
|
564
|
+
args: [{
|
|
565
|
+
providedIn: 'root',
|
|
566
|
+
}]
|
|
567
|
+
}] });
|
|
568
|
+
|
|
456
569
|
class TileLayerComponent extends DestructibleComponent {
|
|
457
|
-
|
|
570
|
+
postboy;
|
|
571
|
+
factory;
|
|
458
572
|
layer;
|
|
459
|
-
constructor() {
|
|
573
|
+
constructor(postboy, factory) {
|
|
460
574
|
super();
|
|
575
|
+
this.postboy = postboy;
|
|
576
|
+
this.factory = factory;
|
|
461
577
|
}
|
|
462
|
-
|
|
463
|
-
|
|
578
|
+
ngOnInit() {
|
|
579
|
+
this.postboy
|
|
580
|
+
.subscribe(MapRenderedEvent.ID)
|
|
581
|
+
.pipe(filter((m) => !!m), first())
|
|
582
|
+
.subscribe((m) => this.initLayer());
|
|
583
|
+
}
|
|
584
|
+
_settings = new TileLayerSettings();
|
|
585
|
+
set settings(value) {
|
|
586
|
+
if (!value || this._settings.isSame(value))
|
|
587
|
+
return;
|
|
588
|
+
this._settings = value;
|
|
589
|
+
this.initLayer();
|
|
590
|
+
}
|
|
591
|
+
onDestroy = () => this.removeLayer();
|
|
592
|
+
initLayer() {
|
|
593
|
+
this.removeLayer();
|
|
594
|
+
this.layer = this.factory.build(this._settings);
|
|
595
|
+
this.postboy.fire(new AddTileCommand(this.layer));
|
|
596
|
+
}
|
|
597
|
+
removeLayer() {
|
|
598
|
+
if (this.layer)
|
|
599
|
+
this.postboy.fire(new RemoveTileCommand(this.layer));
|
|
600
|
+
}
|
|
601
|
+
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TileLayerComponent, deps: [{ token: MapPostboyService }, { token: TileLayerFactory }], target: i0.ɵɵFactoryTarget.Component });
|
|
602
|
+
static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.12", type: TileLayerComponent, selector: "lib-tile-layer", inputs: { settings: "settings" }, usesInheritance: true, ngImport: i0, template: '', isInline: true, changeDetection: i0.ChangeDetectionStrategy.OnPush });
|
|
464
603
|
}
|
|
465
604
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TileLayerComponent, decorators: [{
|
|
466
605
|
type: Component,
|
|
467
606
|
args: [{ selector: 'lib-tile-layer', template: '', changeDetection: ChangeDetectionStrategy.OnPush }]
|
|
468
|
-
}], ctorParameters: function () { return []; }
|
|
607
|
+
}], ctorParameters: function () { return [{ type: MapPostboyService }, { type: TileLayerFactory }]; }, propDecorators: { settings: [{
|
|
608
|
+
type: Input
|
|
609
|
+
}] } });
|
|
469
610
|
|
|
470
611
|
class FeatureLayerSettings {
|
|
471
612
|
name = IdGenerator.get();
|
|
@@ -620,7 +761,7 @@ class MapModule {
|
|
|
620
761
|
TileLayerComponent,
|
|
621
762
|
OsmTileLayerComponent,
|
|
622
763
|
FeatureLayerComponent,
|
|
623
|
-
MarkersComponent], imports: [CommonModule], exports: [MapPlateComponent, FeatureLayerComponent, MarkersComponent] });
|
|
764
|
+
MarkersComponent], imports: [CommonModule], exports: [MapPlateComponent, FeatureLayerComponent, MarkersComponent, TileLayerComponent] });
|
|
624
765
|
static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MapModule, imports: [CommonModule] });
|
|
625
766
|
}
|
|
626
767
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MapModule, decorators: [{
|
|
@@ -635,49 +776,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
|
|
|
635
776
|
FeatureLayerComponent,
|
|
636
777
|
MarkersComponent,
|
|
637
778
|
],
|
|
638
|
-
exports: [MapPlateComponent, FeatureLayerComponent, MarkersComponent],
|
|
779
|
+
exports: [MapPlateComponent, FeatureLayerComponent, MarkersComponent, TileLayerComponent],
|
|
639
780
|
}]
|
|
640
781
|
}] });
|
|
641
782
|
|
|
642
|
-
class TileLayerSettings {
|
|
643
|
-
name = 'tiles';
|
|
644
|
-
maxZoom = 19;
|
|
645
|
-
minZoom = 0;
|
|
646
|
-
opacity = 1;
|
|
647
|
-
url = '';
|
|
648
|
-
static copy(model) {
|
|
649
|
-
const result = new TileLayerSettings();
|
|
650
|
-
result.name = model.name;
|
|
651
|
-
result.maxZoom = model.maxZoom;
|
|
652
|
-
result.minZoom = model.minZoom;
|
|
653
|
-
result.url = model.url;
|
|
654
|
-
return result;
|
|
655
|
-
}
|
|
656
|
-
setUrl(url) {
|
|
657
|
-
return TileLayerSettings.copy({ ...this, url });
|
|
658
|
-
}
|
|
659
|
-
setName(name) {
|
|
660
|
-
return TileLayerSettings.copy({ ...this, name });
|
|
661
|
-
}
|
|
662
|
-
setMaxZoom(maxZoom) {
|
|
663
|
-
return TileLayerSettings.copy({ ...this, maxZoom });
|
|
664
|
-
}
|
|
665
|
-
setMinZoom(minZoom) {
|
|
666
|
-
return TileLayerSettings.copy({ ...this, minZoom });
|
|
667
|
-
}
|
|
668
|
-
isSame(model) {
|
|
669
|
-
if (this.maxZoom !== model.maxZoom)
|
|
670
|
-
return false;
|
|
671
|
-
if (this.minZoom !== model.minZoom)
|
|
672
|
-
return false;
|
|
673
|
-
if (this.url !== model.url)
|
|
674
|
-
return false;
|
|
675
|
-
if (this.name !== model.name)
|
|
676
|
-
return false;
|
|
677
|
-
return true;
|
|
678
|
-
}
|
|
679
|
-
}
|
|
680
|
-
|
|
681
783
|
class MarkerStyleHelper {
|
|
682
784
|
static fromSvg(svg, size = [30, 30], zIndex = 400) {
|
|
683
785
|
let image = new Image();
|