bring state back

demo/index.ts

@@ -46,7 +46,6 @@ async function start() {
         .getContainer()
         .addEventListener('click', () => {
             plugin.removeRealtyScene();
-            // plugin.addRealtyScene(REALTY_SCENE, '235034');
             plugin.addRealtyScene(REALTY_SCENE);
         });
 
@@ -64,7 +63,9 @@ async function start() {
         .getContainer()
         .addEventListener('click', () => {
             plugin.removeRealtyScene();
-            plugin.addRealtyScene(REALTY_SCENE_1, 'ds321ba234cb');
+            plugin.addRealtyScene(REALTY_SCENE_1, {
+                buildingId: 'ds321ba234cb',
+            });
         });
 
     new mapglAPI.Control(map, '<button>Remove Scene 1</button>', {

src/control/types.ts

@@ -22,7 +22,7 @@ export interface ControlShowOptions {
  * Event that emitted on button presses of the control
  */
 export interface FloorChangeEvent {
-    modelId: Id;
+    modelId: Id; // id модели этажа или здания
 }
 
 export interface ControlEventTable {

src/plugin.ts

@@ -1,7 +1,7 @@
 import type { Map as MapGL } from '@2gis/mapgl/types';
 import type { BuildingOptions } from './types/realtyScene';
 import type { GltfPluginEventTable } from './types/events';
-import type { Id, PluginOptions, ModelOptions } from './types/plugin';
+import type { Id, PluginOptions, ModelOptions, BuildingState } from './types/plugin';
 
 import { applyOptionalDefaults } from './utils/common';
 import { Evented } from './external/evented';
@@ -187,9 +187,9 @@ export class GltfPlugin extends Evented<GltfPluginEventTable> {
         ids.forEach((id) => this.hideModel(id));
     }
 
-    public async addRealtyScene(scene: BuildingOptions[], activeModelId?: Id) {
+    public async addRealtyScene(scene: BuildingOptions[], state?: BuildingState) {
         this.realtyScene = new RealtyScene(this, this.map, this.options);
-        return this.realtyScene.init(scene, activeModelId);
+        return this.realtyScene.init(scene, state);
     }
 
     // public showRealtyScene() {}

src/realtyScene/realtyScene.ts

@@ -4,7 +4,7 @@ import { GltfPlugin } from '../plugin';
 import { GltfFloorControl } from '../control';
 import classes from './realtyScene.module.css';
 
-import type { Id, ModelOptions, PluginOptions } from '../types/plugin';
+import type { BuildingState, Id, ModelOptions, PluginOptions } from '../types/plugin';
 import type {
     BuildingOptions,
     MapOptions,
@@ -143,7 +143,14 @@ export class RealtyScene {
         this.state = newState;
     }
 
-    public async init(scene: BuildingOptions[], activeModelId?: string) {
+    public async init(scene: BuildingOptions[], state?: BuildingState) {
+        // Приводим стейт пользователя к внутреннему виду id
+        let activeModelId: Id | undefined = state
+            ? state.floorId
+                ? getFloorModelId(state.buildingId, state.floorId)
+                : state.buildingId
+            : undefined;
+
         scene.forEach((building) => {
             const { floors, ...buildingPart } = building;
             const internalBuilding: BuildingOptionsInternal = {
@@ -160,11 +167,6 @@ export class RealtyScene {
                     icon: floor.icon,
                 });
 
-                // Подменяем id активного этажа на внутренний формат buildingId_floorId
-                if (activeModelId === floor.id) {
-                    activeModelId = floorModelId;
-                }
-
                 this.floors.set(floorModelId, {
                     ...floor,
                     buildingOptions: buildingOptions,
@@ -178,7 +180,7 @@ export class RealtyScene {
             this.buildings.set(building.modelId, internalBuilding);
         });
 
-        // Оставляем только существующее значение из переданных modelId
+        // Оставляем только существующее значение из переданных modelId в scene
         activeModelId =
             activeModelId !== undefined &&
             (this.buildings.has(activeModelId) || this.floors.has(activeModelId))

src/types/events.ts

@@ -29,7 +29,7 @@ export interface ModelTarget {
     data: ModelOptions;
 
     /**
-     * Identifier of the building's model
+     * Identifier of the building's or floor's model
      */
     modelId: Id;
 }

src/types/plugin.ts

@@ -103,6 +103,21 @@ export interface PluginOptions {
     groundCoveringColor?: string;
 }
 
+/**
+ * State for the building's scene
+ */
+export interface BuildingState {
+    /**
+     * Identifier of the building's model
+     */
+    buildingId: string;
+
+    /**
+     * Identifier of the floor's model
+     */
+    floorId?: string;
+}
+
 /**
  * Options for a model
  */