From 8b5e0d024813e38bc207f4f7b703ed53111a88a3 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Fri, 8 Nov 2013 13:42:06 -0800 Subject: [PATCH] Fix order of initialization initializeNotes needs to be called after L.OSM.note. --- app/assets/javascripts/index.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 7c9d255bb..816bb4e8f 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -102,18 +102,6 @@ $(document).ready(function () { map.dataLayer = new L.OSM.DataLayer(null); map.dataLayer.options.code = 'D'; - if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') { - initializeNotes(map); - if (params.layers.indexOf(map.noteLayer.options.code) >= 0) { - map.addLayer(map.noteLayer); - } - - initializeBrowse(map); - 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}) @@ -155,6 +143,18 @@ $(document).ready(function () { L.control.scale() .addTo(map); + if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') { + initializeNotes(map); + if (params.layers.indexOf(map.noteLayer.options.code) >= 0) { + map.addLayer(map.noteLayer); + } + + initializeBrowse(map); + if (params.layers.indexOf(map.dataLayer.options.code) >= 0) { + map.addLayer(map.dataLayer); + } + } + $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'}); map.on('moveend layeradd layerremove', function() { -- 2.43.2