@artstesh/maps 1.0.6 → 1.0.8

package/dist/fesm2015/maps-components.js

@@ -1,24 +1,28 @@
 import * as i0 from '@angular/core';
 import { Component, Injectable, ChangeDetectionStrategy, Input, ViewChild, NgModule } from '@angular/core';
-import * as i5 from '@angular/common';
+import * as i6 from '@angular/common';
 import { CommonModule } from '@angular/common';
 import { Feature } from 'ol';
 import { Point } from 'ol/geom';
 import { GeoJSON, WKT } from 'ol/format';
-import { getCenter } from 'ol/extent';
-import { useGeographic, get } from 'ol/proj';
-import { Subject } from 'rxjs';
-import { PostboyService, PostboyAbstractRegistrator } from '@artstesh/postboy';
-import Map from 'ol/Map';
-import View from 'ol/View';
+import { getCenter, createEmpty, extend } from 'ol/extent';
+import { get, useGeographic } from 'ol/proj';
+import { PostboyGenericMessage, PostboyCallbackMessage, PostboyService, PostboyAbstractRegistrator } from '@artstesh/postboy';
+import { first, filter, auditTime } from 'rxjs/operators';
+import { Vector, XYZ } from 'ol/source';
+import { Draw } from 'ol/interaction';
 import TileLayer from 'ol/layer/Tile';
 import OSM from 'ol/source/OSM';
-import { filter, first } from 'rxjs/operators';
-import { XYZ, Vector } from 'ol/source';
 import { Vector as Vector$1 } from 'ol/layer';
+import { bbox } from 'ol/loadingstrategy';
+import { fromExtent } from 'ol/geom/Polygon';
+import Cluster from 'ol/source/Cluster';
+import { combineLatest } from 'rxjs';
+import Map from 'ol/Map';
+import View from 'ol/View';
 import Overlay from 'ol/Overlay';
 import Style from 'ol/style/Style';
