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

package/src/{vcs/vcm/util/style → style}/styleHelpers.js

@@ -11,7 +11,7 @@ import { getLogger as getLoggerByName } from '@vcsuite/logger';
  * @returns {import("@vcsuite/logger").Logger}
  */
 function getLogger() {
-  return getLoggerByName('vcs.vcm.util.style.StyleHelpers');
+  return getLoggerByName('StyleHelpers');
 }
 
 /**
@@ -27,7 +27,6 @@ function getLogger() {
 /**
  * @enum {number}
  * @const
- * @export
  * @property {number} NWSE
  * @property {number} SWNE
  * @property {number} DIAGONALCROSS
@@ -50,7 +49,6 @@ export const PatternType = {
  * @param {string} h
  * @param {number=} opacity
  * @returns {import("ol/color").Color}
- * @export
  */
 export function hexToOlColor(h, opacity) {
   let hex = h.substring(1);
@@ -81,7 +79,6 @@ export function cesiumColorToColor(cesiumColor) {
  * @param {import("ol/color").Color} olColor
  * @returns {import("@vcmap/cesium").Color}
  * @api
- * @export
  */
 export function olColorToCesiumColor(olColor) {
   return Color.fromBytes(olColor[0], olColor[1], olColor[2], olColor[3] * 255);
@@ -93,7 +90,6 @@ export function olColorToCesiumColor(olColor) {
  * @param {import("ol/color").Color=} defaultColor
  * @returns {import("ol/color").Color}
  * @api
- * @export
  */
 export function parseColor(color, defaultColor) {
   if (Array.isArray(color)) {
@@ -135,7 +131,6 @@ export function parseColor(color, defaultColor) {
  * @param {import("ol/color").Color|import("ol/colorlike").ColorLike} color
  * @param {import("ol/color").Color} defaultColor
  * @returns {import("@vcmap/cesium").Color}
- * @export
  */
 export function getCesiumColor(color, defaultColor) {
   const olColor = parseColor(color, defaultColor);
@@ -145,7 +140,6 @@ export function getCesiumColor(color, defaultColor) {
 /**
  * @param {import("ol/color").Color|Array<number>|import("ol/colorlike").ColorLike} color
  * @returns {string}
- * @export
  */
 export function getStringColor(color) {
   return `rgba(${parseColor(color).join(',')})`;
@@ -155,7 +149,6 @@ export function getStringColor(color) {
  * @param {VectorStyleItemFill} options
  * @param {HTMLCanvasElement=} optCanvas
  * @returns {CanvasPattern}
- * @export
  */
 export function createPattern(options, optCanvas) {
   const pixelRatio = DEVICE_PIXEL_RATIO;
@@ -215,7 +208,6 @@ export function createPattern(options, optCanvas) {
 /**
  * @param {import("ol/color").Color} color
  * @returns {string}
- * @export
  */
 export function olColorToHex(color) {
   function componentHex(c) {
@@ -230,7 +222,6 @@ export function olColorToHex(color) {
 /**
  * @param {string} colorValue
  * @returns {boolean}
- * @export
  */
 export function validateHexColor(colorValue) {
   return /^#[0-9a-f]{6}$/.test(colorValue);
@@ -239,7 +230,6 @@ export function validateHexColor(colorValue) {
 /**
  * @param {string|FontObject} font
  * @returns {FontObject}
- * @export
  */
 export function parseFont(font) {
   if (typeof font !== 'string') {
@@ -310,7 +300,6 @@ export function parseFont(font) {
 /**
  * @param {FontObject} fontObject
  * @returns {string}
- * @export
  */
 export function combineFont(fontObject) {
   const order = [
@@ -521,12 +510,12 @@ const default3DTileStyleValues = {
   olcs_outlineWidth: '0.0',
   olcs_outlineColor: getStringColor(blackColor),
   olcs_pointSize: '8.0',
-  olcs_image: undefined,
+  olcs_image: null,
   olcs_font: `'${getDefaultVectorStyleItemOptions().text.font}'`,
   olcs_fontColor: getStringColor(blackColor),
   olcs_fontOutlineWidth: '1.0',
   olcs_fontOutlineColor: getStringColor(whiteColor),
-  olcs_labelText: undefined,
+  olcs_labelText: null,
   olcs_anchorLineColor: getStringColor(whiteColor),
 };
 

package/src/{vcs/vcm/util/style → style}/styleItem.js

@@ -2,14 +2,9 @@ import { Cesium3DTileStyle, Cesium3DTileColorBlendMode } from '@vcmap/cesium';
 import deepEqual from 'fast-deep-equal';
 
 import { parseEnumValue } from '@vcsuite/parsers';
-import VcsObject from '../../object.js';
-import VcsEvent from '../../event/vcsEvent.js';
-
-/**
- * @namespace style
- * @export
- * @api
- */
+import VcsObject from '../vcsObject.js';
+import VcsEvent from '../vcsEvent.js';
+import { styleClassRegistry } from '../classRegistry.js';
 
 /**
  * @typedef {Object} StyleItemLegendEntry
@@ -20,61 +15,25 @@ import VcsEvent from '../../event/vcsEvent.js';
 
 /**
  * @typedef {VcsObjectOptions} StyleItemOptions
- * @property {string|undefined} [type] - used in configuration to differentiate vector from declarative styles
- * @property {string|Object<string, string>|undefined} title - name is used when none is specifies
- * @property {Array<StyleItemLegendEntry>|undefined} [legend]
  * @property {number} [colorBlendMode=import("@vcmap/cesium").Cesium3DTileColorBlendMode.HIGHLIGHT] - colorBlendMode for 3D Tiledataset @see https://cesiumjs.org/import("@vcmap/cesium").Build/Documentation/Cesium3DTileColorBlendMode.html
  * @api
  */
 
-/**
- * @typedef {Object} Reference
- * @property {string} [type=StyleType.REFERENCE]
- * @property {string} name
- * @property {string|undefined} [url] - vcs:undocumented this is not yet implemented
- * @api
- */
-
 /**
  * @typedef {Object} StyleItemSections
  * @property {boolean|undefined} [meta]
  * @api
  */
 
-/**
- * Enumeration of possible style types.
- * @enum {string}
- * @property {string} VECTOR
- * @property {string} DECLARATIVE
- * @property {string} REFERENCE
- * @export
- * @api
- */
-export const StyleType = {
-  VECTOR: 'vector',
-  DECLARATIVE: 'declarative',
-  REFERENCE: 'reference',
-  CLUSTER: 'cluster',
-};
-
-/**
- * indicates, that this style is part of the config and can be referenced by name
- * @type {symbol}
- * @export
- * @api
- */
-export const referenceableStyleSymbol = Symbol('referencableStyleSymbol');
-
 /**
  * An abstract style definition which can be applied to a layer
  * @class
- * @export
  * @api
  * @abstract
  * @extends {VcsObject}
  */
 class StyleItem extends VcsObject {
-  static get className() { return 'vcs.vcm.util.style.StyleItem'; }
+  static get className() { return 'StyleItem'; }
 
   /**
    * @param {StyleItemOptions} options
@@ -82,18 +41,6 @@ class StyleItem extends VcsObject {
   constructor(options) {
     super(options);
 
-    /**
-     * @type {string|Object<string, string>}
-     */
-    this.title = options.title || this.name.toString();
-
-    /**
-     * Legend entries
-     * @type {Array<StyleItemLegendEntry>}
-     * @api
-     */
-    this.legend = options.legend || [];
-
     /** @type {Array<string>} */
     this.supportedLayers = [];
 
@@ -146,24 +93,20 @@ class StyleItem extends VcsObject {
   }
 
   /**
-   * Gets the options for this style item to be used in a config or vcsMeta
-   * @param {(VectorStyleItemSections|DeclarativeStyleItemSections)=} sections
-   * @returns {VectorStyleItemOptions|DeclarativeStyleItemOptions}
-   * @api
+   * @inheritDoc
+   * @returns {StyleItemOptions}
    */
-  getOptions(sections) {
-    if (sections && sections.meta) {
-      return {
-        name: this.name.toString(),
-        title: this.title,
-        legend: this.legend.length ? this.legend : undefined,
-      };
+  toJSON() {
+    const config = /** @type {StyleItemOptions} */ (super.toJSON());
+    if (this.colorBlendMode !== Cesium3DTileColorBlendMode.HIGHLIGHT) {
+      config.colorBlendMode = this.colorBlendMode;
     }
-    return {};
+
+    return config;
   }
 
   /**
-   * Clones this style
+   * Clones this style. Does not pass the name property.
    * @param {StyleItem=} result
    * @returns {StyleItem}
    * @api
@@ -176,36 +119,29 @@ class StyleItem extends VcsObject {
    * @returns {StyleItem}
    * @api
    */
-  // eslint-disable-next-line class-methods-use-this
-  assign(styleItem) { return styleItem; }
+  assign(styleItem) {
+    this.properties = JSON.parse(JSON.stringify(styleItem.properties));
+    return this;
+  }
 
   /**
+   * Tests if two styleItems are equivalent. Does not match the name property (e.g. identifier)
    * @param {StyleItem} styleItem
    * @returns {boolean}
    * @api
    */
   equals(styleItem) {
     if (this !== styleItem) {
-      const options = this.getOptions();
-      const candidateOptions = styleItem.getOptions();
+      const options = this.toJSON();
+      delete options.name;
+      const candidateOptions = styleItem.toJSON();
+      delete candidateOptions.name;
       return deepEqual(options, candidateOptions);
     }
 
     return true;
   }
 
-  /**
-   * gets a reference to this style by its name. should only be used for static styles, aka styles already part of the config
-   * @returns {Reference}
-   * @api
-   */
-  getReference() {
-    return {
-      type: StyleType.REFERENCE,
-      name: this.name.toString(),
-    };
-  }
-
   /**
    * @protected
    */
@@ -224,3 +160,4 @@ class StyleItem extends VcsObject {
 }
 
 export default StyleItem;
+styleClassRegistry.registerClass(StyleItem.className, StyleItem);

package/src/{vcs/vcm/util/style → style}/vectorStyleItem.js

@@ -10,7 +10,7 @@ import Circle from 'ol/style/Circle.js';
 import RegularShape from 'ol/style/RegularShape.js';
 
 import { check, checkMaybe } from '@vcsuite/check';
-import StyleItem, { StyleType } from './styleItem.js';
+import StyleItem from './styleItem.js';
 import {
   parseColor,
   PatternType,
@@ -24,6 +24,7 @@ import {
   getDefaultVectorStyleItemOptions,
 } from './styleHelpers.js';
 import { getShapeFromOptions } from './shapesCategory.js';
+import { styleClassRegistry } from '../classRegistry.js';
 
 /**
  * @typedef {Object} VectorStyleItemPattern
@@ -96,7 +97,7 @@ import { getShapeFromOptions } from './shapesCategory.js';
  * @property {number} POLYLINE
  * @property {number} POINT
  */
-export const olcsGeometryType = {
+export const OlcsGeometryType = {
   POLYGON: 1,
   POLYLINE: 2,
   POINT: 3,
@@ -114,21 +115,19 @@ export const olcsGeometryType = {
 
 /**
  * Is set on a feature and is used to signal that the feature has a specific vectorStyleItem.
- * Is set by the Editor if the layerStyle is overwritten. The Vector layer assures this style is set, if
+ * Is set by the Editor if the layerStyle is overwritten. The VectorLayer layer assures this style is set, if
  * the style on the layer is not a DeclarativeStyle
  * @type {symbol}
- * @export
  */
 export const vectorStyleSymbol = Symbol('VcsVectorStyleItem');
 
 /**
  * @class
  * @extends {StyleItem}
- * @export
  * @api
  */
 class VectorStyleItem extends StyleItem {
-  static get className() { return 'vcs.vcm.util.style.VectorStyleItem'; }
+  static get className() { return 'VectorStyleItem'; }
 
   /**
    * @param {VectorStyleItemOptions} options
@@ -521,12 +520,12 @@ class VectorStyleItem extends StyleItem {
   updateCesiumStyleColor(silent) {
     const colorConditions = getDefaultCondition('olcs_color', true);
     if (this.stroke && this.stroke.getColor()) {
-      colorConditions.splice(1, 0, [`\${olcs_geometryType}===${olcsGeometryType.POLYLINE}`, getStringColor(this.stroke.getColor())]);
+      colorConditions.splice(1, 0, [`\${olcs_geometryType}===${OlcsGeometryType.POLYLINE}`, getStringColor(this.stroke.getColor())]);
     }
     if (this._image instanceof Circle && this._image.getFill()) {
       colorConditions.splice(
         1, 0,
-        [`\${olcs_geometryType}===${olcsGeometryType.POINT}`, getStringColor(this._image.getFill().getColor())],
+        [`\${olcs_geometryType}===${OlcsGeometryType.POINT}`, getStringColor(this._image.getFill().getColor())],
       );
     }
     if (this.fillColor) {
@@ -710,7 +709,9 @@ class VectorStyleItem extends StyleItem {
       });
       return result;
     }
-    return new VectorStyleItem(this.getOptions());
+    const config = this.toJSON();
+    delete config.name;
+    return new VectorStyleItem(config);
   }
 
   /**
@@ -719,6 +720,7 @@ class VectorStyleItem extends StyleItem {
    * @api
    */
   assign(result) {
+    super.assign(result);
     if (result.fillColor) {
       this.fillColor = result.fillColor.slice();
     }
@@ -755,79 +757,61 @@ class VectorStyleItem extends StyleItem {
   }
 
   /**
-   * @param {VectorStyleItemSections=} sections
    * @returns {VectorStyleItemOptions}
    * @api
    */
-  getOptions(sections) {
+  toJSON() {
     // TODO clean default, only copy relevant keys
-    const options = /** @type {VectorStyleItemOptions} */ (super.getOptions(sections));
-    options.type = StyleType.VECTOR;
-    /** @type {VectorStyleItemSections} */
-    const usedSections = sections || {
-      fill: true,
-      stroke: true,
-      text: true,
-      image: true,
-    };
-
-    if (usedSections.fill) {
-      if (this._fillOptions) {
-        options.fill = {
-          color: /** @type {import("ol/color").Color} */ (parseColor(this._fillOptions.color).slice()),
-        };
-        if (this._fillOptions.pattern) {
-          options.fill.pattern = { ...this._fillOptions.pattern };
-        }
-      } else if (this.exclude.fill) {
-        options.fill = false;
+    const options = /** @type {VectorStyleItemOptions} */ (super.toJSON());
+    if (this._fillOptions) {
+      options.fill = {
+        color: /** @type {import("ol/color").Color} */ (parseColor(this._fillOptions.color).slice()),
+      };
+      if (this._fillOptions.pattern) {
+        options.fill.pattern = { ...this._fillOptions.pattern };
       }
+    } else if (this.exclude.fill) {
+      options.fill = false;
     }
 
-    if (usedSections.stroke) {
-      if (this._stroke) {
-        options.stroke = getStrokeOptions(this._stroke);
-      } else if (this.exclude.stroke) {
-        options.stroke = false;
-      }
+    if (this._stroke) {
+      options.stroke = getStrokeOptions(this._stroke);
+    } else if (this.exclude.stroke) {
+      options.stroke = false;
     }
 
-    if (usedSections.text) {
-      if (this._text) {
-        options.text = getTextOptions(this._text);
-      }
+    if (this._text) {
+      options.text = getTextOptions(this._text);
     }
 
-    if (usedSections.label) {
+    if (this._label) {
       options.label = this._label;
     }
 
-    if (usedSections.image) { // TODO this should be nicer...
-      if (this._image instanceof Icon) {
-        options.image = {
-          src: this._image.getSrc(), // XXX this is an issue... we dont want a data URI in the geoJSON
-          scale: this._image.getScale(),
-          opacity: this._image.getOpacity(),
-        };
-      } else if (this._image instanceof Circle) {
-        options.image = {
-          scale: this._image.getScale(),
-          fill: getFillOptions(this._image),
-          radius: this._image.getRadius(),
-          stroke: this._image.getStroke() ? getStrokeOptions(this._image.getStroke()) : undefined,
-        };
-      } else if (this._image instanceof RegularShape) {
-        options.image = {
-          scale: this._image.getScale(),
-          fill: getFillOptions(this._image),
-          points: this._image.getPoints(),
-          angle: this._image.getAngle(),
-          radius: this._image.getRadius(),
-          stroke: this._image.getStroke() ? getStrokeOptions(this._image.getStroke()) : undefined,
-        };
-      } else if (this.exclude.image) {
-        options.image = false;
-      }
+    if (this._image instanceof Icon) {
+      options.image = {
+        src: this._image.getSrc(), // XXX this is an issue... we dont want a data URI in the geoJSON
+        scale: this._image.getScale(),
+        opacity: this._image.getOpacity(),
+      };
+    } else if (this._image instanceof Circle) {
+      options.image = {
+        scale: this._image.getScale(),
+        fill: getFillOptions(this._image),
+        radius: this._image.getRadius(),
+        stroke: this._image.getStroke() ? getStrokeOptions(this._image.getStroke()) : undefined,
+      };
+    } else if (this._image instanceof RegularShape) {
+      options.image = {
+        scale: this._image.getScale(),
+        fill: getFillOptions(this._image),
+        points: this._image.getPoints(),
+        angle: this._image.getAngle(),
+        radius: this._image.getRadius(),
+        stroke: this._image.getStroke() ? getStrokeOptions(this._image.getStroke()) : undefined,
+      };
+    } else if (this.exclude.image) {
+      options.image = false;
     }
 
     return options;
@@ -841,33 +825,38 @@ class VectorStyleItem extends StyleItem {
     const type = feature.getGeometry().getType();
     const extrusion = feature.get('olcs_extrudedHeight') ||
       (feature.get('olcs_storeyHeight') && feature.get('olcs_storeyNumber'));
-    const sections = {};
+    const sections = new Set();
 
     if (type === 'Point' || type === 'MultiPoint') {
       if (feature[vectorStyleSymbol].label != null) {
-        sections.text = true;
-        sections.label = true;
+        sections.add('text');
+        sections.add('label');
       }
-      sections.image = true;
+      sections.add('image');
 
       if (extrusion) {
-        sections.stroke = true;
+        sections.add('stroke');
       }
     } else if (type === 'LineString' || type === 'MultiLineString') {
-      sections.stroke = true;
+      sections.add('stroke');
       if (extrusion) {
-        sections.fill = true;
+        sections.add('fill');
       }
     } else if (type === 'Polygon' || type === 'MultiPolygon' || type === 'Circle') {
-      sections.stroke = true;
-      sections.fill = true;
+      sections.add('stroke');
+      sections.add('fill');
     } else if (type === 'GeometryCollection') {
-      sections.stroke = true;
-      sections.fill = true;
-      sections.image = true;
-      sections.text = true;
-    }
-    return this.getOptions(sections);
+      sections.add('stroke');
+      sections.add('fill');
+      sections.add('image');
+      sections.add('text');
+    }
+    const config = this.toJSON();
+    const options = {};
+    sections.forEach((key) => {
+      options[key] = config[key];
+    });
+    return options;
   }
 
   /**
@@ -904,14 +893,13 @@ export default VectorStyleItem;
 
 /**
  * @type {VectorStyleItem}
- * @export
  */
 export const defaultVectorStyle = new VectorStyleItem(getDefaultVectorStyleItemOptions());
+styleClassRegistry.registerClass(VectorStyleItem.className, VectorStyleItem);
 
 /**
  * @param {import("@vcmap/cesium").Color} cesiumColor
  * @returns {VectorStyleItem}
- * @export
  */
 export function fromCesiumColor(cesiumColor) {
   const color = /** @type {import("ol/color").Color} */ (cesiumColor.toBytes());

package/src/{vcs/vcm/util/style → style}/writeStyle.js

@@ -1,6 +1,5 @@
 import VectorStyleItem from './vectorStyleItem.js';
 import DeclarativeStyleItem from './declarativeStyleItem.js';
-import { referenceableStyleSymbol } from './styleItem.js';
 
 /**
  * @param {VectorStyleItemOptions} obj
@@ -34,13 +33,11 @@ export function embedIconsInStyle(obj, embeddedIcons) {
  * @param {VcsMeta=} vcsMeta
  * @returns {VcsMeta}
  */
-function writeStyle(style, vcsMeta = {}) {
-  if (style[referenceableStyleSymbol]) { // XXX this should be configurable. In some cases, writting out the actual style would be desirable
-    vcsMeta.style = style.getReference();
-  } else if (style instanceof VectorStyleItem) {
-    vcsMeta.style = embedIconsInStyle(style.getOptions(), vcsMeta.embeddedIcons);
+function writeStyle(style, vcsMeta = {}) { // XXX this entire function is not what is to be expected. feature store expects styles as refs to be possible
+  if (style instanceof VectorStyleItem) {
+    vcsMeta.style = embedIconsInStyle(style.toJSON(), vcsMeta.embeddedIcons);
   } else if (style instanceof DeclarativeStyleItem) {
-    vcsMeta.style = style.getOptions();
+    vcsMeta.style = style.toJSON();
   }
   return vcsMeta;
 }

package/src/{vcs/vcm/util → util}/clipping/clippingObject.js

@@ -4,13 +4,12 @@ import { Cesium3DTileset } from '@vcmap/cesium';
 import { check } from '@vcsuite/check';
 import { parseBoolean } from '@vcsuite/parsers';
 import { getLogger as getLoggerByName } from '@vcsuite/logger';
-import CesiumMap from '../../maps/cesium.js';
-import VcsEvent from '../../event/vcsEvent.js';
+import CesiumMap from '../../map/cesiumMap.js';
+import VcsEvent from '../../vcsEvent.js';
 import LayerCollection from '../layerCollection.js';
 
 /**
  * @namespace clipping
- * @export
  * @api
  */
 
@@ -36,21 +35,20 @@ import LayerCollection from '../layerCollection.js';
  * @returns {import("@vcsuite/logger").Logger}
  */
 function getLogger() {
-  return getLoggerByName('vcs.vcm.util.clipping.ClippingObject');
+  return getLoggerByName('ClippingObject');
 }
 
 const globeSymbol = Symbol('ClippingObjectGlobe');
 
 /**
  * The ClippingObject is a container for a Cesium.ClippingPlaneCollection. The container holds information on the
- * targeted Cesium objects, based on layerNames (for [CesiumTileset]{@link CesiumTileset}) or
- * layerName and entity id for Cesium.DataSource which are part of an [DataSource]{@link DataSource} layer.
+ * targeted Cesium objects, based on layerNames (for [CesiumTilesetLayer]{@link CesiumTilesetLayer}) or
+ * layerName and entity id for Cesium.DataSourceLayer which are part of an [DataSourceLayer]{@link DataSource} layer.
  * Adding a ClippingObject to the [ClippingObjectManager]{@link ClippingObjectManager} applies the
  * objects Cesium.ClippingPlaneCollection where applicable. Once added, changes to the targets of the object are tracked.
  * To update the Cesium.ClippingPlaneCollection or its definitions, you must trigger an update by setting the clippingPlaneCollection
  * property to the new definition.
  * @class
- * @export
  * @api stable
  */
 class ClippingObject {
@@ -115,7 +113,7 @@ class ClippingObject {
     this.clippingPlaneUpdated = new VcsEvent();
 
     /**
-     * @type {Set<import("@vcmap/core").FeatureStore>}
+     * @type {Set<import("@vcmap/core").FeatureStoreLayer>}
      * @private
      */
     this._cachedFeatureStoreLayers = new Set();
@@ -264,11 +262,11 @@ class ClippingObject {
           this.targetsUpdated.raiseEvent();
         }
       }
-    } else if (this.layerNames.includes(layer.name) && layer.className === 'vcs.vcm.layer.FeatureStore') {
+    } else if (this.layerNames.includes(layer.name) && layer.className === 'FeatureStoreLayer') {
       if (layer.active) {
-        this._cachedFeatureStoreLayers.add(/** @type {import("@vcmap/core").FeatureStore} */ (layer));
-      } else if (this._cachedFeatureStoreLayers.has(/** @type {import("@vcmap/core").FeatureStore} */ (layer))) {
-        this._cachedFeatureStoreLayers.delete(/** @type {import("@vcmap/core").FeatureStore} */ (layer));
+        this._cachedFeatureStoreLayers.add(/** @type {import("@vcmap/core").FeatureStoreLayer} */ (layer));
+      } else if (this._cachedFeatureStoreLayers.has(/** @type {import("@vcmap/core").FeatureStoreLayer} */ (layer))) {
+        this._cachedFeatureStoreLayers.delete(/** @type {import("@vcmap/core").FeatureStoreLayer} */ (layer));
       }
     }
   }

package/src/{vcs/vcm/util → util}/clipping/clippingObjectManager.js

@@ -1,7 +1,7 @@
 import { check } from '@vcsuite/check';
 import { clearClippingPlanes, setClippingPlanes } from './clippingPlaneHelper.js';
 import ClippingObject from './clippingObject.js';
-import CesiumMap from '../../maps/cesium.js';
+import CesiumMap from '../../map/cesiumMap.js';
 
 /**
  * ClippingObjectManager, a singleton Class for managing [ClippingObjects]{@link ClippingObject}. The manager takes care to only apply a
@@ -12,12 +12,11 @@ import CesiumMap from '../../maps/cesium.js';
  * overwritten in the order they where added to the manager. Exclusive [ClippingObjects]{@link ClippingObject} are always applied last, even
  * if a default [ClippingObject]{@link ClippingObject} is added after.
  * @class
- * @export
  * @api stable
  */
 class ClippingObjectManager {
   static get className() {
-    return 'vcs.vcm.util.clipping.ClippingObjectManager';
+    return 'ClippingObjectManager';
   }
 
   constructor(layerCollection) {