Hide search marker/object when closing sidebar

[rails.git] / app / assets / javascripts / map.js.erb

diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index 74aaf5579b75d825677fca18f8d93f912d1fe212..98299070d2e3ed9e2308909e0a2d330745582551 100644 (file)
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -1,48 +1,3 @@
-// Leaflet extensions
-L.extend(L.LatLngBounds.prototype, {
-  getSize: function () {
-    return (this._northEast.lat - this._southWest.lat) *
-           (this._northEast.lng - this._southWest.lng);
-  },
-
-  wrap: function () {
-    return new L.LatLngBounds(this._southWest.wrap(), this._northEast.wrap());
-  }
-});
-
-L.Icon.Default.imagePath = <%= "#{asset_prefix}/images".to_json %>;
-
-var objectLayer;
-var objectLoader;
-
-function mapLayers() {
-  return [{
-    layer: new L.OSM.Mapnik(),
-    attribution: "",
-    keyid: "mapnik",
-    layerCode: "M",
-    name: I18n.t("javascripts.map.base.standard")
-  }, {
-    layer: new L.OSM.CycleMap(),
-    attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
-    keyid: "cyclemap",
-    layerCode: "C",
-    name: I18n.t("javascripts.map.base.cycle_map")
-  }, {
-    layer: new L.OSM.TransportMap(),
-    attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
-    keyid: "transportmap",
-    layerCode: "T",
-    name: I18n.t("javascripts.map.base.transport_map")
-  }, {
-    layer: new L.OSM.MapQuestOpen(),
-    attribution: "Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>",
-    keyid: "mapquest",
-    layerCode: "Q",
-    name: I18n.t("javascripts.map.base.mapquest")
-  }]
-}
-

 function getUserIcon(url) {
   return L.icon({
     iconUrl: url || <%= asset_path('marker-red.png').to_json %>,
 function getUserIcon(url) {
   return L.icon({
     iconUrl: url || <%= asset_path('marker-red.png').to_json %>,


@@ -53,53 +8,3 @@ function getUserIcon(url) {
     shadowSize: [41, 41]
   });
 }
     shadowSize: [41, 41]
   });
 }

-
-function addObjectToMap(object, map, options) {
-  if (objectLoader) {
-    objectLoader.abort();
-  }
-
-  if (objectLayer) {
-    map.removeLayer(objectLayer);
-  }
-
-  objectLoader = $.ajax({
-    url: OSM.apiUrl(object),
-    dataType: "xml",
-    success: function (xml) {
-      objectLayer = new L.OSM.DataLayer(null, {
-        styles: {
-          node: options.style,
-          way: options.style,
-          area: options.style
-        }
-      });
-
-      objectLayer.interestingNode = function (node, ways, relations) {
-        if (object.type === "node") {
-          return true;
-        } else if (object.type === "relation") {
-          for (var i = 0; i < relations.length; i++)
-            if (relations[i].members.indexOf(node) != -1)
-              return true;
-        } else {
-          return false;
-        }
-      };
-
-      objectLayer.addData(xml);
-
-      var bounds = objectLayer.getBounds();
-
-      if (options.zoom) {
-        map.fitBounds(bounds);
-      }
-
-      if (options.callback) {
-        options.callback(bounds);
-      }
-
-      objectLayer.addTo(map);
-    }
-  });
-}