-import { Icon, Circle, Fill, Stroke } from 'ol/style';
+import { Icon, Circle, Fill, Stroke, Text } from 'ol/style';
 
 class DestructibleComponent {
     constructor() {
@@ -122,6 +126,11 @@ class IdGenerator {
 }
 IdGenerator.collection = 'ABCDEFGHIJKLMNOPQRSTUVWXTZ0123456789'.split('');
 
+class MapConstants {
+}
+MapConstants.FeatureInfo = 'f-info';
+MapConstants.DrawingLayerId = '93a981756ec7';
+
 class MarkerModel {
     constructor(lat, lng, id, info) {
         this.lat = lat;
@@ -137,7 +146,7 @@ class MarkerModel {
         const feature = new Feature(new Point([this.lng, this.lat]));
         feature.setId(this.id);
         if (this.info)
-            feature.set('info', this.info);
+            feature.set(MapConstants.FeatureInfo, this.info);
         return feature;
     }
 }
@@ -165,21 +174,18 @@ class PolygonModel {
     }
 }
 
-class GenericMessage {
-}
-class CallbackMessage extends GenericMessage {
-    constructor() {
-        super(...arguments);
-        this.result$ = new Subject();
-        this.result = this.result$.asObservable();
-    }
-    finish(value) {
-        this.result$.next(value);
-        this.result$.complete();
-    }
-}
+var DrawingType;
+(function (DrawingType) {
+    DrawingType[DrawingType["Polygon"] = 1] = "Polygon";
+})(DrawingType || (DrawingType = {}));
+
+var FeatureOutputFormat;
+(function (FeatureOutputFormat) {
+    FeatureOutputFormat[FeatureOutputFormat["GeoJson"] = 1] = "GeoJson";
+    FeatureOutputFormat[FeatureOutputFormat["WKT"] = 2] = "WKT";
+})(FeatureOutputFormat || (FeatureOutputFormat = {}));
 
-class MapRenderedEvent extends GenericMessage {
+class MapRenderedEvent extends PostboyGenericMessage {
     constructor(map) {
         super();
         this.map = map;
@@ -190,11 +196,12 @@ class MapRenderedEvent extends GenericMessage {
 }
 MapRenderedEvent.ID = 'b6121807-3b89-4cd3-82cf-089d2cefdc4f';
 
-class MapClickEvent extends GenericMessage {
-    constructor(coordinates, entities) {
+class MapClickEvent extends PostboyGenericMessage {
+    constructor(coordinates, entities, features) {
         super();
         this.coordinates = coordinates;
         this.entities = entities;
+        this.features = features;
     }
     get id() {
         return MapClickEvent.ID;
@@ -202,7 +209,19 @@ class MapClickEvent extends GenericMessage {
 }
 MapClickEvent.ID = '323df526-8d9c-49c6-83e8-6e9a1e7762f7';
 
-class CloseTooltipCommand extends GenericMessage {
+class MapMoveEndEvent extends PostboyGenericMessage {
+    constructor(zoom, extent) {
+        super();
+        this.zoom = zoom;
+        this.extent = extent;
+    }
+    get id() {
+        return MapMoveEndEvent.ID;
+    }
+}
+MapMoveEndEvent.ID = 'f21f783e-b5af-4489-9fec-8027fd07a8ad';
+
+class CloseTooltipCommand extends PostboyGenericMessage {
     constructor(tooltipId) {
         super();
         this.tooltipId = tooltipId;
@@ -213,7 +232,27 @@ class CloseTooltipCommand extends GenericMessage {
 }
 CloseTooltipCommand.ID = '4896d52c-e34f-4994-bcfd-32832d12dbe4';
 
-class AddLayerCommand extends GenericMessage {
+class StartDrawingCommand extends PostboyCallbackMessage {
+    constructor(type, style, format = FeatureOutputFormat.GeoJson) {
+        super();
+        this.type = type;
+        this.style = style;
+        this.format = format;
+    }
+    get id() {
+        return StartDrawingCommand.ID;
+    }
+}
+StartDrawingCommand.ID = 'da904f4b-a1c8-4db7-a6af-14d9ee18ec8c';
+
+class CancelDrawingCommand extends PostboyGenericMessage {
+    get id() {
+        return CancelDrawingCommand.ID;
+    }
+}
+CancelDrawingCommand.ID = '7d38d983-feba-4176-a66b-18175e5ecd6b';
+
+class AddLayerCommand extends PostboyGenericMessage {
     constructor(layer) {
         super();
         this.layer = layer;
@@ -224,7 +263,7 @@ class AddLayerCommand extends GenericMessage {
 }
 AddLayerCommand.ID = 'd93e250f-92bc-43ac-9c6a-46c521a1aaa5';
 
-class PlaceLayerFeaturesCommand extends GenericMessage {
+class PlaceLayerFeaturesCommand extends PostboyGenericMessage {
     constructor(layer, features) {
         super();
         this.layer = layer;
@@ -236,7 +275,7 @@ class PlaceLayerFeaturesCommand extends GenericMessage {
 }
 PlaceLayerFeaturesCommand.ID = '8caf86bc-869b-426f-b36d-4642f6b8aab0';
 
-class RemoveLayerCommand extends GenericMessage {
+class RemoveLayerCommand extends PostboyGenericMessage {
     constructor(layer) {
         super();
         this.layer = layer;
@@ -247,7 +286,7 @@ class RemoveLayerCommand extends GenericMessage {
 }
 RemoveLayerCommand.ID = 'ab484e0e-e185-45cd-8434-12101f3c7eb1';
 
-class AddTileCommand extends GenericMessage {
+class AddTileCommand extends PostboyGenericMessage {
     constructor(layer) {
         super();
         this.layer = layer;
@@ -258,7 +297,7 @@ class AddTileCommand extends GenericMessage {
 }
 AddTileCommand.ID = '25b7df28-72ce-4453-9fe6-54285a2fdc57';
 
-class RemoveTileCommand extends GenericMessage {
+class RemoveTileCommand extends PostboyGenericMessage {
     constructor(layer) {
         super();
         this.layer = layer;
@@ -269,17 +308,50 @@ class RemoveTileCommand extends GenericMessage {
 }
 RemoveTileCommand.ID = 'c36ccc0b-5638-4819-b148-2de57a59a5b7';
 
+class FitToFeaturesCommand extends PostboyGenericMessage {
+    constructor(features, zoomAfter = 0) {
+        super();
+        this.features = features;
+        this.zoomAfter = zoomAfter;
+    }
+    get id() {
+        return FitToFeaturesCommand.ID;
+    }
+}
+FitToFeaturesCommand.ID = '76cdc091-3793-4b6c-82f7-1e0334cf08a8';
+
+class GetLayerQuery extends PostboyCallbackMessage {
+    constructor(name) {
+        super();
+        this.name = name;
+    }
+    get id() {
+        return GetLayerQuery.ID;
+    }
+}
+GetLayerQuery.ID = '5c04c87b-8a93-4c2a-979e-d1e313d860ed';
+
+class DrawingFinishedEvent extends PostboyGenericMessage {
+    constructor() {
+        super();
+    }
+    get id() {
+        return DrawingFinishedEvent.ID;
+    }
+}
+DrawingFinishedEvent.ID = 'c724b68e-b4eb-4783-90f1-a8e31973fd36';
+
 class MapPostboyService extends PostboyService {
     constructor() {
-        super(...arguments);
-        this.observe = (id) => this.subscribe(id);
+        super();
+        this.addLocker({ locker: StartDrawingCommand.ID, unlocker: DrawingFinishedEvent.ID, locking: [MapClickEvent.ID] });
     }
 }
-MapPostboyService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapPostboyService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+MapPostboyService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapPostboyService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
 MapPostboyService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapPostboyService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapPostboyService, decorators: [{
             type: Injectable
-        }] });
+        }], ctorParameters: function () { return []; } });
 
 class MapManagementService {
     constructor(postboy) {
@@ -293,6 +365,7 @@ class MapManagementService {
         this.observePlaceFeatures();
         this.observeAddTile();
         this.observeRemoveTile();
+        this.observeLayerQuery();
     }
     observeRemoveTile() {
         this.postboy.subscribe(RemoveTileCommand.ID).subscribe((c) => {
@@ -301,6 +374,9 @@ class MapManagementService {
             this.map.removeLayer(c.layer);
         });
     }
+    observeLayerQuery() {
+        this.postboy.subscribe(GetLayerQuery.ID).subscribe((ev) => { var _a; return ev.finish((_a = this.layers[ev.name]) !== null && _a !== void 0 ? _a : null); });
+    }
     observeAddTile() {
         this.postboy.subscribe(AddTileCommand.ID).subscribe((c) => {
             if (!this.map)
@@ -323,11 +399,14 @@ class MapManagementService {
     }
     observePlaceFeatures() {
         this.postboy.subscribe(PlaceLayerFeaturesCommand.ID).subscribe((c) => {
-            var _a, _b, _c;
+            var _a, _b;
             if (!this.layers[c.layer])
                 return;
-            (_b = (_a = this.layers[c.layer]) === null || _a === void 0 ? void 0 : _a.getSource()) === null || _b === void 0 ? void 0 : _b.clear();
-            (_c = this.layers[c.layer].getSource()) === null || _c === void 0 ? void 0 : _c.addFeatures(c.features);
+            let source = (_a = this.layers[c.layer]) === null || _a === void 0 ? void 0 : _a.getSource();
+            if (!!source['getSource'])
+                source = (_b = source) === null || _b === void 0 ? void 0 : _b.getSource();
+            source === null || source === void 0 ? void 0 : source.clear();
+            source === null || source === void 0 ? void 0 : source.addFeatures(c.features);
         });
     }
     observeRemoveLayer() {
@@ -350,7 +429,16 @@ class MapStateService {
         this.postboy = postboy;
     }
     up() {
-        this.postboy.subscribe(MapRenderedEvent.ID).subscribe((m) => (this.map = m));
+        this.postboy.subscribe(MapRenderedEvent.ID).subscribe((ev) => {
+            var _a;
+            this.map = ev.map;
+            (_a = this.map) === null || _a === void 0 ? void 0 : _a.on('moveend', () => {
+                var _a, _b;
+                const zoom = Math.floor(((_a = this.map) === null || _a === void 0 ? void 0 : _a.getView().getZoom()) || -1);
+                const extent = ((_b = this.map) === null || _b === void 0 ? void 0 : _b.getView().calculateExtent()) || [];
+                this.postboy.fire(new MapMoveEndEvent(zoom, extent));
+            });
+        });
     }
 }
 MapStateService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapStateService, deps: [{ token: MapPostboyService }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -359,6 +447,39 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImpo
             type: Injectable
         }], ctorParameters: function () { return [{ type: MapPostboyService }]; } });
 
+class MapFeatureService {
+    constructor(postboy) {
+        this.postboy = postboy;
+    }
+    up() {
+        this.observeMapRender();
+        this.observeFitToFeatures();
+    }
+    observeMapRender() {
+        this.postboy.subscribe(MapRenderedEvent.ID).subscribe((m) => {
+            this.map = m.map;
+        });
+    }
+    observeFitToFeatures() {
+        this.postboy.subscribe(FitToFeaturesCommand.ID).subscribe((m) => {
+            this.fitToGeometries(m.features.map((f) => f.getGeometry()), m.zoomAfter);
+        });
+    }
+    fitToGeometries(geometries, zoomAfter) {
+        if (!(geometries === null || geometries === void 0 ? void 0 : geometries.length) || !this.map)
+            return;
+        const extent = createEmpty();
+        geometries.forEach((g) => extend(extent, g.getExtent()));
+        this.map.getView().fit(extent);
+        this.map.getView().setZoom(this.map.getView().getZoom() + zoomAfter);
+    }
+}
+MapFeatureService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapFeatureService, deps: [{ token: MapPostboyService }], target: i0.ɵɵFactoryTarget.Injectable });
+MapFeatureService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapFeatureService });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapFeatureService, decorators: [{
+            type: Injectable
+        }], ctorParameters: function () { return [{ type: MapPostboyService }]; } });
+
 class MapClickService {
     constructor(postboy) {
         this.postboy = postboy;
@@ -377,7 +498,7 @@ class MapClickService {
     }
     onClick(ev) {
         var _a;
-        const model = new MapClickEvent(ev.coordinate, {});
+        const model = new MapClickEvent(ev.coordinate, {}, {});
         (_a = this.map) === null || _a === void 0 ? void 0 : _a.forEachFeatureAtPixel(ev.pixel, (f, l) => {
             this.getFeatureCollectionWithInner([f])
                 .filter((f) => f.getId() != null)
@@ -385,7 +506,10 @@ class MapClickService {
                 let layerName = l.get('name');
                 if (!model.entities[layerName])
                     model.entities[layerName] = [];
-                model.entities[layerName].push(f.getId());
+                if (!model.features[layerName])
+                    model.features[layerName] = [];
+                model.entities[layerName].push(Object.assign({ id: fs.getId() }, fs.get(MapConstants.FeatureInfo)));
+                model.features[layerName].push(fs);
             });
         });
         return model;
@@ -405,10 +529,76 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImpo
             type: Injectable
         }], ctorParameters: function () { return [{ type: MapPostboyService }]; } });
 
+class DrawingService {
+    constructor(postboy) {
+        this.postboy = postboy;
+    }
+    up() {
+        this.postboy.subscribe(StartDrawingCommand.ID).subscribe((ev) => {
+            this.draw((l) => {
+                if (!l || !this.map) {
+                    this.clearInteraction(l);
+                    return;
+                }
+                const cancelSub = this.observeCancelation(ev, l);
+                this.drawInteraction = new Draw({
+                    source: l.getSource(),
+                    type: DrawingType[ev.type],
+                    style: ev.style,
+                });
+                this.map.addInteraction(this.drawInteraction);
+                this.drawInteraction.on('drawend', (evt) => {
+                    cancelSub.unsubscribe();
+                    this.onEnd(evt, ev, l);
+                });
+            });
+        });
+        this.observeMapRender();
+    }
+    onEnd(evt, command, layer) {
+        command.finish(command.format === FeatureOutputFormat.GeoJson
+            ? new GeoJSON().writeFeature(evt.feature)
+            : new WKT().writeFeature(evt.feature));
+        this.clearInteraction(layer);
+    }
+    observeMapRender() {
+        this.postboy.subscribe(MapRenderedEvent.ID).subscribe((m) => {
+            this.map = m.map;
+        });
+    }
+    draw(action) {
+        const query = new GetLayerQuery(MapConstants.DrawingLayerId);
+        query.result.subscribe((l) => action(l));
+        this.postboy.fire(query);
+    }
+    observeCancelation(ev, layer) {
+        return this.postboy
+            .subscribe(CancelDrawingCommand.ID)
+            .pipe(first())
+            .subscribe(() => {
+            ev.finish(null);
+            this.clearInteraction(layer);
+        });
+    }
+    clearInteraction(layer) {
+        var _a;
+        if (!!this.drawInteraction) {
+            (_a = this.map) === null || _a === void 0 ? void 0 : _a.removeInteraction(this.drawInteraction);
+            layer === null || layer === void 0 ? void 0 : layer.setSource(new Vector({}));
+        }
+        setTimeout(() => this.postboy.fire(new DrawingFinishedEvent()), 300);
+    }
+}
+DrawingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: DrawingService, deps: [{ token: MapPostboyService }], target: i0.ɵɵFactoryTarget.Injectable });
+DrawingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: DrawingService });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: DrawingService, decorators: [{
+            type: Injectable
+        }], ctorParameters: function () { return [{ type: MapPostboyService }]; } });
+
 class MessageRegistratorService extends PostboyAbstractRegistrator {
-    constructor(service, management, state, interaction) {
+    constructor(service, management, state, feature, interaction, drawing) {
         super(service);
-        this.registerServices([management, state, interaction]);
+        this.registerServices([management, state, interaction, feature, drawing]);
     }
     _up() {
         this.registerReplay(MapRenderedEvent.ID);
@@ -419,147 +609,19 @@ class MessageRegistratorService extends PostboyAbstractRegistrator {
         this.registerSubject(RemoveTileCommand.ID);
         this.registerSubject(MapClickEvent.ID);
         this.registerSubject(CloseTooltipCommand.ID);
+        this.registerSubject(FitToFeaturesCommand.ID);
+        this.registerSubject(MapMoveEndEvent.ID);
+        this.registerSubject(CancelDrawingCommand.ID);
+        this.registerSubject(StartDrawingCommand.ID);
+        this.registerSubject(GetLayerQuery.ID);
+        this.registerSubject(DrawingFinishedEvent.ID);
     }
 }
-MessageRegistratorService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MessageRegistratorService, deps: [{ token: MapPostboyService }, { token: MapManagementService }, { token: MapStateService }, { token: MapClickService }], target: i0.ɵɵFactoryTarget.Injectable });
+MessageRegistratorService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MessageRegistratorService, deps: [{ token: MapPostboyService }, { token: MapManagementService }, { token: MapStateService }, { token: MapFeatureService }, { token: MapClickService }, { token: DrawingService }], target: i0.ɵɵFactoryTarget.Injectable });
 MessageRegistratorService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MessageRegistratorService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MessageRegistratorService, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return [{ type: MapPostboyService }, { type: MapManagementService }, { type: MapStateService }, { type: MapClickService }]; } });
-
-class MapPlateFactory {
-    build(settings) {
-        return new Map({
-            controls: [],
-            view: new View({
-                center: (settings === null || settings === void 0 ? void 0 : settings.center) || [0, 0],
-                zoom: (settings === null || settings === void 0 ? void 0 : settings.zoom) || 4,
-                minZoom: (settings === null || settings === void 0 ? void 0 : settings.minZoom) || 0,
-                maxZoom: (settings === null || settings === void 0 ? void 0 : settings.maxZoom) || 19,
-            }),
-            layers: [],
-        });
-    }
-}
-MapPlateFactory.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapPlateFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-MapPlateFactory.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapPlateFactory, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapPlateFactory, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }] });
-
-class OsmTileLayerComponent extends DestructibleComponent {
-    constructor() {
-        super();
-        this._url = '';
-    }
-    set url(value) {
-        if (!value || this._url === value)
-            return;
-        this._url = value;
-        this.initLayer();
-    }
-    set map(value) {
-        if (!value || this._map === value)
-            return;
-        this._map = value;
-        this.initLayer();
-    }
-    ngOnInit() { }
-    ngOnDestroy() {
-        var _a, _b;
-        if (this.layer) {
-            (_a = this._map) === null || _a === void 0 ? void 0 : _a.removeLayer(this.layer);
-        }
-        // @ts-ignore
-        (_b = this.layer) === null || _b === void 0 ? void 0 : _b.setMap(null);
-    }
-    initLayer() {
-        if (!this._url || !this._map)
-            return;
-        if (this.layer)
-            this._map.removeLayer(this.layer);
-        this.layer = new TileLayer({
-            source: new OSM({
-                url: this._url,
-            }),
-        });
-        this.layer.set('name', 'osm-tile-layer');
-        this._map.addLayer(this.layer);
-    }
-}
-OsmTileLayerComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: OsmTileLayerComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-OsmTileLayerComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "12.2.17", type: OsmTileLayerComponent, selector: "lib-osm-tile-layer", inputs: { url: "url", map: "map" }, usesInheritance: true, ngImport: i0, template: '', isInline: true, changeDetection: i0.ChangeDetectionStrategy.OnPush });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: OsmTileLayerComponent, decorators: [{
-            type: Component,
-            args: [{
-                    selector: 'lib-osm-tile-layer',
-                    template: '',
-                    styleUrls: [],
-                    changeDetection: ChangeDetectionStrategy.OnPush,
-                }]
-        }], ctorParameters: function () { return []; }, propDecorators: { url: [{
-                type: Input
-            }], map: [{
-                type: Input
-            }] } });
-
-class MapPlateComponent extends DestructibleComponent {
-    constructor(elementRef, postboy, mapFactory, registrator, detector) {
-        super();
-        this.elementRef = elementRef;
-        this.postboy = postboy;
-        this.mapFactory = mapFactory;
-        this.registrator = registrator;
-        this.detector = detector;
-        this.osmUrl = '';
-        this._settings = new MapSettings();
-        this.onDestroy = () => {
-            this.registrator.down();
-        };
-        registrator.up();
-    }
-    set settings(value) {
-        if (!value || this._settings.isSame(value))
-            return;
-        this._settings = value;
-        this.setOsm();
-    }
-    ngOnInit() {
-        useGeographic();
-        this.map = this.mapFactory.build(this._settings);
-        this.map.setTarget(this.elementRef.nativeElement);
-        this.detector.detectChanges();
-        this.map.once('postrender', () => {
-            this.map.updateSize();
-            this.postboy.fire(new MapRenderedEvent(this.map));
-        });
-        this.setOsm();
-    }
-    setOsm() {
-        if (!this.map)
-            return;
-        this.osmUrl = `https://mt{0-3}.google.com/vt/lyrs=${MapLyrsLabel.get(this._settings.lyrs)}&hl=${this._settings.language}&x={x}&y={y}&z={z}`;
-        this.detector.detectChanges();
-        this.map.updateSize();
-    }
-}
-MapPlateComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapPlateComponent, deps: [{ token: i0.ElementRef }, { token: MapPostboyService }, { token: MapPlateFactory }, { token: MessageRegistratorService }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component });
-MapPlateComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "12.2.17", type: MapPlateComponent, selector: "lib-map-plate", inputs: { settings: "settings" }, providers: [MessageRegistratorService, MapStateService, MapManagementService, MapClickService], usesInheritance: true, ngImport: i0, template: "<ng-content></ng-content>\n<lib-osm-tile-layer *ngIf=\"osmUrl && map\" [map]=\"map\" [url]=\"osmUrl\"></lib-osm-tile-layer>\n", styles: ["lib-map-plate{position:relative;display:flex;flex-direction:column;height:100%}\n"], components: [{ type: OsmTileLayerComponent, selector: "lib-osm-tile-layer", inputs: ["url", "map"] }], directives: [{ type: i5.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapPlateComponent, decorators: [{
-            type: Component,
-            args: [{
-                    selector: 'lib-map-plate',
-                    templateUrl: './map-plate.component.html',
-                    styleUrls: ['./map-plate.component.scss'],
-                    changeDetection: ChangeDetectionStrategy.OnPush,
-                    providers: [MessageRegistratorService, MapStateService, MapManagementService, MapClickService],
-                }]
-        }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: MapPostboyService }, { type: MapPlateFactory }, { type: MessageRegistratorService }, { type: i0.ChangeDetectorRef }]; }, propDecorators: { settings: [{
-                type: Input
-            }] } });
+        }], ctorParameters: function () { return [{ type: MapPostboyService }, { type: MapManagementService }, { type: MapStateService }, { type: MapFeatureService }, { type: MapClickService }, { type: DrawingService }]; } });
 
 class TileLayerSettings {
     constructor() {
@@ -697,6 +759,62 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImpo
                 type: Input
             }] } });
 
