@vcmap/core 5.0.0-rc.28 → 5.0.0-rc.29

package/src/layer/featureVisibility.js

@@ -1,4 +1,9 @@
-import { Color, Cesium3DTileFeature, Cesium3DTilePointFeature, Entity as CesiumEntity } from '@vcmap-cesium/engine';
+import {
+  Color,
+  Cesium3DTileFeature,
+  Cesium3DTilePointFeature,
+  Entity as CesiumEntity,
+} from '@vcmap-cesium/engine';
 import Feature from 'ol/Feature.js';
 import Style from 'ol/style/Style.js';
 
@@ -51,10 +56,12 @@ export const globalHidden = Symbol('globalHidden');
  * @returns {boolean}
  */
 export function featureExists(feature) {
-  return feature &&
+  return (
+    feature &&
     feature.content &&
     !feature.content.isDestroyed() &&
-    !feature.content.batchTable.isDestroyed();
+    !feature.content.batchTable.isDestroyed()
+  );
 }
 
 /**
@@ -63,10 +70,10 @@ export function featureExists(feature) {
  */
 export function hideFeature(feature) {
   if (
-    (
-      (feature instanceof Cesium3DTileFeature || feature instanceof Cesium3DTilePointFeature) &&
-      featureExists(feature)
-    ) || feature instanceof CesiumEntity
+    ((feature instanceof Cesium3DTileFeature ||
+      feature instanceof Cesium3DTilePointFeature) &&
+      featureExists(feature)) ||
+    feature instanceof CesiumEntity
   ) {
     feature.show = false;
   } else if (feature instanceof Feature) {
@@ -82,7 +89,8 @@ export function hideFeature(feature) {
 export function cacheOriginalStyle(feature) {
   if (!Reflect.has(feature, originalStyle)) {
     if (
-      (feature instanceof Cesium3DTileFeature || feature instanceof Cesium3DTilePointFeature) &&
+      (feature instanceof Cesium3DTileFeature ||
+        feature instanceof Cesium3DTilePointFeature) &&
       featureExists(feature)
     ) {
       feature[originalStyle] = feature.color.clone();
@@ -100,7 +108,8 @@ export function resetOriginalStyle(feature) {
   if (!(feature[globalHidden] || feature[hidden] || feature[highlighted])) {
     const style = feature[originalStyle];
     if (
-      (feature instanceof Cesium3DTileFeature || feature instanceof Cesium3DTilePointFeature) &&
+      (feature instanceof Cesium3DTileFeature ||
+        feature instanceof Cesium3DTilePointFeature) &&
       featureExists(feature)
     ) {
       feature.color = style;
@@ -119,7 +128,8 @@ export function highlightFeature(feature) {
   if (!(feature[globalHidden] || feature[hidden])) {
     const style = feature[highlighted];
     if (
-      (feature instanceof Cesium3DTileFeature || feature instanceof Cesium3DTilePointFeature) &&
+      (feature instanceof Cesium3DTileFeature ||
+        feature instanceof Cesium3DTilePointFeature) &&
       featureExists(feature)
     ) {
       feature.color = style.cesiumFillColor;
@@ -162,10 +172,10 @@ export function showFeature(feature, symbol) {
 
   if (!(feature[hidden] || feature[globalHidden])) {
     if (
-      (
-        (feature instanceof Cesium3DTileFeature || feature instanceof Cesium3DTilePointFeature) &&
-        featureExists(feature)
-      ) || feature instanceof CesiumEntity
+      ((feature instanceof Cesium3DTileFeature ||
+        feature instanceof Cesium3DTilePointFeature) &&
+        featureExists(feature)) ||
+      feature instanceof CesiumEntity
     ) {
       feature.show = true;
     }
@@ -258,41 +268,47 @@ class FeatureVisibility {
    */
   highlight(toHighlight) {
     const updatedIds = [];
-    Object.entries(toHighlight)
-      .forEach(([id, style]) => {
-        let usedStyle = style;
-        if (style instanceof Color) {
-          usedStyle = fromCesiumColor(style);
-        } else if (style instanceof Style) {
-          usedStyle = new VectorStyleItem({});
-          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;
-        }
-        // eslint-disable-next-line no-self-assign
-        usedStyle = /** @type {VectorStyleItem} */ (usedStyle);
-
-        if (!this.highlightedObjects[id]) {
-          this.highlightedObjects[id] = {
-            style: usedStyle,
-            features: new Set(),
-          };
-          updatedIds.push(id);
-          // @ts-ignore
-        } else if (this.highlightedObjects[id].style !== usedStyle) {
-          this.highlightedObjects[id].style = usedStyle;
-          this.highlightedObjects[id].features.forEach((s, feature) => {
-            feature[highlighted] = usedStyle;
-            highlightFeature(feature);
-          });
+    Object.entries(toHighlight).forEach(([id, style]) => {
+      let usedStyle = style;
+      if (style instanceof Color) {
+        usedStyle = fromCesiumColor(style);
+      } else if (style instanceof Style) {
+        usedStyle = new VectorStyleItem({});
+        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;
+      }
+      // eslint-disable-next-line no-self-assign
+      usedStyle = /** @type {VectorStyleItem} */ (usedStyle);
+
+      if (!this.highlightedObjects[id]) {
+        this.highlightedObjects[id] = {
+          style: usedStyle,
+          features: new Set(),
+        };
+        updatedIds.push(id);
+        // @ts-ignore
+      } else if (this.highlightedObjects[id].style !== usedStyle) {
+        this.highlightedObjects[id].style = usedStyle;
+        this.highlightedObjects[id].features.forEach((s, feature) => {
+          feature[highlighted] = usedStyle;
+          highlightFeature(feature);
+        });
+      }
+    });
 
     if (updatedIds.length > 0) {
       this.lastUpdated = Date.now();
-      this.changed.raiseEvent({ action: FeatureVisibilityAction.HIGHLIGHT, ids: updatedIds });
+      this.changed.raiseEvent({
+        action: FeatureVisibilityAction.HIGHLIGHT,
+        ids: updatedIds,
+      });
     }
   }
 
@@ -305,17 +321,19 @@ class FeatureVisibility {
     const updatedIds = [];
     toUnHighlight.forEach((id) => {
       if (this.highlightedObjects[id]) {
-        this.highlightedObjects[id].features
-          .forEach((f) => {
-            unhighlightFeature(f);
-          });
+        this.highlightedObjects[id].features.forEach((f) => {
+          unhighlightFeature(f);
+        });
         delete this.highlightedObjects[id];
         updatedIds.push(id);
       }
     });
 
     if (updatedIds.length > 0) {
-      this.changed.raiseEvent({ action: FeatureVisibilityAction.UNHIGHLIGHT, ids: updatedIds });
+      this.changed.raiseEvent({
+        action: FeatureVisibilityAction.UNHIGHLIGHT,
+        ids: updatedIds,
+      });
     }
   }
 
@@ -333,7 +351,10 @@ class FeatureVisibility {
    * @returns {boolean}
    */
   hasHighlightFeature(id, feature) {
-    return this.highlightedObjects[id] && this.highlightedObjects[id].features.has(feature);
+    return (
+      this.highlightedObjects[id] &&
+      this.highlightedObjects[id].features.has(feature)
+    );
   }
 
   /**
@@ -365,7 +386,10 @@ class FeatureVisibility {
 
     if (updatedIds.length > 0) {
       this.lastUpdated = Date.now();
-      this.changed.raiseEvent({ action: FeatureVisibilityAction.HIDE, ids: updatedIds });
+      this.changed.raiseEvent({
+        action: FeatureVisibilityAction.HIDE,
+        ids: updatedIds,
+      });
     }
   }
 
@@ -378,17 +402,19 @@ class FeatureVisibility {
     const updatedIds = [];
     unHide.forEach((id) => {
       if (this.hiddenObjects[id]) {
-        this.hiddenObjects[id]
-          .forEach((f) => {
-            showFeature(f, hidden);
-          });
+        this.hiddenObjects[id].forEach((f) => {
+          showFeature(f, hidden);
+        });
         delete this.hiddenObjects[id];
         updatedIds.push(id);
       }
     });
 
     if (updatedIds.length > 0) {
-      this.changed.raiseEvent({ action: FeatureVisibilityAction.SHOW, ids: updatedIds });
+      this.changed.raiseEvent({
+        action: FeatureVisibilityAction.SHOW,
+        ids: updatedIds,
+      });
     }
   }
 
@@ -426,9 +452,13 @@ class FeatureVisibility {
    * Clears all caches and removes cesium events.
    */
   destroy() {
-    Object.values(this.hiddenObjects).forEach((s) => { s.clear(); });
+    Object.values(this.hiddenObjects).forEach((s) => {
+      s.clear();
+    });
     this.hiddenObjects = {};
-    Object.values(this.highlightedObjects).forEach(({ features }) => { features.clear(); });
+    Object.values(this.highlightedObjects).forEach(({ features }) => {
+      features.clear();
+    });
     this.highlightedObjects = {};
     this.changed.destroy();
   }

package/src/layer/geojsonHelpers.js

@@ -6,8 +6,14 @@ import Point from 'ol/geom/Point.js';
 import Circle from 'ol/geom/Circle.js';
 
 import { getDistance as haversineDistance } from 'ol/sphere.js';
-import Projection, { mercatorProjection, wgs84Projection } from '../util/projection.js';
-import VectorStyleItem, { defaultVectorStyle, vectorStyleSymbol } from '../style/vectorStyleItem.js';
+import Projection, {
+  mercatorProjection,
+  wgs84Projection,
+} from '../util/projection.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';
@@ -15,7 +21,11 @@ import { embedIconsInStyle } from '../style/writeStyle.js';
 import DeclarativeStyleItem from '../style/declarativeStyleItem.js';
 import { vcsMetaVersion } from './layer.js';
 import Extent3D from '../util/featureconverter/extent3D.js';
-import { circleFromCenterRadius, enforceEndingVertex, removeEndingVertexFromGeometry } from '../util/geometryHelpers.js';
+import {
+  circleFromCenterRadius,
+  enforceEndingVertex,
+  removeEndingVertexFromGeometry,
+} from '../util/geometryHelpers.js';
 
 const featureProjection = 'EPSG:3857';
 
@@ -70,7 +80,6 @@ function getFormat() {
  * @api
  */
 
-
 /**
  * @param {Object} geojson
  * @returns {string|null}
@@ -107,7 +116,11 @@ export function updateLegacyFeature(feature) {
     } else {
       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.set(
+        'olcs_extrudedHeight',
+        feature.get('extrudedHeight') - minHeight,
+        true,
+      );
     }
     feature.unset('extrudedHeight', true);
   }
@@ -142,11 +155,7 @@ function readGeometry(geometryObj, options) {
  * @todo this could also be done for declarative styles image and conditions could be checked?
  */
 function setEmbeddedIcons(object, options) {
-  if (
-    object.image &&
-    object.image.src &&
-    /^:\d+$/.test(object.image.src)
-  ) {
+  if (object.image && object.image.src && /^:\d+$/.test(object.image.src)) {
     if (options.embeddedIcons) {
       object.image.src = options.embeddedIcons[object.image.src.substring(1)];
     } else {
@@ -217,7 +226,10 @@ function readFeature(featureObj, options) {
     return null;
   }
   const radius = featureObj.geometry.olcs_radius;
-  let geometry = getFormat().readGeometry(featureObj.geometry, options.formatOptions);
+  let geometry = getFormat().readGeometry(
+    featureObj.geometry,
+    options.formatOptions,
+  );
 
   if (featureObj.radius && geometry instanceof Point) {
     const coordinates = geometry.getCoordinates();
@@ -243,7 +255,10 @@ function readFeature(featureObj, options) {
   }
   const { properties } = featureObj;
   if (options.readLegacyStyleOptions && !featureObj.vcsMeta.style) {
-    featureObj.vcsMeta.style = parseLegacyStyleOptions(properties, geometry.getType());
+    featureObj.vcsMeta.style = parseLegacyStyleOptions(
+      properties,
+      geometry.getType(),
+    );
   }
   removeEndingVertexFromGeometry(geometry);
   const feature = new Feature({ ...properties, geometry });
@@ -256,7 +271,10 @@ function readFeature(featureObj, options) {
   }
 
   if (featureObj.vcsMeta.style && !options.dontReadStyle) {
-    featureObj.vcsMeta.style = setEmbeddedIcons(featureObj.vcsMeta.style, options);
+    featureObj.vcsMeta.style = setEmbeddedIcons(
+      featureObj.vcsMeta.style,
+      options,
+    );
     let styleItem;
     if (options.defaultStyle) {
       styleItem = options.defaultStyle
@@ -287,16 +305,18 @@ export function parseGeoJSON(input, readOptions = {}) {
   const geoJSON = typeof input === 'string' ? JSON.parse(input) : input;
 
   const epsgCode = getEPSGCodeFromGeojson(geoJSON);
-  const defaultDataProjection = epsgCode ? { epsg: epsgCode } : readOptions.dataProjection;
+  const defaultDataProjection = epsgCode
+    ? { epsg: epsgCode }
+    : readOptions.dataProjection;
   /** @type {GeoJSONinternalReadOptions} */
   const options = {
     formatOptions: {
-      dataProjection: defaultDataProjection ?
-        defaultDataProjection.epsg :
-        wgs84Projection.epsg,
-      featureProjection: readOptions.targetProjection ?
-        readOptions.targetProjection.epsg :
-        mercatorProjection.epsg,
+      dataProjection: defaultDataProjection
+        ? defaultDataProjection.epsg
+        : wgs84Projection.epsg,
+      featureProjection: readOptions.targetProjection
+        ? readOptions.targetProjection.epsg
+        : mercatorProjection.epsg,
     },
     dontReadStyle: readOptions.dontReadStyle,
     readLegacyStyleOptions: readOptions.readLegacyStyleOptions,
@@ -321,7 +341,10 @@ export function parseGeoJSON(input, readOptions = {}) {
       if (geoJSON.vcsMeta.style.type === DeclarativeStyleItem.className) {
         style = new DeclarativeStyleItem(geoJSON.vcsMeta.style);
       } else {
-        geoJSON.vcsMeta.style = setEmbeddedIcons(geoJSON.vcsMeta.style, options);
+        geoJSON.vcsMeta.style = setEmbeddedIcons(
+          geoJSON.vcsMeta.style,
+          options,
+        );
         options.defaultStyle = options.defaultStyle
           .clone()
           .assign(new VectorStyleItem(geoJSON.vcsMeta.style));
@@ -329,13 +352,18 @@ export function parseGeoJSON(input, readOptions = {}) {
       }
     }
     return {
-      features: geoJSON.features.map(f => readFeature(f, options)).filter(f => f),
+      features: geoJSON.features
+        .map((f) => readFeature(f, options))
+        .filter((f) => f),
       style: geoJSON.vcsMeta.style ? style : undefined,
       vcsMeta: geoJSON.vcsMeta ? geoJSON.vcsMeta : undefined,
     };
   } else if (geoJSON.type === 'Feature') {
     const feature = readFeature(geoJSON, options);
-    return { features: feature ? [feature] : [], vcsMeta: geoJSON.vcsMeta ? geoJSON.vcsMeta : undefined };
+    return {
+      features: feature ? [feature] : [],
+      vcsMeta: geoJSON.vcsMeta ? geoJSON.vcsMeta : undefined,
+    };
   } else if (geoJSON.type != null) {
     return { features: [readGeometry(geoJSON, options)] };
   }
@@ -348,7 +376,11 @@ export function parseGeoJSON(input, readOptions = {}) {
  * @param {Array=} embeddedIcons
  * @returns {Object}
  */
-export function writeGeoJSONFeature(feature, options = {}, embeddedIcons) {
+export function writeGeoJSONFeature(
+  feature,
+  options = {},
+  embeddedIcons = undefined,
+) {
   const featureObject = {
     type: 'Feature',
     properties: feature.getProperties(),
@@ -373,12 +405,16 @@ export function writeGeoJSONFeature(feature, options = {}, embeddedIcons) {
     geometry = new Point(geometry.getCenter());
   } else if (geometry instanceof Polygon) {
     const coordinates = geometry.getCoordinates();
-    coordinates.forEach((ring) => { enforceEndingVertex(ring); });
+    coordinates.forEach((ring) => {
+      enforceEndingVertex(ring);
+    });
     geometry.setCoordinates(coordinates);
   } else if (geometry instanceof MultiPolygon) {
     const coordinates = geometry.getCoordinates();
     coordinates.forEach((poly) => {
-      poly.forEach((ring) => { enforceEndingVertex(ring); });
+      poly.forEach((ring) => {
+        enforceEndingVertex(ring);
+      });
     });
     geometry.setCoordinates(coordinates);
   }
@@ -410,15 +446,20 @@ export function writeGeoJSONFeature(feature, options = {}, embeddedIcons) {
  * @param {GeoJSONwriteOptions=} options
  * @returns {string|Object}
  */
-export function writeGeoJSON(data, options = {}) { // how to handel embedded icons when they are not set on the vcsMeta but options is true?
+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 || {};
   vcsMeta.version = vcsMetaVersion;
-  const featureObjs = data.features.map(feature => writeGeoJSONFeature(feature, options, vcsMeta.embeddedIcons));
+  const featureObjs = data.features.map((feature) =>
+    writeGeoJSONFeature(feature, options, vcsMeta.embeddedIcons),
+  );
   const obj = {
     type: 'FeatureCollection',
     features: featureObjs,
     vcsMeta,
   };
 
-  return options.asObject ? obj : JSON.stringify(obj, null, options.prettyPrint ? 2 : null);
+  return options.asObject
+    ? obj
+    : JSON.stringify(obj, null, options.prettyPrint ? 2 : null);
 }

package/src/layer/geojsonLayer.js

@@ -16,7 +16,6 @@ import { requestJson } from '../util/fetch.js';
  */
 export const featureFromOptions = Symbol('featureFromOptions');
 
-
 /**
  * GeojsonLayer layer for Cesium, OpenlayersMap and ObliqueMap
  * @class
@@ -24,7 +23,9 @@ export const featureFromOptions = Symbol('featureFromOptions');
  * @api stable
  */
 class GeoJSONLayer extends VectorLayer {
-  static get className() { return 'GeoJSONLayer'; }
+  static get className() {
+    return 'GeoJSONLayer';
+  }
 
   /**
    * @returns {GeoJSONOptions}
@@ -75,7 +76,9 @@ class GeoJSONLayer extends VectorLayer {
    */
   async reload() {
     if (this._dataFetchedPromise) {
-      const configFeatures = this.getFeatures().filter(f => f[featureFromOptions]);
+      const configFeatures = this.getFeatures().filter(
+        (f) => f[featureFromOptions],
+      );
       this.removeAllFeatures();
       this.source.addFeatures(configFeatures);
       this._dataFetchedPromise = null;
@@ -100,10 +103,9 @@ class GeoJSONLayer extends VectorLayer {
         features: this._featuresToLoad,
       });
 
-      this.getFeatures()
-        .forEach((f) => {
-          f[featureFromOptions] = true;
-        });
+      this.getFeatures().forEach((f) => {
+        f[featureFromOptions] = true;
+      });
 
       this._featuresToLoad.splice(0);
       this._featuresToLoad = undefined;
@@ -111,9 +113,11 @@ class GeoJSONLayer extends VectorLayer {
 
     if (this.url) {
       this._dataFetchedPromise = requestJson(this.url)
-        .then(data => this._parseGeojsonData(data))
+        .then((data) => this._parseGeojsonData(data))
         .catch((err) => {
-          this.getLogger().warning(`Could not send request for loading layer content (${err.message})`);
+          this.getLogger().warning(
+            `Could not send request for loading layer content (${err.message})`,
+          );
           return Promise.reject(err);
         });
     } else {
@@ -160,9 +164,11 @@ class GeoJSONLayer extends VectorLayer {
     if (Array.isArray(this._featuresToLoad)) {
       config.features = this._featuresToLoad.slice();
     } else {
-      const features = this.getFeatures().filter(f => f[featureFromOptions]);
+      const features = this.getFeatures().filter((f) => f[featureFromOptions]);
       if (features.length > 0) {
-        config.features = features.map(f => writeGeoJSONFeature(f, { writeStyle: true, writeId: true }));
+        config.features = features.map((f) =>
+          writeGeoJSONFeature(f, { writeStyle: true, writeId: true }),
+        );
       }
     }
 

package/src/layer/globalHider.js

@@ -65,7 +65,10 @@ class GlobalHider {
 
     if (updatedIds.length > 0) {
       this.lastUpdated = Date.now();
-      this.changed.raiseEvent({ action: FeatureVisibilityAction.HIDE, ids: updatedIds });
+      this.changed.raiseEvent({
+        action: FeatureVisibilityAction.HIDE,
+        ids: updatedIds,
+      });
     }
   }
 
@@ -95,7 +98,10 @@ class GlobalHider {
     });
 
     if (updatedIds.length > 0) {
-      this.changed.raiseEvent({ action: FeatureVisibilityAction.SHOW, ids: updatedIds });
+      this.changed.raiseEvent({
+        action: FeatureVisibilityAction.SHOW,
+        ids: updatedIds,
+      });
     }
   }
 
@@ -119,12 +125,16 @@ class GlobalHider {
    * @returns {boolean}
    */
   hasFeature(uuid, feature) {
-    return this._hiddenObjectFeatures[uuid] ? this._hiddenObjectFeatures[uuid].has(feature) : false;
+    return this._hiddenObjectFeatures[uuid]
+      ? this._hiddenObjectFeatures[uuid].has(feature)
+      : false;
   }
 
   destroy() {
     this.hiddenObjects = {};
-    Object.values(this._hiddenObjectFeatures).forEach((set) => { set.clear(); });
+    Object.values(this._hiddenObjectFeatures).forEach((set) => {
+      set.clear();
+    });
     this._hiddenObjectFeatures = {};
     this.changed.destroy();
   }