@vcmap/core 5.0.0-rc.0 → 5.0.0-rc.11

package/src/{vcs/vcm/layer/featureStoreChanges.js → layer/featureStoreLayerChanges.js}

@@ -1,10 +1,10 @@
-import axios from 'axios';
 import { unByKey } from 'ol/Observable.js';
 import Feature from 'ol/Feature.js';
 import { check } from '@vcsuite/check';
-import { featureStoreState, featureStoreStateSymbol } from './featureStoreState.js';
+import { FeatureStoreLayerState, featureStoreStateSymbol } from './featureStoreLayerState.js';
 import { parseGeoJSON, writeGeoJSONFeature } from './geojsonHelpers.js';
-import VcsObject from '../object.js';
+import VcsObject from '../vcsObject.js';
+import { requestJson } from '../util/fetch.js';
 
 /**
  * @typedef {Object} FeatureStoreTrackResults
@@ -26,22 +26,81 @@ import VcsObject from '../object.js';
  * @property {boolean} changed
  */
 
+/**
+ * @typedef {Object} CommitAction
+ * @property {string} action
+ * @property {import("ol/format/GeoJSON").GeoJSONFeature} feature
+ * @property {import("ol").Feature<import("ol/geom/Geometry").default>} original
+ * @property {function(string=):void} success
+ */
+
+/**
+ * @param {Set<import("ol").Feature<import("ol/geom/Geometry").default>>} added
+ * @param {Set<import("ol").Feature<import("ol/geom/Geometry").default>>} edited
+ * @param {Set<import("ol").Feature<import("ol/geom/Geometry").default>>} removed
+ * @returns {Array<CommitAction>}
+ * @private
+ */
+export function createCommitActions(added, edited, removed) {
+  const actions = [];
+  added.forEach((f) => {
+    const feature = writeGeoJSONFeature(f, { writeStyle: true });
+    actions.push({
+      action: 'add',
+      feature,
+      original: f,
+      success(data) {
+        f.setId(data);
+        f[featureStoreStateSymbol] = FeatureStoreLayerState.DYNAMIC;
+      },
+    });
+  });
+
+  edited.forEach((f) => {
+    const feature = writeGeoJSONFeature(f, { writeStyle: true });
+    feature._id = f.getId();
+    feature.geomety = 'test'; // XXX why test???
+    actions.push({
+      action: 'edit',
+      original: f,
+      feature,
+      success() {
+        if (f[featureStoreStateSymbol] === FeatureStoreLayerState.STATIC) {
+          f[featureStoreStateSymbol] = FeatureStoreLayerState.EDITED;
+        }
+      },
+    });
+  });
+
+  removed.forEach((f) => {
+    const _id = f.getId();
+    actions.push({
+      original: f,
+      action: 'remove',
+      feature: { _id },
+      success() {},
+    });
+  });
+
+  return actions;
+}
+
 /**
  * do not construct directly, use the layers .changeTracker instead
  * @class
  * @extends {VcsObject}
  * @api
  */