+class OsmTileLayerComponent extends DestructibleComponent {
+    constructor() {
+        super();
+        this._url = '';
+    }
+    set url(value) {
+        if (!value || this._url === value)
+            return;
+        this._url = value;
+        this.initLayer();
+    }
+    set map(value) {
+        if (!value || this._map === value)
+            return;
+        this._map = value;
+        this.initLayer();
+    }
+    ngOnInit() { }
+    ngOnDestroy() {
+        var _a, _b;
+        if (this.layer) {
+            (_a = this._map) === null || _a === void 0 ? void 0 : _a.removeLayer(this.layer);
+        }
+        // @ts-ignore
+        (_b = this.layer) === null || _b === void 0 ? void 0 : _b.setMap(null);
+    }
+    initLayer() {
+        if (!this._url || !this._map)
+            return;
+        if (this.layer)
+            this._map.removeLayer(this.layer);
+        this.layer = new TileLayer({
+            source: new OSM({
+                url: this._url,
+            }),
+        });
+        this.layer.set('name', 'osm-tile-layer');
+        this._map.addLayer(this.layer);
+    }
+}
+OsmTileLayerComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: OsmTileLayerComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
+OsmTileLayerComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "12.2.17", type: OsmTileLayerComponent, selector: "lib-osm-tile-layer", inputs: { url: "url", map: "map" }, usesInheritance: true, ngImport: i0, template: '', isInline: true, changeDetection: i0.ChangeDetectionStrategy.OnPush });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: OsmTileLayerComponent, decorators: [{
+            type: Component,
+            args: [{
+                    selector: 'lib-osm-tile-layer',
+                    template: '',
+                    styleUrls: [],
+                    changeDetection: ChangeDetectionStrategy.OnPush,
+                }]
+        }], ctorParameters: function () { return []; }, propDecorators: { url: [{
+                type: Input
+            }], map: [{
+                type: Input
+            }] } });
+
 class FeatureLayerSettings {
     constructor() {
         this.name = IdGenerator.get();
@@ -812,6 +930,295 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImpo
                 type: Input
             }] } });
 
