From: Tom Hughes <tom@compton.nu>
Date: Mon, 11 May 2009 10:31:34 +0000 (+0000)
Subject: Destroy OL objects which use the dataLayer before we destroy the layer
X-Git-Tag: live~7400
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4d62aea5ecf45f2161c5ba35efab29d745720001?hp=3a8a2ebb1adb517a9ffac26af6be3cce415bdd67

Destroy OL objects which use the dataLayer before we destroy the layer
or we will get errors which stop the rest of stopBrowse() executing.
---

diff --git a/app/views/browse/start.rjs b/app/views/browse/start.rjs
index f38b1dc80..8c8d62260 100644
--- a/app/views/browse/start.rjs
+++ b/app/views/browse/start.rjs
@@ -50,11 +50,6 @@ page << <<EOJ
     if (browseActive) {
       browseActive = false;
 
-      if (browseDataLayer) {
-        browseDataLayer.destroy();
-        browseDataLayer = null; 
-      } 
-
       if (browseSelectControl) {   
         browseSelectControl.destroy();  
         browseSelectControl = null;
@@ -70,6 +65,11 @@ page << <<EOJ
         browseActiveFeature = null; 
       }
 
+      if (browseDataLayer) {
+        browseDataLayer.destroy();
+        browseDataLayer = null; 
+      } 
+
       map.dataLayer.setVisibility(false);
       map.events.unregister("moveend", map, showData);
     }