Simplify
authorJohn Firebaugh <john.firebaugh@gmail.com>
Thu, 14 Nov 2013 20:22:20 +0000 (12:22 -0800)
committerJohn Firebaugh <john.firebaugh@gmail.com>
Thu, 14 Nov 2013 20:22:20 +0000 (12:22 -0800)
app/assets/javascripts/index.js
app/assets/javascripts/leaflet.map.js.erb

index d612b27780109c50bcbbd5de8a7ccc95e993b4f5..6fc870a4ce296a2971d1f965be8ddf249268d736 100644 (file)
@@ -230,19 +230,7 @@ $(document).ready(function () {
     };
 
     page.load = function(path, type, id) {
-      if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
-
-      map.addObject({type: type, id: parseInt(id)},
-        {
-          zoom: window.location.hash == "",
-          style: {
-            color: "#FF6200",
-            weight: 4,
-            opacity: 1,
-            fillOpacity: 0.5
-          }
-        }
-      );
+      map.addObject({type: type, id: parseInt(id)});
     };
 
     page.unload = function() {
index 75700913fc571792d13a21725f821137b25dc521..f598a48393c9d0d8be108602a1b7c7bd814deb1a 100644 (file)
@@ -169,7 +169,21 @@ L.OSM.Map = L.Map.extend({
     return str;
   },
 
-  addObject: function(object, options) {
+  addObject: function(object) {
+    var objectStyle = {
+      color: "#FF6200",
+      weight: 4,
+      opacity: 1,
+      fillOpacity: 0.5
+    };
+
+    var changesetStyle = {
+      weight: 1,
+      color: '#FF9500',
+      opacity: 1,
+      fillOpacity: 0
+    };
+
     this._object = object;
 
     if (this._objectLoader) this._objectLoader.abort();
@@ -182,15 +196,10 @@ L.OSM.Map = L.Map.extend({
       success: function (xml) {
         map._objectLayer = new L.OSM.DataLayer(null, {
           styles: {
-            node: options.style,
-            way: options.style,
-            area: options.style,
-            changeset: {
-              weight: 1,
-              color: '#FF9500',
-              opacity: 1,
-              fillOpacity: 0
-            }
+            node: objectStyle,
+            way: objectStyle,
+            area: objectStyle,
+            changeset: changesetStyle
           }
         });
 
@@ -207,13 +216,12 @@ L.OSM.Map = L.Map.extend({
         };
 
         map._objectLayer.addData(xml);
+        map._objectLayer.addTo(map);
 
         var bounds = map._objectLayer.getBounds();
-
-        if (options.zoom && bounds.isValid()) map.fitBounds(bounds);
-        if (options.callback) options.callback(bounds);
-
-        map._objectLayer.addTo(map);
+        if (bounds.isValid()) {
+          map.fitBounds(bounds);
+        }
       }
     });
   },