Some fixes (#35)

2gis · Apr 27, 2024 · cec00bf · cec00bf
1 parent e234579
commit cec00bf
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@2gis/mapgl-gltf",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Plugin for the rendering glTF models with MapGL",
   "main": "dist/bundle.js",
   "typings": "dist/types/index.d.ts",

diff --git a/src/labelGroups.ts b/src/labelGroups.ts
@@ -15,6 +15,10 @@ export const DEFAULT_IMAGE: LabelImage = {
     padding: [5, 10, 5, 10],
 };
 
+/**
+ * @hidden
+ * @internal
+ */
 export class LabelGroups {
     private labelsByGroupId: Map<string, Label[]> = new Map();
 

diff --git a/src/realtyScene/realtyScene.ts b/src/realtyScene/realtyScene.ts
@@ -103,12 +103,23 @@ export class RealtyScene {
             const prevModelOptions = prevState.buildingVisibility.get(buildingId);
             const newModelOptions = newState.buildingVisibility.get(buildingId);
 
-            // если опции не изменились, то ничего не делаем
+            // если опции не изменились, то выставляем только опции карты, если модель активна
             if (
                 prevModelOptions?.modelId === newModelOptions?.modelId &&
                 prevState.status === newState.status
             ) {
                 buildingVisibility.set(buildingId, prevModelOptions);
+
+                if (prevModelOptions && prevModelOptions.modelId === newState.activeModelId) {
+                    const options =
+                        this.buildings.get(prevModelOptions.modelId) ??
+                        this.floors.get(prevModelOptions.modelId);
+
+                    if (options) {
+                        this.setMapOptions(options.mapOptions);
+                    }
+                }
+
                 return;
             }
 
@@ -230,14 +241,16 @@ export class RealtyScene {
                     this.control.show({
                         buildingModelId: buildingOptions.modelId,
                         activeModelId: newState.activeModelId,
-                        floorLevels: [
-                            {
-                                modelId: buildingOptions.modelId,
-                                icon: 'building',
-                                text: '',
-                            },
-                            ...buildingOptions.floors,
-                        ],
+                        floorLevels: buildingOptions.floors.length
+                            ? [
+                                  {
+                                      modelId: buildingOptions.modelId,
+                                      icon: 'building',
+                                      text: '',
+                                  },
+                                  ...buildingOptions.floors,
+                              ]
+                            : [],
                     });
                 }
             }