@artstesh/maps 1.1.36 → 1.2.0
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/bundles/maps-components-src-map.umd.js +32 -9
- package/dist/bundles/maps-components-src-map.umd.js.map +1 -1
- package/dist/bundles/maps-components.umd.js +32 -9
- package/dist/bundles/maps-components.umd.js.map +1 -1
- package/dist/esm2015/map/map-plate/layers/osm-tile-layer/osm-tile-layer.component.js +12 -2
- package/dist/esm2015/map/map-plate/map-plate.component.js +2 -2
- package/dist/esm2015/map/messages/executors/generate-zoom-control.executor.js +1 -1
- package/dist/esm2015/map/models/map-settings.js +14 -1
- package/dist/esm2015/map/services/drawing/drawing.service.js +5 -2
- package/dist/esm2015/map/services/map-postboy.service.js +1 -9
- package/dist/esm2015/src/map/map-plate/layers/osm-tile-layer/osm-tile-layer.component.js +12 -2
- package/dist/esm2015/src/map/map-plate/map-plate.component.js +2 -2
- package/dist/esm2015/src/map/messages/executors/generate-zoom-control.executor.js +1 -1
- package/dist/esm2015/src/map/models/map-settings.js +14 -1
- package/dist/esm2015/src/map/services/drawing/drawing.service.js +5 -2
- package/dist/esm2015/src/map/services/map-postboy.service.js +1 -9
- package/dist/fesm2015/maps-components-src-map.js +28 -8
- package/dist/fesm2015/maps-components-src-map.js.map +1 -1
- package/dist/fesm2015/maps-components.js +28 -8
- package/dist/fesm2015/maps-components.js.map +1 -1
- package/dist/map/map-plate/layers/osm-tile-layer/osm-tile-layer.component.d.ts +4 -2
- package/dist/map/messages/executors/generate-zoom-control.executor.d.ts +2 -2
- package/dist/map/models/map-settings.d.ts +8 -0
- package/dist/package.json +1 -1
- package/dist/src/map/map-plate/layers/osm-tile-layer/osm-tile-layer.component.d.ts +4 -2
- package/dist/src/map/messages/executors/generate-zoom-control.executor.d.ts +2 -2
- package/dist/src/map/models/map-settings.d.ts +8 -0
- package/package.json +13 -3
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
|
+
import { LockMessage, UnlockMessage } from '@artstesh/postboy';
|
|
2
3
|
import { StartDrawingCommand } from '../../messages/commands/start-drawing.command';
|
|
3
4
|
import { CancelDrawingCommand } from '../../messages/commands/cancel-drawing.command';
|
|
4
5
|
import { first } from 'rxjs/operators';
|
|
5
6
|
import { DrawingFinishedEvent } from '../../messages/events/drawing-finished.event';
|
|
6
|
-
import { MapRenderedEvent } from '../../messages';
|
|
7
|
+
import { MapClickEvent, MapRenderedEvent } from '../../messages';
|
|
7
8
|
import { GetLayerQuery } from '../../messages/queries/get-layer.query';
|
|
8
9
|
import { MapConstants } from '../../models/map.constants';
|
|
9
10
|
import { Vector as Source } from 'ol/source';
|
|
@@ -38,6 +39,7 @@ export class DrawingService {
|
|
|
38
39
|
}
|
|
39
40
|
observeDrawing() {
|
|
40
41
|
this.postboy.sub(StartDrawingCommand).subscribe((ev) => {
|
|
42
|
+
this.postboy.exec(new LockMessage(MapClickEvent));
|
|
41
43
|
this.draw((l) => {
|
|
42
44
|
var _a;
|
|
43
45
|
if (!l || !this.map) {
|
|
@@ -85,6 +87,7 @@ export class DrawingService {
|
|
|
85
87
|
(_a = this.map) === null || _a === void 0 ? void 0 : _a.removeInteraction(this.drawInteraction);
|
|
86
88
|
layer === null || layer === void 0 ? void 0 : layer.setSource(new Source({}));
|
|
87
89
|
}
|
|
90
|
+
this.postboy.exec(new UnlockMessage(MapClickEvent));
|
|
88
91
|
setTimeout(() => this.postboy.fire(new DrawingFinishedEvent()), 300);
|
|
89
92
|
}
|
|
90
93
|
}
|
|
@@ -93,4 +96,4 @@ DrawingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", versi
|
|
|
93
96
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: DrawingService, decorators: [{
|
|
94
97
|
type: Injectable
|
|
95
98
|
}], ctorParameters: function () { return [{ type: i1.MapPostboyService }]; } });
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"drawing.service.js","sourceRoot":"","sources":["../../../../../../projects/maps-components/src/map/services/drawing/drawing.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { IPostboyDependingService } from '@artstesh/postboy';\nimport { MapPostboyService } from '../map-postboy.service';\nimport { StartDrawingCommand } from '../../messages/commands/start-drawing.command';\nimport { CancelDrawingCommand } from '../../messages/commands/cancel-drawing.command';\nimport { first } from 'rxjs/operators';\nimport { DrawingFinishedEvent } from '../../messages/events/drawing-finished.event';\nimport { Subscription } from 'rxjs';\nimport { MapRenderedEvent } from '../../messages';\nimport { GetLayerQuery } from '../../messages/queries/get-layer.query';\nimport { MapConstants } from '../../models/map.constants';\nimport { Vector as Layer } from 'ol/layer';\nimport VectorSource from 'ol/source/Vector';\nimport { Vector as Source } from 'ol/source';\nimport { Draw } from 'ol/interaction';\nimport { FeatureOutputFormat, PolygonModel } from '../../models';\nimport { Map } from 'ol';\nimport { DrawEvent } from 'ol/interaction/Draw';\nimport { Geometry } from 'ol/geom';\nimport { GeoJSON, WKT } from 'ol/format';\nimport { DrawSelectionAreaCommand } from '../../messages/commands/draw-selection-area.command';\nimport { GetFeaturesInAreaQuery } from '../../messages/queries/get-features-in-area.query';\nimport { IIdentified } from '../../models/i-identified';\nimport { GenerateDrawExecutor } from '../../messages/executors/generate-draw.executor';\nimport { Dictionary } from '@artstesh/collections';\n\n@Injectable()\nexport class DrawingService implements IPostboyDependingService {\n  private drawInteraction?: Draw;\n  private map?: Map;\n\n  constructor(private postboy: MapPostboyService) {}\n\n  up(): void {\n    this.observeDrawing();\n    this.observeSelectArea();\n    this.observeMapRender();\n  }\n\n  private observeSelectArea() {\n    this.postboy.sub(DrawSelectionAreaCommand).subscribe((ev) => {\n      this.postboy.fireCallback(new StartDrawingCommand(ev.type, ev.style), (r) => {\n        if (!r) {\n          ev.finish(new Dictionary<IIdentified[]>());\n          return;\n        }\n        const area = PolygonModel.fromGeoJson(1, r).feature.getGeometry()!;\n        this.postboy.fireCallback(new GetFeaturesInAreaQuery(area, ev.ignore), (result) => ev.finish(result));\n      });\n    });\n  }\n\n  private observeDrawing() {\n    this.postboy.sub(StartDrawingCommand).subscribe((ev) => {\n      this.draw((l) => {\n        if (!l || !this.map) {\n          this.clearInteraction(l);\n          return;\n        }\n        const cancelSub = this.observeCancelation(ev, l);\n        this.drawInteraction = this.postboy.exec(new GenerateDrawExecutor(l, ev.style, ev.type))!;\n        this.map?.addInteraction(this.drawInteraction);\n        this.drawInteraction.on('drawend', (evt: DrawEvent) => {\n          cancelSub.unsubscribe();\n          this.onEnd(evt, ev, l);\n        });\n      });\n    });\n  }\n\n  private onEnd(evt: DrawEvent, command: StartDrawingCommand, layer: Layer<VectorSource<Geometry>>): void {\n    command.finish(\n      command.format === FeatureOutputFormat.GeoJson\n        ? new GeoJSON().writeFeature(evt.feature)\n        : command.format === FeatureOutputFormat.WKT\n        ? new WKT().writeFeature(evt.feature)\n        : new GeoJSON().writeGeometry(evt.feature.getGeometry()!),\n    );\n    this.clearInteraction(layer);\n  }\n\n  private observeMapRender() {\n    this.postboy.sub(MapRenderedEvent).subscribe((m) => {\n      this.map = m.map;\n    });\n  }\n\n  private draw(action: (layer: Layer<VectorSource<any>> | null) => void): void {\n    this.postboy.fireCallback(new GetLayerQuery(MapConstants.DrawingLayerId), (l) => action(l));\n  }\n\n  private observeCancelation(ev: StartDrawingCommand, layer: Layer<VectorSource<any>> | null): Subscription {\n    return this.postboy\n      .sub(CancelDrawingCommand)\n      .pipe(first())\n      .subscribe(() => {\n        ev.finish(null);\n        this.clearInteraction(layer);\n      });\n  }\n\n  private clearInteraction(layer: Layer<Source<Geometry>> | null): void {\n    if (!!this.drawInteraction) {\n      this.map?.removeInteraction(this.drawInteraction);\n      layer?.setSource(new Source({}));\n    }\n    setTimeout(() => this.postboy.fire(new DrawingFinishedEvent()), 300);\n  }\n}\n"]}
|
|
99
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"drawing.service.js","sourceRoot":"","sources":["../../../../../../projects/maps-components/src/map/services/drawing/drawing.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { IPostboyDependingService, LockMessage, UnlockMessage } from '@artstesh/postboy';\nimport { MapPostboyService } from '../map-postboy.service';\nimport { StartDrawingCommand } from '../../messages/commands/start-drawing.command';\nimport { CancelDrawingCommand } from '../../messages/commands/cancel-drawing.command';\nimport { first } from 'rxjs/operators';\nimport { DrawingFinishedEvent } from '../../messages/events/drawing-finished.event';\nimport { Subscription } from 'rxjs';\nimport { MapClickEvent, MapRenderedEvent } from '../../messages';\nimport { GetLayerQuery } from '../../messages/queries/get-layer.query';\nimport { MapConstants } from '../../models/map.constants';\nimport { Vector as Layer } from 'ol/layer';\nimport VectorSource from 'ol/source/Vector';\nimport { Vector as Source } from 'ol/source';\nimport { Draw } from 'ol/interaction';\nimport { FeatureOutputFormat, PolygonModel } from '../../models';\nimport { Map } from 'ol';\nimport { DrawEvent } from 'ol/interaction/Draw';\nimport { Geometry } from 'ol/geom';\nimport { GeoJSON, WKT } from 'ol/format';\nimport { DrawSelectionAreaCommand } from '../../messages/commands/draw-selection-area.command';\nimport { GetFeaturesInAreaQuery } from '../../messages/queries/get-features-in-area.query';\nimport { IIdentified } from '../../models/i-identified';\nimport { GenerateDrawExecutor } from '../../messages/executors/generate-draw.executor';\nimport { Dictionary } from '@artstesh/collections';\n\n@Injectable()\nexport class DrawingService implements IPostboyDependingService {\n  private drawInteraction?: Draw;\n  private map?: Map;\n\n  constructor(private postboy: MapPostboyService) {}\n\n  up(): void {\n    this.observeDrawing();\n    this.observeSelectArea();\n    this.observeMapRender();\n  }\n\n  private observeSelectArea() {\n    this.postboy.sub(DrawSelectionAreaCommand).subscribe((ev) => {\n      this.postboy.fireCallback(new StartDrawingCommand(ev.type, ev.style), (r) => {\n        if (!r) {\n          ev.finish(new Dictionary<IIdentified[]>());\n          return;\n        }\n        const area = PolygonModel.fromGeoJson(1, r).feature.getGeometry()!;\n        this.postboy.fireCallback(new GetFeaturesInAreaQuery(area, ev.ignore), (result) => ev.finish(result));\n      });\n    });\n  }\n\n  private observeDrawing() {\n    this.postboy.sub(StartDrawingCommand).subscribe((ev) => {\n      this.postboy.exec(new LockMessage(MapClickEvent));\n      this.draw((l) => {\n        if (!l || !this.map) {\n          this.clearInteraction(l);\n          return;\n        }\n        const cancelSub = this.observeCancelation(ev, l);\n        this.drawInteraction = this.postboy.exec(new GenerateDrawExecutor(l, ev.style, ev.type))!;\n        this.map?.addInteraction(this.drawInteraction);\n        this.drawInteraction.on('drawend', (evt: DrawEvent) => {\n          cancelSub.unsubscribe();\n          this.onEnd(evt, ev, l);\n        });\n      });\n    });\n  }\n\n  private onEnd(evt: DrawEvent, command: StartDrawingCommand, layer: Layer<VectorSource<Geometry>>): void {\n    command.finish(\n      command.format === FeatureOutputFormat.GeoJson\n        ? new GeoJSON().writeFeature(evt.feature)\n        : command.format === FeatureOutputFormat.WKT\n        ? new WKT().writeFeature(evt.feature)\n        : new GeoJSON().writeGeometry(evt.feature.getGeometry()!),\n    );\n    this.clearInteraction(layer);\n  }\n\n  private observeMapRender() {\n    this.postboy.sub(MapRenderedEvent).subscribe((m) => {\n      this.map = m.map;\n    });\n  }\n\n  private draw(action: (layer: Layer<VectorSource<any>> | null) => void): void {\n    this.postboy.fireCallback(new GetLayerQuery(MapConstants.DrawingLayerId), (l) => action(l));\n  }\n\n  private observeCancelation(ev: StartDrawingCommand, layer: Layer<VectorSource<any>> | null): Subscription {\n    return this.postboy\n      .sub(CancelDrawingCommand)\n      .pipe(first())\n      .subscribe(() => {\n        ev.finish(null);\n        this.clearInteraction(layer);\n      });\n  }\n\n  private clearInteraction(layer: Layer<Source<Geometry>> | null): void {\n    if (!!this.drawInteraction) {\n      this.map?.removeInteraction(this.drawInteraction);\n      layer?.setSource(new Source({}));\n    }\n    this.postboy.exec(new UnlockMessage(MapClickEvent));\n    setTimeout(() => this.postboy.fire(new DrawingFinishedEvent()), 300);\n  }\n}\n"]}
|
|
@@ -1,17 +1,9 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
2
|
import { PostboyService } from '@artstesh/postboy';
|
|
3
|
-
import { StartDrawingCommand } from '../messages/commands/start-drawing.command';
|
|
4
|
-
import { MapClickEvent } from '../messages';
|
|
5
|
-
import { DrawingFinishedEvent } from '../messages/events/drawing-finished.event';
|
|
6
3
|
import * as i0 from "@angular/core";
|
|
7
4
|
export class MapPostboyService extends PostboyService {
|
|
8
5
|
constructor() {
|
|
9
6
|
super();
|
|
10
|
-
this.addLocker({
|
|
11
|
-
locker: StartDrawingCommand.ID,
|
|
12
|
-
unlocker: DrawingFinishedEvent.ID,
|
|
13
|
-
locking: [MapClickEvent.ID],
|
|
14
|
-
});
|
|
15
7
|
}
|
|
16
8
|
}
|
|
17
9
|
MapPostboyService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapPostboyService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -19,4 +11,4 @@ MapPostboyService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", ve
|
|
|
19
11
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapPostboyService, decorators: [{
|
|
20
12
|
type: Injectable
|
|
21
13
|
}], ctorParameters: function () { return []; } });
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
14
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFwLXBvc3Rib3kuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21hcHMtY29tcG9uZW50cy9zcmMvbWFwL3NlcnZpY2VzL21hcC1wb3N0Ym95LnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMzQyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7O0FBTW5ELE1BQU0sT0FBTyxpQkFBa0IsU0FBUSxjQUFjO0lBQ25EO1FBQ0UsS0FBSyxFQUFFLENBQUM7SUFDVixDQUFDOzsrR0FIVSxpQkFBaUI7bUhBQWpCLGlCQUFpQjs0RkFBakIsaUJBQWlCO2tCQUQ3QixVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgUG9zdGJveVNlcnZpY2UgfSBmcm9tICdAYXJ0c3Rlc2gvcG9zdGJveSc7XG5pbXBvcnQgeyBTdGFydERyYXdpbmdDb21tYW5kIH0gZnJvbSAnLi4vbWVzc2FnZXMvY29tbWFuZHMvc3RhcnQtZHJhd2luZy5jb21tYW5kJztcbmltcG9ydCB7IE1hcENsaWNrRXZlbnQgfSBmcm9tICcuLi9tZXNzYWdlcyc7XG5pbXBvcnQgeyBEcmF3aW5nRmluaXNoZWRFdmVudCB9IGZyb20gJy4uL21lc3NhZ2VzL2V2ZW50cy9kcmF3aW5nLWZpbmlzaGVkLmV2ZW50JztcblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIE1hcFBvc3Rib3lTZXJ2aWNlIGV4dGVuZHMgUG9zdGJveVNlcnZpY2Uge1xuICBjb25zdHJ1Y3RvcigpIHtcbiAgICBzdXBlcigpO1xuICB9XG59XG4iXX0=
|
|
@@ -11,7 +11,7 @@ import { getCenter, createEmpty, extend } from 'ol/extent';
|
|
|
11
11
|
import Polygon, { circular, fromExtent } from 'ol/geom/Polygon';
|
|
12
12
|
import { Control, Zoom } from 'ol/control';
|
|
13
13
|
import { get, useGeographic, transform } from 'ol/proj';
|
|
14
|
-
import { PostboyGenericMessage, PostboyCallbackMessage, PostboyExecutor, PostboyService, PostboyAbstractRegistrator } from '@artstesh/postboy';
|
|
14
|
+
import { PostboyGenericMessage, PostboyCallbackMessage, PostboyExecutor, PostboyService, LockMessage, UnlockMessage, PostboyAbstractRegistrator } from '@artstesh/postboy';
|
|
15
15
|
import * as Sphere from 'ol/sphere';
|
|
16
16
|
import { getLength } from 'ol/sphere';
|
|
17
17
|
import { Draw, Modify, Translate, defaults } from 'ol/interaction';
|
|
@@ -86,6 +86,7 @@ class MapSettings {
|
|
|
86
86
|
this.zoom = 4;
|
|
87
87
|
this.lyrs = MapLyrs.Hybrid;
|
|
88
88
|
this.language = 'en';
|
|
89
|
+
this.osmOpacity = 1;
|
|
89
90
|
this.interactionSettings = {};
|
|
90
91
|
}
|
|
91
92
|
static copy(model) {
|
|
@@ -97,6 +98,7 @@ class MapSettings {
|
|
|
97
98
|
result.lyrs = model.lyrs;
|
|
98
99
|
result.interactionSettings = model.interactionSettings;
|
|
99
100
|
result.language = model.language;
|
|
101
|
+
result.osmOpacity = model.osmOpacity;
|
|
100
102
|
return result;
|
|
101
103
|
}
|
|
102
104
|
/**
|
|
@@ -163,6 +165,15 @@ class MapSettings {
|
|
|
163
165
|
setLanguage(language) {
|
|
164
166
|
return MapSettings.copy(Object.assign(Object.assign({}, this), { language }));
|
|
165
167
|
}
|
|
168
|
+
/**
|
|
169
|
+
* Sets the opacity level for the OpenStreetMap layer.
|
|
170
|
+
*
|
|
171
|
+
* @param {number} osmOpacity - The opacity value for the OpenStreetMap layer, where 0 is fully transparent and 1 is fully opaque.
|
|
172
|
+
* @return {MapSettings} A new MapSettings instance with the updated OpenStreetMap opacity.
|
|
173
|
+
*/
|
|
174
|
+
setOsmOpacity(osmOpacity) {
|
|
175
|
+
return MapSettings.copy(Object.assign(Object.assign({}, this), { osmOpacity }));
|
|
176
|
+
}
|
|
166
177
|
/**
|
|
167
178
|
* Compares the current MapSettings instance with another to determine if they are identical.
|
|
168
179
|
*
|
|
@@ -182,6 +193,8 @@ class MapSettings {
|
|
|
182
193
|
return false;
|
|
183
194
|
if (this.interactionSettings !== model.interactionSettings)
|
|
184
195
|
return false;
|
|
196
|
+
if (this.osmOpacity !== model.osmOpacity)
|
|
197
|
+
return false;
|
|
185
198
|
return this.center.length === model.center.length && !this.center.filter((c, i) => c !== model.center[i]).length;
|
|
186
199
|
}
|
|
187
200
|
}
|
|
@@ -925,11 +938,6 @@ RemoveRasterTileCommand.ID = 'd1c4bf6a-e2f2-4385-a7a2-cecb525f8939';
|
|
|
925
938
|
class MapPostboyService extends PostboyService {
|
|
926
939
|
constructor() {
|
|
927
940
|
super();
|
|
928
|
-
this.addLocker({
|
|
929
|
-
locker: StartDrawingCommand.ID,
|
|
930
|
-
unlocker: DrawingFinishedEvent.ID,
|
|
931
|
-
locking: [MapClickEvent.ID],
|
|
932
|
-
});
|
|
933
941
|
}
|
|
934
942
|
}
|
|
935
943
|
MapPostboyService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapPostboyService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -1243,6 +1251,7 @@ class DrawingService {
|
|
|
1243
1251
|
}
|
|
1244
1252
|
observeDrawing() {
|
|
1245
1253
|
this.postboy.sub(StartDrawingCommand).subscribe((ev) => {
|
|
1254
|
+
this.postboy.exec(new LockMessage(MapClickEvent));
|
|
1246
1255
|
this.draw((l) => {
|
|
1247
1256
|
var _a;
|
|
1248
1257
|
if (!l || !this.map) {
|
|
@@ -1290,6 +1299,7 @@ class DrawingService {
|
|
|
1290
1299
|
(_a = this.map) === null || _a === void 0 ? void 0 : _a.removeInteraction(this.drawInteraction);
|
|
1291
1300
|
layer === null || layer === void 0 ? void 0 : layer.setSource(new Vector({}));
|
|
1292
1301
|
}
|
|
1302
|
+
this.postboy.exec(new UnlockMessage(MapClickEvent));
|
|
1293
1303
|
setTimeout(() => this.postboy.fire(new DrawingFinishedEvent()), 300);
|
|
1294
1304
|
}
|
|
1295
1305
|
}
|
|
@@ -1729,6 +1739,7 @@ class OsmTileLayerComponent extends DestructibleComponent {
|
|
|
1729
1739
|
constructor() {
|
|
1730
1740
|
super();
|
|
1731
1741
|
this._url = '';
|
|
1742
|
+
this._opacity = 1;
|
|
1732
1743
|
}
|
|
1733
1744
|
set url(value) {
|
|
1734
1745
|
if (!value || this._url === value)
|
|
@@ -1736,6 +1747,12 @@ class OsmTileLayerComponent extends DestructibleComponent {
|
|
|
1736
1747
|
this._url = value;
|
|
1737
1748
|
this.initLayer();
|
|
1738
1749
|
}
|
|
1750
|
+
set opacity(value) {
|
|
1751
|
+
if (!value || this._opacity === value)
|
|
1752
|
+
return;
|
|
1753
|
+
this._opacity = value;
|
|
1754
|
+
this.initLayer();
|
|
1755
|
+
}
|
|
1739
1756
|
set map(value) {
|
|
1740
1757
|
if (!value || this._map === value)
|
|
1741
1758
|
return;
|
|
@@ -1760,13 +1777,14 @@ class OsmTileLayerComponent extends DestructibleComponent {
|
|
|
1760
1777
|
source: new OSM({
|
|
1761
1778
|
url: this._url,
|
|
1762
1779
|
}),
|
|
1780
|
+
opacity: this._opacity,
|
|
1763
1781
|
});
|
|
1764
1782
|
this.layer.set('name', 'osm-tile-layer');
|
|
1765
1783
|
this._map.addLayer(this.layer);
|
|
1766
1784
|
}
|
|
1767
1785
|
}
|
|
1768
1786
|
OsmTileLayerComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: OsmTileLayerComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
|
|
1769
|
-
OsmTileLayerComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "12.2.17", type: OsmTileLayerComponent, selector: "art-osm-tile-layer", inputs: { url: "url", map: "map" }, usesInheritance: true, ngImport: i0, template: '', isInline: true, changeDetection: i0.ChangeDetectionStrategy.OnPush });
|
|
1787
|
+
OsmTileLayerComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "12.2.17", type: OsmTileLayerComponent, selector: "art-osm-tile-layer", inputs: { url: "url", opacity: "opacity", map: "map" }, usesInheritance: true, ngImport: i0, template: '', isInline: true, changeDetection: i0.ChangeDetectionStrategy.OnPush });
|
|
1770
1788
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: OsmTileLayerComponent, decorators: [{
|
|
1771
1789
|
type: Component,
|
|
1772
1790
|
args: [{
|
|
@@ -1777,6 +1795,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImpo
|
|
|
1777
1795
|
}]
|
|
1778
1796
|
}], ctorParameters: function () { return []; }, propDecorators: { url: [{
|
|
1779
1797
|
type: Input
|
|
1798
|
+
}], opacity: [{
|
|
1799
|
+
type: Input
|
|
1780
1800
|
}], map: [{
|
|
1781
1801
|
type: Input
|
|
1782
1802
|
}] } });
|
|
@@ -2828,7 +2848,7 @@ MapPlateComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", vers
|
|
|
2828
2848
|
FeatureService,
|
|
2829
2849
|
FeatureModificationService,
|
|
2830
2850
|
ControlsService,
|
|
2831
|
-
], usesInheritance: true, ngImport: i0, template: "<ng-content></ng-content>\r\n<art-osm-tile-layer *ngIf=\"osmUrl && map\" [map]=\"map\" [url]=\"osmUrl\"></art-osm-tile-layer>\r\n<art-feature-layer *ngIf=\"map\" [settings]=\"drawingLayerSettings\"></art-feature-layer>\r\n", styles: ["art-map-plate{display:block;width:100%;height:100%}\n"], components: [{ type: OsmTileLayerComponent, selector: "art-osm-tile-layer", inputs: ["url", "map"] }, { type: FeatureLayerComponent, selector: "art-feature-layer", inputs: ["settings"] }], directives: [{ type: i6.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None });
|
|
2851
|
+
], usesInheritance: true, ngImport: i0, template: "<ng-content></ng-content>\r\n<art-osm-tile-layer *ngIf=\"osmUrl && map\" [map]=\"map\" [url]=\"osmUrl\" [opacity]=\"_settings.osmOpacity\"></art-osm-tile-layer>\r\n<art-feature-layer *ngIf=\"map\" [settings]=\"drawingLayerSettings\"></art-feature-layer>\r\n", styles: ["art-map-plate{display:block;width:100%;height:100%}\n"], components: [{ type: OsmTileLayerComponent, selector: "art-osm-tile-layer", inputs: ["url", "opacity", "map"] }, { type: FeatureLayerComponent, selector: "art-feature-layer", inputs: ["settings"] }], directives: [{ type: i6.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None });
|
|
2832
2852
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapPlateComponent, decorators: [{
|
|
2833
2853
|
type: Component,
|
|
2834
2854
|
args: [{
|