Add cache support for addModels

2gis · Jun 28, 2023 · 8a9c15b · 8a9c15b
1 parent 90b5816
commit 8a9c15b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/loader.ts b/src/loader.ts
@@ -40,6 +40,12 @@ export class Loader extends GLTFLoader {
             offsetY = 0,
             offsetZ = 0,
         } = modelOptions;
+
+        const actualModelId = String(modelId);
+        if (this.models.has(actualModelId)) {
+            return Promise.resolve();
+        }
+
         const modelPosition = mapPointFromLngLat(coordinates);
         const mapPointsOffsetX = geoToMapDistance(coordinates, offsetX);
         const mapPointsOffsetY = geoToMapDistance(coordinates, offsetY);

diff --git a/src/plugin.ts b/src/plugin.ts
@@ -47,7 +47,7 @@ export class GltfPlugin extends Evented<GltfPluginEventTable> {
      *
      * plugin.addModels([
      *     {
-     *         id: 1,
+     *         modelId: '03a234cb',
      *         coordinates: [82.886554, 54.980988],
      *         modelUrl: 'models/cube_draco.glb',
      *         rotateX: 90,
@@ -149,11 +149,6 @@ export class GltfPlugin extends Evented<GltfPluginEventTable> {
     public async addModel(modelOptions: ModelOptions) {
         await this.waitForPluginInit;
 
-        const wasAdded = this.addModelFromCache(modelOptions.modelId);
-        if (wasAdded) {
-            return Promise.resolve();
-        }
-
         return this.loader.loadModel(modelOptions).then(() => {
             if (modelOptions.linkedIds) {
                 this.map.setHiddenObjects(modelOptions.linkedIds);