@open-pioneer/map 0.6.1 → 0.8.0-dev.20241120115147

package/api/layers/WMTSLayer.d.ts

@@ -1,5 +1,5 @@
 import type { Options as WMSSourceOptions } from "ol/source/ImageWMS";
-import { Layer, LayerConfig } from "./base";
+import { LayerBaseType, LayerConfig } from "./base";
 export interface WMTSLayerConfig extends LayerConfig {
     /** URL of the WMTS service. */
     url: string;
@@ -15,13 +15,15 @@ export interface WMTSLayerConfig extends LayerConfig {
      */
     sourceOptions?: Partial<WMSSourceOptions>;
 }
-export interface WMTSLayer extends Layer {
+export interface WMTSLayer extends LayerBaseType {
+    readonly type: "wmts";
     /** URL of the WMTS service. */
     readonly url: string;
     /** The name of the WMTS layer in the service's capabilities. */
     readonly name: string;
     /** The name of the tile matrix set in the service's capabilities. */
     readonly matrixSet: string;
+    readonly layers: undefined;
 }
 export interface WMTSLayerConstructor {
     prototype: WMTSLayer;

package/api/layers/WMTSLayer.js.map

@@ -1 +1 @@
-{"version":3,"file":"WMTSLayer.js","sources":["WMTSLayer.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2023 Open Pioneer project (https://github.com/open-pioneer)\n// SPDX-License-Identifier: Apache-2.0\nimport type { Options as WMSSourceOptions } from \"ol/source/ImageWMS\";\nimport { Layer, LayerConfig } from \"./base\";\nimport { WMTSLayerImpl } from \"../../model/layers/WMTSLayerImpl\";\nexport interface WMTSLayerConfig extends LayerConfig {\n    /** URL of the WMTS service. */\n    url: string;\n\n    /** The name of the WMTS layer in the service's capabilities. */\n    name: string;\n\n    /** The name of the tile matrix set in the service's capabilities. */\n    matrixSet: string;\n\n    /**\n     * Additional source options for the layer's WMTS source.\n     *\n     * NOTE: These options are intended for advanced configuration:\n     * the WMTS Layer manages some of the OpenLayers source options itself.\n     */\n    sourceOptions?: Partial<WMSSourceOptions>;\n}\nexport interface WMTSLayer extends Layer {\n    /** URL of the WMTS service. */\n    readonly url: string;\n\n    /** The name of the WMTS layer in the service's capabilities. */\n    readonly name: string;\n\n    /** The name of the tile matrix set in the service's capabilities. */\n    readonly matrixSet: string;\n}\nexport interface WMTSLayerConstructor {\n    prototype: WMTSLayer;\n\n    /** Creates a new {@link WMTSLayer}. */\n    new (config: WMTSLayerConfig): WMTSLayer;\n}\n\nexport const WMTSLayer: WMTSLayerConstructor = WMTSLayerImpl;\n"],"names":[],"mappings":";;AAwCO,MAAM,SAAkC,GAAA;;;;"}
+{"version":3,"file":"WMTSLayer.js","sources":["WMTSLayer.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2023 Open Pioneer project (https://github.com/open-pioneer)\n// SPDX-License-Identifier: Apache-2.0\nimport type { Options as WMSSourceOptions } from \"ol/source/ImageWMS\";\nimport { LayerBaseType, LayerConfig } from \"./base\";\nimport { WMTSLayerImpl } from \"../../model/layers/WMTSLayerImpl\";\n\nexport interface WMTSLayerConfig extends LayerConfig {\n    /** URL of the WMTS service. */\n    url: string;\n\n    /** The name of the WMTS layer in the service's capabilities. */\n    name: string;\n\n    /** The name of the tile matrix set in the service's capabilities. */\n    matrixSet: string;\n\n    /**\n     * Additional source options for the layer's WMTS source.\n     *\n     * NOTE: These options are intended for advanced configuration:\n     * the WMTS Layer manages some of the OpenLayers source options itself.\n     */\n    sourceOptions?: Partial<WMSSourceOptions>;\n}\n\nexport interface WMTSLayer extends LayerBaseType {\n    readonly type: \"wmts\";\n\n    /** URL of the WMTS service. */\n    readonly url: string;\n\n    /** The name of the WMTS layer in the service's capabilities. */\n    readonly name: string;\n\n    /** The name of the tile matrix set in the service's capabilities. */\n    readonly matrixSet: string;\n\n    readonly layers: undefined;\n}\n\nexport interface WMTSLayerConstructor {\n    prototype: WMTSLayer;\n\n    /** Creates a new {@link WMTSLayer}. */\n    new (config: WMTSLayerConfig): WMTSLayer;\n}\n\nexport const WMTSLayer: WMTSLayerConstructor = WMTSLayerImpl;\n"],"names":[],"mappings":";;AA+CO,MAAM,SAAkC,GAAA;;;;"}

package/api/layers/base.d.ts

@@ -2,21 +2,18 @@ import type { EventSource } from "@open-pioneer/core";
 import type OlBaseLayer from "ol/layer/Base";
 import type { MapModel } from "../MapModel";
 import type { LayerRetrievalOptions } from "../shared";
+import type { SimpleLayer } from "./SimpleLayer";
+import type { WMSLayer, WMSSublayer } from "./WMSLayer";
+import type { WMTSLayer } from "./WMTSLayer";
+import type { GroupLayer, GroupLayerCollection } from "./GroupLayer";
 /** Events emitted by the {@link Layer} and other layer types. */
 export interface LayerBaseEvents {
-    "changed": void;
-    "changed:title": void;
-    "changed:legend": void;
-    "changed:description": void;
-    "changed:visible": void;
-    "changed:attributes": void;
-    "changed:loadState": void;
     "destroy": void;
 }
 /** The load state of a layer. */
 export type LayerLoadState = "not-loaded" | "loading" | "loaded" | "error";
 /** Custom function to check the state of a layer and returning a "loaded" or "error". */
-export type HealthCheckFunction = (layer: LayerBase) => Promise<"loaded" | "error">;
+export type HealthCheckFunction = (layer: Layer) => Promise<"loaded" | "error">;
 /**
  * Configuration options supported by all layer types (layers and sublayers).
  */
@@ -52,9 +49,19 @@ export interface LayerBaseConfig {
  * Instances of this interface cannot be constructed directly; use a real layer
  * class such as {@link SimpleLayer} instead.
  */
-export interface LayerBase<AdditionalEvents = {}> extends EventSource<LayerBaseEvents & AdditionalEvents> {
+export interface AnyLayerBaseType<AdditionalEvents = {}> extends EventSource<LayerBaseEvents & AdditionalEvents> {
+    /**
+     * Identifies the type of this layer.
+     */
+    readonly type: AnyLayerTypes;
     /** The map this layer belongs to. */
     readonly map: MapModel;
+    /**
+     * The direct parent of this layer instance, used for sublayers or for layers in a group layer.
+     *
+     * The property shall be undefined if the layer is not a sublayer or member of a group layer.
+     */
+    readonly parent: AnyLayer | undefined;
     /**
      * The unique id of this layer within its map model.
      *
@@ -74,13 +81,31 @@ export interface LayerBase<AdditionalEvents = {}> extends EventSource<LayerBaseE
      */
     readonly visible: boolean;
     /**
-     * LegendURL from the service capabilties, if available
+     * LegendURL from the service capabilities, if available.
      */
     readonly legend: string | undefined;
     /**
-     * The collection of child sublayers for this layer.
+     * The direct children of this layer.
+     *
+     * The children may either be a set of operational layers (e.g. for a group layer) or a set of sublayers, or `undefined`.
+     *
+     * See also {@link layers} and {@link sublayers}.
+     */
+    readonly children: ChildrenCollection<AnyLayer> | undefined;
+    /**
+     * If this layer is a group layer this property contains a collection of all layers that a members to the group.
+     *
+     * The property shall be `undefined` if it is not a group layer.
+     *
+     * The properties `layers` and `sublayers` are mutually exclusive.
+     */
+    readonly layers: GroupLayerCollection | undefined;
+    /**
+     * The collection of child sublayers for this layer. Sublayers are layers that cannot exist without an appropriate parent layer.
      *
      * Layers that can never have any sublayers may not have a `sublayers` collection.
+     *
+     * The properties `layers` and `sublayers` are mutually exclusive.
      */
     readonly sublayers: SublayersCollection | undefined;
     /**
@@ -136,7 +161,11 @@ export interface LayerConfig extends LayerBaseConfig {
  * Instances of this interface cannot be constructed directly; use a real layer
  * class such as {@link SimpleLayer} instead.
  */
-export interface Layer<AdditionalEvents = {}> extends LayerBase<AdditionalEvents> {
+export interface LayerBaseType<AdditionalEvents = {}> extends AnyLayerBaseType<AdditionalEvents> {
+    /**
+     * Identifies the type of this layer.
+     */
+    readonly type: LayerTypes;
     /**
      * The load state of a layer.
      */
@@ -155,29 +184,59 @@ export interface Layer<AdditionalEvents = {}> extends LayerBase<AdditionalEvents
 /**
  * Represents a sublayer of another layer.
  */
-export interface Sublayer extends LayerBase {
+export interface SublayerBaseType extends AnyLayerBaseType {
+    /**
+     * Identifies the type of this sublayer.
+     */
+    readonly type: SublayerTypes;
     /**
      * The direct parent of this layer instance.
      * This can either be the parent layer or another sublayer.
      */
-    readonly parent: Layer | Sublayer;
+    readonly parent: AnyLayer;
     /**
      * The parent layer that owns this sublayer.
      */
     readonly parentLayer: Layer;
 }
 /**
- * Events emitted by the {@link SublayersCollection}.
+ * Contains the children of a layer.
  */
-export interface SublayersCollectionEvents {
-    changed: void;
+export interface ChildrenCollection<LayerType> {
+    /**
+     * Returns the items in this collection.
+     */
+    getItems(options?: LayerRetrievalOptions): LayerType[];
 }
 /**
  * Contains the sublayers that belong to a {@link Layer} or {@link Sublayer}.
  */
-export interface SublayersCollection<SublayerType = Sublayer> extends EventSource<SublayersCollectionEvents> {
+export interface SublayersCollection<SublayerType = Sublayer> extends ChildrenCollection<SublayerType> {
     /**
      * Returns the child sublayers in this collection.
      */
     getSublayers(options?: LayerRetrievalOptions): SublayerType[];
 }
+/**
+ * Union type for all layers (extending {@link LayerBaseType})
+ */
+export type Layer = SimpleLayer | WMSLayer | WMTSLayer | GroupLayer;
+export type LayerTypes = Layer["type"];
+/**
+ * Union type for all sublayers (extending {@link SublayerBaseType}
+ */
+export type Sublayer = WMSSublayer;
+export type SublayerTypes = Sublayer["type"];
+/**
+ * Union for all types of layers
+ */
+export type AnyLayer = Layer | Sublayer;
+export type AnyLayerTypes = AnyLayer["type"];
+/**
+ * Type guard for checking if the layer is a {@link Sublayer}.
+ */
+export declare function isSublayer(layer: AnyLayer): layer is Sublayer;
+/**
+ * Type guard for checking if the layer is a {@link Layer} (and not a {@link Sublayer}).
+ */
+export declare function isLayer(layer: AnyLayer): layer is Layer;

package/api/layers/base.js

@@ -0,0 +1,9 @@
+function isSublayer(layer) {
+  return "parentLayer" in layer;
+}
+function isLayer(layer) {
+  return "olLayer" in layer;
+}
+
+export { isLayer, isSublayer };
+//# sourceMappingURL=base.js.map

package/api/layers/base.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base.js","sources":["base.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2023 Open Pioneer project (https://github.com/open-pioneer)\n// SPDX-License-Identifier: Apache-2.0\nimport type { EventSource } from \"@open-pioneer/core\";\nimport type OlBaseLayer from \"ol/layer/Base\";\nimport type { MapModel } from \"../MapModel\";\nimport type { LayerRetrievalOptions } from \"../shared\";\nimport type { SimpleLayer } from \"./SimpleLayer\";\nimport type { WMSLayer, WMSSublayer } from \"./WMSLayer\";\nimport type { WMTSLayer } from \"./WMTSLayer\";\nimport type { GroupLayer, GroupLayerCollection } from \"./GroupLayer\";\n\n/** Events emitted by the {@link Layer} and other layer types. */\nexport interface LayerBaseEvents {\n    \"destroy\": void;\n}\n\n/** The load state of a layer. */\nexport type LayerLoadState = \"not-loaded\" | \"loading\" | \"loaded\" | \"error\";\n\n/** Custom function to check the state of a layer and returning a \"loaded\" or \"error\". */\nexport type HealthCheckFunction = (layer: Layer) => Promise<\"loaded\" | \"error\">;\n\n/**\n * Configuration options supported by all layer types (layers and sublayers).\n */\nexport interface LayerBaseConfig {\n    /**\n     * The unique id of this layer.\n     * Defaults to a generated id.\n     */\n    id?: string;\n\n    /**\n     * The human-readable title of this layer.\n     */\n    title: string;\n\n    /**\n     * The human-readable description of this layer.\n     * Defaults to an empty string.\n     */\n    description?: string;\n\n    /**\n     * Whether this layer should initially be visible.\n     * Defaults to `true`.\n     */\n    visible?: boolean;\n\n    /**\n     * Additional attributes for this layer.\n     * These can be arbitrary values.\n     */\n    attributes?: Record<string | symbol, unknown>;\n}\n\n/**\n * Interface shared by all layer types (operational layers and sublayers).\n *\n * Instances of this interface cannot be constructed directly; use a real layer\n * class such as {@link SimpleLayer} instead.\n */\nexport interface AnyLayerBaseType<AdditionalEvents = {}>\n    extends EventSource<LayerBaseEvents & AdditionalEvents> {\n    /**\n     * Identifies the type of this layer.\n     */\n    readonly type: AnyLayerTypes;\n\n    /** The map this layer belongs to. */\n    readonly map: MapModel;\n\n    /**\n     * The direct parent of this layer instance, used for sublayers or for layers in a group layer.\n     *\n     * The property shall be undefined if the layer is not a sublayer or member of a group layer.\n     */\n    readonly parent: AnyLayer | undefined;\n\n    /**\n     * The unique id of this layer within its map model.\n     *\n     * NOTE: layer ids may not be globally unique: layers that belong\n     * to different map models may have the same id.\n     */\n    readonly id: string;\n\n    /** The human-readable title of this layer. */\n    readonly title: string;\n\n    /** The human-readable description of this layer. May be empty. */\n    readonly description: string;\n\n    /**\n     * Whether the layer is visible or not.\n     *\n     * NOTE: The model's visible state may do more than influence the raw OpenLayers's visibility property.\n     * Future versions may completely remove invisible layers from the OpenLayer's map under some circumstances.\n     */\n    readonly visible: boolean;\n\n    /**\n     * LegendURL from the service capabilities, if available.\n     */\n    readonly legend: string | undefined;\n\n    /**\n     * The direct children of this layer.\n     *\n     * The children may either be a set of operational layers (e.g. for a group layer) or a set of sublayers, or `undefined`.\n     *\n     * See also {@link layers} and {@link sublayers}.\n     */\n    readonly children: ChildrenCollection<AnyLayer> | undefined;\n\n    /**\n     * If this layer is a group layer this property contains a collection of all layers that a members to the group.\n     *\n     * The property shall be `undefined` if it is not a group layer.\n     *\n     * The properties `layers` and `sublayers` are mutually exclusive.\n     */\n    readonly layers: GroupLayerCollection | undefined;\n\n    /**\n     * The collection of child sublayers for this layer. Sublayers are layers that cannot exist without an appropriate parent layer.\n     *\n     * Layers that can never have any sublayers may not have a `sublayers` collection.\n     *\n     * The properties `layers` and `sublayers` are mutually exclusive.\n     */\n    readonly sublayers: SublayersCollection | undefined;\n\n    /**\n     * Additional attributes associated with this layer.\n     */\n    readonly attributes: Readonly<Record<string | symbol, unknown>>;\n\n    /**\n     * Updates the title of this layer.\n     */\n    setTitle(newTitle: string): void;\n\n    /**\n     * Updates the description of this layer.\n     */\n    setDescription(newDescription: string): void;\n\n    /**\n     * Updates the visibility of this layer to the new value.\n     *\n     * NOTE: The visibility of base layers cannot be changed through this method.\n     * Call {@link LayerCollection.activateBaseLayer} instead.\n     */\n    setVisible(newVisibility: boolean): void;\n\n    /**\n     * Updates the attributes of this layer.\n     * Values in `newAttributes` are merged into the existing ones (i.e. via `Object.assign`).\n     */\n    updateAttributes(newAttributes: Record<string | symbol, unknown>): void;\n\n    /**\n     * Deletes the attribute of this layer.\n     */\n    deleteAttribute(deleteAttribute: string | symbol): void;\n}\n\n/**\n * Configuration options supported by all operational layer types.\n */\nexport interface LayerConfig extends LayerBaseConfig {\n    /**\n     * Whether this layer is a base layer or not.\n     * Only one base layer can be active at a time.\n     *\n     * Defaults to `false`.\n     */\n    isBaseLayer?: boolean;\n\n    /**\n     * Optional property to check the availability of the layer.\n     * It is possible to provide either a URL which indicates the state of the service (2xx response meaning \"ok\")\n     * or a {@link HealthCheckFunction} performing a custom check and returning the state.\n     */\n    healthCheck?: string | HealthCheckFunction;\n}\n\n/**\n * Represents an operational layer in the map.\n *\n * Instances of this interface cannot be constructed directly; use a real layer\n * class such as {@link SimpleLayer} instead.\n */\nexport interface LayerBaseType<AdditionalEvents = {}> extends AnyLayerBaseType<AdditionalEvents> {\n    /**\n     * Identifies the type of this layer.\n     */\n    readonly type: LayerTypes;\n\n    /**\n     * The load state of a layer.\n     */\n    readonly loadState: LayerLoadState;\n\n    /**\n     * The raw OpenLayers layer.\n     */\n    readonly olLayer: OlBaseLayer;\n\n    /**\n     * True if this layer is a base layer.\n     *\n     * Only one base layer can be visible at a time.\n     */\n    readonly isBaseLayer: boolean;\n}\n\n/**\n * Represents a sublayer of another layer.\n */\nexport interface SublayerBaseType extends AnyLayerBaseType {\n    /**\n     * Identifies the type of this sublayer.\n     */\n    readonly type: SublayerTypes;\n\n    /**\n     * The direct parent of this layer instance.\n     * This can either be the parent layer or another sublayer.\n     */\n    readonly parent: AnyLayer;\n\n    /**\n     * The parent layer that owns this sublayer.\n     */\n    readonly parentLayer: Layer;\n}\n\n/**\n * Contains the children of a layer.\n */\nexport interface ChildrenCollection<LayerType> {\n    /**\n     * Returns the items in this collection.\n     */\n    getItems(options?: LayerRetrievalOptions): LayerType[];\n}\n\n/**\n * Contains the sublayers that belong to a {@link Layer} or {@link Sublayer}.\n */\nexport interface SublayersCollection<SublayerType = Sublayer>\n    extends ChildrenCollection<SublayerType> {\n    /**\n     * Returns the child sublayers in this collection.\n     */\n    getSublayers(options?: LayerRetrievalOptions): SublayerType[];\n}\n\n/**\n * Union type for all layers (extending {@link LayerBaseType})\n */\nexport type Layer = SimpleLayer | WMSLayer | WMTSLayer | GroupLayer;\nexport type LayerTypes = Layer[\"type\"];\n\n/**\n * Union type for all sublayers (extending {@link SublayerBaseType}\n */\nexport type Sublayer = WMSSublayer;\nexport type SublayerTypes = Sublayer[\"type\"];\n\n/**\n * Union for all types of layers\n */\nexport type AnyLayer = Layer | Sublayer;\nexport type AnyLayerTypes = AnyLayer[\"type\"];\n\n/**\n * Type guard for checking if the layer is a {@link Sublayer}.\n */\nexport function isSublayer(layer: AnyLayer): layer is Sublayer {\n    return \"parentLayer\" in layer;\n}\n\n/**\n * Type guard for checking if the layer is a {@link Layer} (and not a {@link Sublayer}).\n */\nexport function isLayer(layer: AnyLayer): layer is Layer {\n    return \"olLayer\" in layer;\n}\n"],"names":[],"mappings":"AAyRO,SAAS,WAAW,KAAoC,EAAA;AAC3D,EAAA,OAAO,aAAiB,IAAA,KAAA,CAAA;AAC5B,CAAA;AAKO,SAAS,QAAQ,KAAiC,EAAA;AACrD,EAAA,OAAO,SAAa,IAAA,KAAA,CAAA;AACxB;;;;"}

package/api/layers/index.d.ts

@@ -2,3 +2,4 @@ export * from "./base";
 export * from "./SimpleLayer";
 export * from "./WMSLayer";
 export * from "./WMTSLayer";
+export * from "./GroupLayer";

package/index.js

@@ -1,12 +1,15 @@
+export { isLayer, isSublayer } from './api/layers/base.js';
 export { SimpleLayer } from './api/layers/SimpleLayer.js';
 export { WMSLayer } from './api/layers/WMSLayer.js';
 export { WMTSLayer } from './api/layers/WMTSLayer.js';
+export { GroupLayer } from './api/layers/GroupLayer.js';
 export { getProjection, registerProjections } from './projections.js';
 export { BkgTopPlusOpen } from './layers/BkgTopPlusOpen.js';
 export { useCenter, useProjection, useResolution, useScale, useView } from './ui/hooks.js';
 export { MapAnchor } from './ui/MapAnchor.js';
 export { MapContainer } from './ui/MapContainer.js';
 export { useMapModel } from './ui/useMapModel.js';
+export { DefaultMapProvider } from './ui/DefaultMapProvider.js';
 export { calculateBufferedExtent } from './util/geometry-utils.js';
 export { TOPMOST_LAYER_Z } from './model/LayerCollectionImpl.js';
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;"}

package/model/AbstractLayer.d.ts

@@ -1,5 +1,5 @@
 import OlBaseLayer from "ol/layer/Base";
-import { Layer, LayerLoadState, SimpleLayerConfig } from "../api";
+import { LayerBaseType, LayerLoadState, SimpleLayerConfig } from "../api";
 import { AbstractLayerBase } from "./AbstractLayerBase";
 import { MapModelImpl } from "./MapModelImpl";
 /**
@@ -7,7 +7,7 @@ import { MapModelImpl } from "./MapModelImpl";
  *
  * These layers always have an associated OpenLayers layer.
  */
-export declare abstract class AbstractLayer<AdditionalEvents = {}> extends AbstractLayerBase<AdditionalEvents> implements Layer {
+export declare abstract class AbstractLayer<AdditionalEvents = {}> extends AbstractLayerBase<AdditionalEvents> implements LayerBaseType {
     #private;
     constructor(config: SimpleLayerConfig);
     get visible(): boolean;
@@ -18,7 +18,8 @@ export declare abstract class AbstractLayer<AdditionalEvents = {}> extends Abstr
     /**
      * Called by the map model when the layer is added to the map.
      */
-    __attach(map: MapModelImpl): void;
+    __attachToMap(map: MapModelImpl): void;
     setVisible(newVisibility: boolean): void;
     __setVisible(newVisibility: boolean): void;
+    abstract readonly type: "simple" | "wms" | "wmts" | "group";
 }

package/model/AbstractLayer.js

@@ -1,4 +1,5 @@
-import { createLogger } from '@open-pioneer/core';
+import { external, reactive } from '@conterra/reactivity-core';
+import { createLogger, destroyResource } from '@open-pioneer/core';
 import { unByKey } from 'ol/Observable.js';
 import OlLayer from 'ol/layer/Layer.js';
 import { AbstractLayerBase } from './AbstractLayerBase.js';
@@ -10,18 +11,20 @@ class AbstractLayer extends AbstractLayerBase {
   #healthCheck;
   #visible;
   #loadState;
+  #visibilityWatchKey;
   #stateWatchResource;
   constructor(config) {
     super(config);
     this.#olLayer = config.olLayer;
     this.#isBaseLayer = config.isBaseLayer ?? false;
     this.#healthCheck = config.healthCheck;
-    this.#visible = config.visible ?? true;
-    this.#loadState = getSourceState(getSource(this.#olLayer));
-    this.__setVisible(this.#visible);
+    this.#visible = external(() => this.#olLayer.getVisible());
+    this.#visibilityWatchKey = this.#olLayer.on("change:visible", this.#visible.trigger);
+    this.#loadState = reactive(getSourceState(getSource(this.#olLayer)));
+    this.__setVisible(config.visible ?? true);
   }
   get visible() {
-    return this.#visible;
+    return this.#visible.value;
   }
   get olLayer() {
     return this.#olLayer;
@@ -30,30 +33,32 @@ class AbstractLayer extends AbstractLayerBase {
     return this.#isBaseLayer;
   }
   get loadState() {
-    return this.#loadState;
+    return this.#loadState.value;
   }
   destroy() {
     if (this.__destroyed) {
       return;
     }
-    this.#stateWatchResource?.destroy();
+    this.#stateWatchResource = destroyResource(this.#stateWatchResource);
+    this.#visibilityWatchKey && unByKey(this.#visibilityWatchKey);
+    this.#visibilityWatchKey = void 0;
     this.olLayer.dispose();
     super.destroy();
   }
   /**
    * Called by the map model when the layer is added to the map.
    */
-  __attach(map) {
+  __attachToMap(map) {
     super.__attachToMap(map);
     const { initial: initialState, resource: stateWatchResource } = watchLoadState(
       this,
       this.#healthCheck,
       (state) => {
-        this.#setLoadState(state);
+        this.#loadState.value = state;
       }
     );
     this.#stateWatchResource = stateWatchResource;
-    this.#setLoadState(initialState);
+    this.#loadState.value = initialState;
   }
   setVisible(newVisibility) {
     if (this.isBaseLayer) {
@@ -65,21 +70,9 @@ class AbstractLayer extends AbstractLayerBase {
     this.__setVisible(newVisibility);
   }
   __setVisible(newVisibility) {
-    let changed = false;
-    if (this.#visible !== newVisibility) {
-      this.#visible = newVisibility;
-      changed = true;
-    }
-    if (this.#olLayer.getVisible() != this.#visible) {
+    if (this.#olLayer.getVisible() !== newVisibility) {
       this.#olLayer.setVisible(newVisibility);
     }
-    changed && this.__emitChangeEvent("changed:visible");
-  }
-  #setLoadState(loadState) {
-    if (loadState !== this.#loadState) {
-      this.#loadState = loadState;
-      this.__emitChangeEvent("changed:loadState");
-    }
   }
 }
 function watchLoadState(layer, healthCheck, onChange) {

package/model/AbstractLayer.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractLayer.js","sources":["AbstractLayer.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2023 Open Pioneer project (https://github.com/open-pioneer)\n// SPDX-License-Identifier: Apache-2.0\nimport { Resource, createLogger } from \"@open-pioneer/core\";\nimport { unByKey } from \"ol/Observable\";\nimport { EventsKey } from \"ol/events\";\nimport OlBaseLayer from \"ol/layer/Base\";\nimport OlLayer from \"ol/layer/Layer\";\nimport OlSource from \"ol/source/Source\";\nimport { HealthCheckFunction, Layer, LayerConfig, LayerLoadState, SimpleLayerConfig } from \"../api\";\nimport { AbstractLayerBase } from \"./AbstractLayerBase\";\nimport { MapModelImpl } from \"./MapModelImpl\";\n\nconst LOG = createLogger(\"map:AbstractLayer\");\n\n/**\n * Base class for normal layer types.\n *\n * These layers always have an associated OpenLayers layer.\n */\nexport abstract class AbstractLayer<AdditionalEvents = {}>\n    extends AbstractLayerBase<AdditionalEvents>\n    implements Layer\n{\n    #olLayer: OlBaseLayer;\n    #isBaseLayer: boolean;\n    #healthCheck?: string | HealthCheckFunction;\n    #visible: boolean;\n\n    #loadState: LayerLoadState;\n    #stateWatchResource: Resource | undefined;\n\n    constructor(config: SimpleLayerConfig) {\n        super(config);\n        this.#olLayer = config.olLayer;\n        this.#isBaseLayer = config.isBaseLayer ?? false;\n        this.#healthCheck = config.healthCheck;\n\n        this.#visible = config.visible ?? true;\n        this.#loadState = getSourceState(getSource(this.#olLayer));\n\n        this.__setVisible(this.#visible); // apply initial visibility\n    }\n\n    get visible(): boolean {\n        return this.#visible;\n    }\n\n    get olLayer(): OlBaseLayer {\n        return this.#olLayer;\n    }\n\n    get isBaseLayer(): boolean {\n        return this.#isBaseLayer;\n    }\n\n    get loadState(): LayerLoadState {\n        return this.#loadState;\n    }\n\n    destroy() {\n        if (this.__destroyed) {\n            return;\n        }\n\n        this.#stateWatchResource?.destroy();\n        this.olLayer.dispose();\n        super.destroy();\n    }\n\n    /**\n     * Called by the map model when the layer is added to the map.\n     */\n    __attach(map: MapModelImpl): void {\n        super.__attachToMap(map);\n\n        const { initial: initialState, resource: stateWatchResource } = watchLoadState(\n            this,\n            this.#healthCheck,\n            (state) => {\n                this.#setLoadState(state);\n            }\n        );\n        this.#stateWatchResource = stateWatchResource;\n        this.#setLoadState(initialState);\n    }\n\n    setVisible(newVisibility: boolean): void {\n        if (this.isBaseLayer) {\n            LOG.warn(\n                `Cannot change visibility of base layer '${this.id}': use activateBaseLayer() on the map's LayerCollection instead.`\n            );\n            return;\n        }\n\n        this.__setVisible(newVisibility);\n    }\n\n    __setVisible(newVisibility: boolean): void {\n        let changed = false;\n        if (this.#visible !== newVisibility) {\n            this.#visible = newVisibility;\n            changed = true;\n        }\n\n        // Improvement: actual map sync?\n        if (this.#olLayer.getVisible() != this.#visible) {\n            this.#olLayer.setVisible(newVisibility);\n        }\n        changed && this.__emitChangeEvent(\"changed:visible\");\n    }\n\n    #setLoadState(loadState: LayerLoadState) {\n        if (loadState !== this.#loadState) {\n            this.#loadState = loadState;\n            this.__emitChangeEvent(\"changed:loadState\");\n        }\n    }\n}\n\nfunction watchLoadState(\n    layer: AbstractLayer,\n    healthCheck: LayerConfig[\"healthCheck\"],\n    onChange: (newState: LayerLoadState) => void\n): { initial: LayerLoadState; resource: Resource } {\n    const olLayer = layer.olLayer;\n\n    if (!(olLayer instanceof OlLayer)) {\n        // Some layers don't have a source (such as group)\n        return {\n            initial: \"loaded\",\n            resource: {\n                destroy() {\n                    void 0;\n                }\n            }\n        };\n    }\n\n    let currentSource = getSource(olLayer);\n    const currentOlLayerState = getSourceState(currentSource);\n\n    let currentLoadState: LayerLoadState = currentOlLayerState;\n    let currentHealthState = \"loading\"; // initial state loading until health check finished\n\n    // custom health check not needed when OpenLayers already returning an error state\n    if (currentOlLayerState !== \"error\") {\n        // health check only once during initialization\n        doHealthCheck(layer, healthCheck).then((state: LayerLoadState) => {\n            currentHealthState = state;\n            updateState();\n        });\n    }\n\n    const updateState = () => {\n        const olLayerState = getSourceState(currentSource);\n        const nextLoadState: LayerLoadState =\n            currentHealthState === \"error\" ? \"error\" : olLayerState;\n\n        if (currentLoadState !== nextLoadState) {\n            currentLoadState = nextLoadState;\n            onChange(currentLoadState);\n        }\n    };\n\n    let stateHandle: EventsKey | undefined;\n    stateHandle = currentSource?.on(\"change\", () => {\n        updateState();\n    });\n\n    const sourceHandle = olLayer.on(\"change:source\", () => {\n        // unsubscribe from old source\n        stateHandle && unByKey(stateHandle);\n        stateHandle = undefined;\n\n        // subscribe to new source and update state\n        currentSource = getSource(olLayer);\n        stateHandle = currentSource?.on(\"change\", () => {\n            updateState();\n        });\n        updateState();\n    });\n    return {\n        initial: currentLoadState,\n        resource: {\n            destroy() {\n                stateHandle && unByKey(stateHandle);\n                unByKey(sourceHandle);\n            }\n        }\n    };\n}\n\nasync function doHealthCheck(\n    layer: AbstractLayer,\n    healthCheck: LayerConfig[\"healthCheck\"]\n): Promise<LayerLoadState> {\n    if (healthCheck == null) {\n        return \"loaded\";\n    }\n\n    let healthCheckFn: HealthCheckFunction;\n    if (typeof healthCheck === \"function\") {\n        healthCheckFn = healthCheck;\n    } else if (typeof healthCheck === \"string\") {\n        healthCheckFn = async () => {\n            const httpService = layer.map.__sharedDependencies.httpService;\n            const response = await httpService.fetch(healthCheck);\n            if (response.ok) {\n                return \"loaded\";\n            }\n            LOG.warn(\n                `Health check failed for layer '${layer.id}' (http status ${response.status})`\n            );\n            return \"error\";\n        };\n    } else {\n        LOG.error(\n            `Unexpected object for 'healthCheck' parameter of layer '${layer.id}'`,\n            healthCheck\n        );\n        return \"error\";\n    }\n\n    try {\n        return await healthCheckFn(layer);\n    } catch (e) {\n        LOG.warn(`Health check failed for layer '${layer.id}'`, e);\n        return \"error\";\n    }\n}\n\nfunction getSource(olLayer: OlLayer | OlBaseLayer) {\n    if (!(olLayer instanceof OlLayer)) {\n        return undefined;\n    }\n    return (olLayer?.getSource() as OlSource | null) ?? undefined;\n}\n\nfunction getSourceState(olSource: OlSource | undefined) {\n    const state = olSource?.getState();\n    switch (state) {\n        case undefined:\n            return \"loaded\";\n        case \"undefined\":\n            return \"not-loaded\";\n        case \"loading\":\n            return \"loading\";\n        case \"ready\":\n            return \"loaded\";\n        case \"error\":\n            return \"error\";\n    }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"AbstractLayer.js","sources":["AbstractLayer.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2023 Open Pioneer project (https://github.com/open-pioneer)\n// SPDX-License-Identifier: Apache-2.0\nimport { ExternalReactive, reactive, external, Reactive } from \"@conterra/reactivity-core\";\nimport { createLogger, destroyResource, Resource } from \"@open-pioneer/core\";\nimport { unByKey } from \"ol/Observable\";\nimport { EventsKey } from \"ol/events\";\nimport OlBaseLayer from \"ol/layer/Base\";\nimport OlLayer from \"ol/layer/Layer\";\nimport OlSource from \"ol/source/Source\";\nimport {\n    HealthCheckFunction,\n    Layer,\n    LayerBaseType,\n    LayerConfig,\n    LayerLoadState,\n    SimpleLayerConfig\n} from \"../api\";\nimport { AbstractLayerBase } from \"./AbstractLayerBase\";\nimport { MapModelImpl } from \"./MapModelImpl\";\n\nconst LOG = createLogger(\"map:AbstractLayer\");\n\n/**\n * Base class for normal layer types.\n *\n * These layers always have an associated OpenLayers layer.\n */\nexport abstract class AbstractLayer<AdditionalEvents = {}>\n    extends AbstractLayerBase<AdditionalEvents>\n    implements LayerBaseType\n{\n    #olLayer: OlBaseLayer;\n    #isBaseLayer: boolean;\n    #healthCheck?: string | HealthCheckFunction;\n\n    #visible: ExternalReactive<boolean>;\n    #loadState: Reactive<LayerLoadState>;\n\n    #visibilityWatchKey: EventsKey | undefined;\n    #stateWatchResource: Resource | undefined;\n\n    constructor(config: SimpleLayerConfig) {\n        super(config);\n        this.#olLayer = config.olLayer;\n        this.#isBaseLayer = config.isBaseLayer ?? false;\n        this.#healthCheck = config.healthCheck;\n\n        this.#visible = external(() => this.#olLayer.getVisible());\n        this.#visibilityWatchKey = this.#olLayer.on(\"change:visible\", this.#visible.trigger);\n\n        this.#loadState = reactive(getSourceState(getSource(this.#olLayer)));\n        this.__setVisible(config.visible ?? true); // apply initial visibility\n    }\n\n    get visible(): boolean {\n        return this.#visible.value;\n    }\n\n    get olLayer(): OlBaseLayer {\n        return this.#olLayer;\n    }\n\n    get isBaseLayer(): boolean {\n        return this.#isBaseLayer;\n    }\n\n    get loadState(): LayerLoadState {\n        return this.#loadState.value;\n    }\n\n    destroy() {\n        if (this.__destroyed) {\n            return;\n        }\n\n        this.#stateWatchResource = destroyResource(this.#stateWatchResource);\n        this.#visibilityWatchKey && unByKey(this.#visibilityWatchKey);\n        this.#visibilityWatchKey = undefined;\n        this.olLayer.dispose();\n        super.destroy();\n    }\n\n    /**\n     * Called by the map model when the layer is added to the map.\n     */\n    __attachToMap(map: MapModelImpl): void {\n        super.__attachToMap(map);\n\n        const { initial: initialState, resource: stateWatchResource } = watchLoadState(\n            this,\n            this.#healthCheck,\n            (state) => {\n                this.#loadState.value = state;\n            }\n        );\n        this.#stateWatchResource = stateWatchResource;\n        this.#loadState.value = initialState;\n    }\n\n    setVisible(newVisibility: boolean): void {\n        if (this.isBaseLayer) {\n            LOG.warn(\n                `Cannot change visibility of base layer '${this.id}': use activateBaseLayer() on the map's LayerCollection instead.`\n            );\n            return;\n        }\n\n        this.__setVisible(newVisibility);\n    }\n\n    __setVisible(newVisibility: boolean): void {\n        if (this.#olLayer.getVisible() !== newVisibility) {\n            this.#olLayer.setVisible(newVisibility);\n        }\n    }\n\n    abstract readonly type: \"simple\" | \"wms\" | \"wmts\" | \"group\";\n}\n\nfunction watchLoadState(\n    layer: AbstractLayer,\n    healthCheck: LayerConfig[\"healthCheck\"],\n    onChange: (newState: LayerLoadState) => void\n): { initial: LayerLoadState; resource: Resource } {\n    const olLayer = layer.olLayer;\n\n    if (!(olLayer instanceof OlLayer)) {\n        // Some layers don't have a source (such as group)\n        return {\n            initial: \"loaded\",\n            resource: {\n                destroy() {\n                    void 0;\n                }\n            }\n        };\n    }\n\n    let currentSource = getSource(olLayer);\n    const currentOlLayerState = getSourceState(currentSource);\n\n    let currentLoadState: LayerLoadState = currentOlLayerState;\n    let currentHealthState = \"loading\"; // initial state loading until health check finished\n\n    // custom health check not needed when OpenLayers already returning an error state\n    if (currentOlLayerState !== \"error\") {\n        // health check only once during initialization\n        doHealthCheck(layer, healthCheck).then((state: LayerLoadState) => {\n            currentHealthState = state;\n            updateState();\n        });\n    }\n\n    const updateState = () => {\n        const olLayerState = getSourceState(currentSource);\n        const nextLoadState: LayerLoadState =\n            currentHealthState === \"error\" ? \"error\" : olLayerState;\n\n        if (currentLoadState !== nextLoadState) {\n            currentLoadState = nextLoadState;\n            onChange(currentLoadState);\n        }\n    };\n\n    let stateHandle: EventsKey | undefined;\n    stateHandle = currentSource?.on(\"change\", () => {\n        updateState();\n    });\n\n    const sourceHandle = olLayer.on(\"change:source\", () => {\n        // unsubscribe from old source\n        stateHandle && unByKey(stateHandle);\n        stateHandle = undefined;\n\n        // subscribe to new source and update state\n        currentSource = getSource(olLayer);\n        stateHandle = currentSource?.on(\"change\", () => {\n            updateState();\n        });\n        updateState();\n    });\n    return {\n        initial: currentLoadState,\n        resource: {\n            destroy() {\n                stateHandle && unByKey(stateHandle);\n                unByKey(sourceHandle);\n            }\n        }\n    };\n}\n\nasync function doHealthCheck(\n    layer: AbstractLayer,\n    healthCheck: LayerConfig[\"healthCheck\"]\n): Promise<LayerLoadState> {\n    if (healthCheck == null) {\n        return \"loaded\";\n    }\n\n    let healthCheckFn: HealthCheckFunction;\n    if (typeof healthCheck === \"function\") {\n        healthCheckFn = healthCheck;\n    } else if (typeof healthCheck === \"string\") {\n        healthCheckFn = async () => {\n            const httpService = layer.map.__sharedDependencies.httpService;\n            const response = await httpService.fetch(healthCheck);\n            if (response.ok) {\n                return \"loaded\";\n            }\n            LOG.warn(\n                `Health check failed for layer '${layer.id}' (http status ${response.status})`\n            );\n            return \"error\";\n        };\n    } else {\n        LOG.error(\n            `Unexpected object for 'healthCheck' parameter of layer '${layer.id}'`,\n            healthCheck\n        );\n        return \"error\";\n    }\n\n    try {\n        return await healthCheckFn(layer as Layer);\n    } catch (e) {\n        LOG.warn(`Health check failed for layer '${layer.id}'`, e);\n        return \"error\";\n    }\n}\n\nfunction getSource(olLayer: OlLayer | OlBaseLayer) {\n    if (!(olLayer instanceof OlLayer)) {\n        return undefined;\n    }\n    return (olLayer?.getSource() as OlSource | null) ?? undefined;\n}\n\nfunction getSourceState(olSource: OlSource | undefined) {\n    const state = olSource?.getState();\n    switch (state) {\n        case undefined:\n            return \"loaded\";\n        case \"undefined\":\n            return \"not-loaded\";\n        case \"loading\":\n            return \"loading\";\n        case \"ready\":\n            return \"loaded\";\n        case \"error\":\n            return \"error\";\n    }\n}\n"],"names":[],"mappings":"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"}

package/model/AbstractLayerBase.d.ts

@@ -1,5 +1,7 @@
-import { EventEmitter, EventNames } from "@open-pioneer/core";
-import { LayerBase, LayerBaseEvents, Sublayer } from "../api";
+import { EventEmitter } from "@open-pioneer/core";
+import { AnyLayer, AnyLayerBaseType, AnyLayerTypes, ChildrenCollection, LayerBaseEvents, Sublayer } from "../api";
+import { GroupLayer } from "../api/layers/GroupLayer";
+import { GroupLayerCollectionImpl } from "./layers/GroupLayerImpl";
 import { MapModelImpl } from "./MapModelImpl";
 import { SublayersCollectionImpl } from "./SublayersCollectionImpl";
 export interface AbstractLayerBaseOptions {
@@ -12,7 +14,7 @@ export interface AbstractLayerBaseOptions {
  * Base class for "normal" layers and sublayers alike to implement common properties
  * such as id, title and attributes.
  */
-export declare abstract class AbstractLayerBase<AdditionalEvents = {}> extends EventEmitter<LayerBaseEvents & AdditionalEvents> implements LayerBase {
+export declare abstract class AbstractLayerBase<AdditionalEvents = {}> extends EventEmitter<LayerBaseEvents & AdditionalEvents> implements AnyLayerBaseType {
     #private;
     constructor(config: AbstractLayerBaseOptions);
     protected get __destroyed(): boolean;
@@ -21,18 +23,32 @@ export declare abstract class AbstractLayerBase<AdditionalEvents = {}> extends E
     get title(): string;
     get description(): string;
     get attributes(): Record<string | symbol, unknown>;
+    get parent(): AnyLayer | undefined;
+    get children(): ChildrenCollection<AnyLayer & AbstractLayerBase> | undefined;
+    abstract get type(): AnyLayerTypes;
     abstract get visible(): boolean;
+    abstract get layers(): GroupLayerCollectionImpl | undefined;
     abstract get sublayers(): SublayersCollectionImpl<Sublayer & AbstractLayerBase> | undefined;
     abstract get legend(): string | undefined;
     destroy(): void;
     /**
      * Attaches the layer to its owning map.
      */
-    protected __attachToMap(map: MapModelImpl): void;
+    __attachToMap(map: MapModelImpl): void;
+    /**
+     * Attach group layers to its parent group layer.
+     * Called by the parent layer.
+     */
+    __attachToGroup(parent: GroupLayer): void;
+    /**
+     * Detach layer from parent group layer.
+     *
+     * Called by the parent group layer when destroyed or the layer gets removed.
+     */
+    __detachFromGroup(): void;
     setTitle(newTitle: string): void;
     setDescription(newDescription: string): void;
     updateAttributes(newAttributes: Record<string | symbol, unknown>): void;
     deleteAttribute(deleteAttribute: string | symbol): void;
     abstract setVisible(newVisibility: boolean): void;
-    protected __emitChangeEvent<Name extends EventNames<LayerBaseEvents & AdditionalEvents>>(event: Name): void;
 }

package/model/AbstractLayerBase.js

@@ -1,20 +1,28 @@
+import { reactiveMap, computed, reactive, batch } from '@conterra/reactivity-core';
 import { createLogger, EventEmitter } from '@open-pioneer/core';
 import { v4 } from 'uuid';
 
 const LOG = createLogger("map:AbstractLayerModel");
 class AbstractLayerBase extends EventEmitter {
   #map;
+  #parent;
   #id;
   #title;
   #description;
+  #attributesMap = reactiveMap();
   #attributes;
   #destroyed = false;
   constructor(config) {
     super();
     this.#id = config.id ?? v4();
-    this.#attributes = config.attributes ?? {};
-    this.#title = config.title;
-    this.#description = config.description ?? "";
+    this.#attributes = computed(() => {
+      return Object.fromEntries(this.#attributesMap.entries());
+    });
+    this.#title = reactive(config.title);
+    this.#description = reactive(config.description ?? "");
+    if (config.attributes) {
+      this.updateAttributes(config.attributes);
+    }
   }
   get __destroyed() {
     return this.#destroyed;
@@ -30,13 +38,19 @@ class AbstractLayerBase extends EventEmitter {
     return this.#id;
   }
   get title() {
-    return this.#title;
+    return this.#title.value;
   }
   get description() {
-    return this.#description;
+    return this.#description.value;
   }
   get attributes() {
-    return this.#attributes;
+    return this.#attributes.value;
+  }
+  get parent() {
+    return this.#parent;
+  }
+  get children() {
+    return this.layers ?? this.sublayers ?? void 0;
   }
   destroy() {
     if (this.#destroyed) {
@@ -44,6 +58,7 @@ class AbstractLayerBase extends EventEmitter {
     }
     this.#destroyed = true;
     this.sublayers?.destroy();
+    this.layers?.destroy();
     try {
       this.emit("destroy");
     } catch (e) {
@@ -61,44 +76,42 @@ class AbstractLayerBase extends EventEmitter {
     }
     this.#map = map;
   }
-  setTitle(newTitle) {
-    if (newTitle !== this.#title) {
-      this.#title = newTitle;
-      this.__emitChangeEvent("changed:title");
+  /**
+   * Attach group layers to its parent group layer.
+   * Called by the parent layer.
+   */
+  __attachToGroup(parent) {
+    if (this.#parent) {
+      throw new Error(
+        `Layer '${this.id}' has already been attached to the group layer '${this.#parent.id}'`
+      );
     }
+    this.#parent = parent;
+  }
+  /**
+   * Detach layer from parent group layer.
+   *
+   * Called by the parent group layer when destroyed or the layer gets removed.
+   */
+  __detachFromGroup() {
+    this.#parent = void 0;
+  }
+  setTitle(newTitle) {
+    this.#title.value = newTitle;
   }
   setDescription(newDescription) {
-    if (newDescription !== this.#description) {
-      this.#description = newDescription;
-      this.__emitChangeEvent("changed:description");
-    }
+    this.#description.value = newDescription;
   }
   updateAttributes(newAttributes) {
-    const attributes = this.#attributes;
     const keys = Reflect.ownKeys(newAttributes);
-    let changed = false;
-    for (const key of keys) {
-      const existing = attributes[key];
-      const value = newAttributes[key];
-      if (existing !== value) {
-        attributes[key] = value;
-        changed = true;
+    batch(() => {
+      for (const key of keys) {
+        this.#attributesMap.set(key, newAttributes[key]);
       }
-    }
-    if (changed) {
-      this.__emitChangeEvent("changed:attributes");
-    }
+    });
   }
   deleteAttribute(deleteAttribute) {
-    const attributes = this.#attributes;
-    if (attributes[deleteAttribute]) {
-      delete attributes[deleteAttribute];
-      this.__emitChangeEvent("changed:attributes");
-    }
-  }
-  __emitChangeEvent(event) {
-    this.emit(event);
-    this.emit("changed");
+    this.#attributesMap.delete(deleteAttribute);
   }
 }