@artstesh/maps 5.0.0 → 5.0.3

package/dist/src/map/map-plate/map-plate.component.d.ts

@@ -2,8 +2,8 @@ import { ChangeDetectorRef, ElementRef, OnInit } from '@angular/core';
 import { MapSettings } from '../models';
 import Map from 'ol/Map';
 import { DestructibleComponent } from '../common/destructible.component';
+import { MessageRegistratorService } from '../services/message-registrator.service';
 import { MapPostboyService } from '../services/map-postboy.service';
-import { ServiceCollector } from '../services/service.collector';
 import { MapPlateFactory } from './map-plate.factory.service';
 import * as i0 from "@angular/core";
 export declare class MapPlateComponent extends DestructibleComponent implements OnInit {
@@ -13,7 +13,7 @@ export declare class MapPlateComponent extends DestructibleComponent implements
     private detector;
     map: Map;
     osmUrl: string;
-    constructor(elementRef: ElementRef, postboy: MapPostboyService, mapFactory: MapPlateFactory, registrator: ServiceCollector, detector: ChangeDetectorRef);
+    constructor(elementRef: ElementRef, postboy: MapPostboyService, mapFactory: MapPlateFactory, registrator: MessageRegistratorService, detector: ChangeDetectorRef);
     _settings: MapSettings;
     set settings(value: MapSettings | undefined);
     ngOnInit(): void;

package/dist/src/map/map.module.d.ts

@@ -8,6 +8,6 @@ import * as i6 from "./map-plate/features/markers/markers.component";
 import * as i7 from "@angular/common";
 export declare class MapModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<MapModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MapModule, [typeof i1.DestructibleComponent, typeof i2.MapPlateComponent, typeof i3.TileLayerComponent, typeof i4.OsmTileLayerComponent, typeof i5.FeatureLayerComponent, typeof i6.MarkersComponent], [typeof i7.CommonModule], [typeof i2.MapPlateComponent, typeof i5.FeatureLayerComponent, typeof i6.MarkersComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MapModule, [typeof i1.DestructibleComponent, typeof i2.MapPlateComponent, typeof i3.TileLayerComponent, typeof i4.OsmTileLayerComponent, typeof i5.FeatureLayerComponent, typeof i6.MarkersComponent], [typeof i7.CommonModule], [typeof i2.MapPlateComponent, typeof i5.FeatureLayerComponent, typeof i6.MarkersComponent, typeof i3.TileLayerComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<MapModule>;
 }

package/dist/src/map/messages/commands/add-tile.command.d.ts

@@ -0,0 +1,9 @@
+import { GenericMessage } from '../generic-message';
+import TileLayer from 'ol/layer/Tile';
+import { XYZ } from 'ol/source';
+export declare class AddTileCommand extends GenericMessage {
+    layer: TileLayer<XYZ>;
+    static readonly ID = "25b7df28-72ce-4453-9fe6-54285a2fdc57";
+    constructor(layer: TileLayer<XYZ>);
+    get id(): string;
+}

package/dist/src/map/messages/commands/remove-tile.command.d.ts

@@ -0,0 +1,9 @@
+import { GenericMessage } from '../generic-message';
+import TileLayer from 'ol/layer/Tile';
+import { XYZ } from 'ol/source';
+export declare class RemoveTileCommand extends GenericMessage {
+    layer: TileLayer<XYZ>;
+    static readonly ID = "c36ccc0b-5638-4819-b148-2de57a59a5b7";
+    constructor(layer: TileLayer<XYZ>);
+    get id(): string;
+}

package/dist/src/map/messages/events/map-click.event.d.ts

@@ -0,0 +1,12 @@
+import { GenericMessage } from '../generic-message';
+export declare class MapClickEvent extends GenericMessage {
+    coordinates: number[];
+    entities: {
+        [layer: string]: (string | number)[];
+    };
+    static readonly ID = "323df526-8d9c-49c6-83e8-6e9a1e7762f7";
+    constructor(coordinates: number[], entities: {
+        [layer: string]: (string | number)[];
+    });
+    get id(): string;
+}

package/dist/src/map/messages/index.d.ts

@@ -1,2 +1,3 @@
 export * from './generic-message';
 export * from './events/map-rendered.event';
+export * from './events/map-click.event';

package/dist/src/map/models/marker-model.d.ts

@@ -3,11 +3,11 @@ import { Geometry } from 'ol/geom';
 export declare class MarkerModel {
     readonly lat: number;
     readonly lng: number;
-    readonly id?: string | number | undefined;
     info?: {
         [id: string]: any;
     } | undefined;
-    constructor(lat: number, lng: number, id?: string | number | undefined, info?: {
+    readonly id: string | number;
+    constructor(lat: number, lng: number, id?: string | number, info?: {
         [id: string]: any;
     } | undefined);
     private _feature;

package/dist/src/map/services/map-click.service.d.ts

@@ -0,0 +1,16 @@
+import { IPostboyDependingService } from '@artstesh/postboy';
+import { MapBrowserEvent } from 'ol';
+import { MapPostboyService } from './map-postboy.service';
+import { MapClickEvent } from '../messages/events/map-click.event';
+import * as i0 from "@angular/core";
+export declare class MapClickService implements IPostboyDependingService {
+    private postboy;
+    private map?;
+    constructor(postboy: MapPostboyService);
+    up(): void;
+    private observeMapRender;
+    onClick(ev: MapBrowserEvent<UIEvent>): MapClickEvent;
+    private getFeatureCollectionWithInner;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MapClickService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<MapClickService>;
+}

package/dist/src/map/services/map-management.service.d.ts

@@ -1,12 +1,15 @@
 import { MapPostboyService } from './map-postboy.service';
+import { IPostboyDependingService } from '@artstesh/postboy';
 import * as i0 from "@angular/core";
-export declare class MapManagementService {
+export declare class MapManagementService implements IPostboyDependingService {
     private postboy;
     private map?;
     private layers;
     constructor(postboy: MapPostboyService);
+    up(): void;
+    private observeRemoveTile;
+    private observeAddTile;
     private observeMapRender;
-    private observeClearLayer;
     private observeAddLayer;
     private observePlaceFeatures;
     private observeRemoveLayer;

package/dist/src/map/services/map-postboy.service.d.ts

@@ -1,11 +1,8 @@
-import { Observable, Subject } from 'rxjs';
-import { GenericMessage } from '../messages';
+import { PostboyService } from '@artstesh/postboy';
+import { Observable } from 'rxjs';
 import * as i0 from "@angular/core";
-export declare class MapPostboyService {
-    private applications;
-    register<T>(id: string, sub: Subject<T>): void;
-    subscribe<T>(id: string): Observable<T>;
-    fire<T extends GenericMessage>(message: T): void;
+export declare class MapPostboyService extends PostboyService {
+    observe: <T>(id: string) => Observable<T>;
     static ɵfac: i0.ɵɵFactoryDeclaration<MapPostboyService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<MapPostboyService>;
 }

package/dist/src/map/services/map-state.service.d.ts

@@ -1,9 +1,11 @@
 import { MapPostboyService } from './map-postboy.service';
+import { IPostboyDependingService } from '@artstesh/postboy';
 import * as i0 from "@angular/core";
-export declare class MapStateService {
+export declare class MapStateService implements IPostboyDependingService {
     private postboy;
     private map?;
     constructor(postboy: MapPostboyService);
+    up(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<MapStateService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<MapStateService>;
 }

package/dist/src/map/services/message-registrator.service.d.ts

@@ -1,7 +1,12 @@
 import { MapPostboyService } from './map-postboy.service';
+import { PostboyAbstractRegistrator } from '@artstesh/postboy';
+import { MapManagementService } from './map-management.service';
+import { MapStateService } from './map-state.service';
+import { MapClickService } from './map-click.service';
 import * as i0 from "@angular/core";
-export declare class MessageRegistratorService {
-    constructor(service: MapPostboyService);
+export declare class MessageRegistratorService extends PostboyAbstractRegistrator {
+    constructor(service: MapPostboyService, management: MapManagementService, state: MapStateService, interaction: MapClickService);
+    protected _up(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<MessageRegistratorService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<MessageRegistratorService>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@artstesh/maps",
-  "version": "5.0.0",
+  "version": "5.0.3",
   "author": "artstesh",
   "license": "MIT",
   "description": "Let's draw a map ;)",
@@ -43,7 +43,8 @@
     "tslib": "^2.3.0",
     "zone.js": "~0.13.0",
     "ol-geocoder": "^4.0.0",
-    "ol": "^6.9.0"
+    "ol": "^6.9.0",
+    "@artstesh/postboy": "^1.0.3"
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "^16.0.0",

package/dist/esm2022/map/messages/commands/clear-layer.command.mjs

@@ -1,13 +0,0 @@
-import { GenericMessage } from '../generic-message';
-export class ClearLayerCommand extends GenericMessage {
-    layer;
-    static ID = 'd02842b7-fa62-458d-b1e4-12dd814610c5';
-    constructor(layer) {
-        super();
-        this.layer = layer;
-    }
-    get id() {
-        return ClearLayerCommand.ID;
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xlYXItbGF5ZXIuY29tbWFuZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21hcHMtY29tcG9uZW50cy9zcmMvbWFwL21lc3NhZ2VzL2NvbW1hbmRzL2NsZWFyLWxheWVyLmNvbW1hbmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXBELE1BQU0sT0FBTyxpQkFBa0IsU0FBUSxjQUFjO0lBR2hDO0lBRlosTUFBTSxDQUFVLEVBQUUsR0FBRyxzQ0FBc0MsQ0FBQztJQUVuRSxZQUFtQixLQUFhO1FBQzlCLEtBQUssRUFBRSxDQUFDO1FBRFMsVUFBSyxHQUFMLEtBQUssQ0FBUTtJQUVoQyxDQUFDO0lBRUQsSUFBVyxFQUFFO1FBQ1gsT0FBTyxpQkFBaUIsQ0FBQyxFQUFFLENBQUM7SUFDOUIsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEdlbmVyaWNNZXNzYWdlIH0gZnJvbSAnLi4vZ2VuZXJpYy1tZXNzYWdlJztcblxuZXhwb3J0IGNsYXNzIENsZWFyTGF5ZXJDb21tYW5kIGV4dGVuZHMgR2VuZXJpY01lc3NhZ2Uge1xuICBwdWJsaWMgc3RhdGljIHJlYWRvbmx5IElEID0gJ2QwMjg0MmI3LWZhNjItNDU4ZC1iMWU0LTEyZGQ4MTQ2MTBjNSc7XG5cbiAgY29uc3RydWN0b3IocHVibGljIGxheWVyOiBzdHJpbmcpIHtcbiAgICBzdXBlcigpO1xuICB9XG5cbiAgcHVibGljIGdldCBpZCgpOiBzdHJpbmcge1xuICAgIHJldHVybiBDbGVhckxheWVyQ29tbWFuZC5JRDtcbiAgfVxufVxuIl19

package/dist/esm2022/map/services/service.collector.mjs

@@ -1,14 +0,0 @@
-import { Injectable } from '@angular/core';
-import * as i0 from "@angular/core";
-import * as i1 from "./message-registrator.service";
-import * as i2 from "./map-management.service";
-import * as i3 from "./map-state.service";
-export class ServiceCollector {
-    constructor(registrator, management, state) { }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServiceCollector, deps: [{ token: i1.MessageRegistratorService }, { token: i2.MapManagementService }, { token: i3.MapStateService }], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServiceCollector });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServiceCollector, decorators: [{
-            type: Injectable
-        }], ctorParameters: function () { return [{ type: i1.MessageRegistratorService }, { type: i2.MapManagementService }, { type: i3.MapStateService }]; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5jb2xsZWN0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9tYXBzLWNvbXBvbmVudHMvc3JjL21hcC9zZXJ2aWNlcy9zZXJ2aWNlLmNvbGxlY3Rvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDOzs7OztBQU0zQyxNQUFNLE9BQU8sZ0JBQWdCO0lBQzNCLFlBQVksV0FBc0MsRUFBRSxVQUFnQyxFQUFFLEtBQXNCLElBQUcsQ0FBQzt3R0FEckcsZ0JBQWdCOzRHQUFoQixnQkFBZ0I7OzRGQUFoQixnQkFBZ0I7a0JBRDVCLFVBQVUiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBNZXNzYWdlUmVnaXN0cmF0b3JTZXJ2aWNlIH0gZnJvbSAnLi9tZXNzYWdlLXJlZ2lzdHJhdG9yLnNlcnZpY2UnO1xuaW1wb3J0IHsgTWFwTWFuYWdlbWVudFNlcnZpY2UgfSBmcm9tICcuL21hcC1tYW5hZ2VtZW50LnNlcnZpY2UnO1xuaW1wb3J0IHsgTWFwU3RhdGVTZXJ2aWNlIH0gZnJvbSAnLi9tYXAtc3RhdGUuc2VydmljZSc7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBTZXJ2aWNlQ29sbGVjdG9yIHtcbiAgY29uc3RydWN0b3IocmVnaXN0cmF0b3I6IE1lc3NhZ2VSZWdpc3RyYXRvclNlcnZpY2UsIG1hbmFnZW1lbnQ6IE1hcE1hbmFnZW1lbnRTZXJ2aWNlLCBzdGF0ZTogTWFwU3RhdGVTZXJ2aWNlKSB7fVxufVxuIl19

package/dist/esm2022/src/map/messages/commands/clear-layer.command.mjs

@@ -1,13 +0,0 @@
-import { GenericMessage } from '../generic-message';
-export class ClearLayerCommand extends GenericMessage {
-    layer;
-    static ID = 'd02842b7-fa62-458d-b1e4-12dd814610c5';
-    constructor(layer) {
-        super();
-        this.layer = layer;
-    }
-    get id() {
-        return ClearLayerCommand.ID;
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xlYXItbGF5ZXIuY29tbWFuZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21hcHMtY29tcG9uZW50cy9zcmMvbWFwL21lc3NhZ2VzL2NvbW1hbmRzL2NsZWFyLWxheWVyLmNvbW1hbmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXBELE1BQU0sT0FBTyxpQkFBa0IsU0FBUSxjQUFjO0lBR2hDO0lBRlosTUFBTSxDQUFVLEVBQUUsR0FBRyxzQ0FBc0MsQ0FBQztJQUVuRSxZQUFtQixLQUFhO1FBQzlCLEtBQUssRUFBRSxDQUFDO1FBRFMsVUFBSyxHQUFMLEtBQUssQ0FBUTtJQUVoQyxDQUFDO0lBRUQsSUFBVyxFQUFFO1FBQ1gsT0FBTyxpQkFBaUIsQ0FBQyxFQUFFLENBQUM7SUFDOUIsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEdlbmVyaWNNZXNzYWdlIH0gZnJvbSAnLi4vZ2VuZXJpYy1tZXNzYWdlJztcblxuZXhwb3J0IGNsYXNzIENsZWFyTGF5ZXJDb21tYW5kIGV4dGVuZHMgR2VuZXJpY01lc3NhZ2Uge1xuICBwdWJsaWMgc3RhdGljIHJlYWRvbmx5IElEID0gJ2QwMjg0MmI3LWZhNjItNDU4ZC1iMWU0LTEyZGQ4MTQ2MTBjNSc7XG5cbiAgY29uc3RydWN0b3IocHVibGljIGxheWVyOiBzdHJpbmcpIHtcbiAgICBzdXBlcigpO1xuICB9XG5cbiAgcHVibGljIGdldCBpZCgpOiBzdHJpbmcge1xuICAgIHJldHVybiBDbGVhckxheWVyQ29tbWFuZC5JRDtcbiAgfVxufVxuIl19

package/dist/esm2022/src/map/services/service.collector.mjs

@@ -1,14 +0,0 @@
-import { Injectable } from '@angular/core';
-import * as i0 from "@angular/core";
-import * as i1 from "./message-registrator.service";
-import * as i2 from "./map-management.service";
-import * as i3 from "./map-state.service";
-export class ServiceCollector {
-    constructor(registrator, management, state) { }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServiceCollector, deps: [{ token: i1.MessageRegistratorService }, { token: i2.MapManagementService }, { token: i3.MapStateService }], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServiceCollector });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServiceCollector, decorators: [{
-            type: Injectable
-        }], ctorParameters: function () { return [{ type: i1.MessageRegistratorService }, { type: i2.MapManagementService }, { type: i3.MapStateService }]; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5jb2xsZWN0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9tYXBzLWNvbXBvbmVudHMvc3JjL21hcC9zZXJ2aWNlcy9zZXJ2aWNlLmNvbGxlY3Rvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDOzs7OztBQU0zQyxNQUFNLE9BQU8sZ0JBQWdCO0lBQzNCLFlBQVksV0FBc0MsRUFBRSxVQUFnQyxFQUFFLEtBQXNCLElBQUcsQ0FBQzt3R0FEckcsZ0JBQWdCOzRHQUFoQixnQkFBZ0I7OzRGQUFoQixnQkFBZ0I7a0JBRDVCLFVBQVUiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBNZXNzYWdlUmVnaXN0cmF0b3JTZXJ2aWNlIH0gZnJvbSAnLi9tZXNzYWdlLXJlZ2lzdHJhdG9yLnNlcnZpY2UnO1xuaW1wb3J0IHsgTWFwTWFuYWdlbWVudFNlcnZpY2UgfSBmcm9tICcuL21hcC1tYW5hZ2VtZW50LnNlcnZpY2UnO1xuaW1wb3J0IHsgTWFwU3RhdGVTZXJ2aWNlIH0gZnJvbSAnLi9tYXAtc3RhdGUuc2VydmljZSc7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBTZXJ2aWNlQ29sbGVjdG9yIHtcbiAgY29uc3RydWN0b3IocmVnaXN0cmF0b3I6IE1lc3NhZ2VSZWdpc3RyYXRvclNlcnZpY2UsIG1hbmFnZW1lbnQ6IE1hcE1hbmFnZW1lbnRTZXJ2aWNlLCBzdGF0ZTogTWFwU3RhdGVTZXJ2aWNlKSB7fVxufVxuIl19

package/dist/map/messages/commands/clear-layer.command.d.ts

@@ -1,7 +0,0 @@
-import { GenericMessage } from '../generic-message';
-export declare class ClearLayerCommand extends GenericMessage {
-    layer: string;
-    static readonly ID = "d02842b7-fa62-458d-b1e4-12dd814610c5";
-    constructor(layer: string);
-    get id(): string;
-}

package/dist/map/services/service.collector.d.ts

@@ -1,9 +0,0 @@
-import { MessageRegistratorService } from './message-registrator.service';
-import { MapManagementService } from './map-management.service';
-import { MapStateService } from './map-state.service';
-import * as i0 from "@angular/core";
-export declare class ServiceCollector {
-    constructor(registrator: MessageRegistratorService, management: MapManagementService, state: MapStateService);
-    static ɵfac: i0.ɵɵFactoryDeclaration<ServiceCollector, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<ServiceCollector>;
-}

package/dist/src/map/messages/commands/clear-layer.command.d.ts

@@ -1,7 +0,0 @@
-import { GenericMessage } from '../generic-message';
-export declare class ClearLayerCommand extends GenericMessage {
-    layer: string;
-    static readonly ID = "d02842b7-fa62-458d-b1e4-12dd814610c5";
-    constructor(layer: string);
-    get id(): string;
-}

package/dist/src/map/services/service.collector.d.ts

@@ -1,9 +0,0 @@
-import { MessageRegistratorService } from './message-registrator.service';
-import { MapManagementService } from './map-management.service';
-import { MapStateService } from './map-state.service';
-import * as i0 from "@angular/core";
-export declare class ServiceCollector {
-    constructor(registrator: MessageRegistratorService, management: MapManagementService, state: MapStateService);
-    static ɵfac: i0.ɵɵFactoryDeclaration<ServiceCollector, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<ServiceCollector>;
-}