From: Tom Hughes <tom@compton.nu>
Date: Wed, 21 Nov 2012 22:53:10 +0000 (+0000)
Subject: Tidy up
X-Git-Tag: live~5195^2~3
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f6ac8ffbab8b9fee13bbcf7537cabb460eb40aae

Tidy up
---

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index b41bbb0f4..8afd3269d 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -115,10 +115,10 @@ $(document).ready(function () {
     $("#sidebar_title").html(I18n.t('site.sidebar.search_results'));
     $("#sidebar_content").load($(this).attr("action"), {
       query: $("#query").val(),
-      minlon: bounds.getSouthWest().lng,
-      minlat: bounds.getSouthWest().lat,
-      maxlon: bounds.getNorthEast().lng,
-      maxlat: bounds.getNorthEast().lat
+      minlon: bounds.getWestLng(),
+      minlat: bounds.getSouthLat(),
+      maxlon: bounds.getEastLng(),
+      maxlat: bounds.getNorthLat()
     }, openSidebar);
 
     return false;
diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index 6701cf740..00aec6484 100644
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -83,7 +83,7 @@ function createMap(divName, options) {
   map = L.map(divName, $.extend({}, options, {panControl: false, zoomsliderControl: false, maxZoom: 18}));
 
   if (map.attributionControl) {
-    map.attributionControl.setPrefix(''); // For tmcw
+    map.attributionControl.setPrefix('');
   }
 
   if (options.panZoomControl) {
@@ -99,12 +99,11 @@ function createMap(divName, options) {
 
   for (var i = 0; i < layers.length; i++) {
     layers[i].layer = new (layers[i].klass)(layers[i]);
-    if (i == 0) {
-      layers[i].layer.addTo(map);
-    }
     layersControl.addBaseLayer(layers[i].layer, layers[i].name);
   }
 
+  layers[0].layer.addTo(map);
+
   $("#" + divName).on("resized", function () {
     map.invalidateSize();
   });
@@ -186,7 +185,7 @@ function getMapLayers() {
 
 function setMapLayers(layerConfig) {
   for (var i = 0; i < layers.length; i++) {
-    if (~layerConfig.indexOf(layers[i].layerCode)) {
+    if (layerConfig.indexOf(layers[i].layerCode) >= 0) {
       map.addLayer(layers[i].layer);
     } else {
       map.removeLayer(layers[i].layer);
diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index ae90442d0..19bed2bd3 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -9,7 +9,7 @@
   <!--[if IE]>
     <%= stylesheet_link_tag "leaflet.ie" %>
     <%= stylesheet_link_tag "large-#{dir}", :media => "screen" %>
-  <![endif]--> <!-- IE is totally broken with CSS media queries -->
+  <![endif]-->
   <%= favicon_link_tag "favicon.ico" %>
   <%= favicon_link_tag "osm_logo.png", :rel => "apple-touch-icon", :type => "image/png" %>
   <%= tag("link", { :rel => "publisher", :href => "https://plus.google.com/111953119785824514010" }) %>