+class ClusterLayerSettings {
+    constructor() {
+        this.name = IdGenerator.get();
+        this.zIndex = 1;
+        this.maxZoom = 19;
+        this.minZoom = 0;
+        this.distance = 20;
+        this.bbox = false;
+        this.clusterCancel = 14;
+    }
+    static copy(model) {
+        const result = new ClusterLayerSettings();
+        result.name = model.name;
+        result.maxZoom = model.maxZoom;
+        result.minZoom = model.minZoom;
+        result.zIndex = model.zIndex;
+        result.bbox = model.bbox;
+        result.clusterCancel = model.clusterCancel;
+        result.distance = model.distance;
+        result.style = model.style;
+        return result;
+    }
+    setZIndex(zIndex) {
+        return ClusterLayerSettings.copy(Object.assign(Object.assign({}, this), { zIndex }));
+    }
+    setDistance(distance) {
+        return ClusterLayerSettings.copy(Object.assign(Object.assign({}, this), { distance }));
+    }
+    setName(name) {
+        return ClusterLayerSettings.copy(Object.assign(Object.assign({}, this), { name }));
+    }
+    setMaxZoom(maxZoom) {
+        return ClusterLayerSettings.copy(Object.assign(Object.assign({}, this), { maxZoom }));
+    }
+    setMinZoom(minZoom) {
+        return ClusterLayerSettings.copy(Object.assign(Object.assign({}, this), { minZoom }));
+    }
+    setClusterCancel(clusterCancel) {
+        return ClusterLayerSettings.copy(Object.assign(Object.assign({}, this), { clusterCancel }));
+    }
+    setBbox(bbox) {
+        return ClusterLayerSettings.copy(Object.assign(Object.assign({}, this), { bbox }));
+    }
+    setStyle(style) {
+        return ClusterLayerSettings.copy(Object.assign(Object.assign({}, this), { style }));
+    }
+    isSame(model) {
+        if (this.maxZoom !== model.maxZoom)
+            return false;
+        if (this.minZoom !== model.minZoom)
+            return false;
+        if (this.zIndex !== model.zIndex)
+            return false;
+        if (this.name !== model.name)
+            return false;
+        if (this.distance !== model.distance)
+            return false;
+        if (this.clusterCancel !== model.clusterCancel)
+            return false;
+        if (this.bbox !== model.bbox)
+            return false;
+        if (this.style !== model.style)
+            return false;
+        return true;
+    }
+}
+
+class ClusterLayerManager {
+    constructor(settings, layer, postboy) {
+        this.settings = settings;
+        this.layer = layer;
+        this.postboy = postboy;
+        this.observeClick();
+        this.observeMapMovement();
+    }
+    observeMapMovement() {
+        combineLatest([
+            this.postboy.subscribe(MapMoveEndEvent.ID).pipe(auditTime(250)),
+            this.postboy.subscribe(MapRenderedEvent.ID),
+        ]).subscribe(([movement, renderEvent]) => {
+            this.checkClusterNecessity(renderEvent.map);
+        });
+    }
+    observeClick() {
+        this.postboy.subscribe(MapClickEvent.ID).subscribe((m) => {
+            var _a, _b;
+            if (((_b = (_a = m.features[this.settings.name]) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 1) {
+                this.postboy.fire(new FitToFeaturesCommand(m.features[this.settings.name], -1));
+            }
+        });
+    }
+    checkClusterNecessity(map) {
+        var _a, _b, _c;
+        let zoom = (_a = map.getView().getZoom()) !== null && _a !== void 0 ? _a : 0;
+        const distance = zoom > this.settings.clusterCancel ? 0 : this.settings.distance;
+        (_c = (_b = this.layer) === null || _b === void 0 ? void 0 : _b.getSource()) === null || _c === void 0 ? void 0 : _c.setDistance(distance);
+    }
+}
+
+class ClusterLayerFactory {
+    build(settings, postboy) {
+        const source = new Vector({
+            strategy: settings.bbox ? bbox : undefined,
+        });
+        const cluster = new Cluster({
+            distance: settings.distance,
+            source: source,
+            geometryFunction: (feature) => {
+                var _a, _b;
+                const geom = feature.getGeometry();
+                if ((geom === null || geom === void 0 ? void 0 : geom.getType()) == 'Point') {
+                    return geom;
+                }
+                else if ((geom === null || geom === void 0 ? void 0 : geom.getType()) == 'Polygon') {
+                    return (_a = geom) === null || _a === void 0 ? void 0 : _a.getInteriorPoint();
+                }
+                else if ((geom === null || geom === void 0 ? void 0 : geom.getType()) == 'MultiPolygon') {
+                    return (_b = fromExtent(geom.getExtent())) === null || _b === void 0 ? void 0 : _b.getInteriorPoint();
+                }
+                return undefined;
+            },
+        });
+        const layer = new Vector$1({
+            source: cluster,
+            maxZoom: settings.maxZoom || undefined,
+            minZoom: settings.minZoom || undefined,
+            zIndex: settings.zIndex || 0,
+        });
+        layer.setStyle(this.styleFunc(settings));
+        layer.set('name', settings.name);
+        return new ClusterLayerManager(settings, layer, postboy);
+    }
+    styleFunc(settings) {
+        return (feature) => {
+            const features = feature.get('features');
+            if (!settings.style)
+                return undefined;
+            return settings.style(features.map((f) => (Object.assign({ id: f.getId() }, f.get(MapConstants.FeatureInfo)))));
+        };
+    }
+}
+ClusterLayerFactory.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: ClusterLayerFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+ClusterLayerFactory.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: ClusterLayerFactory, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: ClusterLayerFactory, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }] });
+
+class ClusterLayerComponent extends DestructibleComponent {
+    constructor(postboy, factory) {
+        super();
+        this.postboy = postboy;
+        this.factory = factory;
+        this.manager = null;
+        this._settings = new ClusterLayerSettings();
+        this.onDestroy = () => this.removeLayer();
+    }
+    ngOnInit() {
+        this.postboy
+            .subscribe(MapRenderedEvent.ID)
+            .pipe(filter((m) => !!m), first())
+            .subscribe((m) => this.initLayer());
+    }
+    set settings(value) {
+        if (!value || this._settings.isSame(value))
+            return;
+        this._settings = value;
+        this.initLayer();
+    }
+    initLayer() {
+        this.removeLayer();
+        this.manager = this.factory.build(this._settings, this.postboy);
+        this.postboy.fire(new AddLayerCommand(this.manager.layer));
+    }
+    removeLayer() {
+        var _a;
+        if ((_a = this.manager) === null || _a === void 0 ? void 0 : _a.layer)
+            this.postboy.fire(new RemoveLayerCommand(this.manager.layer));
+    }
+}
+ClusterLayerComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: ClusterLayerComponent, deps: [{ token: MapPostboyService }, { token: ClusterLayerFactory }], target: i0.ɵɵFactoryTarget.Component });
+ClusterLayerComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "12.2.17", type: ClusterLayerComponent, selector: "lib-cluster-layer", inputs: { settings: "settings" }, usesInheritance: true, ngImport: i0, template: '', isInline: true, changeDetection: i0.ChangeDetectionStrategy.OnPush });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: ClusterLayerComponent, decorators: [{
+            type: Component,
+            args: [{
+                    selector: 'lib-cluster-layer',
+                    template: '',
+                    styleUrls: [],
+                    changeDetection: ChangeDetectionStrategy.OnPush,
+                }]
+        }], ctorParameters: function () { return [{ type: MapPostboyService }, { type: ClusterLayerFactory }]; }, propDecorators: { settings: [{
+                type: Input
+            }] } });
+
+class MapPlateFactory {
+    build(settings) {
+        return new Map({
+            controls: [],
+            view: new View({
+                center: (settings === null || settings === void 0 ? void 0 : settings.center) || [0, 0],
+                zoom: (settings === null || settings === void 0 ? void 0 : settings.zoom) || 4,
+                minZoom: (settings === null || settings === void 0 ? void 0 : settings.minZoom) || 0,
+                maxZoom: (settings === null || settings === void 0 ? void 0 : settings.maxZoom) || 19,
+            }),
+            layers: [],
+        });
+    }
+}
+MapPlateFactory.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapPlateFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+MapPlateFactory.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapPlateFactory, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapPlateFactory, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }] });
+
+class MapPlateComponent extends DestructibleComponent {
+    constructor(elementRef, postboy, mapFactory, registrator, detector) {
+        super();
+        this.elementRef = elementRef;
+        this.postboy = postboy;
+        this.mapFactory = mapFactory;
+        this.registrator = registrator;
+        this.detector = detector;
+        this.osmUrl = '';
+        this._settings = new MapSettings();
+        this.drawingLayerSettings = new FeatureLayerSettings().setName(MapConstants.DrawingLayerId);
+        this.onDestroy = () => {
+            this.registrator.down();
+        };
+        registrator.up();
+    }
+    set settings(value) {
+        if (!value || this._settings.isSame(value))
+            return;
+        this._settings = value;
+        this.setOsm();
+    }
+    ngOnInit() {
+        useGeographic();
+        this.map = this.mapFactory.build(this._settings);
+        this.map.setTarget(this.elementRef.nativeElement);
+        this.detector.detectChanges();
+        this.map.once('postrender', () => {
+            this.map.updateSize();
+            this.postboy.fire(new MapRenderedEvent(this.map));
+        });
+        this.setOsm();
+    }
+    setOsm() {
+        if (!this.map)
+            return;
+        this.osmUrl = `https://mt{0-3}.google.com/vt/lyrs=${MapLyrsLabel.get(this._settings.lyrs)}&hl=${this._settings.language}&x={x}&y={y}&z={z}`;
+        this.detector.detectChanges();
+        this.map.updateSize();
+    }
+}
+MapPlateComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapPlateComponent, deps: [{ token: i0.ElementRef }, { token: MapPostboyService }, { token: MapPlateFactory }, { token: MessageRegistratorService }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component });
+MapPlateComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "12.2.17", type: MapPlateComponent, selector: "lib-map-plate", inputs: { settings: "settings" }, providers: [
+        MessageRegistratorService,
+        MapStateService,
+        MapManagementService,
+        MapClickService,
+        MapFeatureService,
+        DrawingService,
+    ], 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"], components: [{ type: OsmTileLayerComponent, selector: "lib-osm-tile-layer", inputs: ["url", "map"] }, { type: FeatureLayerComponent, selector: "lib-feature-layer", inputs: ["settings"] }], directives: [{ type: i6.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapPlateComponent, decorators: [{
+            type: Component,
+            args: [{
+                    selector: 'lib-map-plate',
+                    templateUrl: './map-plate.component.html',
+                    styleUrls: ['./map-plate.component.scss'],
+                    changeDetection: ChangeDetectionStrategy.OnPush,
+                    providers: [
+                        MessageRegistratorService,
+                        MapStateService,
+                        MapManagementService,
+                        MapClickService,
+                        MapFeatureService,
+                        DrawingService,
+                    ],
+                }]
+        }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: MapPostboyService }, { type: MapPlateFactory }, { type: MessageRegistratorService }, { type: i0.ChangeDetectorRef }]; }, propDecorators: { settings: [{
+                type: Input
+            }] } });
+
 class MarkersComponent extends DestructibleComponent {
     constructor(postboy) {
         super();
@@ -974,8 +1381,7 @@ class PolygonsComponent extends DestructibleComponent {
             .subscribe(() => this.putPolygons());
     }
     putPolygons() {
-        var _a;
-        if (!((_a = this._polygons) === null || _a === void 0 ? void 0 : _a.length))
+        if (!this._polygons)
             return;
         this.postboy.fire(new PlaceLayerFeaturesCommand(this.layerName, this._polygons.map((m) => m.feature)));
     }
@@ -1006,12 +1412,14 @@ MapModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.
         FeatureLayerComponent,
         MarkersComponent,
         TooltipComponent,
-        PolygonsComponent], imports: [CommonModule], exports: [MapPlateComponent,
+        PolygonsComponent,
+        ClusterLayerComponent], imports: [CommonModule], exports: [MapPlateComponent,
         FeatureLayerComponent,
         MarkersComponent,
         TileLayerComponent,
         TooltipComponent,
-        PolygonsComponent] });
+        PolygonsComponent,
+        ClusterLayerComponent] });
 MapModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapModule, imports: [[CommonModule]] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0, type: MapModule, decorators: [{
             type: NgModule,
@@ -1026,6 +1434,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImpo
                         MarkersComponent,
                         TooltipComponent,
                         PolygonsComponent,
+                        ClusterLayerComponent,
                     ],
                     exports: [
                         MapPlateComponent,
@@ -1034,6 +1443,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImpo
                         TileLayerComponent,
                         TooltipComponent,
                         PolygonsComponent,
+                        ClusterLayerComponent,
                     ],
                 }]
         }] });
