Fix issue with reloadLayer overwriting url

NASA-AMMOS · Jun 18, 2024 · 2be2bf5 · 2be2bf5
1 parent cae65a6
commit 2be2bf5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/essence/Ancillary/TimeControl.js b/src/essence/Ancillary/TimeControl.js
@@ -262,13 +262,16 @@ var TimeControl = {
                 // refresh map
                 if (evenIfControlled === true || layer.controlled !== true)
                     if (L_.layers.on[layer.name] || evenIfOff) {
-                        return await Map_.refreshLayer(layer)
+                        return await Map_.refreshLayer(layer, () => {
+                            // put start/endtime keywords back
+                            if (layer.time && layer.time.enabled === true)
+                                layer.url = originalUrl
+                        })
                     }
             }
         }
         // put start/endtime keywords back
         if (layer.time && layer.time.enabled === true) layer.url = originalUrl
-
         return true
     },
     performTimeUrlReplacements: async function (url, layer) {

diff --git a/src/essence/Basics/Map_/Map_.js b/src/essence/Basics/Map_/Map_.js
@@ -393,7 +393,7 @@ let Map_ = {
             )
         }
     },
-    refreshLayer: async function (layerObj) {
+    refreshLayer: async function (layerObj, cb) {
         // We need to find and remove all points on the map that belong to the layer
         // Not sure if there is a cleaner way of doing this
         for (var i = L_._layersOrdered.length - 1; i >= 0; i--) {
@@ -419,8 +419,10 @@ let Map_ = {
                     console.error(
                         `ERROR - refreshLayer: Cannot make layer ${layerObj.display_name}/${layerObj.name} as it's already being made!`
                     )
+                    if (typeof cb === 'function') cb()
                     return false
                 }
+                if (typeof cb === 'function') cb()
                 return true
             }
         }