Merge pull request #23 from 2gis/TILES-5477-dontwaitall-and-addModels…

…Partially

TILES-5477 bug with dontWaitAll and addModelsPartially

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@2gis/mapgl-gltf",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Plugin for the rendering glTF models with MapGL",
   "main": "dist/bundle.js",
   "typings": "dist/types/index.d.ts",

src/plugin.ts

@@ -126,7 +126,7 @@ export class GltfPlugin extends Evented<GltfPluginEventTable> {
     public async addModelsPartially(modelOptions: ModelOptions[], ids: Id[]) {
         await this.waitForPluginInit;
 
-        const loadedModels = this.startModelLoading(modelOptions);
+        const loadedModels = this.startModelLoading(modelOptions, ids);
 
         return Promise.all(loadedModels).then(() => {
             if (this.options.modelsLoadStrategy === 'waitAll') {
@@ -314,15 +314,17 @@ export class GltfPlugin extends Evented<GltfPluginEventTable> {
         });
     }
 
-    private startModelLoading(modelOptions: ModelOptions[]) {
+    private startModelLoading(modelOptions: ModelOptions[], ids?: Id[]) {
         return modelOptions.map((options) => {
             return this.loader.loadModel(options).then(() => {
                 if (this.options.modelsLoadStrategy === 'dontWaitAll') {
-                    if (options.linkedIds) {
-                        this.map.setHiddenObjects(options.linkedIds);
+                    if (ids === undefined || ids.includes(options.modelId)) {
+                        if (options.linkedIds) {
+                            this.map.setHiddenObjects(options.linkedIds);
+                        }
+                        this.addModelFromCache(options.modelId);
+                        this.map.triggerRerender();
                     }
-                    this.addModelFromCache(options.modelId);
-                    this.map.triggerRerender();
                 }
             });
         });