@@ -1059,6 +1469,10 @@ class MarkerStyleHelper {
             }),
         });
     }
+    static withText(style, text) {
+        style.setText(text);
+        return style;
+    }
 }
 
 class PolygonStyleHelper {
@@ -1075,6 +1489,19 @@ class PolygonStyleHelper {
     }
 }
 
+class TextStyleHelper {
+    static get(text, font, color) {
+        return new Text({
+            text: text,
+            font: font,
+            textAlign: 'center',
+            fill: new Fill({
+                color: color,
+            }),
+        });
+    }
+}
+
 /*
  * Public API Surface of maps
  */
@@ -1087,5 +1514,5 @@ class PolygonStyleHelper {
  * Generated bundle index. Do not edit.
  */
 
-export { CallbackMessage, CloseTooltipCommand, FeatureLayerComponent, FeatureLayerSettings, GenericMessage, MapClickEvent, MapLyrs, MapLyrsLabel, MapModule, MapPlateComponent, MapPostboyService, MapRenderedEvent, MapSettings, MarkerModel, MarkerStyleHelper, MarkersComponent, MessageRegistratorService, OsmTileLayerComponent, PolygonModel, PolygonStyleHelper, PolygonsComponent, TileLayerComponent, TileLayerSettings, TooltipComponent, TooltipSettings };
+export { CancelDrawingCommand, CloseTooltipCommand, ClusterLayerComponent, ClusterLayerSettings, DrawingType, FeatureLayerComponent, FeatureLayerSettings, FeatureOutputFormat, MapClickEvent, MapLyrs, MapLyrsLabel, MapModule, MapMoveEndEvent, MapPlateComponent, MapPostboyService, MapRenderedEvent, MapSettings, MarkerModel, MarkerStyleHelper, MarkersComponent, MessageRegistratorService, OsmTileLayerComponent, PolygonModel, PolygonStyleHelper, PolygonsComponent, StartDrawingCommand, TextStyleHelper, TileLayerComponent, TileLayerSettings, TooltipComponent, TooltipSettings };
 //# sourceMappingURL=maps-components.js.map