@vcmap/core 5.0.0-rc.15 → 5.0.0-rc.16

package/index.d.ts

@@ -413,7 +413,7 @@ export interface InteractionEvent extends MapEvent {
     /**
      * a potential feature at said location
     */
-    feature?: undefined | import("ol").Feature<import("ol/geom/Geometry").default> | import("@vcmap/cesium").Cesium3DTileFeature | import("@vcmap/cesium").Cesium3DTilePointFeature;
+    feature?: undefined | import("ol").Feature<import("ol/geom/Geometry").default> | import("@vcmap/cesium").Cesium3DTileFeature | import("@vcmap/cesium").Cesium3DTilePointFeature | import("@vcmap/cesium").Entity;
     /**
      * if set to true, the event chain is interrupted
     */

package/index.js

@@ -5,6 +5,7 @@ import './src/cesium/wallpaperMaterial.js';
 import './src/cesium/cesium3DTilePointFeature.js';
 import './src/cesium/cesium3DTileFeature.js';
 import './src/cesium/cesiumVcsCameraPrimitive.js';
+import './src/cesium/entity.js';
 
 export { default as AppBackedCategory } from './src/category/appBackedCategory.js';
 export { default as Category } from './src/category/category.js';

package/package.json

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

package/src/cesium/entity.js

@@ -0,0 +1,27 @@
+// @ts-nocheck
+import { Entity } from '@vcmap/cesium';
+
+/**
+ * @returns {string|number}
+ */
+Entity.prototype.getId = function getId() {
+  return this.id;
+};
+
+/**
+ * To be used for cesium 3D style functions
+ * @param {string} property
+ * @returns {*}
+ */
+Entity.prototype.getProperty = function getProperty(property) {
+  return this[property];
+};
+
+/**
+ * To be used for cesium 3D style functions
+ * @param {string} property
+ * @returns {*}
+ */
+Entity.prototype.getPropertyInherited = function getPropertyInherited(property) {
+  return this.getProperty(property);
+};

package/src/featureProvider/wmsFeatureProvider.js

@@ -42,6 +42,7 @@ const geojsonFormats = [
   'application/geojson',
   'application/json',
   'application/vnd.geo+json',
+  'application/geo+json',
 ];
 
 /**

package/src/interaction/abstractInteraction.js

@@ -11,7 +11,7 @@ import { EventType, ModificationKeyType, PointerKeyType } from './interactionTyp
 /**
  * @typedef {MapEvent} InteractionEvent
  * @property {EventType} type
- * @property {undefined|import("ol").Feature<import("ol/geom/Geometry").default>|import("@vcmap/cesium").Cesium3DTileFeature|import("@vcmap/cesium").Cesium3DTilePointFeature} feature - a potential feature at said location
+ * @property {undefined|import("ol").Feature<import("ol/geom/Geometry").default>|import("@vcmap/cesium").Cesium3DTileFeature|import("@vcmap/cesium").Cesium3DTilePointFeature|import("@vcmap/cesium").Entity} feature - a potential feature at said location
  * @property {boolean|undefined} stopPropagation - if set to true, the event chain is interrupted
  * @property {undefined|ObliqueParameters} obliqueParameters - additional parameters from oblique if obliquemode is active
  * @property {import("@vcmap/cesium").Ray|undefined} ray - potential ray

package/src/interaction/featureAtPixelInteraction.js

@@ -1,4 +1,11 @@
-import { Cartographic, Cartesian3, Math as CesiumMath, Cesium3DTileFeature, Cesium3DTilePointFeature } from '@vcmap/cesium';
+import {
+  Cartographic,
+  Cartesian3,
+  Math as CesiumMath,
+  Cesium3DTileFeature,
+  Cesium3DTilePointFeature,
+  Entity,
+} from '@vcmap/cesium';
 
 import AbstractInteraction from './abstractInteraction.js';
 import Projection from '../util/projection.js';
@@ -241,11 +248,8 @@ class FeatureAtPixelInteraction extends AbstractInteraction {
         }
       } else if (object.id && object.id.olFeature) { // cluster size === 1
         event.feature = object.id.olFeature;
-      } else if (object.id && object.id[vcsLayerName]) { // entity
-        event.feature = object;
-        event.feature[vcsLayerName] = object.id[vcsLayerName];
-      } else {
-        event.feature = object;
+      } else if (object.id && object.id[vcsLayerName] && object.id instanceof Entity) { // entity
+        event.feature = object.id;
       }
 
       if (!(event.type & this.pickPosition)) {