@vcmap/core 6.2.3 → 6.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/dist/src/cesium/cesium3DTileFeature.js +3 -1
  2. package/dist/src/cesium/cesium3DTileFeature.js.map +1 -1
  3. package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.d.ts +1 -0
  4. package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.js +46 -10
  5. package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.js.map +1 -1
  6. package/package.json +1 -1
  7. package/src/cesium/cesium3DTileFeature.ts +3 -1
  8. package/src/layer/cesium/cesiumTilesetCesiumImpl.ts +52 -13
package/dist/src/cesium/cesium3DTileFeature.js CHANGED
@@ -4,7 +4,9 @@ Cesium3DTileFeature.prototype.getId = function getId() {
4
4
  `${this.content.url}${String(this._batchId)}`); // XXX there is a new property `featureId` on the Cesium3DTileset. this may cause issues when picking b3dm.
5
5
  };
6
6
  export function getAttributes() {
7
- if (this.tileset.asset?.version === '1.1') {
7
+ if (this.tileset.asset?.version ===
8
+ '1.1' ||
9
+ !this.getPropertyIds().includes('attributes')) {
8
10
  const attributes = {};
9
11
  this.getPropertyIds().forEach((id) => {
10
12
  attributes[id] = this.getProperty(id);
package/dist/src/cesium/cesium3DTileFeature.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cesium3DTileFeature.js","sourceRoot":"","sources":["../../../src/cesium/cesium3DTileFeature.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE3D,mBAAmB,CAAC,SAAS,CAAC,KAAK,GAAG,SAAS,KAAK;IAGlD,OAAO,CACJ,IAAI,CAAC,WAAW,CAAC,IAAI,CAAqB;QAC3C,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAC9C,CAAC,CAAC,2GAA2G;AAChH,CAAC,CAAC;AAEF,MAAM,UAAU,aAAa;IAG3B,IACG,IAAI,CAAC,OAAO,CAAC,KAAyC,EAAE,OAAO,KAAK,KAAK,EAC1E,CAAC;QACD,MAAM,UAAU,GAA4B,EAAE,CAAC;QAC/C,IAAI,CAAC,cAAc,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;YACnC,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QACH,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAA4B,CAAC;AACnE,CAAC;AAED,mBAAmB,CAAC,SAAS,CAAC,aAAa,GAAG,aAAa,CAAC"}
1
+ {"version":3,"file":"cesium3DTileFeature.js","sourceRoot":"","sources":["../../../src/cesium/cesium3DTileFeature.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE3D,mBAAmB,CAAC,SAAS,CAAC,KAAK,GAAG,SAAS,KAAK;IAGlD,OAAO,CACJ,IAAI,CAAC,WAAW,CAAC,IAAI,CAAqB;QAC3C,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAC9C,CAAC,CAAC,2GAA2G;AAChH,CAAC,CAAC;AAEF,MAAM,UAAU,aAAa;IAG3B,IACG,IAAI,CAAC,OAAO,CAAC,KAAyC,EAAE,OAAO;QAC9D,KAAK;QACP,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,EAC7C,CAAC;QACD,MAAM,UAAU,GAA4B,EAAE,CAAC;QAC/C,IAAI,CAAC,cAAc,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;YACnC,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QACH,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAA4B,CAAC;AACnE,CAAC;AAED,mBAAmB,CAAC,SAAS,CAAC,aAAa,GAAG,aAAa,CAAC"}
package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.d.ts CHANGED
@@ -31,6 +31,7 @@ declare class CesiumTilesetCesiumImpl extends LayerImplementation<CesiumMap> imp
31
31
  private _originalOrigin;
32
32
  private _styleLastUpdated;
33
33
  private _onStyleChangeRemover;
34
+ private _onFeatureVisibilityChangeRemover;
34
35
  private _customShader;
35
36
  constructor(map: CesiumMap, options: CesiumTilesetImplementationOptions);
36
37
  get customShader(): CustomShader | undefined;
package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.js CHANGED
@@ -2,7 +2,7 @@ import { Composite3DTileContent, Cesium3DTileset, Cesium3DTileColorBlendMode, Ma
2
2
  import { createEmpty } from 'ol/extent.js';
3
3
  import LayerImplementation from '../layerImplementation.js';
4
4
  import { allowPicking, vcsLayerName } from '../layerSymbols.js';
5
- import { hideFeature, highlightFeature, originalStyle, updateOriginalStyle, } from '../featureVisibility.js';
5
+ import { hideFeature, highlightFeature, originalStyle, updateOriginalStyle, FeatureVisibilityAction, } from '../featureVisibility.js';
6
6
  import Projection from '../../util/projection.js';
7
7
  import { circleFromCenterRadius } from '../../util/geometryHelpers.js';
8
8
  import { getResourceOrUrl } from './resourceHelper.js';
@@ -57,6 +57,7 @@ class CesiumTilesetCesiumImpl extends LayerImplementation {
57
57
  _originalOrigin = null;
58
58
  _styleLastUpdated = Date.now();
59
59
  _onStyleChangeRemover = null;
60
+ _onFeatureVisibilityChangeRemover = null;
60
61
  _customShader;
61
62
  constructor(map, options) {
62
63
  super(map, options);
@@ -71,6 +72,15 @@ class CesiumTilesetCesiumImpl extends LayerImplementation {
71
72
  this.offset = options.offset;
72
73
  this._customShader = options.customShader;
73
74
  this.allowPicking = options.allowPicking;
75
+ // Listen for unhighlight events to force style update when needed
76
+ this._onFeatureVisibilityChangeRemover =
77
+ this.featureVisibility.changed.addEventListener((event) => {
78
+ if (event.action === FeatureVisibilityAction.UNHIGHLIGHT &&
79
+ this.cesium3DTileset) {
80
+ // Force tileset to re-apply style for unhighlighted features
81
+ this.cesium3DTileset.makeStyleDirty();
82
+ }
83
+ });
74
84
  }
75
85
  get customShader() {
76
86
  return this._customShader;
@@ -234,11 +244,12 @@ class CesiumTilesetCesiumImpl extends LayerImplementation {
234
244
  }
235
245
  }
236
246
  styleContent(content) {
247
+ const styleHasChanged = this._styleLastUpdated > (content[cesiumTilesetLastUpdated] ?? 0);
237
248
  if (!content[cesiumTilesetLastUpdated] ||
238
249
  content[cesiumTilesetLastUpdated] < this.featureVisibility.lastUpdated ||
239
250
  content[cesiumTilesetLastUpdated] <
240
251
  (this.globalHider?.lastUpdated ?? 0) ||
241
- content[cesiumTilesetLastUpdated] < this._styleLastUpdated) {
252
+ styleHasChanged) {
242
253
  // content[updateFeatureOverride]?.reset();
243
254
  delete content[updateFeatureOverride];
244
255
  const batchSize = content.featuresLength;
@@ -261,18 +272,40 @@ class CesiumTilesetCesiumImpl extends LayerImplementation {
261
272
  featureOverride.highlight.push([id, feature]);
262
273
  shouldUpdateOriginalStyle = false;
263
274
  }
264
- if (this.featureVisibility.hiddenObjects[id] &&
265
- !this.featureVisibility.hasHiddenFeature(id, feature)) {
266
- this.featureVisibility.addHiddenFeature(id, feature);
267
- featureOverride.hideLocal.push([id, feature]);
275
+ else if (this.featureVisibility.hasHighlightFeature(id, feature) &&
276
+ styleHasChanged &&
277
+ feature[originalStyle]) {
278
+ // Feature is already highlighted and style has changed
279
+ // Clear the old cached style - when unhighlighted, we'll force a tileset style update
280
+ delete feature[originalStyle];
281
+ featureOverride.highlight.push([id, feature]);
282
+ shouldUpdateOriginalStyle = false;
283
+ }
284
+ if (this.featureVisibility.hiddenObjects[id]) {
285
+ if (!this.featureVisibility.hasHiddenFeature(id, feature)) {
286
+ this.featureVisibility.addHiddenFeature(id, feature);
287
+ featureOverride.hideLocal.push([id, feature]);
288
+ }
289
+ else if (styleHasChanged && feature[originalStyle]) {
290
+ // Feature is already hidden and style has changed, clear original style
291
+ // so it will be re-cached with the new style when shown
292
+ delete feature[originalStyle];
293
+ }
294
+ shouldUpdateOriginalStyle = false;
268
295
  }
269
- if (this.globalHider?.hiddenObjects[id] &&
270
- !this.globalHider?.hasFeature(id, feature)) {
271
- this.globalHider?.addFeature(id, feature);
296
+ if (this.globalHider?.hiddenObjects[id]) {
297
+ if (!this.globalHider?.hasFeature(id, feature)) {
298
+ this.globalHider?.addFeature(id, feature);
299
+ }
272
300
  featureOverride.hideGlobal.push([id, feature]);
301
+ if (styleHasChanged && feature[originalStyle]) {
302
+ // Feature is globally hidden and style has changed, clear original style
303
+ delete feature[originalStyle];
304
+ }
305
+ shouldUpdateOriginalStyle = false;
273
306
  }
274
307
  if (shouldUpdateOriginalStyle &&
275
- this._styleLastUpdated > (content[cesiumTilesetLastUpdated] ?? 0) &&
308
+ styleHasChanged &&
276
309
  feature[originalStyle] // can only be a color for cesium, so no check for undefined required
277
310
  ) {
278
311
  updateOriginalStyle(feature);
@@ -320,6 +353,9 @@ class CesiumTilesetCesiumImpl extends LayerImplementation {
320
353
  if (this._onStyleChangeRemover) {
321
354
  this._onStyleChangeRemover();
322
355
  }
356
+ if (this._onFeatureVisibilityChangeRemover) {
357
+ this._onFeatureVisibilityChangeRemover();
358
+ }
323
359
  super.destroy();
324
360
  }
325
361
  }
package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cesiumTilesetCesiumImpl.js","sourceRoot":"","sources":["../../../../src/layer/cesium/cesiumTilesetCesiumImpl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cesiumTilesetCesiumImpl.js","sourceRoot":"","sources":["../../../../src/layer/cesium/cesiumTilesetCesiumImpl.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vcmap/core",
3
- "version": "6.2.3",
3
+ "version": "6.2.4",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "type": "module",
package/src/cesium/cesium3DTileFeature.ts CHANGED
@@ -14,7 +14,9 @@ export function getAttributes(
14
14
  this: Cesium3DTileFeature | Cesium3DTilePointFeature,
15
15
  ): Record<string, unknown> {
16
16
  if (
17
- (this.tileset.asset as { version: string } | undefined)?.version === '1.1'
17
+ (this.tileset.asset as { version: string } | undefined)?.version ===
18
+ '1.1' ||
19
+ !this.getPropertyIds().includes('attributes')
18
20
  ) {
19
21
  const attributes: Record<string, unknown> = {};
20
22
  this.getPropertyIds().forEach((id) => {
package/src/layer/cesium/cesiumTilesetCesiumImpl.ts CHANGED
@@ -26,6 +26,7 @@ import {
26
26
  highlightFeature,
27
27
  originalStyle,
28
28
  updateOriginalStyle,
29
+ FeatureVisibilityAction,
29
30
  } from '../featureVisibility.js';
30
31
  import Projection from '../../util/projection.js';
31
32
  import { circleFromCenterRadius } from '../../util/geometryHelpers.js';
@@ -119,6 +120,8 @@ class CesiumTilesetCesiumImpl
119
120
 
120
121
  private _onStyleChangeRemover: (() => void) | null = null;
121
122
 
123
+ private _onFeatureVisibilityChangeRemover: (() => void) | null = null;
124
+
122
125
  private _customShader: CustomShader | undefined;
123
126
 
124
127
  constructor(map: CesiumMap, options: CesiumTilesetImplementationOptions) {
@@ -135,6 +138,18 @@ class CesiumTilesetCesiumImpl
135
138
  this.offset = options.offset;
136
139
  this._customShader = options.customShader;
137
140
  this.allowPicking = options.allowPicking;
141
+
142
+ // Listen for unhighlight events to force style update when needed
143
+ this._onFeatureVisibilityChangeRemover =
144
+ this.featureVisibility.changed.addEventListener((event) => {
145
+ if (
146
+ event.action === FeatureVisibilityAction.UNHIGHLIGHT &&
147
+ this.cesium3DTileset
148
+ ) {
149
+ // Force tileset to re-apply style for unhighlighted features
150
+ this.cesium3DTileset.makeStyleDirty();
151
+ }
152
+ });
138
153
  }
139
154
 
140
155
  get customShader(): CustomShader | undefined {
@@ -330,12 +345,14 @@ class CesiumTilesetCesiumImpl
330
345
  }
331
346
 
332
347
  styleContent(content: Cesium3DTileContent): void {
348
+ const styleHasChanged =
349
+ this._styleLastUpdated > (content[cesiumTilesetLastUpdated] ?? 0);
333
350
  if (
334
351
  !content[cesiumTilesetLastUpdated] ||
335
352
  content[cesiumTilesetLastUpdated] < this.featureVisibility.lastUpdated ||
336
353
  content[cesiumTilesetLastUpdated] <
337
354
  (this.globalHider?.lastUpdated ?? 0) ||
338
- content[cesiumTilesetLastUpdated] < this._styleLastUpdated
355
+ styleHasChanged
339
356
  ) {
340
357
  // content[updateFeatureOverride]?.reset();
341
358
  delete content[updateFeatureOverride];
@@ -361,27 +378,45 @@ class CesiumTilesetCesiumImpl
361
378
  this.featureVisibility.addHighlightFeature(id, feature);
362
379
  featureOverride.highlight.push([id, feature]);
363
380
  shouldUpdateOriginalStyle = false;
381
+ } else if (
382
+ this.featureVisibility.hasHighlightFeature(id, feature) &&
383
+ styleHasChanged &&
384
+ feature[originalStyle]
385
+ ) {
386
+ // Feature is already highlighted and style has changed
387
+ // Clear the old cached style - when unhighlighted, we'll force a tileset style update
388
+ delete feature[originalStyle];
389
+ featureOverride.highlight.push([id, feature]);
390
+ shouldUpdateOriginalStyle = false;
364
391
  }
365
392
 
366
- if (
367
- this.featureVisibility.hiddenObjects[id] &&
368
- !this.featureVisibility.hasHiddenFeature(id, feature)
369
- ) {
370
- this.featureVisibility.addHiddenFeature(id, feature);
371
- featureOverride.hideLocal.push([id, feature]);
393
+ if (this.featureVisibility.hiddenObjects[id]) {
394
+ if (!this.featureVisibility.hasHiddenFeature(id, feature)) {
395
+ this.featureVisibility.addHiddenFeature(id, feature);
396
+ featureOverride.hideLocal.push([id, feature]);
397
+ } else if (styleHasChanged && feature[originalStyle]) {
398
+ // Feature is already hidden and style has changed, clear original style
399
+ // so it will be re-cached with the new style when shown
400
+ delete feature[originalStyle];
401
+ }
402
+ shouldUpdateOriginalStyle = false;
372
403
  }
373
404
 
374
- if (
375
- this.globalHider?.hiddenObjects[id] &&
376
- !this.globalHider?.hasFeature(id, feature)
377
- ) {
378
- this.globalHider?.addFeature(id, feature);
405
+ if (this.globalHider?.hiddenObjects[id]) {
406
+ if (!this.globalHider?.hasFeature(id, feature)) {
407
+ this.globalHider?.addFeature(id, feature);
408
+ }
379
409
  featureOverride.hideGlobal.push([id, feature]);
410
+ if (styleHasChanged && feature[originalStyle]) {
411
+ // Feature is globally hidden and style has changed, clear original style
412
+ delete feature[originalStyle];
413
+ }
414
+ shouldUpdateOriginalStyle = false;
380
415
  }
381
416
 
382
417
  if (
383
418
  shouldUpdateOriginalStyle &&
384
- this._styleLastUpdated > (content[cesiumTilesetLastUpdated] ?? 0) &&
419
+ styleHasChanged &&
385
420
  feature[originalStyle] // can only be a color for cesium, so no check for undefined required
386
421
  ) {
387
422
  updateOriginalStyle(feature);
@@ -435,6 +470,10 @@ class CesiumTilesetCesiumImpl
435
470
  this._onStyleChangeRemover();
436
471
  }
437
472
 
473
+ if (this._onFeatureVisibilityChangeRemover) {
474
+ this._onFeatureVisibilityChangeRemover();
475
+ }
476
+
438
477
  super.destroy();
439
478
  }
440
479
  }