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

package/index.d.ts

@@ -4763,7 +4763,7 @@ export class CameraLimiter {
      * Limits the given camera based on this limiters specs.
      */
     limitCamera(camera: import("@vcmap/cesium").Camera): Promise<void>;
-    getConfigObject(): CameraLimiterOptions;
+    toJSON(): CameraLimiterOptions;
 }
 
 /**
@@ -5326,7 +5326,7 @@ export class VcsObject {
     properties: any;
     readonly className: string;
     getLogger(): import("@vcsuite/logger").Logger;
-    getConfigObject(): VcsObjectOptions;
+    toJSON(): VcsObjectOptions;
     destroy(): void;
     dispose(): void;
 }
@@ -6189,7 +6189,7 @@ export class Extent {
      * @returns true if extent is valid
      */
     isValid(): boolean;
-    getConfigObject(): ExtentOptions;
+    toJSON(): ExtentOptions;
     clone(): Extent;
     equals(extent: Extent): boolean;
     /**
@@ -6278,7 +6278,7 @@ export class AbstractFeatureProvider {
     /**
      * Returns the object required to configure this feature provider.
      */
-    getConfigObject(): AbstractFeatureProviderOptions;
+    toJSON(): AbstractFeatureProviderOptions;
     /**
      * Destroys this feature provider and detaches its resources
      */
