From: Tom MacWright <tom@macwright.org>
Date: Mon, 10 Jun 2013 19:46:48 +0000 (-0700)
Subject: Remove unnecessary abstraction around rectangles
X-Git-Tag: live~4838^2~58
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7d84b81fd953e7a9965330c67f3e42701000fb19

Remove unnecessary abstraction around rectangles
---

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index 24fe5171e..a5738e1ba 100644
--- a/app/assets/javascripts/browse.js
+++ b/app/assets/javascripts/browse.js
@@ -33,7 +33,12 @@ $(document).ready(function () {
                               [params.maxlat, params.maxlon]);
 
     map.fitBounds(bbox);
-    addBoxToMap(bbox);
+
+    L.rectangle(bbox, {
+      weight: 2,
+      color: '#e90',
+      fillOpacity: 0
+    }).addTo(map);
 
     $("#loading").hide();
     $("#browse_map .geolink").show();
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 0e3e7cd56..8d3a043d6 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -48,7 +48,11 @@ $(document).ready(function () {
       map.fitBounds(bbox);
 
       if (params.box) {
-        addBoxToMap(bbox);
+        L.rectangle(bbox, {
+          weight: 2,
+          color: '#e90',
+          fillOpacity: 0
+        }).addTo(map);
       }
     } else {
       map.setView([params.lat, params.lon], params.zoom);
diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index 80e77f26c..b3ac299f0 100644
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -151,18 +151,6 @@ function addObjectToMap(object, options) {
   });
 }
 
-function addBoxToMap(bounds) {
-  var box = L.rectangle(bounds, {
-    weight: 2,
-    color: '#e90',
-    fillOpacity: 0
-  });
-
-  box.addTo(map);
-
-  return box;
-}
-
 function getMapBaseLayer() {
   for (var i = 0; i < layers.length; i++) {
     if (map.hasLayer(layers[i].layer)) {