venue-js 1.8.0-next.2 → 1.8.0-next.3

package/dist/index.d.mts

@@ -48,7 +48,6 @@ declare class TextSpriteMarker extends BaseObject {
     _updatePosition(): void;
     _animation(): void;
     setText(text: string): void;
-    setAltitude(altitude: number): this;
 }
 
 type ImageMarkerOptions = BaseObjectOptionType & {

package/dist/index.d.ts

@@ -48,7 +48,6 @@ declare class TextSpriteMarker extends BaseObject {
     _updatePosition(): void;
     _animation(): void;
     setText(text: string): void;
-    setAltitude(altitude: number): this;
 }
 
 type ImageMarkerOptions = BaseObjectOptionType & {

package/dist/index.js

@@ -5498,10 +5498,9 @@ var Element3DRenderer = class extends EventTarget {
         const color = feature4.properties.style.polygonFill ?? colorOptions ?? "#ffffff";
         if (color === "transparent") return;
         const material = this.getOrCreateMaterialByColor(color);
-        const altitude = 0;
+        const altitude = MULTIORDINAL_HEIGHT_METER * feature4.properties.ordinal;
         const height = feature4.properties.height ?? heightOptions ?? HEIGHT_METER;
-        const levelBottomHeight = MULTIORDINAL_HEIGHT_METER * feature4.properties.ordinal;
-        const bottomHeight = levelBottomHeight + (feature4.properties.bottomHeight ?? bottomHeightOptions ?? 0);
+        const bottomHeight = feature4.properties.bottomHeight ?? bottomHeightOptions ?? 0;
         const extrudedPolygon = this.threeLayer.toExtrudePolygon(
           offsetFeature,
           { asynchronous: true, ...options, height, bottomHeight, altitude },
@@ -5966,10 +5965,10 @@ var Marker2DRenderer = class extends EventTarget {
     marker.addTo(this.map);
     return marker;
   };
-  createTextMarker = (position, label, options) => {
+  createTextMarker = (position, ordinal, label, options) => {
     return null;
   };
-  createImageMarker = (position, src, options) => {
+  createImageMarker = (position, ordinal, src, options) => {
     return null;
   };
   removeMarker = (marker) => {
@@ -6147,8 +6146,10 @@ var TextSpriteMarker = class extends import_maptalks9.BaseObject {
     const options = this.getOptions();
     const layer = options.layer;
     if (!layer) return;
-    const altitude = (options.altitude || 0) + (options.bottomHeight || 0) + this.#altitudeOffset;
-    const z = layer.altitudeToVector3(altitude, altitude).x;
+    const altitude = options.altitude || 0;
+    const bottomHeight = options.bottomHeight || 0;
+    const totalHeight = altitude + bottomHeight + this.#altitudeOffset;
+    const z = layer.altitudeToVector3(totalHeight, totalHeight).x;
     const position = layer.coordinateToVector3(this._coordinate, z);
     (0, import_lodash28.set)(this.properties, "default.position", position);
     this.getObject3d().position.copy(position);
@@ -6181,13 +6182,10 @@ var TextSpriteMarker = class extends import_maptalks9.BaseObject {
     group.add(newSprite);
     this._updatePosition();
   }
-  setAltitude(altitude) {
-    const bottomHeight = this.options.bottomHeight ?? 0;
-    return super.setAltitude(altitude + bottomHeight + this.#altitudeOffset);
-  }
 };
 
 // src/IndoorMap/renderer/3d/Marker3DRenderer.ts
+var MULTIORDINAL_HEIGHT_METER2 = 9;
 var Marker3DRenderer = class extends EventTarget {
   isReady = false;
   threeLayer;
@@ -6214,25 +6212,26 @@ var Marker3DRenderer = class extends EventTarget {
       map: new THREE3.TextureLoader().load(svgPath)
     });
   }
-  createTextMarker = (position, label, options) => {
+  createTextMarker = (position, ordinal, label, options) => {
     const combinedOptions = {
-      altitude: 0,
       text: label,
-      ...options ?? {}
+      ...options ?? {},
+      altitude: ordinal * MULTIORDINAL_HEIGHT_METER2
     };
     const [lng, lat] = position;
     const marker = new TextSpriteMarker(new maptalks7.Coordinate(lng, lat), combinedOptions, this.threeLayer);
     this.threeLayer.addMesh([marker]);
     return marker;
   };
-  createImageMarker = (position, src, options) => {
+  createImageMarker = (position, ordinal, src, options) => {
     const [lng, lat] = position;
     let meshes = [];
     const height = options.height ?? 0;
     const { leg, ...markerOptions } = options;
     const { color: legColor = "#000000", ...legOptions } = leg ?? {};
     const material = this.createPointMaterialFromSvg(src, 40);
-    const marker = this.threeLayer.toPoint(new maptalks7.Coordinate(lng, lat), { height, ...markerOptions }, material);
+    const altitude = ordinal * MULTIORDINAL_HEIGHT_METER2;
+    const marker = this.threeLayer.toPoint(new maptalks7.Coordinate(lng, lat), { height, altitude, ...markerOptions }, material);
     marker.getObject3d().renderOrder = 10;
     meshes.push(marker);
     if (options.leg) {
@@ -6676,7 +6675,7 @@ var RendererManager = class extends EventTarget {
     }
   };
   createMarker(type, coordinate, ordinal, textOrPath, options) {
-    const meshes = type === "text" ? this.markerRenderer.createTextMarker(coordinate, textOrPath, options) : this.markerRenderer.createImageMarker(coordinate, textOrPath, options);
+    const meshes = type === "text" ? this.markerRenderer.createTextMarker(coordinate, ordinal, textOrPath, options) : this.markerRenderer.createImageMarker(coordinate, ordinal, textOrPath, options);
     const markerId = `${this.markersMap.size + 1}`;
     const markerMeshes = Array.isArray(meshes) ? (0, import_lodash29.compact)(meshes) : (0, import_lodash29.compact)([meshes]);
     this._addMarkersToManager(markerId, markerMeshes, ordinal);