-class FeatureStoreChanges extends VcsObject {
-  static get className() { return 'vcs.vcm.layer.FeatureStoreChanges'; }
+class FeatureStoreLayerChanges extends VcsObject {
+  static get className() { return 'FeatureStoreLayerChanges'; }
 
   /**
-   * @param {import("@vcmap/core").FeatureStore} layer
+   * @param {import("@vcmap/core").FeatureStoreLayer} layer
    */
   constructor(layer) {
     super({});
 
-    /** @type {import("@vcmap/core").FeatureStore} */
+    /** @type {import("@vcmap/core").FeatureStoreLayer} */
     this.layer = layer;
     /** @type {FeatureStoreChangesListeners} */
     this._changesListeners = {
@@ -107,85 +166,42 @@ class FeatureStoreChanges extends VcsObject {
    * @returns {Promise<void>}
    * @api
    */
-  commitChanges(url) {
-    const actions = [];
-    this._addedFeatures.forEach((f) => {
-      const feature = writeGeoJSONFeature(f, { writeStyle: true });
-      actions.push({
-        action: 'add',
-        feature,
-        original: f,
-        success(data) {
-          f.setId(data);
-          f[featureStoreStateSymbol] = featureStoreState.DYNAMIC;
+  async commitChanges(url) {
+    const actions = createCommitActions(this._addedFeatures, this._editedFeatures, this._removedFeatures);
+    if (actions.length > 0) {
+      const data = await requestJson(url.toString(), {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
         },
+        body: JSON.stringify(actions.map(a => ({ action: a.action, feature: a.feature }))),
       });
-    });
 
-    this._editedFeatures.forEach((f) => {
-      const feature = writeGeoJSONFeature(f, { writeStyle: true });
-      feature._id = f.getId();
-      feature.geomety = 'test';
-      actions.push({
-        action: 'edit',
-        original: f,
-        feature,
-        success() {
-          if (f[featureStoreStateSymbol] === featureStoreState.STATIC) {
-            f[featureStoreStateSymbol] = featureStoreState.EDITED;
-          }
-        },
+      const failures = data.failedActions.map(({ index, error }) => {
+        const action = actions[index];
+        this.getLogger().log(`failed action ${action.action}: ${error}`);
+        actions[index] = null;
+        return this._resetFeature(action.original);
       });
-    });
 
-    this._removedFeatures.forEach((f) => {
-      const _id = f.getId();
-      actions.push({
-        original: f,
-        action: 'remove',
-        feature: { _id },
-        success() {},
-      });
-    });
-    /** @type {Promise<void>} */
-    let promise = Promise.resolve();
-    if (actions.length) {
-      // @ts-ignore
-      promise = axios.post(url.toString(), actions.map(a => ({ action: a.action, feature: a.feature })))
-        .then(({ data }) => {
-          const failures = data.failedActions.map(({ index, error }) => {
-            const action = actions[index];
-            this.getLogger().log(`failed action ${action.action}: ${error}`);
-            actions[index] = null;
-            return this._resetFeature(action.original);
-          });
-
-          actions
-            .filter(a => a)
-            .forEach(({ action, success }) => {
-              if (action === 'add') {
-                success(data.insertedIds.shift()._id); // XXX should this be shift or should we find the index?
-              } else {
-                success();
-              }
-            });
-          return Promise.all(failures);
+      actions
+        .filter(a => a)
+        .forEach(({ action, success }) => {
+          if (action === 'add') {
+            success(data.insertedIds.shift()._id); // XXX should this be shift or should we find the index?
+          } else {
+            success();
+          }
         });
-    }
-
-    return promise
-      .then(() => {
-        const promises = [];
-        this._convertedFeatures.forEach((f) => { promises.push(this._resetFeature(f)); });
-        return Promise.all(promises);
-      })
-      .then(() => {
-        this._resetValues();
-      })
-      .catch((err) => {
-        this._resetValues();
+      await Promise.all(failures);
+    } else {
+      try {
+        await Promise.all([...this._convertedFeatures].map(async (f) => { await this._resetFeature(f); }));
+      } catch (err) {
         this.getLogger().error(err.message);
-      });
+      }
+      this._resetValues();
+    }
   }
 
   /**
@@ -222,7 +238,7 @@ class FeatureStoreChanges extends VcsObject {
       return Promise.resolve();
     }
 
-    if (feature[featureStoreStateSymbol] === featureStoreState.STATIC) {
+    if (feature[featureStoreStateSymbol] === FeatureStoreLayerState.STATIC) {
       this.layer.resetStaticFeature(featureId);
       return Promise.resolve();
     }
@@ -279,7 +295,7 @@ class FeatureStoreChanges extends VcsObject {
     if (!feature[featureStoreStateSymbol]) {
       this._addedFeatures.add(feature);
       this.values.changed = true;
-    } else if (feature[featureStoreStateSymbol] === featureStoreState.STATIC) {
+    } else if (feature[featureStoreStateSymbol] === FeatureStoreLayerState.STATIC) {
       this._convertedFeatures.add(feature);
       this.values.changed = true;
     }
@@ -357,4 +373,4 @@ class FeatureStoreChanges extends VcsObject {
   }
 }
 
-export default FeatureStoreChanges;
+export default FeatureStoreLayerChanges;

package/src/{vcs/vcm/layer/featureStoreState.js → layer/featureStoreLayerState.js}

@@ -10,9 +10,8 @@ export const featureStoreStateSymbol = Symbol('vcsFeatureType');
  * @property {string} STATIC
  * @property {string} EDITED
  * @api
- * @export
  */
-export const featureStoreState = {
+export const FeatureStoreLayerState = {
   DYNAMIC: 'dynamic',
   STATIC: 'static',
   EDITED: 'edited',

package/src/{vcs/vcm/layer → layer}/featureVisibility.js

@@ -2,9 +2,9 @@ import { Color, Cesium3DTileFeature, Cesium3DTilePointFeature, Entity as CesiumE
 import Feature from 'ol/Feature.js';
 import Style from 'ol/style/Style.js';
 
-import VectorStyleItem, { fromCesiumColor } from '../util/style/vectorStyleItem.js';
-import { emptyStyle } from '../util/style/styleHelpers.js';
-import VcsEvent from '../event/vcsEvent.js';
+import VectorStyleItem, { fromCesiumColor } from '../style/vectorStyleItem.js';
+import { emptyStyle } from '../style/styleHelpers.js';
+import VcsEvent from '../vcsEvent.js';
 
 /**
  * Set on an ol.Feature or Cesium.Cesium3DTileFeature to indicate its style before it was hidden or highlighted.
@@ -181,7 +181,6 @@ export function showFeature(feature, symbol) {
 /**
  * Enumeration of feature visibility actions.
  * @enum {number}
- * @export
  * @api
  * @property {number} HIGHLIGHT
  * @property {number} UNHIGHLIGHT
@@ -264,8 +263,9 @@ class FeatureVisibility {
           usedStyle = fromCesiumColor(style);
         } else if (style instanceof Style) {
           usedStyle = new VectorStyleItem({});
-          if (style.getText() && style.getText().getText()) {
-            usedStyle.label = style.getText().getText();
+          if (style.getText() && style.getText().getText() && !Array.isArray(style.getText().getText())) {
+            // getText can return a rich Text Array<string> We do not support this at the moment.
+            usedStyle.label = String(style.getText().getText());
           }
           usedStyle.style = style;
         }

package/src/{vcs/vcm/layer → layer}/geojsonHelpers.js

@@ -6,18 +6,15 @@ import Point from 'ol/geom/Point.js';
 import Circle from 'ol/geom/Circle.js';
 
 import { getDistance as haversineDistance } from 'ol/sphere.js';
-import { getLogger as getLoggerByName } from '@vcsuite/logger';
 import Projection, { mercatorProjection, wgs84Projection } from '../util/projection.js';
-import VectorStyleItem, { defaultVectorStyle, vectorStyleSymbol } from '../util/style/vectorStyleItem.js';
-import { parseColor } from '../util/style/styleHelpers.js';
-import Vector from './vector.js';
-import { featureStoreStateSymbol } from './featureStoreState.js';
-import { StyleType } from '../util/style/styleItem.js';
-import writeStyle, { embedIconsInStyle } from '../util/style/writeStyle.js';
-import DeclarativeStyleItem from '../util/style/declarativeStyleItem.js';
+import VectorStyleItem, { defaultVectorStyle, vectorStyleSymbol } from '../style/vectorStyleItem.js';
+import { parseColor } from '../style/styleHelpers.js';
+import VectorLayer from './vectorLayer.js';
+import { featureStoreStateSymbol } from './featureStoreLayerState.js';
+import { embedIconsInStyle } from '../style/writeStyle.js';
+import DeclarativeStyleItem from '../style/declarativeStyleItem.js';
 import { vcsMetaVersion } from './layer.js';
-import { createOrUpdateFromGeometry } from '../util/featureconverter/extent3d.js';
-import { styleCollection } from '../globalCollections.js';
+import Extent3D from '../util/featureconverter/extent3D.js';
 import { circleFromCenterRadius, enforceEndingVertex, removeEndingVertexFromGeometry } from '../util/geometryHelpers.js';
 
 const featureProjection = 'EPSG:3857';
@@ -38,13 +35,6 @@ function getFormat() {
   return format;
 }
 
-/**
- * @returns {import("@vcsuite/logger").Logger}
- */
-function getLogger() {
-  return getLoggerByName('vcs.vcm.layer.GeoJSONHelper');
-}
-
 /**
  * @typedef {Object} GeoJSONData
  * @property {Array<import("ol").Feature<import("ol/geom/Geometry").default>>} features
@@ -84,7 +74,6 @@ function getLogger() {
 /**
  * @param {Object} geojson
  * @returns {string|null}
- * @export
  */
 export function getEPSGCodeFromGeojson(geojson) {
   const { crs } = geojson;
@@ -92,7 +81,7 @@ export function getEPSGCodeFromGeojson(geojson) {
     if (crs.type === 'name') {
       return crs.properties.name;
     } else if (crs.type === 'EPSG') {
-      // 'EPSG' is not part of the GeoJSON specification, but is generated by
+      // 'EPSG' is not part of the GeojsonLayer specification, but is generated by
       // GeoServer.
       // TODO: remove this when http://jira.codehaus.org/browse/GEOS-5996
       // is fixed and widely deployed.
@@ -105,7 +94,6 @@ export function getEPSGCodeFromGeojson(geojson) {
 /**
  * updates legacy features to the new olcesium namespaceing olcs_
  * @param {import("ol").Feature<import("ol/geom/Geometry").default>} feature
- * @export
  */
 export function updateLegacyFeature(feature) {
   // these changes can be done silently, because the features haven't been added to any layer
@@ -117,8 +105,8 @@ export function updateLegacyFeature(feature) {
     if (feature.get('drawingType')) {
       feature.set('olcs_extrudedHeight', feature.get('extrudedHeight'), true);
     } else {
-      const extent = createOrUpdateFromGeometry(feature.getGeometry());
-      const minHeight = Number.isFinite(extent[2]) ? extent[2] : 0;
+      const extent = Extent3D.fromGeometry(feature.getGeometry());
+      const minHeight = Number.isFinite(extent.minZ) ? extent.minZ : 0;
       feature.set('olcs_extrudedHeight', feature.get('extrudedHeight') - minHeight, true);
     }
     feature.unset('extrudedHeight', true);
@@ -141,7 +129,7 @@ export function updateLegacyFeature(feature) {
 function readGeometry(geometryObj, options) {
   const geometry = getFormat().readGeometry(geometryObj, options.formatOptions);
   if (String(options.formatOptions.featureProjection) === 'EPSG:3857') {
-    geometry[Vector.alreadyTransformedToMercator] = true;
+    geometry[VectorLayer.alreadyTransformedToMercator] = true;
   }
   removeEndingVertexFromGeometry(geometry);
   return new Feature({ geometry });
@@ -246,7 +234,7 @@ function readFeature(featureObj, options) {
     geometry = circleFromCenterRadius(coordinates, radius);
   }
   if (String(options.formatOptions.featureProjection) === 'EPSG:3857') {
-    geometry[Vector.alreadyTransformedToMercator] = true;
+    geometry[VectorLayer.alreadyTransformedToMercator] = true;
   }
 
   featureObj.vcsMeta = featureObj.vcsMeta || {};
@@ -288,12 +276,11 @@ function readFeature(featureObj, options) {
 }
 
 /**
- * parses a string to GeoJSON
+ * parses a string to GeojsonLayer
  * @param {string|Object} input
  * @param {GeoJSONreadOptions=} readOptions
  * @returns {GeoJSONData}
  * @throws SyntaxError
- * @export
  * @api
  */
 export function parseGeoJSON(input, readOptions = {}) {
@@ -331,14 +318,7 @@ export function parseGeoJSON(input, readOptions = {}) {
       options.embeddedIcons = geoJSON.vcsMeta.embeddedIcons;
     }
     if (geoJSON.vcsMeta.style && readOptions.dynamicStyle) {
-      if (geoJSON.vcsMeta.style.type === StyleType.REFERENCE) {
-        style = styleCollection.getByKey(geoJSON.vcsMeta.style.name);
-        if (!style) {
-          getLogger().warning(`could not load referenced style ${geoJSON.vcsMeta.style.name}`);
-        } else if (style instanceof VectorStyleItem) {
-          options.defaultStyle = style;
-        }
-      } else if (geoJSON.vcsMeta.style.type === StyleType.DECLARATIVE) {
+      if (geoJSON.vcsMeta.style.type === DeclarativeStyleItem.className) {
         style = new DeclarativeStyleItem(geoJSON.vcsMeta.style);
       } else {
         geoJSON.vcsMeta.style = setEmbeddedIcons(geoJSON.vcsMeta.style, options);
@@ -425,11 +405,10 @@ export function writeGeoJSONFeature(feature, options = {}, embeddedIcons) {
 }
 
 /**
- * Writes all the features of the current layer to GeoJSON
+ * Writes all the features of the current layer to GeojsonLayer
  * @param {GeoJSONData} data
  * @param {GeoJSONwriteOptions=} options
  * @returns {string|Object}
- * @export
  */
 export function writeGeoJSON(data, options = {}) { // how to handel embedded icons when they are not set on the vcsMeta but options is true?
   const vcsMeta = data.vcsMeta || {};
@@ -441,10 +420,5 @@ export function writeGeoJSON(data, options = {}) { // how to handel embedded ico
     vcsMeta,
   };
 
-  if (options.writeStyle && data.style) { // legacy fallback for plugin use
-    getLogger().deprecate('data.style', 'use layer.getVcsMeta and pass that in instead');
-    writeStyle(data.style, obj.vcsMeta);
-  }
-
   return options.asObject ? obj : JSON.stringify(obj, null, options.prettyPrint ? 2 : null);
 }

package/src/{vcs/vcm/layer/geojson.js → layer/geojsonLayer.js}

@@ -1,12 +1,12 @@
-import axios from 'axios';
-import Vector from './vector.js';
+import VectorLayer from './vectorLayer.js';
 import { parseGeoJSON, writeGeoJSONFeature } from './geojsonHelpers.js';
 import Projection, { wgs84Projection } from '../util/projection.js';
-import { VcsClassRegistry } from '../classRegistry.js';
+import { layerClassRegistry } from '../classRegistry.js';
+import { requestJson } from '../util/fetch.js';
 
 /**
  * @typedef {VectorOptions} GeoJSONOptions
- * @property {Array<Object>|undefined} features - an array of GeoJSON features to parse
+ * @property {Array<Object>|undefined} features - an array of GeojsonLayer features to parse
  * @api
  */
 
@@ -18,22 +18,21 @@ export const featureFromOptions = Symbol('featureFromOptions');
 
 
 /**
- * GeoJSON layer for Cesium, Openlayers and Oblique
+ * GeojsonLayer layer for Cesium, OpenlayersMap and ObliqueMap
  * @class
- * @export
- * @extends {Vector}
+ * @extends {VectorLayer}
  * @api stable
  */
-class GeoJSON extends Vector {
-  static get className() { return 'vcs.vcm.layer.GeoJSON'; }
+class GeoJSONLayer extends VectorLayer {
+  static get className() { return 'GeoJSONLayer'; }
 
   /**
    * @returns {GeoJSONOptions}
    */
   static getDefaultOptions() {
     return {
-      ...Vector.getDefaultOptions(),
-      projection: wgs84Projection.getConfigObject(),
+      ...VectorLayer.getDefaultOptions(),
+      projection: wgs84Projection.toJSON(),
       features: undefined,
     };
   }
@@ -42,7 +41,7 @@ class GeoJSON extends Vector {
    * @param {GeoJSONOptions} options
    */
   constructor(options) {
-    const defaultOptions = GeoJSON.getDefaultOptions();
+    const defaultOptions = GeoJSONLayer.getDefaultOptions();
     options.projection = options.projection || defaultOptions.projection;
 
     super(options);
@@ -111,10 +110,8 @@ class GeoJSON extends Vector {
     }
 
     if (this.url) {
-      this._dataFetchedPromise = axios.get(this.url)
-        .then((response) => {
-          this._parseGeojsonData(response.data);
-        })
+      this._dataFetchedPromise = requestJson(this.url)
+        .then(data => this._parseGeojsonData(data))
         .catch((err) => {
           this.getLogger().warning(`Could not send request for loading layer content (${err.message})`);
           return Promise.reject(err);
@@ -149,13 +146,13 @@ class GeoJSON extends Vector {
    * @inheritDoc
    * @returns {GeoJSONOptions}
    */
-  getConfigObject() {
-    const config = /** @type {GeoJSONOptions} */ (super.getConfigObject());
-    const defaultOptions = GeoJSON.getDefaultOptions();
+  toJSON() {
+    const config = /** @type {GeoJSONOptions} */ (super.toJSON());
+    const defaultOptions = GeoJSONLayer.getDefaultOptions();
 
     const defaultProjection = new Projection(defaultOptions.projection);
     if (!this.projection.equals(defaultProjection)) {
-      config.projection = this.projection.getConfigObject();
+      config.projection = this.projection.toJSON();
     } else {
       delete config.projection;
     }
@@ -181,5 +178,5 @@ class GeoJSON extends Vector {
   }
 }
 
-VcsClassRegistry.registerClass(GeoJSON.className, GeoJSON);
-export default GeoJSON;
+layerClassRegistry.registerClass(GeoJSONLayer.className, GeoJSONLayer);
+export default GeoJSONLayer;

package/src/{vcs/vcm/layer → layer}/globalHider.js

@@ -1,5 +1,4 @@
 import { check } from '@vcsuite/check';
-import { getLogger } from '@vcsuite/logger';
 import {
   globalHidden,
   hideFeature,
@@ -7,7 +6,7 @@ import {
   showFeature,
   FeatureVisibilityAction,
 } from './featureVisibility.js';
-import VcsEvent from '../event/vcsEvent.js';
+import VcsEvent from '../vcsEvent.js';
 
 /**
  * @type {GlobalHider}
@@ -135,7 +134,6 @@ class GlobalHider {
 
 /**
  * @returns {GlobalHider}
- * @export
  * @api
  */
 export function getGlobalHider() {
@@ -145,13 +143,4 @@ export function getGlobalHider() {
   return instance;
 }
 
-/**
- * @returns {GlobalHider}
- * @deprecated v4.1
- */
-export function getInstance() {
-  getLogger('vcs.vcm.layer.GlobalHider').deprecate('getInstance', 'use getGlobalHider instead');
-  return getGlobalHider();
-}
-
 export default GlobalHider;

package/src/{vcs/vcm/layer → layer}/layer.js

@@ -1,13 +1,13 @@
 import { check } from '@vcsuite/check';
 import { parseBoolean, parseInteger } from '@vcsuite/parsers';
-import VcsObject from '../object.js';
+import VcsObject from '../vcsObject.js';
 import Extent from '../util/extent.js';
 import { getGlobalHider } from './globalHider.js';
 import { vcsLayerName } from './layerSymbols.js';
 import LayerState from './layerState.js';
-import VcsEvent from '../event/vcsEvent.js';
+import VcsEvent from '../vcsEvent.js';
 import { getCurrentLocale, getLocaleChangedEvent } from '../util/locale.js';
-import { VcsClassRegistry } from '../classRegistry.js';
+import { layerClassRegistry } from '../classRegistry.js';
 
 /**
  * @typedef {Object} GenericFeature
@@ -22,8 +22,8 @@ import { VcsClassRegistry } from '../classRegistry.js';
 
 /**
  * @typedef {import("@vcmap/core").Layer} SplitLayer
- * @property {import("@vcmap/cesium").ImagerySplitDirection} splitDirection
- * @property {VcsEvent<import("@vcmap/cesium").ImagerySplitDirection>} splitDirectionChanged
+ * @property {import("@vcmap/cesium").SplitDirection} splitDirection
+ * @property {VcsEvent<import("@vcmap/cesium").SplitDirection>} splitDirectionChanged
  */
 
 /**
@@ -38,7 +38,7 @@ import { VcsClassRegistry } from '../classRegistry.js';
 /**
  * @typedef {VectorPropertiesOptions} VcsMeta
  * @property {string|undefined} version - the version of the vcsMeta schema
- * @property {VectorStyleItemOptions|DeclarativeStyleItemOptions|Reference|undefined} style
+ * @property {VectorStyleItemOptions|DeclarativeStyleItemOptions|undefined} style
  * @property {Array<string>|undefined} embeddedIcons
  * @property {number|undefined} screenSpaceError
  * @property {*|undefined} flightOptions
@@ -100,13 +100,12 @@ export const vcsMetaVersion = '2.0';
  * To receive implementation options, implement `geImplementationOptions`
  * @abstract
  * @class
- * @export
  * @extends {VcsObject}
  * @api stable
  */
 class Layer extends VcsObject {
   /** @type {string} */
-  static get className() { return 'vcs.vcm.layer.Layer'; }
+  static get className() { return 'Layer'; }
 
   /**
    * Symbol to declare a layers name on its visualizations, e.g. ol.layer.Layer, Cesium.Cesium3DTileset
@@ -680,9 +679,9 @@ class Layer extends VcsObject {
   /**
    * @returns {LayerOptions}
    */
-  getConfigObject() {
+  toJSON() {
     /** @type {LayerOptions} */
-    const config = super.getConfigObject();
+    const config = super.toJSON();
     const defaultOptions = Layer.getDefaultOptions();
 
     if (this.activeOnStartup !== defaultOptions.activeOnStartup) {
@@ -706,7 +705,7 @@ class Layer extends VcsObject {
     }
 
     if (this.extent && this.extent.isValid()) {
-      config.extent = this.extent.getConfigObject();
+      config.extent = this.extent.toJSON();
     }
 
     if (this._exclusiveGroups.length > 0) {
@@ -748,5 +747,5 @@ class Layer extends VcsObject {
   }
 }
 
-VcsClassRegistry.registerClass(Layer.className, Layer);
+layerClassRegistry.registerClass(Layer.className, Layer);
 export default Layer;

package/src/{vcs/vcm/layer → layer}/layerImplementation.js

@@ -1,17 +1,16 @@
-import VcsObject from '../object.js';
+import VcsObject from '../vcsObject.js';
 import LayerState from './layerState.js';
 
 /**
  * represents an implementation for a Layer for a specific Map
  * @class
- * @export
  * @extends {VcsObject}
  * @abstract
  * @api
  * @template {import("@vcmap/core").VcsMap} T
  */
 class LayerImplementation extends VcsObject {
-  static get className() { return 'vcs.vcm.layer.LayerImplementation'; }
+  static get className() { return 'LayerImplementation'; }
 
   /**
    * @param {T} map

package/src/{vcs/vcm/layer → layer}/layerState.js

@@ -2,7 +2,6 @@
  * Enumeration of possible layer states.
  * State machine: inactive <-> loading -> active -> inactive
  * @enum {number}
- * @export
  * @api
  * @property {number} INACTIVE
  * @property {number} ACTIVE