@@ -6792,7 +6792,7 @@ export class Projection {
     /**
      * Returns the object literal representation of this object
      */
-    getConfigObject(): ProjectionOptions;
+    toJSON(): ProjectionOptions;
     /**
      * Fast transform from Web-Mercator to WGS84
      * @param [inPlace] - whether to transform in place

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/core",
-  "version": "5.0.0-rc.1",
+  "version": "5.0.0-rc.2",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/vcs/vcm/layer/cesiumTileset.js

@@ -266,7 +266,7 @@ class CesiumTileset extends FeatureLayer {
       const threeDimExtent = getExtentFromTileset(impl.cesium3DTileset);
 
       const actualExtent = new Extent({
-        ...mercatorProjection.getConfigObject(),
+        ...mercatorProjection.toJSON(),
         coordinates: threeDimExtent,
       });
 
@@ -309,9 +309,9 @@ class CesiumTileset extends FeatureLayer {
   /**
    * @returns {CesiumTilesetOptions}
    */
-  getConfigObject() {
+  toJSON() {
     /** @type {CesiumTilesetOptions} */
-    const config = super.getConfigObject();
+    const config = super.toJSON();
     const defaultOptions = CesiumTileset.getDefaultOptions();
     if (this.highlightStyle) {
       config.highlightStyle = this.highlightStyle[referenceableStyleSymbol] ?

package/src/vcs/vcm/layer/czml.js

@@ -102,8 +102,8 @@ class Czml extends DataSource {
    * @inheritDoc
    * @returns {CzmlOptions}
    */
-  getConfigObject() {
-    const config = /** @type {CzmlOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {CzmlOptions} */ (super.toJSON());
     if (this.sourceUri) {
       config.sourceUri = this.sourceUri;
     }

package/src/vcs/vcm/layer/dataSource.js

@@ -235,8 +235,8 @@ class DataSource extends Layer {
    * @inheritDoc
    * @returns {DataSourceOptions}
    */
-  getConfigObject() {
-    const config = /** @type {DataSourceOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {DataSourceOptions} */ (super.toJSON());
     if (Object.keys(this._genericFeatureProperties).length > 0) {
       config.genericFeatureProperties = { ...this._genericFeatureProperties };
     }

package/src/vcs/vcm/layer/featureLayer.js

@@ -229,8 +229,8 @@ class FeatureLayer extends Layer {
   /**
    * @returns {FeatureLayerOptions}
    */
-  getConfigObject() {
-    const config = /** @type {FeatureLayerOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {FeatureLayerOptions} */ (super.toJSON());
     if (!this.getStyleOrDefaultStyle().equals(this._style)) {
       if (this._style[referenceableStyleSymbol]) {
         config.style = this.style.getReference();

package/src/vcs/vcm/layer/featureStore.js

@@ -93,7 +93,7 @@ class FeatureStore extends Vector {
       featureType: 'simple',
       features: [],
       ...Vector.getDefaultOptions(),
-      projection: mercatorProjection.getConfigObject(),
+      projection: mercatorProjection.toJSON(),
       staticRepresentation: {},
       hiddenStaticFeatureIds: [],
       vcsMeta: {
@@ -497,7 +497,7 @@ class FeatureStore extends Vector {
     }
 
     const actualExtent = new Extent({
-      ...mercatorProjection.getConfigObject(),
+      ...mercatorProjection.toJSON(),
       coordinates: mercatorExtent,
     });
 
@@ -596,8 +596,8 @@ class FeatureStore extends Vector {
    * @inheritDoc
    * @returns {FeatureStoreOptions}
    */
-  getConfigObject() {
-    const config = /** @type {FeatureStoreOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {FeatureStoreOptions} */ (super.toJSON());
     const defaultOptions = FeatureStore.getDefaultOptions();
 
     delete config.projection;

package/src/vcs/vcm/layer/geojson.js

@@ -33,7 +33,7 @@ class GeoJSON extends Vector {
   static getDefaultOptions() {
     return {
       ...Vector.getDefaultOptions(),
-      projection: wgs84Projection.getConfigObject(),
+      projection: wgs84Projection.toJSON(),
       features: undefined,
     };
   }
@@ -149,13 +149,13 @@ class GeoJSON extends Vector {
    * @inheritDoc
    * @returns {GeoJSONOptions}
    */
-  getConfigObject() {
-    const config = /** @type {GeoJSONOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {GeoJSONOptions} */ (super.toJSON());
     const defaultOptions = GeoJSON.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;
     }

package/src/vcs/vcm/layer/layer.js

@@ -680,9 +680,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 +706,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) {

package/src/vcs/vcm/layer/openStreetMap.js

@@ -160,8 +160,8 @@ class OpenStreetMap extends Layer {
    * @inheritDoc
    * @returns {OpenStreetMapOptions}
    */
-  getConfigObject() {
-    const config = /** @type {OpenStreetMapOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {OpenStreetMapOptions} */ (super.toJSON());
     const defaultOptions = OpenStreetMap.getDefaultOptions();
 
     if (this._splitDirection !== ImagerySplitDirection.NONE) {

package/src/vcs/vcm/layer/pointCloud.js

@@ -146,8 +146,8 @@ class PointCloud extends CesiumTileset {
    * @inheritDoc
    * @returns {PointCloudOptions}
    */
-  getConfigObject() {
-    const config = /** @type {PointCloudOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {PointCloudOptions} */ (super.toJSON());
     const defaultOptions = PointCloud.getDefaultOptions();
 
     if (this.defaultPointSize !== defaultOptions.pointSize) {

package/src/vcs/vcm/layer/rasterLayer.js

@@ -248,8 +248,8 @@ class RasterLayer extends Layer {
    * @inheritDoc
    * @returns {RasterLayerOptions}
    */
-  getConfigObject() {
-    const config = /** @type {RasterLayerOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {RasterLayerOptions} */ (super.toJSON());
     const defaultOptions = RasterLayer.getDefaultOptions();
 
     if (this.extent.equals(new Extent())) {

package/src/vcs/vcm/layer/singleImage.js

@@ -103,8 +103,8 @@ class SingleImage extends RasterLayer {
    * @inheritDoc
    * @returns {SingleImageOptions}
    */
-  getConfigObject() {
-    const config = /** @type {SingleImageOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {SingleImageOptions} */ (super.toJSON());
     delete config.tilingSchema;
 
     if (this.credit) {

package/src/vcs/vcm/layer/terrain.js

@@ -104,8 +104,8 @@ class Terrain extends Layer {
   /**
    * @returns {TerrainOptions}
    */
-  getConfigObject() {
-    const config = /** @type {TerrainOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {TerrainOptions} */ (super.toJSON());
     const defaultOptions = Terrain.getDefaultOptions();
 
     if (this.requestVertexNormals !== defaultOptions.requestVertexNormals) {

package/src/vcs/vcm/layer/tileProvider/tileProvider.js

@@ -530,8 +530,8 @@ class TileProvider extends VcsObject {
    * @returns {TileProviderOptions}
    * @api
    */
-  getConfigObject() {
-    const config = /** @type {TileProviderOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {TileProviderOptions} */ (super.toJSON());
     const defaultOptions = TileProvider.getDefaultOptions();
 
     if (defaultOptions.tileCacheSize !== this.tileCacheSize) {

package/src/vcs/vcm/layer/tms.js

@@ -92,8 +92,8 @@ class TMS extends RasterLayer {
    * @inheritDoc
    * @returns {TMSOptions}
    */
-  getConfigObject() {
-    const config = /** @type {TMSOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {TMSOptions} */ (super.toJSON());
     const defaultOptions = TMS.getDefaultOptions();
 
     if (this.tilingSchema !== defaultOptions.tilingSchema) {

package/src/vcs/vcm/layer/vector.js

@@ -538,7 +538,7 @@ class Vector extends FeatureLayer {
       return metaExtent;
     }
     const extent = new Extent({
-      ...mercatorProjection.getConfigObject(),
+      ...mercatorProjection.toJSON(),
       coordinates: this.source.getExtent(),
     });
     if (extent.isValid()) {
@@ -573,12 +573,12 @@ class Vector extends FeatureLayer {
   /**
    * @returns {VectorOptions}
    */
-  getConfigObject() {
-    const config = /** @type {VectorOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {VectorOptions} */ (super.toJSON());
     const defaultOptions = Vector.getDefaultOptions();
 
     if (this.projection.epsg !== getDefaultProjection().epsg) {
-      config.projection = this.projection.getConfigObject();
+      config.projection = this.projection.toJSON();
     }
 
     if (this.maxResolution !== defaultOptions.maxResolution) {

package/src/vcs/vcm/layer/vectorTile.js

@@ -448,8 +448,8 @@ class VectorTile extends FeatureLayer {
    * @inheritDoc
    * @returns {VectorTileOptions}
    */
-  getConfigObject() {
-    const config = /** @type {VectorTileOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {VectorTileOptions} */ (super.toJSON());
     const defaultOptions = VectorTile.getDefaultOptions();
 
     if (this._maxLevel !== defaultOptions.maxLevel) {
@@ -466,7 +466,7 @@ class VectorTile extends FeatureLayer {
     }
 
     if (this.tileProvider) {
-      const tileProviderConfig = this.tileProvider.getConfigObject();
+      const tileProviderConfig = this.tileProvider.toJSON();
       config.tileProvider = tileProviderConfig;
     } else if (this._tileProviderOptions) {
       config.tileProvider = this._tileProviderOptions;

package/src/vcs/vcm/layer/wfs.js

@@ -40,7 +40,7 @@ class WFS extends Vector {
    * @param {WFSOptions} options
    */
   constructor(options) {
-    const proj = new Projection(options.projection).getConfigObject();
+    const proj = new Projection(options.projection).toJSON();
     proj.alias = [`http://www.opengis.net/gml/srs/epsg.xml#${/** @type {string} */ (proj.epsg).match(/\d+/)[0]}`];
     options.projection = proj;
     super(options);
@@ -148,8 +148,8 @@ class WFS extends Vector {
    * @inheritDoc
    * @returns {WFSOptions}
    */
-  getConfigObject() {
-    const config = /** @type {WFSOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {WFSOptions} */ (super.toJSON());
 
     config.featureType = this.featureType.slice();
     config.featureNS = this.featureNS;

package/src/vcs/vcm/layer/wms.js

@@ -192,8 +192,8 @@ class WMS extends RasterLayer {
   /**
    * @returns {WMSOptions}
    */
-  getConfigObject() {
-    const config = /** @type {WMSOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {WMSOptions} */ (super.toJSON());
     const defaultOptions = WMS.getDefaultOptions();
 
     if (this.parameters.LAYERS) {
@@ -229,7 +229,7 @@ class WMS extends RasterLayer {
     }
 
     if (this.featureProvider && this.featureProvider instanceof WMSFeatureProvider) {
-      const featureInfoConfig = this.featureProvider.getConfigObject();
+      const featureInfoConfig = this.featureProvider.toJSON();
       if (this.tileSize[0] === featureInfoConfig.tileSize[0] || this.tileSize[1] === featureInfoConfig.tileSize[1]) {
         delete featureInfoConfig.tileSize;
       }

package/src/vcs/vcm/layer/wmts.js

@@ -176,8 +176,8 @@ class WMTS extends RasterLayer {
    * @inheritDoc
    * @returns {WMTSOptions}
    */
-  getConfigObject() {
-    const config = /** @type {WMTSOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {WMTSOptions} */ (super.toJSON());
     const defaultOptions = WMTS.getDefaultOptions();
 
     if (this.tilingSchema !== defaultOptions.tilingSchema) {

package/src/vcs/vcm/maps/cameraLimiter.js

@@ -194,7 +194,7 @@ class CameraLimiter {
   /**
    * @returns {CameraLimiterOptions}
    */
-  getConfigObject() {
+  toJSON() {
     const config = {};
     const defaultOptions = CameraLimiter.getDefaultOptions();
     if (this.terrainUrl) {

package/src/vcs/vcm/maps/cesium.js

@@ -1096,8 +1096,8 @@ class CesiumMap extends VcsMap {
    * @returns {CesiumMapOptions}
    * @api
    */
-  getConfigObject() {
-    const config = /** @type {CesiumMapOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {CesiumMapOptions} */ (super.toJSON());
     const defaultOptions = CesiumMap.getDefaultOptions();
 
     if (this.enableLightning !== defaultOptions.enableLightning) {
@@ -1117,7 +1117,7 @@ class CesiumMap extends VcsMap {
     }
 
     if (this._cameraLimiter) {
-      config.cameraLimiter = this._cameraLimiter.getConfigObject();
+      config.cameraLimiter = this._cameraLimiter.toJSON();
     } else if (this._cameraLimiterOptions && !this.initialized) {
       config.cameraLimiter = this._cameraLimiterOptions;
     }

package/src/vcs/vcm/maps/map.js

@@ -464,8 +464,8 @@ class VcsMap extends VcsObject {
    * @returns {VcsMapOptions}
    * @api
    */
-  getConfigObject() {
-    const config = /** @type {VcsMapOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {VcsMapOptions} */ (super.toJSON());
     if (this.fallbackMap) {
       config.fallbackMap = this.fallbackMap;
     }

package/src/vcs/vcm/maps/oblique.js

@@ -497,8 +497,8 @@ class Oblique extends BaseOLMap {
    * @returns {ObliqueOptions}
    * @api
    */
-  getConfigObject() {
-    const config = /** @type {ObliqueOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {ObliqueOptions} */ (super.toJSON());
     const defaultOptions = Oblique.getDefaultOptions();
 
     if (this.mapChangeEvent === 'movened') {

package/src/vcs/vcm/maps/openlayers.js

@@ -189,8 +189,8 @@ class Openlayers extends BaseOLMap {
    * @returns {OpenlayersOptions}
    * @api
    */
-  getConfigObject() {
-    const config = /** @type {OpenlayersOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {OpenlayersOptions} */ (super.toJSON());
 
     const defaultOptions = Openlayers.getDefaultOptions();
     if (this.fixedNorthOrientation !== defaultOptions.fixedNorthOrientation) {

package/src/vcs/vcm/object.js

@@ -59,7 +59,7 @@ class VcsObject {
    * @returns {VcsObjectOptions}
    * @api
    */
-  getConfigObject() {
+  toJSON() {
     const config = {
       type: this.className,
       name: this.name,

package/src/vcs/vcm/util/extent.js

@@ -78,15 +78,15 @@ class Extent {
   /**
    * @returns {ExtentOptions}
    */
-  getConfigObject() {
-    return { coordinates: this.extent.slice(), ...this.projection.getConfigObject() };
+  toJSON() {
+    return { coordinates: this.extent.slice(), ...this.projection.toJSON() };
   }
 
   /**
    * @returns {Extent}
    */
   clone() {
-    return new Extent(this.getConfigObject());
+    return new Extent(this.toJSON());
   }
 
   /**

package/src/vcs/vcm/util/featureProvider/abstractFeatureProvider.js

@@ -154,9 +154,9 @@ class AbstractFeatureProvider extends VcsObject {
    * @returns {AbstractFeatureProviderOptions}
    * @api
    */
-  getConfigObject() {
+  toJSON() {
     const config =
-      /** @type {AbstractFeatureProviderOptions} */ (super.getConfigObject());
+      /** @type {AbstractFeatureProviderOptions} */ (super.toJSON());
 
     const defaultOptions = AbstractFeatureProvider.getDefaultOptions();
     delete config.name; // the name is irrelevant, since its the layers name

package/src/vcs/vcm/util/featureProvider/wmsFeatureProvider.js

@@ -222,8 +222,8 @@ class WMSFeatureProvider extends AbstractFeatureProvider {
    * @inheritDoc
    * @returns {WMSFeatureProviderOptions}
    */
-  getConfigObject() {
-    const config = /** @type {WMSFeatureProviderOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {WMSFeatureProviderOptions} */ (super.toJSON());
     const defaultOptions = WMSFeatureProvider.getDefaultOptions();
     if (this.featureInfoResponseType !== defaultOptions.responseType) {
       config.responseType = this.featureInfoResponseType;
@@ -234,7 +234,7 @@ class WMSFeatureProvider extends AbstractFeatureProvider {
     }
 
     if (this.projection !== defaultOptions.projection) {
-      config.projection = this.projection.getConfigObject();
+      config.projection = this.projection.toJSON();
     }
 
     config.url = this._wmsSourceOptions.url;
@@ -259,7 +259,7 @@ class WMSFeatureProvider extends AbstractFeatureProvider {
       config.tileSize = this._wmsSourceOptions.tileSize.slice();
     }
     if (this.extent) {
-      config.extent = this.extent.getConfigObject();
+      config.extent = this.extent.toJSON();
     }
 
     return config;

package/src/vcs/vcm/util/projection.js

@@ -262,7 +262,7 @@ class Projection {
    * @returns {ProjectionOptions}
    * @api stable
    */
-  getConfigObject() {
+  toJSON() {
     const configObject = {
       epsg: this.epsg,
     };

package/src/vcs/vcm/util/style/styleItem.js

@@ -162,6 +162,23 @@ class StyleItem extends VcsObject {
     return {};
   }
 
+  /**
+   * @inheritDoc
+   * @returns {StyleItemOptions}
+   */
+  toJSON() {
+    const config = { ...super.toJSON(), ...this.getOptions() };
+    if (this.title) {
+      config.title = this.title;
+    }
+
+    if (this.legend.length > 0) {
+      config.legend = this.legend.slice();
+    }
+
+    return config;
+  }
+
   /**
    * Clones this style
    * @param {StyleItem=} result

package/src/vcs/vcm/util/viewpoint.js

@@ -158,9 +158,9 @@ class ViewPoint extends VcsObject {
    * @returns {ViewPointOptions} returns a options object. This object can be used to reconstruct a new viewpoint
    * @api stable
    */
-  getConfigObject() {
+  toJSON() {
     return {
-      ...super.getConfigObject(),
+      ...super.toJSON(),
       distance: this.distance,
       cameraPosition: this.cameraPosition ? this.cameraPosition.slice() : null,
       groundPosition: this.groundPosition ? this.groundPosition.slice() : null,
@@ -179,7 +179,7 @@ class ViewPoint extends VcsObject {
    * @api stable
    */
   clone() {
-    return new ViewPoint(this.getConfigObject());
+    return new ViewPoint(this.toJSON());
   }
 
   /**