From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 4 Oct 2013 22:20:08 +0000 (-0700)
Subject: Consolidate layer initialization
X-Git-Tag: live~4609^2~222
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/de97f7bfe418ecedb8800236020c95f16474f1ab

Consolidate layer initialization
---

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 91855f823..7c65f35c3 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -93,6 +93,16 @@ $(document).ready(function () {
   map.dataLayer = new L.OSM.DataLayer(null);
   map.dataLayer.options.code = 'D';
 
+  if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
+    if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
+      map.addLayer(map.noteLayer);
+    }
+
+    if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
+      map.addLayer(map.dataLayer);
+    }
+  }
+
   var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
 
   L.OSM.zoom({position: position})
diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index f52c58019..f00d3999f 100644
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -2,7 +2,7 @@
 //= require templates/browse/feature_list
 //= require templates/browse/feature_history
 
-function initializeBrowse(map, params) {
+function initializeBrowse(map) {
   var browseBounds;
   var layersById;
   var selectedLayer;
@@ -49,12 +49,6 @@ function initializeBrowse(map, params) {
     }
   });
 
-  if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
-    if (params.layers.indexOf(dataLayer.options.code) >= 0) {
-      map.addLayer(dataLayer);
-    }
-  }
-
   function startBrowse(sidebarHtml) {
     locationFilter = new L.LocationFilter({
       enableButton: false,
diff --git a/app/assets/javascripts/index/notes.js.erb b/app/assets/javascripts/index/notes.js.erb
index 91b2c31e1..a30a4919b 100644
--- a/app/assets/javascripts/index/notes.js.erb
+++ b/app/assets/javascripts/index/notes.js.erb
@@ -49,10 +49,6 @@ function initializeNotes(map, params) {
   });
 
   if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
-    if (params.layers.indexOf(noteLayer.options.code) >= 0) {
-      map.addLayer(noteLayer);
-    }
-
     if (params.note) {
       $.ajax({
         url: "/api/" + OSM.API_VERSION + "/notes/" + params.note + ".json",