@artstesh/maps 4.1.36 → 4.2.0

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

@@ -11,7 +11,7 @@ import { getCenter, createEmpty, extend } from 'ol/extent';
 import Polygon, { circular, fromExtent } from 'ol/geom/Polygon';
 import { Control, Zoom } from 'ol/control';
 import { get, useGeographic, transform } from 'ol/proj';
-import { PostboyGenericMessage, PostboyCallbackMessage, PostboyExecutor, PostboyService, PostboyAbstractRegistrator } from '@artstesh/postboy';
+import { PostboyGenericMessage, PostboyCallbackMessage, PostboyExecutor, PostboyService, LockMessage, UnlockMessage, PostboyAbstractRegistrator } from '@artstesh/postboy';
 import * as Sphere from 'ol/sphere';
 import { getLength } from 'ol/sphere';
 import { Draw, Modify, Translate, defaults } from 'ol/interaction';
@@ -86,6 +86,7 @@ class MapSettings {
         this.zoom = 4;
         this.lyrs = MapLyrs.Hybrid;
         this.language = 'en';
+        this.osmOpacity = 1;
         this.interactionSettings = {};
     }
     static copy(model) {
@@ -97,6 +98,7 @@ class MapSettings {
         result.lyrs = model.lyrs;
         result.interactionSettings = model.interactionSettings;
         result.language = model.language;
+        result.osmOpacity = model.osmOpacity;
         return result;
     }
     /**
@@ -163,6 +165,15 @@ class MapSettings {
     setLanguage(language) {
         return MapSettings.copy({ ...this, language });
     }
+    /**
+     * Sets the opacity level for the OpenStreetMap layer.
+     *
+     * @param {number} osmOpacity - The opacity value for the OpenStreetMap layer, where 0 is fully transparent and 1 is fully opaque.
+     * @return {MapSettings} A new MapSettings instance with the updated OpenStreetMap opacity.
+     */
+    setOsmOpacity(osmOpacity) {
+        return MapSettings.copy({ ...this, osmOpacity });
+    }
     /**
      * Compares the current MapSettings instance with another to determine if they are identical.
      *
@@ -182,6 +193,8 @@ class MapSettings {
             return false;
         if (this.interactionSettings !== model.interactionSettings)
             return false;
+        if (this.osmOpacity !== model.osmOpacity)
+            return false;
         return this.center.length === model.center.length && !this.center.filter((c, i) => c !== model.center[i]).length;
     }
 }
@@ -924,11 +937,6 @@ RemoveRasterTileCommand.ID = 'd1c4bf6a-e2f2-4385-a7a2-cecb525f8939';
 class MapPostboyService extends PostboyService {
     constructor() {
         super();
-        this.addLocker({
-            locker: StartDrawingCommand.ID,
-            unlocker: DrawingFinishedEvent.ID,
-            locking: [MapClickEvent.ID],
-        });
     }
 }
 MapPostboyService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MapPostboyService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
@@ -1234,6 +1242,7 @@ class DrawingService {
     }
     observeDrawing() {
         this.postboy.sub(StartDrawingCommand).subscribe((ev) => {
+            this.postboy.exec(new LockMessage(MapClickEvent));
             this.draw((l) => {
                 if (!l || !this.map) {
                     this.clearInteraction(l);
@@ -1279,6 +1288,7 @@ class DrawingService {
             this.map?.removeInteraction(this.drawInteraction);
             layer?.setSource(new Vector({}));
         }
+        this.postboy.exec(new UnlockMessage(MapClickEvent));
         setTimeout(() => this.postboy.fire(new DrawingFinishedEvent()), 300);
     }
 }
@@ -1708,6 +1718,7 @@ class OsmTileLayerComponent extends DestructibleComponent {
     constructor() {
         super();
         this._url = '';
+        this._opacity = 1;
     }
     set url(value) {
         if (!value || this._url === value)
@@ -1715,6 +1726,12 @@ class OsmTileLayerComponent extends DestructibleComponent {
         this._url = value;
         this.initLayer();
     }
+    set opacity(value) {
+        if (!value || this._opacity === value)
+            return;
+        this._opacity = value;
+        this.initLayer();
+    }
     set map(value) {
         if (!value || this._map === value)
             return;
@@ -1738,18 +1755,21 @@ class OsmTileLayerComponent extends DestructibleComponent {
             source: new OSM({
                 url: this._url,
             }),
+            opacity: this._opacity,
         });
         this.layer.set('name', 'osm-tile-layer');
         this._map.addLayer(this.layer);
     }
 }
 OsmTileLayerComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: OsmTileLayerComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-OsmTileLayerComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.10", type: OsmTileLayerComponent, selector: "art-osm-tile-layer", inputs: { url: "url", map: "map" }, usesInheritance: true, ngImport: i0, template: '', isInline: true, changeDetection: i0.ChangeDetectionStrategy.OnPush });
+OsmTileLayerComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.10", 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 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: OsmTileLayerComponent, decorators: [{
             type: Component,
             args: [{ selector: 'art-osm-tile-layer', template: '', changeDetection: ChangeDetectionStrategy.OnPush }]
         }], ctorParameters: function () { return []; }, propDecorators: { url: [{
                 type: Input
+            }], opacity: [{
+                type: Input
             }], map: [{
                 type: Input
             }] } });
@@ -2777,7 +2797,7 @@ MapPlateComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", vers
         FeatureService,
         FeatureModificationService,
         ControlsService,
-    ], 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"], dependencies: [{ kind: "directive", type: i4.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: OsmTileLayerComponent, selector: "art-osm-tile-layer", inputs: ["url", "map"] }, { kind: "component", type: FeatureLayerComponent, selector: "art-feature-layer", inputs: ["settings"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None });
+    ], 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"], dependencies: [{ kind: "directive", type: i4.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: OsmTileLayerComponent, selector: "art-osm-tile-layer", inputs: ["url", "opacity", "map"] }, { kind: "component", type: FeatureLayerComponent, selector: "art-feature-layer", inputs: ["settings"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MapPlateComponent, decorators: [{
             type: Component,
             args: [{ selector: 'art-map-plate', changeDetection: ChangeDetectionStrategy.OnPush, providers: [
@@ -2791,7 +2811,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
                         FeatureService,
                         FeatureModificationService,
                         ControlsService,
-                    ], encapsulation: ViewEncapsulation.None, 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"] }]
+                    ], encapsulation: ViewEncapsulation.None, 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"] }]
         }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: MapPostboyService }, { type: MapPlateFactory }, { type: MessageRegistratorService }, { type: i0.ChangeDetectorRef }]; }, propDecorators: { settings: [{
                 type: Input
             }] } });