Cancel any existing object load before starting a new one

[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 2e72046d1e677e38af0357b68004db74b1f5378d..48fd35d0e7e4e0eaa19fdaf2072d35c921d1c0e4 100644 (file)
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -1,5 +1,5 @@
 // Leaflet extensions
 // Leaflet extensions

-L.LatLngBounds.include({
+L.extend(L.LatLngBounds.prototype, {

   getSouthLat: function () {
     return this._southWest.lat;
   },
   getSouthLat: function () {
     return this._southWest.lat;
   },


@@ -29,10 +29,14 @@ L.LatLngBounds.include({
   getSize: function () {
     return (this._northEast.lat - this._southWest.lat) *
            (this._northEast.lng - this._southWest.lng);
   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.Bounds.include({
+L.extend(L.Bounds.prototype, {

   getWidth: function () {
    return this.max.x - this.min.x;
   },
   getWidth: function () {
    return this.max.x - this.min.x;
   },


@@ -42,33 +46,36 @@ L.Bounds.include({
   }
 });
 
   }
 });
 

+L.Icon.Default.imagePath = <%= "#{asset_prefix}/images".to_json %>;
+

 var map;
 var map;

+var objectLayer;
+var objectLoader;

 
 var layers = [
   {
 
 var layers = [
   {

-    urlTemplate: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+    klass: L.OSM.Mapnik,

     attribution: "",
     keyid: "mapnik",
     layerCode: "M",
     name: I18n.t("javascripts.map.base.standard")
   },
   {
     attribution: "",
     keyid: "mapnik",
     layerCode: "M",
     name: I18n.t("javascripts.map.base.standard")
   },
   {

-    urlTemplate: 'http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png',
+    klass: 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")
   },
   {
     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")
   },
   {

-    urlTemplate: 'http://{s}.tile2.opencyclemap.org/transport/{z}/{x}/{y}.png',
+    klass: 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")
   },
   {
     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")
   },
   {

-    urlTemplate: 'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png',
-    subdomains: '1234',
+    klass: 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",
     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",


@@ -77,26 +84,33 @@ var layers = [
 ];
 
 function createMap(divName, options) {
 ];
 
 function createMap(divName, options) {

-  map = L.map(divName, options);
+  options = $.extend({zoomControl: true, panZoomControl: true, layerControl: true}, options);
+
+  map = L.map(divName, $.extend({}, options, {panControl: false, zoomsliderControl: false, maxZoom: 18}));

 
   if (map.attributionControl) {
 
   if (map.attributionControl) {

-    map.attributionControl.setPrefix(''); // For tmcw
+    map.attributionControl.setPrefix('');
+  }
+
+  if (options.panZoomControl) {
+    new L.Control.Pan().addTo(map);
+    new L.Control.Zoomslider({stepHeight: 7}).addTo(map);

   }
 
   var layersControl = L.control.layers();
 
   }
 
   var layersControl = L.control.layers();
 

-  if (!options || options.layerControl !== false) {
+  if (options.layerControl) {

     layersControl.addTo(map);
     layersControl.addTo(map);

+    map.layersControl = layersControl;

   }
 
   for (var i = 0; i < layers.length; i++) {
   }
 
   for (var i = 0; i < layers.length; i++) {

-    layers[i].layer = L.tileLayer(layers[i].urlTemplate, layers[i]);
-    if (i == 0) {
-      layers[i].layer.addTo(map);
-    }
+    layers[i].layer = new (layers[i].klass)(layers[i]);

     layersControl.addBaseLayer(layers[i].layer, layers[i].name);
   }
 
     layersControl.addBaseLayer(layers[i].layer, layers[i].name);
   }
 

+  layers[0].layer.addTo(map);
+

   $("#" + divName).on("resized", function () {
     map.invalidateSize();
   });
   $("#" + divName).on("resized", function () {
     map.invalidateSize();
   });


@@ -104,34 +118,31 @@ function createMap(divName, options) {
   return map;
 }
 
   return map;
 }
 

-function getArrowIcon() {
+function getUserIcon(url) {

   return L.icon({
   return L.icon({

-    iconUrl: <%= asset_path('arrow.png').to_json %>,
-    iconSize: [25, 22],
-    iconAnchor: [22, 20]
+    iconUrl: url || <%= asset_path('marker-red.png').to_json %>,
+    iconSize: [25, 41],
+    iconAnchor: [12, 41],
+    popupAnchor: [1, -34],
+    shadowUrl: <%= asset_path('images/marker-shadow.png').to_json %>,
+    shadowSize: [41, 41]

   });
 }
 
   });
 }
 

-function addMarkerToMap(position, icon, description) {
-  var marker = L.marker(position, icon ? {icon: icon} : null).addTo(map);
-
-  if (description) {
-    marker.bindPopup(description);
+function addObjectToMap(object, zoom, callback) {
+  if (objectLoader) {
+    objectLoader.abort();

   }
 
   }
 

-  return marker;
-}
-
-function removeMarkerFromMap(marker) {
-  map.removeLayer(marker);
-}
+  if (objectLayer) {
+    map.removeLayer(objectLayer);
+  }

 
 

-function addObjectToMap(object, zoom, callback) {
-  $.ajax({
+  objectLoader = $.ajax({

     url: OSM.apiUrl(object),
     dataType: "xml",
     success: function (xml) {
     url: OSM.apiUrl(object),
     dataType: "xml",
     success: function (xml) {

-      var layer = new L.OSM(xml, {
+      objectLayer = new L.OSM.DataLayer(xml, {

         style: {
           strokeColor: "blue",
           strokeWidth: 3,
         style: {
           strokeColor: "blue",
           strokeWidth: 3,


@@ -142,7 +153,7 @@ function addObjectToMap(object, zoom, callback) {
         }
       });
 
         }
       });
 

-      var bounds = layer.getBounds();
+      var bounds = objectLayer.getBounds();

 
       if (zoom) {
         map.fitBounds(bounds);
 
       if (zoom) {
         map.fitBounds(bounds);


@@ -152,7 +163,7 @@ function addObjectToMap(object, zoom, callback) {
         callback(bounds);
       }
 
         callback(bounds);
       }
 

-      layer.addTo(map);
+      objectLayer.addTo(map);

     }
   });
 }
     }
   });
 }


@@ -188,11 +199,16 @@ function getMapLayers() {
 }
 
 function setMapLayers(layerConfig) {
 }
 
 function setMapLayers(layerConfig) {

+  var foundLayer = false;

   for (var i = 0; i < layers.length; i++) {
   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);
       map.addLayer(layers[i].layer);

+      foundLayer = true;

     } else {
       map.removeLayer(layers[i].layer);
     }
   }
     } else {
       map.removeLayer(layers[i].layer);
     }
   }

+  if (!foundLayer) {
+    map.addLayer(layers[0].layer);
+  }

 }
 }