@vcmap/core 5.0.0-rc.2 → 5.0.0-rc.20

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,21 +18,20 @@ 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(),
+      ...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);
@@ -151,7 +148,7 @@ class GeoJSON extends Vector {
    */
   toJSON() {
     const config = /** @type {GeoJSONOptions} */ (super.toJSON());
-    const defaultOptions = GeoJSON.getDefaultOptions();
+    const defaultOptions = GeoJSONLayer.getDefaultOptions();
 
     const defaultProjection = new Projection(defaultOptions.projection);
     if (!this.projection.equals(defaultProjection)) {
@@ -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,14 +6,19 @@ import {
   showFeature,
   FeatureVisibilityAction,
 } from './featureVisibility.js';
-import VcsEvent from '../event/vcsEvent.js';
+import VcsEvent from '../vcsEvent.js';
 
 /**
- * @type {GlobalHider}
+ * @typedef {Object} HiddenObject
+ * @property {string} id
  */
-let instance;
 
 /**
+ * GlobalHider globally hides features existing within a layer of a {@link LayerCollection}.
+ * Features can be defined as hidden by {@link VcsAppConfig} or {@link LayerOptions}.
+ * Hiding will be performed, when a {@link Context} is loaded, a {@link Layer} is activated or GlobalHider API is called.
+ * A feature can be hidden multiple times by different actors, e.g. contexts, layers, which is handled by this class.
+ * A feature will be shown again, when a {@link Context} is removed, a {@link Layer} is deactivated or GlobalHider API is called.
  * @class
  */
 class GlobalHider {
@@ -124,34 +128,6 @@ class GlobalHider {
     this._hiddenObjectFeatures = {};
     this.changed.destroy();
   }
-
-  static destroy() {
-    if (instance) {
-      instance.destroy();
-    }
-    instance = undefined;
-  }
-}
-
-/**
- * @returns {GlobalHider}
- * @export
- * @api
- */
-export function getGlobalHider() {
-  if (!instance) {
-    instance = new GlobalHider();
-  }
-  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,12 @@
-import { check } from '@vcsuite/check';
+import { check, checkMaybe } 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 { getCurrentLocale, getLocaleChangedEvent } from '../util/locale.js';
-import { VcsClassRegistry } from '../classRegistry.js';
+import VcsEvent from '../vcsEvent.js';
+import { layerClassRegistry } from '../classRegistry.js';
+import GlobalHider from './globalHider.js';
 
 /**
  * @typedef {Object} GenericFeature
@@ -22,8 +21,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 +37,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 +99,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
@@ -188,16 +186,10 @@ class Layer extends VcsObject {
 
     /**
      * @type {string|Object}
-     * @private
+     * @protected
      */
     this._url = options.url;
 
-    /**
-     * @type {Function}
-     * @private
-     */
-    this._localeChangedListener = null;
-
     /**
      * @type {number}
      * @private
@@ -214,12 +206,19 @@ class Layer extends VcsObject {
     /**
      * array of object Ids which should be hidden within the context of the layers layerCollection, if this layer is active
      * @type {Array.<string>}
+     * @private
      * @api
      */
-    this.hiddenObjectIds = Array.isArray(options.hiddenObjectIds) ?
+    this._hiddenObjectIds = Array.isArray(options.hiddenObjectIds) ?
       options.hiddenObjectIds :
       defaultOptions.hiddenObjectIds;
 
+    /**
+     * @type {import("@vcmap/core").GlobalHider|null}
+     * @private
+     */
+    this._globalHider = null;
+
     /**
      * @type {Array<string|symbol>}
      * @private
@@ -235,9 +234,6 @@ class Layer extends VcsObject {
      */
     this.exclusiveGroupsChanged = new VcsEvent();
 
-    /** @type {import("@vcmap/core").GlobalHider} */
-    this.globalHider = getGlobalHider();
-
     /**
      * @type {CopyrightOptions|undefined}
      */
@@ -268,6 +264,12 @@ class Layer extends VcsObject {
      * @api
      */
     this.featureProvider = undefined;
+
+    /**
+     * @type {string}
+     * @private
+     */
+    this._locale = 'en';
   }
 
   /**
@@ -332,9 +334,8 @@ class Layer extends VcsObject {
       if (typeof this._url === 'string') {
         return this._url;
       }
-      const locale = getCurrentLocale();
-      if (this._url[locale]) {
-        return this._url[locale];
+      if (this._url[this._locale]) {
+        return this._url[this._locale];
       }
       return Object.values(this._url)[0];
     }
@@ -353,6 +354,42 @@ class Layer extends VcsObject {
     }
   }
 
+  /**
+   * @type {Array<string>}
+   */
+  get hiddenObjectIds() { return this._hiddenObjectIds; }
+
+  /**
+   * @param {Array<string>} hiddenObjectIds
+   */
+  set hiddenObjectIds(hiddenObjectIds) {
+    check(hiddenObjectIds, [String]);
+
+    if (this._globalHider && this.active) {
+      this._globalHider.hideObjects(hiddenObjectIds);
+    }
+    this._hiddenObjectIds = hiddenObjectIds;
+  }
+
+
+  /**
+   * @type {import("@vcmap/core").GlobalHider|null}
+   * @readonly
+   */
+  get globalHider() { return this._globalHider; }
+
+  /**
+   * @param {import("@vcmap/core").GlobalHider} globalHider
+   */
+  setGlobalHider(globalHider) {
+    checkMaybe(globalHider, GlobalHider);
+
+    if (globalHider && this.active) {
+      globalHider.hideObjects(this.hiddenObjectIds);
+    }
+    this._globalHider = globalHider;
+  }
+
   /**
    * Indicates, that this layer is part of an exclusiveGroup
    * @api
@@ -406,6 +443,29 @@ class Layer extends VcsObject {
     }
   }
 
+  /**
+   * returns the currently set locale. Can be used to provide locale specific URLs.
+   * @type {string}
+   */
+  get locale() {
+    return this._locale;
+  }
+
+  /**
+   * sets the locale and reloads the layer the if the URL is a locale aware Object.
+   * @param {string} value
+   */
+  set locale(value) {
+    check(value, String);
+
+    if (this._locale !== value) {
+      this._locale = value;
+      if (this._url && typeof this._url === 'object' && this._url[this._locale]) {
+        this.reload();
+      }
+    }
+  }
+
   /**
    * creates an array of layer implementations for the given map.
    * @param {import("@vcmap/core").VcsMap} map Map
@@ -501,25 +561,11 @@ class Layer extends VcsObject {
     return null;
   }
 
-  /**
-   * recreates the implementations on locale change, if the url of this layer is an Object
-   * @param {string} locale
-   * @private
-   */
-  _handleLocaleChange(locale) {
-    if (this._url && typeof this._url === 'object' && this._url[locale]) {
-      this.reload();
-    }
-  }
-
   /**
    * initializes the layer, can be used to defer loading
    * @returns {Promise<void>}
    */
   initialize() {
-    if (!this.initialized) {
-      this._localeChangedListener = getLocaleChangedEvent().addEventListener(this._handleLocaleChange.bind(this));
-    }
     this._initialized = true;
     return Promise.resolve();
   }
@@ -617,7 +663,9 @@ class Layer extends VcsObject {
     if (this._state !== LayerState.LOADING) {
       return;
     }
-    this.globalHider.hideObjects(this.hiddenObjectIds);
+    if (this._globalHider) {
+      this._globalHider.hideObjects(this.hiddenObjectIds);
+    }
     this._state = LayerState.ACTIVE;
     try {
       this.stateChanged.raiseEvent(LayerState.ACTIVE);
@@ -667,7 +715,9 @@ class Layer extends VcsObject {
           impl.deactivate();
         }
       });
-      this.globalHider.showObjects(this.hiddenObjectIds);
+      if (this._globalHider) {
+        this._globalHider.showObjects(this.hiddenObjectIds);
+      }
       this._state = LayerState.INACTIVE;
       try {
         this.stateChanged.raiseEvent(LayerState.INACTIVE);
@@ -736,10 +786,6 @@ class Layer extends VcsObject {
         impl.destroy();
       });
 
-    if (this._localeChangedListener) {
-      this._localeChangedListener();
-      this._localeChangedListener = null;
-    }
     this._initialized = false;
     this._implementations.clear();
     this.stateChanged.destroy();
@@ -748,5 +794,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

package/src/{vcs/vcm/layer/oblique/layerOblique.js → layer/oblique/layerObliqueImpl.js}

@@ -3,12 +3,12 @@ import { vcsLayerName } from '../layerSymbols.js';
 
 /**
  * @class
- * @extends {LayerImplementation<import("@vcmap/core").Oblique>}}
+ * @extends {LayerImplementation<import("@vcmap/core").ObliqueMap>}}
  * @abstract
  */
-class LayerOblique extends LayerImplementation {
+class LayerObliqueImpl extends LayerImplementation {
   /**
-   * @param {import("@vcmap/core").Oblique} map
+   * @param {import("@vcmap/core").ObliqueMap} map
    * @param {LayerImplementationOptions} options
    */
   constructor(map, options) {
@@ -73,4 +73,4 @@ class LayerOblique extends LayerImplementation {
   }
 }
 
-export default LayerOblique;
+export default LayerObliqueImpl;

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

@@ -91,7 +91,7 @@ export async function mercatorGeometryToImageGeometry(inputSourceGeometry, desti
   const coordinates = sourceGeometry.getCoordinates();
   /** type {Array.<import("ol/coordinate").Coordinate>} */
   const flattenCoordinates = getFlatCoordinatesFromGeometry(sourceGeometry, coordinates);
-  let transformer = getTransform(mercatorProjection.proj, image.meta.projection);
+  let transformer = getTransform(mercatorProjection.proj, image.meta.projection.proj);
 
   let updatedPositions = [];
   if (image.meta.terrainProvider) {
@@ -99,7 +99,7 @@ export async function mercatorGeometryToImageGeometry(inputSourceGeometry, desti
       Projection.mercatorToWgs84(coord, true);
       return Cartographic.fromDegrees(coord[0], coord[1]);
     });
-    transformer = getTransform(wgs84Projection.proj, image.meta.projection);
+    transformer = getTransform(wgs84Projection.proj, image.meta.projection.proj);
     updatedPositions = await sampleTerrainMostDetailed(image.meta.terrainProvider, cartographicCoordinates);
   }
 

package/src/{vcs/vcm/layer/oblique/vectorOblique.js → layer/oblique/vectorObliqueImpl.js}

@@ -5,7 +5,6 @@ import Feature from 'ol/Feature.js';
 
 import { mercatorProjection } from '../../util/projection.js';
 import { mercatorGeometryToImageGeometry, imageGeometryToMercatorGeometry, getPolygonizedGeometry, setNewGeometry } from './obliqueHelpers.js';
-import { getGlobalHider } from '../globalHider.js';
 import {
   actuallyIsCircle,
   alreadyTransformedToImage,
@@ -13,21 +12,20 @@ import {
   obliqueGeometry,
   originalFeatureSymbol,
 } from '../vectorSymbols.js';
-import LayerOblique from './layerOblique.js';
+import LayerObliqueImpl from './layerObliqueImpl.js';
 import { synchronizeFeatureVisibilityWithSource } from '../vectorHelpers.js';
 
 /**
  * represents a specific vector layer for oblique.
  * @class
- * @export
- * @extends {LayerOblique}
+ * @extends {LayerObliqueImpl}
  * @implements {FeatureLayerImplementation}
  */
-class VectorOblique extends LayerOblique {
-  static get className() { return 'vcs.vcm.layer.oblique.VectorOblique'; }
+class VectorObliqueImpl extends LayerObliqueImpl {
+  static get className() { return 'VectorObliqueImpl'; }
 
   /**
-   * @param {import("@vcmap/core").Oblique} map
+   * @param {import("@vcmap/core").ObliqueMap} map
    * @param {VectorImplementationOptions} options
    */
   constructor(map, options) {
@@ -75,7 +73,7 @@ class VectorOblique extends LayerOblique {
     /**
      * @type {import("@vcmap/core").GlobalHider}
      */
-    this.globalHider = getGlobalHider();
+    this.globalHider = options.globalHider;
     /**
      * @type {import("ol/source").Vector<import("ol/geom/Geometry").default>}
      */
@@ -466,4 +464,4 @@ class VectorOblique extends LayerOblique {
   }
 }
 
-export default VectorOblique;
+export default VectorObliqueImpl;