Port to Leaflet
authorJohn Firebaugh <john.firebaugh@gmail.com>
Sat, 25 Aug 2012 17:55:46 +0000 (10:55 -0700)
committerJohn Firebaugh <john.firebaugh@gmail.com>
Fri, 9 Nov 2012 20:59:27 +0000 (12:59 -0800)
32 files changed:
app/assets/images/marker-blue.png [new file with mode: 0644]
app/assets/images/marker-green.png [new file with mode: 0644]
app/assets/images/marker-red.png [new file with mode: 0644]
app/assets/images/missing-tile.png [moved from app/assets/openlayers/theme/openstreetmap/img/missing-tile.png with 100% similarity]
app/assets/javascripts/application.js
app/assets/javascripts/browse.js
app/assets/javascripts/changeset.js
app/assets/javascripts/diary_entry.js
app/assets/javascripts/index.js
app/assets/javascripts/index/browse.js
app/assets/javascripts/index/export.js
app/assets/javascripts/index/key.js
app/assets/javascripts/map.js.erb
app/assets/javascripts/openlayers.js.erb [deleted file]
app/assets/javascripts/user.js
app/assets/openlayers/theme/openstreetmap/img/carat.png [deleted file]
app/assets/openlayers/theme/openstreetmap/style.css.scss [deleted file]
app/views/layouts/_head.html.erb
app/views/user/_contact.html.erb
app/views/user/view.html.erb
vendor/assets/leaflet/images/layers.png [new file with mode: 0644]
vendor/assets/leaflet/images/marker-icon.png [new file with mode: 0644]
vendor/assets/leaflet/images/marker-shadow.png [new file with mode: 0644]
vendor/assets/leaflet/images/zoom-in.png [new file with mode: 0644]
vendor/assets/leaflet/images/zoom-out.png [new file with mode: 0644]
vendor/assets/leaflet/leaflet.css [new file with mode: 0644]
vendor/assets/leaflet/leaflet.draw.css [new file with mode: 0644]
vendor/assets/leaflet/leaflet.draw.ie.css [new file with mode: 0644]
vendor/assets/leaflet/leaflet.draw.js [new file with mode: 0644]
vendor/assets/leaflet/leaflet.ie.css [new file with mode: 0644]
vendor/assets/leaflet/leaflet.js [new file with mode: 0644]
vendor/assets/leaflet/leaflet.osm.js [new file with mode: 0644]

diff --git a/app/assets/images/marker-blue.png b/app/assets/images/marker-blue.png
new file mode 100644 (file)
index 0000000..f5b4efc
Binary files /dev/null and b/app/assets/images/marker-blue.png differ
diff --git a/app/assets/images/marker-green.png b/app/assets/images/marker-green.png
new file mode 100644 (file)
index 0000000..c36b164
Binary files /dev/null and b/app/assets/images/marker-green.png differ
diff --git a/app/assets/images/marker-red.png b/app/assets/images/marker-red.png
new file mode 100644 (file)
index 0000000..ea3e59a
Binary files /dev/null and b/app/assets/images/marker-red.png differ
index c52c072..da05801 100644 (file)
@@ -4,7 +4,9 @@
 //= require jquery.timers
 //= require jquery.cookie
 //= require augment
-//= require openlayers
+//= require leaflet
+//= require leaflet.osm
+//= require leaflet.draw
 //= require i18n/translations
 //= require osm
 //= require piwik
index 1c0b1b4..995f0d1 100644 (file)
@@ -21,16 +21,14 @@ $(document).ready(function () {
     return false;
   }
 
-  var map = createMap("small_map", {
-    controls: [ new OpenLayers.Control.Navigation() ]
-  });
+  var map = createMap("small_map");
 
   var params = $("#small_map").data();
   if (params.type == "changeset") {
-    var bbox = new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat);
-    var centre = bbox.getCenterLonLat();
+    var bbox = L.latLngBounds([params.minlat, params.minlon],
+                              [params.maxlat, params.maxlon]);
 
-    map.zoomToExtent(proj(bbox));
+    map.fitBounds(bbox);
     addBoxToMap(bbox);
 
     $("#loading").hide();
@@ -40,7 +38,8 @@ $(document).ready(function () {
       return remoteEditHandler(bbox);
     });
 
-    updatelinks(centre.lon, centre.lat, 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat);
+    var centre = bbox.getCenter();
+    updatelinks(centre.lng, centre.lat, 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat);
   } else {
     $("#object_larger_map").hide();
     $("#object_edit").hide();
@@ -56,10 +55,6 @@ $(document).ready(function () {
       $("#browse_map .geolink").show();
 
       if (extent) {
-        extent = unproj(extent);
-
-        var centre = extent.getCenterLonLat();
-
         $("a.bbox[data-editor=remote]").click(function () {
           return remoteEditHandler(extent);
         });
@@ -71,7 +66,8 @@ $(document).ready(function () {
         $("#object_larger_map").show();
         $("#object_edit").show();
 
-        updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, object);
+        var centre = extent.getCenter();
+        updatelinks(centre.lng, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, object);
       } else {
         $("#small_map").hide();
       }
index ba6e541..6ad1fd7 100644 (file)
@@ -1,83 +1,53 @@
 $(document).ready(function () {
-  var highlight;
+  var rects = {};
+  var map = createMap("changeset_list_map");
+  var group = L.featureGroup().addTo(map);
 
-  function highlightChangeset(id) {
-    var feature = vectors.getFeatureByFid(id);
-    var bounds = feature.geometry.getBounds();
-
-    if (bounds.containsBounds(map.getExtent())) {
-      bounds = map.getExtent().scale(1.1);
+  $("[data-changeset]").each(function () {
+    var changeset = $(this).data('changeset');
+    if (changeset.bbox) {
+      var rect = L.rectangle([[changeset.bbox.minlat, changeset.bbox.minlon],
+                              [changeset.bbox.maxlat, changeset.bbox.maxlon]],
+                             {weight: 2, color: "#ee9900", fillColor: "#ffff55", fillOpacity: 0});
+      rect.id = changeset.id;
+      rects[changeset.id] = rect;
+      rect.addTo(group);
     }
+  });
 
-    if (highlight) vectors.removeFeatures(highlight);
-
-    highlight = new OpenLayers.Feature.Vector(bounds.toGeometry(), {}, {
-      strokeWidth: 2,
-      strokeColor: "#ee9900",
-      fillColor: "#ffff55",
-      fillOpacity: 0.5
-    });
-
-    vectors.addFeatures(highlight);
-
+  function highlightChangeset(id) {
+    rects[id].setStyle({fillOpacity: 0.5});
     $("#tr-changeset-" + id).addClass("selected");
   }
 
   function unHighlightChangeset(id) {
-    vectors.removeFeatures(highlight);
-
+    rects[id].setStyle({fillOpacity: 0});
     $("#tr-changeset-" + id).removeClass("selected");
   }
 
-  var map = createMap("changeset_list_map", {
-    controls: [
-      new OpenLayers.Control.Navigation(),
-      new OpenLayers.Control.Zoom(),
-      new OpenLayers.Control.SimplePanZoom()
-    ]
-  });
-
-  var bounds = new OpenLayers.Bounds();
-
-  $("[data-changeset]").each(function () {
-    var changeset = $(this).data('changeset');
-    if (changeset.bbox) {
-      var bbox = new OpenLayers.Bounds(changeset.bbox.minlon, changeset.bbox.minlat, changeset.bbox.maxlon, changeset.bbox.maxlat);
-
-      bounds.extend(bbox);
-
-      addBoxToMap(bbox, changeset.id, true);
+  group.on({
+    mouseover: function (e) {
+      highlightChangeset(e.layer.id);
+    },
+    mouseout: function (e) {
+      unHighlightChangeset(e.layer.id);
     }
   });
 
-  vectors.events.on({
-    "featureselected": function(feature) {
-      highlightChangeset(feature.feature.fid);
+  $("[data-changeset]").on({
+    mouseover: function () {
+      highlightChangeset($(this).data("changeset").id);
     },
-    "featureunselected": function(feature) {
-      unHighlightChangeset(feature.feature.fid);
+    mouseout: function () {
+      unHighlightChangeset($(this).data("changeset").id);
     }
   });
 
-  var selectControl = new OpenLayers.Control.SelectFeature(vectors, {
-    multiple: false,
-    hover: true
-  });
-  map.addControl(selectControl);
-  selectControl.activate();
-
   var params = OSM.mapParams();
   if (params.bbox) {
-    map.zoomToExtent(proj(new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat)));
+    map.fitBounds([[params.minlat, params.minlon],
+                   [params.maxlat, params.maxlon]]);
   } else {
-    map.zoomToExtent(proj(bounds));
+    map.fitBounds(group.getBounds());
   }
-
-  $("[data-changeset]").mouseover(function() {
-    highlightChangeset($(this).data("changeset").id);
-  });
-
-  $("[data-changeset]").mouseout(function() {
-    unHighlightChangeset($(this).data("changeset").id);
-  });
 });
index c169304..30038a0 100644 (file)
@@ -2,18 +2,14 @@ $(document).ready(function () {
   var marker;
 
   function setLocation(e) {
-    closeMapPopup();
-
-    var lonlat = getEventPosition(e);
-
-    $("#latitude").val(lonlat.lat);
-    $("#longitude").val(lonlat.lon);
+    $("#latitude").val(e.latlng.lat);
+    $("#longitude").val(e.latlng.lng);
 
     if (marker) {
       removeMarkerFromMap(marker);
     }
 
-    marker = addMarkerToMap(lonlat, null, I18n.t('diary_entry.edit.marker_text'));
+    marker = addMarkerToMap(e.latlng, null, I18n.t('diary_entry.edit.marker_text'));
   }
 
   $("#usemap").click(function (e) {
@@ -23,15 +19,15 @@ $(document).ready(function () {
     $("#usemap").hide();
 
     var params = $("#map").data();
-    var centre = new OpenLayers.LonLat(params.lon, params.lat);
+    var centre = [params.lat, params.lon];
     var map = createMap("map");
 
-    setMapCenter(centre, params.zoom);
+    map.setView(centre, params.zoom);
 
     if ($("#latitude").val() && $("#longitude").val()) {
       marker = addMarkerToMap(centre, null, I18n.t('diary_entry.edit.marker_text'));
     }
 
-    map.events.register("click", map, setLocation);
+    map.on("click", setLocation);
   });
 });
index 85f5dab..e6e7309 100644 (file)
@@ -3,24 +3,32 @@
 //= require index/key
 
 $(document).ready(function () {
+  var permalinks = $("#permalink").html();
   var marker;
   var params = OSM.mapParams();
   var map = createMap("map");
 
-  map.events.register("moveend", map, updateLocation);
-  map.events.register("changelayer", map, updateLocation);
+  // https://github.com/CloudMade/Leaflet/issues/1063
+  map.on('load', function () {
+    L.control.scale().addTo(map);
+  });
+
+  map.attributionControl.setPrefix(permalinks);
+
+  map.on("moveend layeradd layerremove", updateLocation);
 
   if (!params.object_zoom) {
     if (params.bbox) {
-      var bbox = new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat);
+      var bbox = L.latLngBounds([params.minlat, params.minlon],
+                                [params.maxlat, params.maxlon]);
 
-      map.zoomToExtent(proj(bbox));
+      map.fitBounds(bbox);
 
       if (params.box) {
         addBoxToMap(bbox);
       }
     } else {
-      setMapCenter(new OpenLayers.LonLat(params.lon, params.lat), params.zoom);
+      map.setView([params.lat, params.lon], params.zoom);
     }
   }
 
@@ -29,7 +37,7 @@ $(document).ready(function () {
   }
 
   if (params.marker) {
-    marker = addMarkerToMap(new OpenLayers.LonLat(params.mlon, params.mlat));
+    marker = addMarkerToMap([params.mlat, params.mlon]);
   }
 
   if (params.object) {
@@ -38,16 +46,17 @@ $(document).ready(function () {
 
   handleResize();
 
-  $("body").on("click", "a.set_position", function () {
+  $("body").on("click", "a.set_position", function (e) {
+    e.preventDefault();
+
     var data = $(this).data();
-    var centre = new OpenLayers.LonLat(data.lon, data.lat);
+    var centre = L.latLng(data.lat, data.lon);
 
     if (data.minLon && data.minLat && data.maxLon && data.maxLat) {
-      var bbox = new OpenLayers.Bounds(data.minLon, data.minLat, data.maxLon, data.maxLat);
-
-      map.zoomToExtent(proj(bbox));
+      map.fitBounds([[data.minLat, data.minLon],
+                     [data.maxLat, data.maxLon]]);
     } else {
-      setMapCenter(centre, data.zoom);
+      map.setView(centre, data.zoom);
     }
 
     if (marker) {
@@ -55,29 +64,38 @@ $(document).ready(function () {
     }
 
     marker = addMarkerToMap(centre, getArrowIcon());
-
-    return false;
   });
 
   function updateLocation() {
-    var lonlat = unproj(map.getCenter());
+    var center = map.getCenter();
     var zoom = map.getZoom();
     var layers = getMapLayers();
-    var extents = unproj(map.getExtent());
-    var expiry = new Date();
-
-    updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, params.object);
+    var extents = map.getBounds();
+
+    updatelinks(center.lng,
+                center.lat,
+                zoom,
+                layers,
+                extents.getWestLng(),
+                extents.getSouthLat(),
+                extents.getEastLng(),
+                extents.getNorthLat(),
+                params.object);
 
+    var expiry = new Date();
     expiry.setYear(expiry.getFullYear() + 10);
-    $.cookie("_osm_location", [lonlat.lon, lonlat.lat, zoom, layers].join("|"), {expires: expiry});
+    $.cookie("_osm_location", [center.lng, center.lat, zoom, layers].join("|"), {expires: expiry});
   }
 
-  function remoteEditHandler(event) {
-    var extent = unproj(map.getExtent());
+  function remoteEditHandler() {
+    var extent = map.getBounds();
     var loaded = false;
 
     $("#linkloader").load(function () { loaded = true; });
-    $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + extent.left + "&top=" + extent.top + "&right=" + extent.right + "&bottom=" + extent.bottom);
+    $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + extent.getWestLng()
+                                                                   + "&bottom=" + extent.getSouthLat()
+                                                                   + "&right=" + extent.getEastLng()
+                                                                   + "&top=" + extent.getNorthLat());
 
     setTimeout(function () {
       if (!loaded) alert(I18n.t('site.index.remote_failed'));
@@ -102,15 +120,15 @@ $(document).ready(function () {
   });
 
   $("#search_form").submit(function () {
-    var extent = unproj(map.getExtent());
+    var bounds = map.getBounds();
 
     $("#sidebar_title").html(I18n.t('site.sidebar.search_results'));
     $("#sidebar_content").load($(this).attr("action"), {
       query: $("#query").val(),
-      minlon: extent.left,
-      minlat: extent.bottom,
-      maxlon: extent.right,
-      maxlat: extent.top
+      minlon: bounds.getSouthWest().lng,
+      minlat: bounds.getSouthWest().lat,
+      maxlon: bounds.getNorthEast().lng,
+      maxlat: bounds.getNorthEast().lat
     }, openSidebar);
 
     return false;
index e75ae9d..5bf5246 100644 (file)
@@ -11,114 +11,86 @@ $(document).ready(function () {
   });
 
   function startBrowse(sidebarHtml) {
-    var browseBoxControl;
     var browseMode = "auto";
     var browseBounds;
-    var browseFeatureList;
-    var browseActiveFeature;
-    var browseDataLayer;
-    var browseSelectControl;
+    var layersById;
+    var selectedLayer;
     var browseObjectList;
     var areasHidden = false;
 
-    OpenLayers.Feature.Vector.style['default'].strokeWidth = 3;
-    OpenLayers.Feature.Vector.style['default'].cursor = "pointer";
+    var dataLayer = new L.OSM(null, {
+      styles: {
+        way: {
+          weight: 3,
+          color: "#000000",
+          opacity: 0.4
+        },
+        area: {
+          weight: 3,
+          color: "#ff0000"
+        },
+        node: {
+          color: "#00ff00"
+        }
+      }
+    });
+
+    dataLayer.addTo(map);
+
+    dataLayer.isWayArea = function () {
+      return !areasHidden && L.OSM.prototype.isWayArea.apply(this, arguments);
+    };
 
-    map.dataLayer.active = true;
+    var drawHandler = new L.Rectangle.Draw(map, {title: I18n.t('browse.start_rjs.drag_a_box')});
+    map.on('draw:rectangle-created', endDrag);
 
     $("#sidebar_title").html(I18n.t('browse.start_rjs.data_frame_title'));
     $("#sidebar_content").html(sidebarHtml);
 
     openSidebar();
 
-    var vectors = new OpenLayers.Layer.Vector();
-
-    browseBoxControl = new OpenLayers.Control.DrawFeature(vectors, OpenLayers.Handler.RegularPolygon, {
-      handlerOptions: {
-        sides: 4,
-        snapAngle: 90,
-        irregular: true,
-        persist: true
-      }
-    });
-    browseBoxControl.handler.callbacks.done = endDrag;
-    map.addControl(browseBoxControl);
-
-    map.events.register("moveend", map, updateData);
-    map.events.triggerEvent("moveend");
+    map.on("moveend", updateData);
+    updateData();
 
     $("#browse_select_view").click(useMap);
 
-    $("#browse_select_box").click(startDrag);
-
     $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
     $("#browse_hide_areas_box").toggle(hideAreas, showAreas);
 
     function updateData() {
       if (browseMode == "auto") {
         if (map.getZoom() >= 15) {
-            useMap(false);
+          useMap();
         } else {
-            setStatus(I18n.t('browse.start_rjs.zoom_or_select'));
+          setStatus(I18n.t('browse.start_rjs.zoom_or_select'));
         }
       }
     }
 
     $("#sidebar").one("closed", function () {
-      if (map.dataLayer.active) {
-        map.dataLayer.active = false;
-
-        if (browseSelectControl) {
-          browseSelectControl.destroy();
-          browseSelectControl = null;
-        }
-
-        if (browseBoxControl) {
-          browseBoxControl.destroy();
-          browseBoxControl = null;
-        }
-
-        if (browseActiveFeature) {
-          browseActiveFeature.destroy();
-          browseActiveFeature = null;
-        }
-
-        if (browseDataLayer) {
-          browseDataLayer.destroy();
-          browseDataLayer = null;
-        }
-
-        map.dataLayer.setVisibility(false);
-        map.events.unregister("moveend", map, updateData);
-      }
+      map.removeLayer(dataLayer);
+      map.off("moveend", updateData);
+      map.off('draw:rectangle-created', endDrag);
+      drawHandler.disable();
     });
 
-    function startDrag() {
+    $("#browse_select_box").click(function () {
       $("#browse_select_box").html(I18n.t('browse.start_rjs.drag_a_box'));
 
-      browseBoxControl.activate();
+      drawHandler.enable();
 
       return false;
-    }
-
-    function useMap(reload) {
-      var bounds = map.getExtent();
-      var projected = unproj(bounds);
-
-      if (!browseBounds || !browseBounds.containsBounds(projected)) {
-        var center = bounds.getCenterLonLat();
-        var tileWidth = bounds.getWidth() * 1.2;
-        var tileHeight = bounds.getHeight() * 1.2;
-        var tileBounds = new OpenLayers.Bounds(center.lon - (tileWidth / 2),
-                                               center.lat - (tileHeight / 2),
-                                               center.lon + (tileWidth / 2),
-                                               center.lat + (tileHeight / 2));
+    });
 
-        browseBounds = tileBounds;
-        getData(tileBounds, reload);
+    function useMap() {
+      var bounds = map.getBounds();
 
+      if (!browseBounds || !browseBounds.contains(bounds)) {
+        browseBounds = bounds;
         browseMode = "auto";
 
+        getData();
+
         $("#browse_select_view").hide();
       }
 
@@ -130,7 +102,7 @@ $(document).ready(function () {
 
       areasHidden = true;
 
-      useMap(true);
+      getData();
     }
 
     function showAreas() {
@@ -138,21 +110,19 @@ $(document).ready(function () {
 
       areasHidden = false;
 
-      useMap(true);
+      getData();
     }
 
-    function endDrag(bbox) {
-      var bounds = bbox.getBounds();
-      var projected = unproj(bounds);
-
-      browseBoxControl.deactivate();
-      browseBounds = projected;
-      getData(bounds);
-
+    function endDrag(e) {
+      browseBounds = e.rect.getBounds();
       browseMode = "manual";
 
+      getData();
+
       $("#browse_select_box").html(I18n.t('browse.start_rjs.manually_select'));
       $("#browse_select_view").show();
+
+      drawHandler.disable();
     }
 
     function displayFeatureWarning(count, limit, callback) {
@@ -174,148 +144,75 @@ $(document).ready(function () {
       $("#browse_content").append(div);
     }
 
-    function customDataLoader(resp, options) {
-      if (map.dataLayer.active) {
-        var request = resp.priv;
-        var doc = request.responseXML;
-
-        if (!doc || !doc.documentElement) {
-          doc = request.responseText;
-        }
-
-        resp.features = this.format.read(doc);
-
-        if (!this.maxFeatures || resp.features.length <= this.maxFeatures) {
-          options.callback.call(options.scope, resp);
-        } else {
-          displayFeatureWarning(resp.features.length, this.maxFeatures, function () {
-            options.callback.call(options.scope, resp);
-          });
-        }
-      }
-    }
-
-    function getData(bounds, reload) {
-      var projected = unproj(bounds);
-      var size = projected.getWidth() * projected.getHeight();
+    function getData() {
+      var size = browseBounds.getSize();
 
       if (size > OSM.MAX_REQUEST_AREA) {
         setStatus(I18n.t("browse.start_rjs.unable_to_load_size", { max_bbox_size: OSM.MAX_REQUEST_AREA, bbox_size: size }));
-      } else {
-        loadData("/api/" + OSM.API_VERSION + "/map?bbox=" + projected.toBBOX(), reload);
+        return;
       }
-    }
 
-    function loadData(url, reload) {
       setStatus(I18n.t('browse.start_rjs.loading'));
 
       $("#browse_content").empty();
+      dataLayer.clearLayers();
+      selectedLayer = null;
+
+      var url = "/api/" + OSM.API_VERSION + "/map?bbox=" + browseBounds.toBBOX();
+
+      /*
+       * Modern browsers are quite happy showing far more than 100 features in
+       * the data browser, so increase the limit to 2000 by default, but keep
+       * it restricted to 500 for IE8 and 100 for older IEs.
+       */
+      var maxFeatures = 2000;
+
+      /*@cc_on
+        if (navigator.appVersion < 8) {
+          maxFeatures = 100;
+        } else if (navigator.appVersion < 9) {
+          maxFeatures = 500;
+        }
+      @*/
 
-      var formatOptions = {
-        checkTags: true,
-        interestingTagsExclude: ['source','source_ref','source:ref','history','attribution','created_by','tiger:county','tiger:tlid','tiger:upload_uuid']
-      };
-
-      if (areasHidden) formatOptions.areaTags = [];
-
-      if (!browseDataLayer || reload) {
-        var style = new OpenLayers.Style();
+      $.ajax({
+        url: url,
+        success: function (xml) {
+          clearStatus();
 
-        style.addRules([new OpenLayers.Rule({
-          symbolizer: {
-            Polygon: { fillColor: '#ff0000', strokeColor: '#ff0000' },
-            Line: { fillColor: '#ffff00', strokeColor: '#000000', strokeOpacity: '0.4' },
-            Point: { fillColor: '#00ff00', strokeColor: '#00ff00' }
-          }
-        })]);
-
-        if (browseDataLayer) browseDataLayer.destroyFeatures();
-
-        /*
-         * Modern browsers are quite happy showing far more than 100 features in
-         * the data browser, so increase the limit to 2000 by default, but keep
-         * it restricted to 500 for IE8 and 100 for older IEs.
-         */
-        var maxFeatures = 2000;
-
-        /*@cc_on
-          if (navigator.appVersion < 8) {
-            maxFeatures = 100;
-          } else if (navigator.appVersion < 9) {
-            maxFeatures = 500;
-          }
-        @*/
-
-        browseDataLayer = new OpenLayers.Layer.Vector("Data", {
-          strategies: [
-            new OpenLayers.Strategy.Fixed()
-          ],
-          protocol: new OpenLayers.Protocol.HTTP({
-            url: url,
-            format: new OpenLayers.Format.OSM(formatOptions),
-            maxFeatures: maxFeatures,
-            handleRead: customDataLoader
-          }),
-          projection: new OpenLayers.Projection("EPSG:4326"),
-          displayInLayerSwitcher: false,
-          styleMap: new OpenLayers.StyleMap({
-            'default': style,
-            'select': { strokeColor: '#0000ff', strokeWidth: 8 }
-          })
-        });
-        browseDataLayer.events.register("loadend", browseDataLayer, dataLoaded );
-        map.addLayer(browseDataLayer);
-
-        browseSelectControl = new OpenLayers.Control.SelectFeature(browseDataLayer, { onSelect: onFeatureSelect });
-        browseSelectControl.handlers.feature.stopDown = false;
-        browseSelectControl.handlers.feature.stopUp = false;
-        map.addControl(browseSelectControl);
-        browseSelectControl.activate();
-      } else {
-        browseDataLayer.destroyFeatures();
-        browseDataLayer.refresh({ url: url });
-      }
+          dataLayer.addData(xml);
 
-      browseActiveFeature = null;
-    }
+          layersById = {};
+          var features = [];
 
-    function dataLoaded() {
-      if (this.map.dataLayer.active) {
-        clearStatus();
-
-        var features = [];
-        for (var i = 0; i < this.features.length; i++) {
-          var feature = this.features[i];
-          features.push({
-            typeName: featureTypeName(feature),
-            url: "/browse/" + featureType(feature) + "/" + feature.osm_id,
-            name: featureName(feature),
-            id: feature.id
+          dataLayer.eachLayer(function (layer) {
+            var feature = layer.feature;
+            layersById[feature.id] = layer;
+            features.push({
+              typeName: featureTypeName(feature),
+              url: "/browse/" + feature.type + "/" + feature.id,
+              name: featureName(feature),
+              id: feature.id
+            });
           });
-        }
 
-        browseObjectList = $(JST["templates/browse/feature_list"]({
-          features: features,
-          url: this.protocol.url
-        }))[0];
+          browseObjectList = $(JST["templates/browse/feature_list"]({
+            features: features,
+            url: url
+          }))[0];
 
-        loadObjectList();
-      }
+          loadObjectList();
+        }
+      });
     }
 
     function viewFeatureLink() {
-      var feature = browseDataLayer.getFeatureById($(this).data("feature-id"));
-      var layer = feature.layer;
-
-      for (var i = 0; i < layer.selectedFeatures.length; i++) {
-        var f = layer.selectedFeatures[i];
-        layer.drawFeature(f, layer.styleMap.createSymbolizer(f, "default"));
-      }
+      var layer = layersById[$(this).data("feature-id")];
 
-      onFeatureSelect(feature);
+      onSelect(layer);
 
       if (browseMode != "auto") {
-        map.setCenter(feature.geometry.getBounds().getCenterLonLat());
+        map.setCenter(layer.getBounds().getCenter());
       }
 
       return false;
@@ -328,19 +225,15 @@ $(document).ready(function () {
       return false;
     }
 
-    function onFeatureSelect(feature) {
+    function onSelect(layer) {
       // Unselect previously selected feature
-      if (browseActiveFeature) {
-        browseActiveFeature.layer.drawFeature(
-          browseActiveFeature,
-          browseActiveFeature.layer.styleMap.createSymbolizer(browseActiveFeature, "default")
-        );
+      if (selectedLayer) {
+        selectedLayer.setStyle(selectedLayer.originalStyle);
       }
 
       // Redraw in selected style
-      feature.layer.drawFeature(
-        feature, feature.layer.styleMap.createSymbolizer(feature, "select")
-      );
+      layer.originalStyle = layer.options;
+      layer.setStyle({color: '#0000ff', weight: 8});
 
       // If the current object is the list, don't innerHTML="", since that could clear it.
       if ($("#browse_content").firstChild == browseObjectList) {
@@ -349,35 +242,41 @@ $(document).ready(function () {
         $("#browse_content").empty();
       }
 
+      var feature = layer.feature;
+
       $("#browse_content").html(JST["templates/browse/feature"]({
         name: featureNameSelect(feature),
-        url: "/browse/" + featureType(feature) + "/" + feature.osm_id,
-        attributes: feature.attributes
+        url: "/browse/" + feature.type + "/" + feature.id,
+        attributes: feature.tags
       }));
 
       $("#browse_content").find("a.browse_show_list").click(loadObjectList);
       $("#browse_content").find("a.browse_show_history").click(loadHistory);
 
       // Stash the currently drawn feature
-      browseActiveFeature = feature;
+      selectedLayer = layer;
     }
 
+    dataLayer.on("click", function (e) {
+      onSelect(e.layer);
+    });
+
     function loadHistory() {
       $(this).attr("href", "").text(I18n.t('browse.start_rjs.wait'));
 
-      var feature = browseActiveFeature;
+      var feature = selectedLayer.feature;
 
       $.ajax({
-        url: "/api/" + OSM.API_VERSION + "/" + featureType(feature) + "/" + feature.osm_id + "/history",
+        url: "/api/" + OSM.API_VERSION + "/" + feature.type + "/" + feature.id + "/history",
         success: function (xml) {
-          if (browseActiveFeature != feature || $("#browse_content").firstChild == browseObjectList) {
+          if (selectedLayer.feature != feature || $("#browse_content").firstChild == browseObjectList) {
             return;
           }
 
           $(this).remove();
 
           var history = [];
-          var nodes = xml.getElementsByTagName(featureType(feature));
+          var nodes = xml.getElementsByTagName(feature.type);
           for (var i = nodes.length - 1; i >= 0; i--) {
             history.push({
               user: nodes[i].getAttribute("user") || I18n.t('browse.start_rjs.private_user'),
@@ -387,7 +286,7 @@ $(document).ready(function () {
 
           $("#browse_content").append(JST["templates/browse/feature_history"]({
             name: featureNameHistory(feature),
-            url: "/browse/" + featureType(feature) + "/" + feature.osm_id,
+            url: "/browse/" + feature.type + "/" + feature.id,
             history: history
           }));
         }.bind(this)
@@ -396,57 +295,26 @@ $(document).ready(function () {
       return false;
     }
 
-    function featureType(feature) {
-      if (feature.geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
-        return "node";
-      } else {
-        return "way";
-      }
-    }
-
     function featureTypeName(feature) {
-      if (featureType(feature) == "node") {
-        return I18n.t('browse.start_rjs.object_list.type.node');
-      } else if (featureType(feature) == "way") {
-        return I18n.t('browse.start_rjs.object_list.type.way');
-      }
+      return I18n.t('browse.start_rjs.object_list.type.' + feature.type);
     }
 
     function featureName(feature) {
-      var lang = $('html').attr('lang');
-      if (feature.attributes['name:' + lang]) {
-        return feature.attributes['name:' + lang];
-      } else if (feature.attributes.name) {
-        return feature.attributes.name;
-      } else {
-        return feature.osm_id;
-      }
+      return feature.tags['name:' + $('html').attr('lang')] ||
+        feature.tags.name ||
+        feature.id;
     }
 
     function featureNameSelect(feature) {
-      var lang = $('html').attr('lang');
-      if (feature.attributes['name:' + lang]) {
-        return feature.attributes['name:' + lang];
-      } else if (feature.attributes.name) {
-        return feature.attributes.name;
-      } else if (featureType(feature) == "node") {
-        return I18n.t("browse.start_rjs.object_list.selected.type.node", { id: feature.osm_id });
-      } else if (featureType(feature) == "way") {
-        return I18n.t("browse.start_rjs.object_list.selected.type.way", { id: feature.osm_id });
-      }
+      return feature.tags['name:' + $('html').attr('lang')] ||
+        feature.tags.name ||
+        I18n.t("browse.start_rjs.object_list.selected.type." + feature.type, { id: feature.id });
     }
 
     function featureNameHistory(feature) {
-      var lang = $('html').attr('lang');
-      if (feature.attributes['name:' + lang]) {
-        return feature.attributes['name:' + lang];
-      } else if (feature.attributes.name) {
-        return feature.attributes.name;
-      } else if (featureType(feature) == "node") {
-        return I18n.t("browse.start_rjs.object_list.history.type.node", { id: feature.osm_id });
-      } else if (featureType(feature) == "way") {
-        return I18n.t("browse.start_rjs.object_list.history.type.way", { id: feature.osm_id });
-      }
+      return feature.tags['name:' + $('html').attr('lang')] ||
+        feature.tags.name ||
+        I18n.t("browse.start_rjs.object_list.history.type." + feature.type, { id: feature.id });
     }
 
     function setStatus(status) {
@@ -459,4 +327,4 @@ $(document).ready(function () {
       $("#browse_status").hide();
     }
   }
-});
\ No newline at end of file
+});
index 8696338..b014e8c 100644 (file)
@@ -11,37 +11,13 @@ $(document).ready(function () {
   }
 
   function startExport(sidebarHtml) {
-    var vectors,
-        box,
-        transform,
-        markerLayer,
-        markerControl;
-
-    vectors = new OpenLayers.Layer.Vector("Vector Layer", {
-      displayInLayerSwitcher: false
-    });
-    map.addLayer(vectors);
-
-    box = new OpenLayers.Control.DrawFeature(vectors, OpenLayers.Handler.RegularPolygon, {
-      handlerOptions: {
-        sides: 4,
-        snapAngle: 90,
-        irregular: true,
-        persist: true
-      }
-    });
-    box.handler.callbacks.done = endDrag;
-    map.addControl(box);
+    var marker, rectangle;
 
-    transform = new OpenLayers.Control.TransformFeature(vectors, {
-      rotate: false,
-      irregular: true
-    });
-    transform.events.register("transformcomplete", transform, transformComplete);
-    map.addControl(transform);
+    var drawHandler = new L.Rectangle.Draw(map, {title: I18n.t('export.start_rjs.drag_a_box')});
+    map.on('draw:rectangle-created', endDrag);
 
-    map.events.register("moveend", map, mapMoved);
-    map.events.register("changebaselayer", map, htmlUrlChanged);
+    map.on("moveend", mapMoved);
+    map.on("layeradd layerremove", htmlUrlChanged);
 
     $("#sidebar_title").html(I18n.t('export.start_rjs.export'));
     $("#sidebar_content").html(sidebarHtml);
@@ -58,12 +34,12 @@ $(document).ready(function () {
 
     openSidebar();
 
-    if (map.baseLayer.name == "Mapnik") {
+    if (map.hasLayer(layers[0].layer)) {
       $("#format_mapnik").prop("checked", true);
     }
 
+    setBounds(map.getBounds());
     formatChanged();
-    setBounds(map.getExtent());
 
     $("body").removeClass("site-index").addClass("site-export");
 
@@ -72,23 +48,30 @@ $(document).ready(function () {
 
       clearBox();
       clearMarker();
-      map.events.unregister("moveend", map, mapMoved);
-      map.events.unregister("changebaselayer", map, htmlUrlChanged);
-      map.removeLayer(vectors);
+
+      map.off("moveend", mapMoved);
+      map.off("layeradd layerremove", htmlUrlChanged);
+      map.off('draw:rectangle-created', endDrag);
+
+      drawHandler.disable();
     });
 
-    function getMercatorBounds() {
-      var bounds = new OpenLayers.Bounds($("#minlon").val(), $("#minlat").val(),
-                                         $("#maxlon").val(), $("#maxlat").val());
+    function getBounds() {
+      return L.latLngBounds(L.latLng($("#minlat").val(), $("#minlon").val()),
+                            L.latLng($("#maxlat").val(), $("#maxlon").val()));
+    }
 
-      return proj(bounds);
+    function getMercatorBounds() {
+      var bounds = getBounds();
+      return L.bounds(L.CRS.EPSG3857.project(bounds.getSouthWest()),
+                      L.CRS.EPSG3857.project(bounds.getNorthEast()));
     }
 
     function boundsChanged() {
-      var bounds = getMercatorBounds();
+      var bounds = getBounds();
 
-      map.events.unregister("moveend", map, mapMoved);
-      map.zoomToExtent(bounds);
+      map.off("moveend", mapMoved);
+      map.fitBounds(bounds);
 
       clearBox();
       drawBox(bounds);
@@ -101,16 +84,15 @@ $(document).ready(function () {
       $("#drag_box").html(I18n.t('export.start_rjs.drag_a_box'));
 
       clearBox();
-      box.activate();
-    };
+      drawHandler.enable();
+    }
 
-    function endDrag(bbox) {
-      var bounds = bbox.getBounds();
+    function endDrag(e) {
+      var bounds = e.rect.getBounds();
 
-      map.events.unregister("moveend", map, mapMoved);
+      map.off("moveend", mapMoved);
       setBounds(bounds);
       drawBox(bounds);
-      box.deactivate();
       validateControls();
 
       $("#drag_box").html(I18n.t('export.start_rjs.manually_select'));
@@ -124,41 +106,27 @@ $(document).ready(function () {
     function startMarker() {
       $("#add_marker").html(I18n.t('export.start_rjs.click_add_marker'));
 
-      if (!markerLayer) {
-        markerLayer = new OpenLayers.Layer.Vector("",{
-          displayInLayerSwitcher: false,
-          style: {
-            externalGraphic: OpenLayers.Util.getImageLocation("marker.png"),
-            graphicXOffset: -10.5,
-            graphicYOffset: -25,
-            graphicWidth: 21,
-            graphicHeight: 25
-          }
-        });
-        map.addLayer(markerLayer);
-
-        markerControl = new OpenLayers.Control.DrawFeature(markerLayer, OpenLayers.Handler.Point);
-        map.addControl(markerControl);
-
-        markerLayer.events.on({ "featureadded": endMarker });
-      }
-
-      markerLayer.destroyFeatures();
-      markerControl.activate();
+      map.on("click", endMarker);
 
       return false;
     }
 
     function endMarker(event) {
-      markerControl.deactivate();
+      map.off("click", endMarker);
 
       $("#add_marker").html(I18n.t('export.start_rjs.change_marker'));
       $("#marker_inputs").show();
 
-      var geom = unproj(event.feature.geometry);
+      var latlng = event.latlng;
+
+      if (marker) {
+        map.removeLayer(marker);
+      }
+
+      marker = L.marker(latlng).addTo(map);
 
-      $("#marker_lon").val(geom.x.toFixed(5));
-      $("#marker_lat").val(geom.y.toFixed(5));
+      $("#marker_lon").val(latlng.lng.toFixed(5));
+      $("#marker_lat").val(latlng.lat.toFixed(5));
 
       htmlUrlChanged();
     }
@@ -168,49 +136,45 @@ $(document).ready(function () {
       $("#marker_inputs").hide();
       $("#add_marker").html(I18n.t('export.start_rjs.add_marker'));
 
-      if (markerLayer) {
-        markerControl.destroy();
-        markerLayer.destroy();
-        markerLayer = null;
-        markerControl = null;
+      if (marker) {
+        map.removeLayer(marker);
       }
     }
 
     function mapMoved() {
-      setBounds(map.getExtent());
+      setBounds(map.getBounds());
       validateControls();
     }
 
     function setBounds(bounds) {
       var toPrecision = zoomPrecision(map.getZoom());
 
-      bounds = unproj(bounds);
-
-      $("#minlon").val(toPrecision(bounds.left));
-      $("#minlat").val(toPrecision(bounds.bottom));
-      $("#maxlon").val(toPrecision(bounds.right));
-      $("#maxlat").val(toPrecision(bounds.top));
+      $("#minlon").val(toPrecision(bounds.getWestLng()));
+      $("#minlat").val(toPrecision(bounds.getSouthLat()));
+      $("#maxlon").val(toPrecision(bounds.getEastLng()));
+      $("#maxlat").val(toPrecision(bounds.getNorthLat()));
 
       mapnikSizeChanged();
       htmlUrlChanged();
     }
 
     function clearBox() {
-      transform.deactivate();
-      vectors.destroyFeatures();
+      if (rectangle) {
+        map.removeLayer(rectangle);
+      }
+      rectangle = null;
     }
 
     function drawBox(bounds) {
-      var feature = new OpenLayers.Feature.Vector(bounds.toGeometry());
-
-      vectors.addFeatures(feature);
-      transform.setFeature(feature);
+      rectangle = L.rectangle(bounds);
+      rectangle.addTo(map);
     }
 
     function validateControls() {
-      var bounds = new OpenLayers.Bounds($("#minlon").val(), $("#minlat").val(), $("#maxlon").val(), $("#maxlat").val());
+      var bounds = getBounds();
 
-      if (bounds.getWidth() * bounds.getHeight() > OSM.MAX_REQUEST_AREA) {
+      var tooLarge = bounds.getSize() > OSM.MAX_REQUEST_AREA;
+      if (tooLarge) {
         $("#export_osm_too_large").show();
       } else {
         $("#export_osm_too_large").hide();
@@ -220,7 +184,7 @@ $(document).ready(function () {
       var disabled = true;
 
       if ($("#format_osm").prop("checked")) {
-        disabled = bounds.getWidth() * bounds.getHeight() > OSM.MAX_REQUEST_AREA;
+        disabled = tooLarge;
       } else if ($("#format_mapnik").prop("checked")) {
         disabled = $("#mapnik_scale").val() < max_scale;
       }
@@ -230,8 +194,9 @@ $(document).ready(function () {
     }
 
     function htmlUrlChanged() {
-      var bounds = new OpenLayers.Bounds($("#minlon").val(), $("#minlat").val(), $("#maxlon").val(), $("#maxlat").val());
-      var layerName = map.baseLayer.keyid;
+      var bounds = getBounds();
+      var layerName = getMapBaseLayer().keyid;
+
       var url = "http://" + OSM.SERVER_URL + "/export/embed.html?bbox=" + bounds.toBBOX() + "&amp;layer=" + layerName;
       var markerUrl = "";
 
@@ -243,9 +208,9 @@ $(document).ready(function () {
       var html = '<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="'+url+'" style="border: 1px solid black"></iframe>';
 
       // Create "larger map" link
-      var center = bounds.getCenterLonLat();
+      var center = bounds.getCenter();
 
-      var zoom = map.getZoomForExtent(proj(bounds));
+      var zoom = map.getBoundsZoom(bounds);
 
       var layers = getMapLayers();
 
@@ -257,7 +222,7 @@ $(document).ready(function () {
         escaped.push(c < 127 ? text.charAt(i) : "&#" + c + ";");
       }
 
-      html += '<br /><small><a href="http://' + OSM.SERVER_URL + '/?lat='+center.lat+'&amp;lon='+center.lon+'&amp;zoom='+zoom+'&amp;layers='+layers+markerUrl+'">'+escaped.join("")+'</a></small>';
+      html += '<br /><small><a href="http://' + OSM.SERVER_URL + '/?lat='+center.lat+'&amp;lon='+center.lng+'&amp;zoom='+zoom+'&amp;layers='+layers+markerUrl+'">'+escaped.join("")+'</a></small>';
 
       $("#export_html_text").val(html);
 
@@ -276,7 +241,7 @@ $(document).ready(function () {
       }
 
       if ($("#format_mapnik").prop("checked")) {
-        $("#mapnik_scale").val(roundScale(map.getScale()));
+//        $("#mapnik_scale").val(roundScale(map.getScale()));
         $("#export_mapnik").show();
 
         mapnikSizeChanged();
@@ -306,8 +271,8 @@ $(document).ready(function () {
     function mapnikImageSize(scale) {
       var bounds = getMercatorBounds();
 
-      return new OpenLayers.Size(Math.round(bounds.getWidth() / scale / 0.00028),
-                                 Math.round(bounds.getHeight() / scale / 0.00028));
+      return {w: Math.round(bounds.getWidth() / scale / 0.00028),
+              h: Math.round(bounds.getHeight() / scale / 0.00028)};
     }
 
     function roundScale(scale) {
index 1e4138b..a4fbb6c 100644 (file)
@@ -1,10 +1,12 @@
 $(document).ready(function () {
   $("#open_map_key").click(function (e) {
+    e.preventDefault();
+
     var url = $(this).attr('href'),
         title = $(this).text();
 
     function updateMapKey() {
-      var mapLayer = map.baseLayer.keyid,
+      var mapLayer = getMapBaseLayer().keyid,
           mapZoom = map.getZoom();
 
       $(".mapkey-table-entry").each(function () {
@@ -24,13 +26,9 @@ $(document).ready(function () {
     openSidebar({ title: title });
 
     $("#sidebar").one("closed", function () {
-      map.events.unregister("zoomend", map, updateMapKey);
-      map.events.unregister("changelayer", map, updateMapKey);
+      map.off("zoomend layeradd layerremove", updateMapKey);
     });
 
-    map.events.register("zoomend", map, updateMapKey);
-    map.events.register("changelayer", map, updateMapKey);
-
-    e.preventDefault();
+    map.on("zoomend layeradd layerremove", updateMapKey);
   });
 });
index c06c9c8..eae9b89 100644 (file)
-var epsg4326 = new OpenLayers.Projection("EPSG:4326");
+// Leaflet extensions
+L.LatLngBounds.include({
+  getSouthLat: function () {
+    return this._southWest.lat;
+  },
+
+  getWestLng: function () {
+    return this._southWest.lng;
+  },
+
+  getNorthLat: function () {
+    return this._northEast.lat;
+  },
+
+  getEastLng: function () {
+    return this._northEast.lng;
+  },
+
+  toBBOX: function () {
+    var decimal = 6;
+    var mult = Math.pow(10, decimal);
+    var xmin = Math.round(this.getWestLng() * mult) / mult;
+    var ymin = Math.round(this.getSouthLat() * mult) / mult;
+    var xmax = Math.round(this.getEastLng() * mult) / mult;
+    var ymax = Math.round(this.getNorthLat() * mult) / mult;
+    return xmin + "," + ymin + "," + xmax + "," + ymax;
+  },
+
+  getSize: function () {
+    return (this._northEast.lat - this._southWest.lat) *
+           (this._northEast.lng - this._southWest.lng);
+  }
+});
+
+L.Bounds.include({
+  getWidth: function () {
+   return this.max.x - this.min.x;
+  },
+
+  getHeight: function () {
+   return this.max.y - this.min.y;
+  }
+});
+
 var map;
-var markers;
-var vectors;
-var popup;
-
-function createMap(divName, options) {
-   options = options || {};
-
-   map = new OpenLayers.Map(divName, {
-      controls: options.controls || [
-         new OpenLayers.Control.ArgParser(),
-         new OpenLayers.Control.Attribution(),
-         new SimpleLayerSwitcher(),
-         new OpenLayers.Control.Navigation(),
-         new OpenLayers.Control.Zoom(),
-         new OpenLayers.Control.SimplePanZoom(),
-         new OpenLayers.Control.ScaleLine({geodesic: true})
-      ],
-      numZoomLevels: 20,
-      displayProjection: new OpenLayers.Projection("EPSG:4326"),
-      theme: "<%= asset_path 'theme/openstreetmap/style.css' %>"
-   });
-
-   var mapnik = new OpenLayers.Layer.OSM.Mapnik(I18n.t("javascripts.map.base.standard"), {
-      attribution: "",
-      keyid: "mapnik",
-      displayOutsideMaxExtent: true,
-      wrapDateLine: true,
-      layerCode: "M"
-   });
-   map.addLayer(mapnik);
-
-   var cyclemap = new OpenLayers.Layer.OSM.CycleMap(I18n.t("javascripts.map.base.cycle_map"), {
-      attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
-      keyid: "cyclemap",
-      displayOutsideMaxExtent: true,
-      wrapDateLine: true,
-      layerCode: "C"
-   });
-   map.addLayer(cyclemap);
-
-   var transportmap = new OpenLayers.Layer.OSM.TransportMap(I18n.t("javascripts.map.base.transport_map"), {
-      attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
-      keyid: "transportmap",
-      displayOutsideMaxExtent: true,
-      wrapDateLine: true,
-      layerCode: "T"
-   });
-   map.addLayer(transportmap);
-
-   var mapquest = new OpenLayers.Layer.OSM(I18n.t("javascripts.map.base.mapquest"), [
-      "http://otile1.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png",
-      "http://otile2.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png",
-      "http://otile3.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png",
-      "http://otile4.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png"
-   ], {
-      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",
-      displayOutsideMaxExtent: true,
-      wrapDateLine: true,
-      numZoomLevels: 19,
-      layerCode: "Q"
-   });
-   map.addLayer(mapquest);
-
-   markers = new OpenLayers.Layer.Markers("Markers", {
-      displayInLayerSwitcher: false,
-      numZoomLevels: 20,
-      projection: "EPSG:900913"
-   });
-   map.addLayer(markers);
-
-   map.dataLayer = new OpenLayers.Layer(I18n.t('browse.start_rjs.data_layer_name'), {
-     visibility: false,
-     displayInLayerSwitcher: false
-   });
-   map.addLayer(map.dataLayer);
-
-   $("#" + divName).on("resized", function () {
-     map.updateSize();
-   });
-
-   return map;
+
+var layers = [
+  {
+    urlTemplate: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+    attribution: "",
+    keyid: "mapnik",
+    layerCode: "M",
+    name: I18n.t("javascripts.map.base.standard")
+  },
+  {
+    urlTemplate: 'http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png',
+    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',
+    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',
+    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 createMap(divName) {
+  map = L.map(divName);
+
+  map.attributionControl.setPrefix(''); // For tmcw
+
+  var layersControl = L.control.layers().addTo(map);
+
+  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);
+    }
+    layersControl.addBaseLayer(layers[i].layer, layers[i].name);
+  }
+
+  $("#" + divName).on("resized", function () {
+    map.invalidateSize();
+  });
+
+  return map;
 }
 
 function getArrowIcon() {
-   var size = new OpenLayers.Size(25, 22);
-   var offset = new OpenLayers.Pixel(-22, -20);
-   var icon = new OpenLayers.Icon("<%= asset_path 'arrow.png' %>", size, offset);
-
-   return icon;
+  return L.icon({
+    iconUrl: <%= asset_path('arrow.png').to_json %>,
+    iconSize: [25, 22],
+    iconAnchor: [22, 20]
+  });
 }
 
 function addMarkerToMap(position, icon, description) {
-   var marker = new OpenLayers.Marker(proj(position), icon);
+  var marker = L.marker(position, icon ? {icon: icon} : null).addTo(map);
 
-   markers.addMarker(marker);
+  if (description) {
+    marker.bindPopup(description);
+  }
 
-   if (description) {
-       marker.events.register("mouseover", marker, function() {
-           openMapPopup(marker, description);
-       });
-   }
+  return marker;
+}
 
-   return marker;
+function removeMarkerFromMap(marker) {
+  map.removeLayer(marker);
 }
 
 function addObjectToMap(object, zoom, callback) {
-   var layer = new OpenLayers.Layer.Vector("Objects", {
-      strategies: [ 
-          new OpenLayers.Strategy.Fixed()
-      ],
-      protocol: new OpenLayers.Protocol.HTTP({
-          url: OSM.apiUrl(object),
-          format: new OpenLayers.Format.OSM()
-      }),
-      style: {
+  $.ajax({
+    url: OSM.apiUrl(object),
+    dataType: "xml",
+    success: function (xml) {
+      var layer = new L.OSM(xml, {
+        style: {
           strokeColor: "blue",
           strokeWidth: 3,
           strokeOpacity: 0.5,
           fillOpacity: 0.2,
           fillColor: "lightblue",
           pointRadius: 6
-      },
-      projection: new OpenLayers.Projection("EPSG:4326"),
-      displayInLayerSwitcher: false
-   });
-
-   layer.events.register("loadend", layer, function() {
-      var extent;
-
-      if (this.features.length) {
-         extent = this.features[0].geometry.getBounds();
-
-         for (var i = 1; i < this.features.length; i++) {
-            extent.extend(this.features[i].geometry.getBounds());
-         }
-
-         if (zoom) {
-            if (extent) {
-               this.map.zoomToExtent(extent);
-            } else {
-               this.map.zoomToMaxExtent();
-            }
-         }
+        }
+      });
+
+      var bounds = layer.getBounds();
+
+      if (zoom) {
+        map.fitBounds(bounds);
       }
 
       if (callback) {
-         callback(extent);
+        callback(bounds);
       }
-   });
-
-   map.addLayer(layer);
-}
-
-function addBoxToMap(boxbounds, id, outline) {
-   if (!vectors) {
-     // Be aware that IE requires Vector layers be initialised on page load, and not under deferred script conditions
-     vectors = new OpenLayers.Layer.Vector("Boxes", {
-        displayInLayerSwitcher: false
-     });
-     map.addLayer(vectors);
-   }
-   var geometry;
-   if (outline) {
-     vertices = boxbounds.toGeometry().getVertices();
-     vertices.push(new OpenLayers.Geometry.Point(vertices[0].x, vertices[0].y));
-     geometry = proj(new OpenLayers.Geometry.LineString(vertices));
-   } else {
-     geometry = proj(boxbounds.toGeometry());
-   }
-   var box = new OpenLayers.Feature.Vector(geometry, {}, {
-      strokeWidth: 2,
-      strokeColor: '#ee9900',
-      fillOpacity: 0
-   });
-   box.fid = id;
-
-   vectors.addFeatures(box);
-
-   return box;
-}
-
-function openMapPopup(marker, description) {
-   closeMapPopup();
-
-   popup = new OpenLayers.Popup.FramedCloud("popup", marker.lonlat, null,
-                                            description, marker.icon, true);
-   popup.setBackgroundColor("#E3FFC5");
-   map.addPopup(popup);
 
-   return popup;
+      layer.addTo(map);
+    }
+  });
 }
 
-function closeMapPopup() {
-   if (popup) {
-      map.removePopup(popup);
-   }
-}
-
-function removeMarkerFromMap(marker){
-   markers.removeMarker(marker);
-}
+function addBoxToMap(bounds) {
+  var box = L.rectangle(bounds, {
+    weight: 2,
+    color: '#e90',
+    fillOpacity: 0
+  });
 
-function proj(x) {
-    return x.clone().transform(epsg4326, map.getProjectionObject());
-}
-
-function unproj(x) {
-    return x.clone().transform(map.getProjectionObject(), epsg4326);
-}
+  box.addTo(map);
 
-function setMapCenter(center, zoom) {
-   zoom = parseInt(zoom, 10);
-   var numzoom = map.getNumZoomLevels();
-   if (zoom >= numzoom) zoom = numzoom - 1;
-   map.setCenter(proj(center), zoom);
+  return box;
 }
 
-function getEventPosition(event) {
-   return unproj(map.getLonLatFromViewPortPx(event.xy));
+function getMapBaseLayer() {
+  for (var i = 0; i < layers.length; i++) {
+    if (map.hasLayer(layers[i].layer)) {
+      return layers[i];
+    }
+  }
 }
 
 function getMapLayers() {
-   var layerConfig = "";
+  for (var i = 0; i < layers.length; i++) {
+    if (map.hasLayer(layers[i].layer)) {
+      return layers[i].layerCode;
+    }
+  }
 
-   for (var i = 0; i < map.layers.length; i++) {
-      if (map.layers[i].layerCode && map.layers[i].getVisibility()) {
-         layerConfig += map.layers[i].layerCode;
-      }
-   }
-
-   return layerConfig;
+  return "";
 }
 
 function setMapLayers(layerConfig) {
-   if (layerConfig.charAt(0) == "B" || layerConfig.charAt(0) == "0") {
-      var l = 0;
-
-      for (var layers = map.getLayersBy("isBaseLayer", true), i = 0; i < layers.length; i++) {
-         var c = layerConfig.charAt(l++);
-
-         if (c == "B") {
-            map.setBaseLayer(layers[i]);
-         } else {
-            map.layers[i].setVisibility(false);
-         }
-      }
-   } else {
-      for (var i = 0; i < map.layers.length; i++) {
-         if (map.layers[i].layerCode) {
-            if (layerConfig.indexOf(map.layers[i].layerCode) >= 0) {
-               if (map.layers[i].isBaseLayer) {
-                  map.setBaseLayer(map.layers[i]);
-               } else {
-                  map.layers[i].setVisibility(true);
-               }
-            } else if (!map.layers[i].isBaseLayer) {
-               map.layers[i].setVisibility(false);
-            }
-         }
-      }
-   }
+  for (var i = 0; i < layers.length; i++) {
+    if (~layerConfig.indexOf(layers[i].layerCode)) {
+      map.addLayer(layers[i].layer);
+    } else {
+      map.removeLayer(layers[i].layer);
+    }
+  }
 }
diff --git a/app/assets/javascripts/openlayers.js.erb b/app/assets/javascripts/openlayers.js.erb
deleted file mode 100644 (file)
index 66d991f..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-//= require OpenLayers
-//= require OpenStreetMap
-//= require SimpleLayerSwitcher
-//= require SimplePanZoom
-
-OpenLayers.Util.imageURLs = {
-    "404.png": "<%= asset_path 'img/404.png' %>",
-    "blank.gif": "<%= asset_path 'img/blank.gif' %>",
-    "cloud-popup-relative.png": "<%= asset_path 'img/cloud-popup-relative.png' %>",
-    "drag-rectangle-off.png": "<%= asset_path 'img/drag-rectangle-off.png' %>",
-    "drag-rectangle-on.png": "<%= asset_path 'img/drag-rectangle-on.png' %>",
-    "east-mini.png": "<%= asset_path 'img/east-mini.png' %>",
-    "layer-switcher-maximize.png": "<%= asset_path 'img/layer-switcher-maximize.png' %>",
-    "layer-switcher-minimize.png": "<%= asset_path 'img/layer-switcher-minimize.png' %>",
-    "marker-blue.png": "<%= asset_path 'img/marker-blue.png' %>",
-    "marker-gold.png": "<%= asset_path 'img/marker-gold.png' %>",
-    "marker-green.png": "<%= asset_path 'img/marker-green.png' %>",
-    "marker.png": "<%= asset_path 'img/marker.png' %>",
-    "measuring-stick-off.png": "<%= asset_path 'img/measuring-stick-off.png' %>",
-    "measuring-stick-on.png": "<%= asset_path 'img/measuring-stick-on.png' %>",
-    "north-mini.png": "<%= asset_path 'img/north-mini.png' %>",
-    "panning-hand-off.png": "<%= asset_path 'img/panning-hand-off.png' %>",
-    "panning-hand-on.png": "<%= asset_path 'img/panning-hand-on.png' %>",
-    "slider.png": "<%= asset_path 'img/slider.png' %>",
-    "south-mini.png": "<%= asset_path 'img/south-mini.png' %>",
-    "west-mini.png": "<%= asset_path 'img/west-mini.png' %>",
-    "zoombar.png": "<%= asset_path 'img/zoombar.png' %>",
-    "zoom-minus-mini.png": "<%= asset_path 'img/zoom-minus-mini.png' %>",
-    "zoom-plus-mini.png": "<%= asset_path 'img/zoom-plus-mini.png' %>",
-    "zoom-world-mini.png": "<%= asset_path 'img/zoom-world-mini.png' %>"
-};
-
-OpenLayers.Util.origGetImageLocation = OpenLayers.Util.getImageLocation;
-
-OpenLayers.Util.getImageLocation = function(image) {
-    return OpenLayers.Util.imageURLs[image] || OpenLayers.Util.origGetImageLocation(image);
-};
-
-OpenLayers.Lang.setCode($('html').attr('lang'));
index 77cb86a..95137bd 100644 (file)
@@ -2,40 +2,36 @@ $(document).ready(function () {
   var map = createMap("map");
 
   if (OSM.home) {
-    setMapCenter(new OpenLayers.LonLat(OSM.home.lon, OSM.home.lat), 12);
+    map.setView([OSM.home.lat, OSM.home.lon], 12);
   } else {
-    setMapCenter(new OpenLayers.LonLat(0, 0), 0);
+    map.setView([0, 0], 0);
   }
 
   if ($("#map").hasClass("set_location")) {
     var marker;
 
     if (OSM.home) {
-      marker = addMarkerToMap(new OpenLayers.LonLat(OSM.home.lon, OSM.home.lat));
+      marker = addMarkerToMap([OSM.home.lat, OSM.home.lon]);
     }
 
-    map.events.register("click", map, function (e) {
+    map.on("click", function (e) {
       if ($('#updatehome').is(':checked')) {
-        var lonlat = getEventPosition(e);
-
         $('#homerow').removeClass();
-        $('#home_lat').val(lonlat.lat);
-        $('#home_lon').val(lonlat.lon);
+        $('#home_lat').val(e.latlng.lat);
+        $('#home_lon').val(e.latlng.lng);
 
         if (marker) {
           removeMarkerFromMap(marker);
         }
 
-        marker = addMarkerToMap(lonlat);
+        marker = addMarkerToMap(e.latlng);
       }
     });
   } else {
     $("[data-user]").each(function () {
       var user = $(this).data('user');
       if (user.lon && user.lat) {
-        var icon = OpenLayers.Marker.defaultIcon();
-        icon.url = OpenLayers.Util.getImageLocation(user.icon);
-        addMarkerToMap(new OpenLayers.LonLat(user.lon, user.lat), icon, user.description);
+        addMarkerToMap([user.lat, user.lon], L.icon({iconUrl: user.icon}), user.description);
       }
     });
   }
diff --git a/app/assets/openlayers/theme/openstreetmap/img/carat.png b/app/assets/openlayers/theme/openstreetmap/img/carat.png
deleted file mode 100644 (file)
index 7fdf17e..0000000
Binary files a/app/assets/openlayers/theme/openstreetmap/img/carat.png and /dev/null differ
diff --git a/app/assets/openlayers/theme/openstreetmap/style.css.scss b/app/assets/openlayers/theme/openstreetmap/style.css.scss
deleted file mode 100644 (file)
index bd755a5..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *= require theme/default/style
- *= require theme/openstreetmap/SimpleLayerSwitcher
- *= require theme/openstreetmap/SimplePanZoom
- */
-
-.olControlOverviewMapExtentRectangle {
-    background-image: image-url("theme/default/img/blank.gif");
-}
-
-.olControlOverviewMapRectReplacement {
-    background-image: image-url("theme/default/img/overview_replacement.gif");
-}
-
-.olControlNavigationHistory {
-    background-image: image-url("theme/default/img/navigation_history.png");
-}
-
-div.olControlSaveFeaturesItemActive {
-    background-image: image-url("theme/default/img/save_features_on.png");
-}
-
-div.olControlSaveFeaturesItemInactive {
-    background-image: image-url("theme/default/img/save_features_off.png");
-}
-
-.olControlPanPanel div {
-    background-image: image-url("theme/default/img/pan-panel.png");
-}
-
-.olControlZoomPanel div {
-    background-image: image-url("theme/default/img/zoom-panel.png");
-}
-
-.olPopupCloseBox {
-    background: image-url("theme/default/img/close.gif") no-repeat;
-}
-
-.olImageLoadError {
-    // remove opacity?
-    // remove filter?
-    background: image-url("theme/openstreetmap/img/missing-tile.png") no-repeat;
-}
-
-.olControlNavToolbar div,
-.olControlEditingToolbar div {
-    background-image: image-url("theme/default/img/editing_tool_bar.png");
-}
-
-div.olControlZoom a {
-    color: black;
-    background: #ffffff;
-    border: 1px solid #cccccc;
-    margin: 0 !important;
-    // remove filter
-}
-
-div.olControlZoom a.olControlZoomIn {
-    border-bottom: 0;
-}
-
-div.olControlZoom a:hover {
-    background: #f5f5f5;
-}
-
-// remove max-width hover?
index 88ad3eb..0461c93 100644 (file)
@@ -5,7 +5,13 @@
   <%= stylesheet_link_tag "small-#{dir}", :media => "only screen and (max-width:641px)" %>
   <%= stylesheet_link_tag "large-#{dir}", :media => "screen and (min-width: 642px)" %>
   <%= stylesheet_link_tag "print-#{dir}", :media => "print" %>
-  <!--[if IE]><%= stylesheet_link_tag "large-#{dir}", :media => "screen" %><![endif]--> <!-- IE is totally broken with CSS media queries -->
+  <%= stylesheet_link_tag "leaflet" %>
+  <%= stylesheet_link_tag "leaflet.draw" %>
+  <!--[if IE]>
+    <%= stylesheet_link_tag "leaflet.ie" %>
+    <%= stylesheet_link_tag "leaflet.draw.ie" %>
+    <%= stylesheet_link_tag "large-#{dir}", :media => "screen" %>
+  <![endif]--> <!-- IE is totally broken with CSS media queries -->
   <%= 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" }) %>
index 82ca579..1a28c21 100644 (file)
@@ -3,7 +3,7 @@
      user_data = {
        :lon => contact.home_lon,
        :lat => contact.home_lat,
-       :icon => type == "friend" ? "marker-blue.png" : "marker-green.png",
+       :icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"),
        :description => render(:partial => "popup", :object => contact, :locals => {:type => type})
      }
   %>
index 114f9b9..a8fce11 100644 (file)
       user_data = {
         :lon => @user.home_lon,
         :lat => @user.home_lat,
-        :icon => "marker.png",
+        :icon => image_path("marker-red.png"),
         :description => render(:partial => "popup", :object => @user, :locals => {:type => "your location"})
       }
     %>
diff --git a/vendor/assets/leaflet/images/layers.png b/vendor/assets/leaflet/images/layers.png
new file mode 100644 (file)
index 0000000..642e278
Binary files /dev/null and b/vendor/assets/leaflet/images/layers.png differ
diff --git a/vendor/assets/leaflet/images/marker-icon.png b/vendor/assets/leaflet/images/marker-icon.png
new file mode 100644 (file)
index 0000000..7614b7c
Binary files /dev/null and b/vendor/assets/leaflet/images/marker-icon.png differ
diff --git a/vendor/assets/leaflet/images/marker-shadow.png b/vendor/assets/leaflet/images/marker-shadow.png
new file mode 100644 (file)
index 0000000..a64f6a6
Binary files /dev/null and b/vendor/assets/leaflet/images/marker-shadow.png differ
diff --git a/vendor/assets/leaflet/images/zoom-in.png b/vendor/assets/leaflet/images/zoom-in.png
new file mode 100644 (file)
index 0000000..4a98a35
Binary files /dev/null and b/vendor/assets/leaflet/images/zoom-in.png differ
diff --git a/vendor/assets/leaflet/images/zoom-out.png b/vendor/assets/leaflet/images/zoom-out.png
new file mode 100644 (file)
index 0000000..4276166
Binary files /dev/null and b/vendor/assets/leaflet/images/zoom-out.png differ
diff --git a/vendor/assets/leaflet/leaflet.css b/vendor/assets/leaflet/leaflet.css
new file mode 100644 (file)
index 0000000..18ca7a1
--- /dev/null
@@ -0,0 +1,378 @@
+/* required styles */\r
+\r
+.leaflet-map-pane,\r
+.leaflet-tile,\r
+.leaflet-marker-icon,\r
+.leaflet-marker-shadow,\r
+.leaflet-tile-pane,\r
+.leaflet-overlay-pane,\r
+.leaflet-shadow-pane,\r
+.leaflet-marker-pane,\r
+.leaflet-popup-pane,\r
+.leaflet-overlay-pane svg,\r
+.leaflet-zoom-box,\r
+.leaflet-image-layer,\r
+.leaflet-layer { /* TODO optimize classes */\r
+       position: absolute;\r
+       }\r
+.leaflet-container {\r
+       overflow: hidden;\r
+       outline: 0;\r
+       }\r
+.leaflet-tile,\r
+.leaflet-marker-icon,\r
+.leaflet-marker-shadow {\r
+       -moz-user-select: none;\r
+       -webkit-user-select: none;\r
+       user-select: none;\r
+       }\r
+.leaflet-marker-icon,\r
+.leaflet-marker-shadow {\r
+       display: block;\r
+       }\r
+.leaflet-clickable {\r
+       cursor: pointer;\r
+       }\r
+.leaflet-dragging, .leaflet-dragging .leaflet-clickable {\r
+       cursor: move;\r
+       }\r
+.leaflet-container img {\r
+    /* map is broken in FF if you have max-width: 100% on tiles */\r
+       max-width: none !important;\r
+       }\r
+.leaflet-container img.leaflet-image-layer {\r
+    /* stupid Android 2 doesn't understand "max-width: none" properly */\r
+    max-width: 15000px !important;\r
+    }\r
+\r
+.leaflet-tile-pane { z-index: 2; }\r
+.leaflet-objects-pane { z-index: 3; }\r
+.leaflet-overlay-pane { z-index: 4; }\r
+.leaflet-shadow-pane { z-index: 5; }\r
+.leaflet-marker-pane { z-index: 6; }\r
+.leaflet-popup-pane { z-index: 7; }\r
+\r
+.leaflet-tile {\r
+    filter: inherit;\r
+    visibility: hidden;\r
+       }\r
+.leaflet-tile-loaded {\r
+       visibility: inherit;\r
+       }\r
+\r
+.leaflet-zoom-box {\r
+    width: 0;\r
+    height: 0;\r
+    }\r
+\r
+/* Leaflet controls */\r
+\r
+.leaflet-control {\r
+       position: relative;\r
+       z-index: 7;\r
+       pointer-events: auto;\r
+       }\r
+.leaflet-top,\r
+.leaflet-bottom {\r
+       position: absolute;\r
+       z-index: 1000;\r
+       pointer-events: none;\r
+       }\r
+.leaflet-top {\r
+       top: 0;\r
+       }\r
+.leaflet-right {\r
+       right: 0;\r
+       }\r
+.leaflet-bottom {\r
+       bottom: 0;\r
+       }\r
+.leaflet-left {\r
+       left: 0;\r
+       }\r
+.leaflet-control {\r
+       float: left;\r
+       clear: both;\r
+       }\r
+.leaflet-right .leaflet-control {\r
+       float: right;\r
+       }\r
+.leaflet-top .leaflet-control {\r
+       margin-top: 10px;\r
+       }\r
+.leaflet-bottom .leaflet-control {\r
+       margin-bottom: 10px;\r
+       }\r
+.leaflet-left .leaflet-control {\r
+       margin-left: 10px;\r
+       }\r
+.leaflet-right .leaflet-control {\r
+       margin-right: 10px;\r
+       }\r
+\r
+.leaflet-control-zoom {\r
+       -moz-border-radius: 7px;\r
+       -webkit-border-radius: 7px;\r
+       border-radius: 7px;\r
+       }\r
+.leaflet-control-zoom {\r
+       padding: 5px;\r
+       background: rgba(0, 0, 0, 0.25);\r
+       }\r
+.leaflet-control-zoom a {\r
+       background-color: rgba(255, 255, 255, 0.75);\r
+       }\r
+.leaflet-control-zoom a, .leaflet-control-layers a {\r
+       background-position: 50% 50%;\r
+       background-repeat: no-repeat;\r
+       display: block;\r
+       }\r
+.leaflet-control-zoom a {\r
+       -moz-border-radius: 4px;\r
+       -webkit-border-radius: 4px;\r
+       border-radius: 4px;\r
+       width: 19px;\r
+       height: 19px;\r
+       }\r
+.leaflet-control-zoom a:hover {\r
+       background-color: #fff;\r
+       }\r
+.leaflet-touch .leaflet-control-zoom a {\r
+       width: 27px;\r
+       height: 27px;\r
+       }\r
+.leaflet-control-zoom-in {\r
+       background-image: url(images/zoom-in.png);\r
+       margin-bottom: 5px;\r
+       }\r
+.leaflet-control-zoom-out {\r
+       background-image: url(images/zoom-out.png);\r
+       }\r
+\r
+.leaflet-control-layers {\r
+       box-shadow: 0 1px 7px #999;\r
+       background: #f8f8f9;\r
+       -moz-border-radius: 8px;\r
+       -webkit-border-radius: 8px;\r
+       border-radius: 8px;\r
+       }\r
+.leaflet-control-layers a {\r
+       background-image: url(images/layers.png);\r
+       width: 36px;\r
+       height: 36px;\r
+       }\r
+.leaflet-touch .leaflet-control-layers a {\r
+       width: 44px;\r
+       height: 44px;\r
+       }\r
+.leaflet-control-layers .leaflet-control-layers-list,\r
+.leaflet-control-layers-expanded .leaflet-control-layers-toggle {\r
+       display: none;\r
+       }\r
+.leaflet-control-layers-expanded .leaflet-control-layers-list {\r
+       display: block;\r
+       position: relative;\r
+       }\r
+.leaflet-control-layers-expanded {\r
+       padding: 6px 10px 6px 6px;\r
+       font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;\r
+       color: #333;\r
+       background: #fff;\r
+       }\r
+.leaflet-control-layers input {\r
+       margin-top: 2px;\r
+       position: relative;\r
+       top: 1px;\r
+       }\r
+.leaflet-control-layers label {\r
+       display: block;\r
+       }\r
+.leaflet-control-layers-separator {\r
+       height: 0;\r
+       border-top: 1px solid #ddd;\r
+       margin: 5px -10px 5px -6px;\r
+       }\r
+\r
+.leaflet-container .leaflet-control-attribution {\r
+       background-color: rgba(255, 255, 255, 0.7);\r
+       box-shadow: 0 0 5px #bbb;\r
+       margin: 0;\r
+    }\r
+\r
+.leaflet-control-attribution,\r
+.leaflet-control-scale-line {\r
+       padding: 0 5px;\r
+       color: #333;\r
+       }\r
+\r
+.leaflet-container .leaflet-control-attribution,\r
+.leaflet-container .leaflet-control-scale {\r
+       font: 11px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;\r
+       }\r
+\r
+.leaflet-left .leaflet-control-scale {\r
+       margin-left: 5px;\r
+       }\r
+.leaflet-bottom .leaflet-control-scale {\r
+       margin-bottom: 5px;\r
+       }\r
+\r
+.leaflet-control-scale-line {\r
+       border: 2px solid #777;\r
+       border-top: none;\r
+       color: black;\r
+       line-height: 1;\r
+       font-size: 10px;\r
+       padding-bottom: 2px;\r
+       text-shadow: 1px 1px 1px #fff;\r
+       background-color: rgba(255, 255, 255, 0.5);\r
+       }\r
+.leaflet-control-scale-line:not(:first-child) {\r
+       border-top: 2px solid #777;\r
+       padding-top: 1px;\r
+       border-bottom: none;\r
+       margin-top: -2px;\r
+       }\r
+.leaflet-control-scale-line:not(:first-child):not(:last-child) {\r
+       border-bottom: 2px solid #777;\r
+       }\r
+\r
+.leaflet-touch .leaflet-control-attribution, .leaflet-touch .leaflet-control-layers {\r
+       box-shadow: none;\r
+       }\r
+.leaflet-touch .leaflet-control-layers {\r
+       border: 5px solid #bbb;\r
+       }\r
+\r
+\r
+/* Zoom and fade animations */\r
+\r
+.leaflet-fade-anim .leaflet-tile, .leaflet-fade-anim .leaflet-popup {\r
+       opacity: 0;\r
+\r
+       -webkit-transition: opacity 0.2s linear;\r
+       -moz-transition: opacity 0.2s linear;\r
+       -o-transition: opacity 0.2s linear;\r
+       transition: opacity 0.2s linear;\r
+       }\r
+.leaflet-fade-anim .leaflet-tile-loaded, .leaflet-fade-anim .leaflet-map-pane .leaflet-popup {\r
+       opacity: 1;\r
+       }\r
+\r
+.leaflet-zoom-anim .leaflet-zoom-animated {\r
+       -webkit-transition: -webkit-transform 0.25s cubic-bezier(0.25,0.1,0.25,0.75);\r
+       -moz-transition: -moz-transform 0.25s cubic-bezier(0.25,0.1,0.25,0.75);\r
+       -o-transition: -o-transform 0.25s cubic-bezier(0.25,0.1,0.25,0.75);\r
+       transition: transform 0.25s cubic-bezier(0.25,0.1,0.25,0.75);\r
+       }\r
+\r
+.leaflet-zoom-anim .leaflet-tile,\r
+.leaflet-pan-anim .leaflet-tile,\r
+.leaflet-touching .leaflet-zoom-animated {\r
+    -webkit-transition: none;\r
+    -moz-transition: none;\r
+    -o-transition: none;\r
+    transition: none;\r
+    }\r
+\r
+.leaflet-zoom-anim .leaflet-zoom-hide {\r
+       visibility: hidden;\r
+       }\r
+\r
+\r
+/* Popup layout */\r
+\r
+.leaflet-popup {\r
+       position: absolute;\r
+       text-align: center;\r
+       }\r
+.leaflet-popup-content-wrapper {\r
+       padding: 1px;\r
+       text-align: left;\r
+       }\r
+.leaflet-popup-content {\r
+       margin: 14px 20px;\r
+       }\r
+.leaflet-popup-tip-container {\r
+       margin: 0 auto;\r
+       width: 40px;\r
+       height: 20px;\r
+       position: relative;\r
+       overflow: hidden;\r
+       }\r
+.leaflet-popup-tip {\r
+       width: 15px;\r
+       height: 15px;\r
+       padding: 1px;\r
+\r
+       margin: -8px auto 0;\r
+\r
+       -moz-transform: rotate(45deg);\r
+       -webkit-transform: rotate(45deg);\r
+       -ms-transform: rotate(45deg);\r
+       -o-transform: rotate(45deg);\r
+       transform: rotate(45deg);\r
+       }\r
+.leaflet-container a.leaflet-popup-close-button {\r
+       position: absolute;\r
+       top: 0;\r
+       right: 0;\r
+       padding: 4px 5px 0 0;\r
+       text-align: center;\r
+       width: 18px;\r
+       height: 14px;\r
+       font: 16px/14px Tahoma, Verdana, sans-serif;\r
+       color: #c3c3c3;\r
+       text-decoration: none;\r
+       font-weight: bold;\r
+       }\r
+.leaflet-container a.leaflet-popup-close-button:hover {\r
+       color: #999;\r
+       }\r
+.leaflet-popup-content p {\r
+       margin: 18px 0;\r
+       }\r
+.leaflet-popup-scrolled {\r
+       overflow: auto;\r
+       border-bottom: 1px solid #ddd;\r
+       border-top: 1px solid #ddd;\r
+       }\r
+\r
+\r
+/* Visual appearance */\r
+\r
+.leaflet-container {\r
+       background: #ddd;\r
+       }\r
+.leaflet-container a {\r
+       color: #0078A8;\r
+       }\r
+.leaflet-container a.leaflet-active {\r
+    outline: 2px solid orange;\r
+    }\r
+.leaflet-zoom-box {\r
+       border: 2px dotted #05f;\r
+       background: white;\r
+       opacity: 0.5;\r
+       }\r
+.leaflet-div-icon {\r
+    background: #fff;\r
+    border: 1px solid #666;\r
+    }\r
+.leaflet-editing-icon {\r
+    border-radius: 2px;\r
+    }\r
+.leaflet-popup-content-wrapper, .leaflet-popup-tip {\r
+       background: white;\r
+\r
+       box-shadow: 0 3px 14px rgba(0,0,0,0.35);\r
+       -webkit-box-shadow: 0 3px 18px rgba(0,0,0,0.33);\r
+       }\r
+.leaflet-popup-content-wrapper {\r
+       -moz-border-radius: 20px;\r
+       -webkit-border-radius: 20px;\r
+       border-radius: 20px;\r
+       }\r
+.leaflet-popup-content {\r
+       font: 12px/1.4 "Helvetica Neue", Arial, Helvetica, sans-serif;\r
+       }\r
diff --git a/vendor/assets/leaflet/leaflet.draw.css b/vendor/assets/leaflet/leaflet.draw.css
new file mode 100644 (file)
index 0000000..566ba32
--- /dev/null
@@ -0,0 +1,130 @@
+/* Leaflet controls */
+
+.leaflet-control-draw {
+       background-color: rgba(0, 0, 0, 0.25);
+       -webkit-border-radius: 7px;
+          -moz-border-radius: 7px;
+               border-radius: 7px;
+       padding: 5px;
+}
+
+.leaflet-control-draw a {
+       background-color: rgba(255, 255, 255, 0.75);
+       background-position: 50% 50%;
+       background-repeat: no-repeat;
+       -webkit-border-radius: 4px;
+          -moz-border-radius: 4px;
+               border-radius: 4px;
+       display: block;
+       margin-top: 5px;
+       width: 19px;
+       height: 19px;
+}
+
+.leaflet-control-draw a:first-child{
+       margin-top: 0;
+}      
+
+.leaflet-control-draw a:hover {
+       background-color: #fff;
+}
+
+.leaflet-touch .leaflet-control-draw a {
+       width: 27px;
+       height: 27px;
+}      
+
+.leaflet-control-draw-polyline {
+       background-image: url(images/draw-polyline.png);
+}
+
+.leaflet-control-draw-polygon {
+       background-image: url(images/draw-polygon.png);
+}
+
+.leaflet-control-draw-rectangle {
+       background-image: url(images/draw-rectangle.png);
+}
+
+.leaflet-control-draw-circle {
+       background-image: url(images/draw-circle.png);
+}
+
+.leaflet-control-draw-marker {
+       background-image: url(images/draw-marker-icon.png);
+}
+
+.leaflet-mouse-marker {
+       background-color: #fff;
+       cursor: crosshair;
+}
+
+.leaflet-draw-label {
+       background-color: #fff;
+       border: 1px solid #ccc;
+       color: #222;
+       font: 12px/18px "Helvetica Neue", Arial, Helvetica, sans-serif;
+       margin-left: 20px;
+       margin-top: -21px;
+       padding: 2px 4px;
+       position: absolute;
+       white-space: nowrap;
+       z-index: 6;
+}
+
+.leaflet-error-draw-label {
+       background-color: #F2DEDE;
+       border-color: #E6B6BD;
+       color: #B94A48;
+}
+
+.leaflet-draw-label-single {
+       margin-top: -12px
+}
+
+.leaflet-draw-label-subtext {
+       color: #999;
+}
+
+.leaflet-draw-guide-dash {
+       font-size: 1%;
+       opacity: 0.6;
+       position: absolute;
+       width: 5px;
+       height: 5px;
+}
+
+.leaflet-flash-anim {
+       -webkit-animation-duration: 0.66s;
+          -moz-animation-duration: 0.66s;
+            -o-animation-duration: 0.66s;
+               animation-duration: 0.66s;
+       -webkit-animation-fill-mode: both;
+          -moz-animation-fill-mode: both;
+            -o-animation-fill-mode: both;
+               animation-fill-mode: both;
+       -webkit-animation-name: leaflet-flash;
+          -moz-animation-name: leaflet-flash;
+            -o-animation-name: leaflet-flash;
+               animation-name: leaflet-flash;
+}
+
+@-webkit-keyframes leaflet-flash {
+       0%, 50%, 100% { opacity: 1; }   
+       25%, 75% { opacity: 0.3; }
+}
+
+@-moz-keyframes leaflet-flash {
+       0%, 50%, 100% { opacity: 1; }   
+       25%, 75% { opacity: 0.3; }
+}
+
+@-o-keyframes leaflet-flash {
+       0%, 50%, 100% { opacity: 1; }   
+       25%, 75% { opacity: 0.3; }
+}
+
+@keyframes leaflet-flash {
+       0%, 50%, 100% { opacity: 1; }   
+       25%, 75% { opacity: 0; }
+}
\ No newline at end of file
diff --git a/vendor/assets/leaflet/leaflet.draw.ie.css b/vendor/assets/leaflet/leaflet.draw.ie.css
new file mode 100644 (file)
index 0000000..f057184
--- /dev/null
@@ -0,0 +1,10 @@
+/* Conditional stylesheet for IE. */
+
+.leaflet-control-draw {
+       filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#3F000000', EndColorStr='#3F000000');
+}
+
+.leaflet-control-draw a {
+       background-color: #eee;
+       filter: alpha(opacity=90);
+}
\ No newline at end of file
diff --git a/vendor/assets/leaflet/leaflet.draw.js b/vendor/assets/leaflet/leaflet.draw.js
new file mode 100644 (file)
index 0000000..cd2af02
--- /dev/null
@@ -0,0 +1,931 @@
+/*
+ Copyright (c) 2012, Smartrak, Jacob Toye
+ Leaflet.draw is an open-source JavaScript library for drawing shapes/markers on leaflet powered maps.
+ https://github.com/jacobtoye/Leaflet.draw
+*/
+(function (window, undefined) {
+
+L.drawVersion = '0.1.4';
+
+L.Util.extend(L.LineUtil, {
+       // Checks to see if two line segments intersect. Does not handle degenerate cases.
+       // http://compgeom.cs.uiuc.edu/~jeffe/teaching/373/notes/x06-sweepline.pdf
+       segmentsIntersect: function (/*Point*/ p, /*Point*/ p1, /*Point*/ p2, /*Point*/ p3) {
+               return  this._checkCounterclockwise(p, p2, p3) !==
+                               this._checkCounterclockwise(p1, p2, p3) &&
+                               this._checkCounterclockwise(p, p1, p2) !==
+                               this._checkCounterclockwise(p, p1, p3);
+       },
+
+       // check to see if points are in counterclockwise order
+       _checkCounterclockwise: function (/*Point*/ p, /*Point*/ p1, /*Point*/ p2) {
+               return (p2.y - p.y) * (p1.x - p.x) > (p1.y - p.y) * (p2.x - p.x);
+       }
+});
+
+L.Polyline.include({
+       // Check to see if this polyline has any linesegments that intersect.
+       // NOTE: does not support detecting intersection for degenerate cases.
+       intersects: function () {
+               var points = this._originalPoints,
+                       len = points ? points.length : 0,
+                       i, j, p, p1, p2, p3;
+
+               if (this._tooFewPointsForIntersection()) {
+                       return false;
+               }
+
+               for (i = len - 1; i >= 3; i--) {
+                       p = points[i - 1];
+                       p1 = points[i];
+
+                       
+                       if (this._lineSegmentsIntersectsRange(p, p1, i - 2)) {
+                               return true;
+                       }
+               }
+
+               return false;
+       },
+
+       // Check for intersection if new latlng was added to this polyline.
+       // NOTE: does not support detecting intersection for degenerate cases.
+       newLatLngIntersects: function (latlng, skipFirst) {
+               // Cannot check a polyline for intersecting lats/lngs when not added to the map
+               if (!this._map) {
+                       return false;
+               }
+
+               return this.newPointIntersects(this._map.latLngToLayerPoint(latlng), skipFirst);
+       },
+
+       // Check for intersection if new point was added to this polyline.
+       // newPoint must be a layer point.
+       // NOTE: does not support detecting intersection for degenerate cases.
+       newPointIntersects: function (newPoint, skipFirst) {
+               var points = this._originalPoints,
+                       len = points ? points.length : 0,
+                       lastPoint = points ? points[len - 1] : null,
+                       // The previous previous line segment. Previous line segement doesn't need testing.
+                       maxIndex = len - 2;
+
+               if (this._tooFewPointsForIntersection(1)) {
+                       return false;
+               }
+
+               return this._lineSegmentsIntersectsRange(lastPoint, newPoint, maxIndex, skipFirst ? 1 : 0);
+       },
+
+       // Polylines with 2 sides can only intersect in cases where points are collinear (we don't support detecting these).
+       // Cannot have intersection when < 3 line segments (< 4 points)
+       _tooFewPointsForIntersection: function (extraPoints) {
+               var points = this._originalPoints,
+                       len = points ? points.length : 0;
+               // Increment length by extraPoints if present
+               len += extraPoints || 0;
+
+               return !this._originalPoints || len <= 3;
+       },
+
+       // Checks a line segment intersections with any line segements before its predecessor.
+       // Don't need to check the predecessor as will never intersect.
+       _lineSegmentsIntersectsRange: function (p, p1, maxIndex, minIndex) {
+               var points = this._originalPoints,
+                       p2, p3;
+
+               minIndex = minIndex || 0;
+
+               // Check all previous line segments (beside the immediately previous) for intersections
+               for (var j = maxIndex; j > minIndex; j--) {
+                       p2 = points[j - 1];
+                       p3 = points[j];
+
+                       if (L.LineUtil.segmentsIntersect(p, p1, p2, p3)) {
+                               return true;
+                       }
+               }
+
+               return false;
+       }
+});
+
+L.Polygon.include({
+       // Checks a polygon for any intersecting line segments. Ignores holes.
+       intersects: function () {
+               var polylineIntersects,
+                       points = this._originalPoints,
+                       len, firstPoint, lastPoint, maxIndex;
+
+               if (this._tooFewPointsForIntersection()) {
+                       return false;
+               }
+
+               polylineIntersects = L.Polyline.prototype.intersects.call(this);
+
+               // If already found an intersection don't need to check for any more.
+               if (polylineIntersects) {
+                       return true;
+               }
+
+               len = points.length;
+               firstPoint = points[0];
+               lastPoint = points[len - 1];
+               maxIndex = len - 2;
+
+               // Check the line segment between last and first point. Don't need to check the first line segment (minIndex = 1)
+               return this._lineSegmentsIntersectsRange(lastPoint, firstPoint, maxIndex, 1);
+       }
+});
+
+L.Handler.Draw = L.Handler.extend({
+       includes: L.Mixin.Events,
+
+       initialize: function (map, options) {
+               this._map = map;
+               this._container = map._container;
+               this._overlayPane = map._panes.overlayPane;
+               this._popupPane = map._panes.popupPane;
+
+               // Merge default shapeOptions options with custom shapeOptions
+               if (options && options.shapeOptions) {
+                       options.shapeOptions = L.Util.extend({}, this.options.shapeOptions, options.shapeOptions);
+               }
+               L.Util.extend(this.options, options);
+       },
+
+       enable: function () {
+               this.fire('activated');
+               L.Handler.prototype.enable.call(this);
+       },
+       
+       addHooks: function () {
+               if (this._map) {
+                       L.DomUtil.disableTextSelection();
+
+                       this._label = L.DomUtil.create('div', 'leaflet-draw-label', this._popupPane);
+                       this._singleLineLabel = false;
+
+                       L.DomEvent.addListener(this._container, 'keyup', this._cancelDrawing, this);
+               }
+       },
+
+       removeHooks: function () {
+               if (this._map) {
+                       L.DomUtil.enableTextSelection();
+
+                       this._popupPane.removeChild(this._label);
+                       delete this._label;
+
+                       L.DomEvent.removeListener(this._container, 'keyup', this._cancelDrawing);
+               }
+       },
+
+       _updateLabelText: function (labelText) {
+               labelText.subtext = labelText.subtext || '';
+
+               // update the vertical position (only if changed)
+               if (labelText.subtext.length === 0 && !this._singleLineLabel) {
+                       L.DomUtil.addClass(this._label, 'leaflet-draw-label-single');
+                       this._singleLineLabel = true;
+               }
+               else if (labelText.subtext.length > 0 && this._singleLineLabel) {
+                       L.DomUtil.removeClass(this._label, 'leaflet-draw-label-single');
+                       this._singleLineLabel = false;
+               }
+
+               this._label.innerHTML =
+                       (labelText.subtext.length > 0 ? '<span class="leaflet-draw-label-subtext">' + labelText.subtext + '</span>' + '<br />' : '') +
+                       '<span>' + labelText.text + '</span>';
+       },
+
+       _updateLabelPosition: function (pos) {
+               L.DomUtil.setPosition(this._label, pos);
+       },
+
+       // Cancel drawing when the escape key is pressed
+       _cancelDrawing: function (e) {
+               if (e.keyCode === 27) {
+                       this.disable();
+               }
+       }
+});
+
+L.Polyline.Draw = L.Handler.Draw.extend({
+       Poly: L.Polyline,
+
+       options: {
+               allowIntersection: true,
+               drawError: {
+                       color: '#b00b00',
+                       message: '<strong>Error:</strong> shape edges cannot cross!',
+                       timeout: 2500
+               },
+               icon: new L.DivIcon({
+                       iconSize: new L.Point(8, 8),
+                       className: 'leaflet-div-icon leaflet-editing-icon'
+               }),
+               guidelineDistance: 20,
+               shapeOptions: {
+                       stroke: true,
+                       color: '#f06eaa',
+                       weight: 4,
+                       opacity: 0.5,
+                       fill: false,
+                       clickable: true
+               },
+               zIndexOffset: 2000 // This should be > than the highest z-index any map layers
+       },
+
+       initialize: function (map, options) {
+               // Merge default drawError options with custom options
+               if (options && options.drawError) {
+                       options.drawError = L.Util.extend({}, this.options.drawError, options.drawError);
+               }
+               L.Handler.Draw.prototype.initialize.call(this, map, options);
+       },
+       
+       addHooks: function () {
+               L.Handler.Draw.prototype.addHooks.call(this);
+               if (this._map) {
+                       this._markers = [];
+
+                       this._markerGroup = new L.LayerGroup();
+                       this._map.addLayer(this._markerGroup);
+
+                       this._poly = new L.Polyline([], this.options.shapeOptions);
+
+                       this._updateLabelText(this._getLabelText());
+
+                       // Make a transparent marker that will used to catch click events. These click
+                       // events will create the vertices. We need to do this so we can ensure that
+                       // we can create vertices over other map layers (markers, vector layers). We
+                       // also do not want to trigger any click handlers of objects we are clicking on
+                       // while drawing.
+                       if (!this._mouseMarker) {
+                               this._mouseMarker = L.marker(this._map.getCenter(), {
+                                       icon: L.divIcon({
+                                               className: 'leaflet-mouse-marker',
+                                               iconAnchor: [20, 20],
+                                               iconSize: [40, 40]
+                                       }),
+                                       opacity: 0,
+                                       zIndexOffset: this.options.zIndexOffset
+                               });
+                       }
+
+                       this._mouseMarker
+                               .on('click', this._onClick, this)
+                               .addTo(this._map);
+
+                       this._map.on('mousemove', this._onMouseMove, this);
+               }
+       },
+
+       removeHooks: function () {
+               L.Handler.Draw.prototype.removeHooks.call(this);
+
+               this._clearHideErrorTimeout();
+
+               this._cleanUpShape();
+               
+               // remove markers from map
+               this._map.removeLayer(this._markerGroup);
+               delete this._markerGroup;
+               delete this._markers;
+
+               this._map.removeLayer(this._poly);
+               delete this._poly;
+
+               this._mouseMarker.off('click', this._onClick);
+               this._map.removeLayer(this._mouseMarker);
+               delete this._mouseMarker;
+
+               // clean up DOM
+               this._clearGuides();
+
+               this._map.off('mousemove', this._onMouseMove);
+       },
+
+       _finishShape: function () {
+               if (!this.options.allowIntersection && this._poly.newLatLngIntersects(this._poly.getLatLngs()[0], true)) {
+                       this._showErrorLabel();
+                       return;
+               }
+               if (!this._shapeIsValid()) {
+                       this._showErrorLabel();
+                       return;
+               }
+
+               this._map.fire(
+                       'draw:poly-created',
+                       { poly: new this.Poly(this._poly.getLatLngs(), this.options.shapeOptions) }
+               );
+               this.disable();
+       },
+
+       //Called to verify the shape is valid when the user tries to finish it
+       //Return false if the shape is not valid
+       _shapeIsValid: function () {
+               return true;
+       },
+
+       _onMouseMove: function (e) {
+               var newPos = e.layerPoint,
+                       latlng = e.latlng,
+                       markerCount = this._markers.length;
+
+               // Save latlng
+               this._currentLatLng = latlng;
+
+               // update the label
+               this._updateLabelPosition(newPos);
+
+               if (markerCount > 0) {
+                       this._updateLabelText(this._getLabelText());
+                       // draw the guide line
+                       this._clearGuides();
+                       this._drawGuide(
+                               this._map.latLngToLayerPoint(this._markers[markerCount - 1].getLatLng()),
+                               newPos
+                       );
+               }
+
+               // Update the mouse marker position
+               this._mouseMarker.setLatLng(latlng);
+
+               L.DomEvent.preventDefault(e.originalEvent);
+       },
+
+       _onClick: function (e) {
+               var latlng = e.target.getLatLng(),
+                       markerCount = this._markers.length;
+
+               if (markerCount > 0 && !this.options.allowIntersection && this._poly.newLatLngIntersects(latlng)) {
+                       this._showErrorLabel();
+                       return;
+               }
+               else if (this._errorShown) {
+                       this._hideErrorLabel();
+               }
+
+               this._markers.push(this._createMarker(latlng));
+
+               this._poly.addLatLng(latlng);
+
+               if (this._poly.getLatLngs().length === 2) {
+                       this._map.addLayer(this._poly);
+               }
+
+               this._updateMarkerHandler();
+
+               this._vertexAdded(latlng);
+       },
+
+       _updateMarkerHandler: function () {
+               // The last marker shold have a click handler to close the polyline
+               if (this._markers.length > 1) {
+                       this._markers[this._markers.length - 1].on('click', this._finishShape, this);
+               }
+               
+               // Remove the old marker click handler (as only the last point should close the polyline)
+               if (this._markers.length > 2) {
+                       this._markers[this._markers.length - 2].off('click', this._finishShape);
+               }
+       },
+       
+       _createMarker: function (latlng) {
+               var marker = new L.Marker(latlng, {
+                       icon: this.options.icon,
+                       zIndexOffset: this.options.zIndexOffset * 2
+               });
+               
+               this._markerGroup.addLayer(marker);
+
+               return marker;
+       },
+
+       _drawGuide: function (pointA, pointB) {
+               var length = Math.floor(Math.sqrt(Math.pow((pointB.x - pointA.x), 2) + Math.pow((pointB.y - pointA.y), 2))),
+                       i,
+                       fraction,
+                       dashPoint,
+                       dash;
+
+               //create the guides container if we haven't yet (TODO: probaly shouldn't do this every time the user starts to draw?)
+               if (!this._guidesContainer) {
+                       this._guidesContainer = L.DomUtil.create('div', 'leaflet-draw-guides', this._overlayPane);
+               }
+       
+               //draw a dash every GuildeLineDistance
+               for (i = this.options.guidelineDistance; i < length; i += this.options.guidelineDistance) {
+                       //work out fraction along line we are
+                       fraction = i / length;
+
+                       //calculate new x,y point
+                       dashPoint = {
+                               x: Math.floor((pointA.x * (1 - fraction)) + (fraction * pointB.x)),
+                               y: Math.floor((pointA.y * (1 - fraction)) + (fraction * pointB.y))
+                       };
+
+                       //add guide dash to guide container
+                       dash = L.DomUtil.create('div', 'leaflet-draw-guide-dash', this._guidesContainer);
+                       dash.style.backgroundColor =
+                               !this._errorShown ? this.options.shapeOptions.color : this.options.drawError.color;
+
+                       L.DomUtil.setPosition(dash, dashPoint);
+               }
+       },
+
+       _updateGuideColor: function (color) {
+               if (this._guidesContainer) {
+                       for (var i = 0, l = this._guidesContainer.childNodes.length; i < l; i++) {
+                               this._guidesContainer.childNodes[i].style.backgroundColor = color;
+                       }
+               }
+       },
+
+       // removes all child elements (guide dashes) from the guides container
+       _clearGuides: function () {
+               if (this._guidesContainer) {
+                       while (this._guidesContainer.firstChild) {
+                               this._guidesContainer.removeChild(this._guidesContainer.firstChild);
+                       }
+               }
+       },
+
+       _updateLabelText: function (labelText) {
+               if (!this._errorShown) {
+                       L.Handler.Draw.prototype._updateLabelText.call(this, labelText);
+               }
+       },
+
+       _getLabelText: function () {
+               var labelText,
+                       distance,
+                       distanceStr;
+
+               if (this._markers.length === 0) {
+                       labelText = {
+                               text: 'Click to start drawing line.'
+                       };
+               } else {
+                       // calculate the distance from the last fixed point to the mouse position
+                       distance = this._measurementRunningTotal + this._currentLatLng.distanceTo(this._markers[this._markers.length - 1].getLatLng());
+                       // show metres when distance is < 1km, then show km
+                       distanceStr = distance  > 1000 ? (distance  / 1000).toFixed(2) + ' km' : Math.ceil(distance) + ' m';
+                       
+                       if (this._markers.length === 1) {
+                               labelText = {
+                                       text: 'Click to continue drawing line.',
+                                       subtext: distanceStr
+                               };
+                       } else {
+                               labelText = {
+                                       text: 'Click last point to finish line.',
+                                       subtext: distanceStr
+                               };
+                       }
+               }
+               return labelText;
+       },
+
+       _showErrorLabel: function () {
+               this._errorShown = true;
+
+               // Update label
+               L.DomUtil.addClass(this._label, 'leaflet-error-draw-label');
+               L.DomUtil.addClass(this._label, 'leaflet-flash-anim');
+               L.Handler.Draw.prototype._updateLabelText.call(this, { text: this.options.drawError.message });
+
+               // Update shape
+               this._updateGuideColor(this.options.drawError.color);
+               this._poly.setStyle({ color: this.options.drawError.color });
+
+               // Hide the error after 2 seconds
+               this._clearHideErrorTimeout();
+               this._hideErrorTimeout = setTimeout(L.Util.bind(this._hideErrorLabel, this), this.options.drawError.timeout);
+       },
+
+       _hideErrorLabel: function () {
+               this._errorShown = false;
+
+               this._clearHideErrorTimeout();
+               
+               // Revert label
+               L.DomUtil.removeClass(this._label, 'leaflet-error-draw-label');
+               L.DomUtil.removeClass(this._label, 'leaflet-flash-anim');
+               this._updateLabelText(this._getLabelText());
+
+               // Revert shape
+               this._updateGuideColor(this.options.shapeOptions.color);
+               this._poly.setStyle({ color: this.options.shapeOptions.color });
+       },
+
+       _clearHideErrorTimeout: function () {
+               if (this._hideErrorTimeout) {
+                       clearTimeout(this._hideErrorTimeout);
+                       this._hideErrorTimeout = null;
+               }
+       },
+
+       _vertexAdded: function (latlng) {
+               if (this._markers.length === 1) {
+                       this._measurementRunningTotal = 0;
+               }
+               else {
+                       this._measurementRunningTotal +=
+                               latlng.distanceTo(this._markers[this._markers.length - 2].getLatLng());
+               }
+       },
+
+       _cleanUpShape: function () {
+               if (this._markers.length > 0) {
+                       this._markers[this._markers.length - 1].off('click', this._finishShape);
+               }
+       }
+});
+
+L.Polygon.Draw = L.Polyline.Draw.extend({
+       Poly: L.Polygon,
+
+       options: {
+               shapeOptions: {
+                       stroke: true,
+                       color: '#f06eaa',
+                       weight: 4,
+                       opacity: 0.5,
+                       fill: true,
+                       fillColor: null, //same as color by default
+                       fillOpacity: 0.2,
+                       clickable: false
+               }
+       },
+
+       _updateMarkerHandler: function () {
+               // The first marker shold have a click handler to close the polygon
+               if (this._markers.length === 1) {
+                       this._markers[0].on('click', this._finishShape, this);
+               }
+       },
+
+       _getLabelText: function () {
+               var text;
+               if (this._markers.length === 0) {
+                       text = 'Click to start drawing shape.';
+               } else if (this._markers.length < 3) {
+                       text = 'Click to continue drawing shape.';
+               } else {
+                       text = 'Click first point to close this shape.';
+               }
+               return {
+                       text: text
+               };
+       },
+
+       _shapeIsValid: function () {
+               return this._markers.length >= 3;
+       },
+
+       _vertexAdded: function (latlng) {
+               //calc area here
+       },
+
+       _cleanUpShape: function () {
+               if (this._markers.length > 0) {
+                       this._markers[0].off('click', this._finishShape);
+               }
+       }
+});
+
+L.SimpleShape = {};
+
+L.SimpleShape.Draw = L.Handler.Draw.extend({
+       addHooks: function () {
+               L.Handler.Draw.prototype.addHooks.call(this);
+               if (this._map) {
+                       this._map.dragging.disable();
+                       //TODO refactor: move cursor to styles
+                       this._container.style.cursor = 'crosshair';
+
+                       this._updateLabelText({ text: this._initialLabelText });
+
+                       this._map
+                               .on('mousedown', this._onMouseDown, this)
+                               .on('mousemove', this._onMouseMove, this);
+
+               }
+       },
+
+       removeHooks: function () {
+               L.Handler.Draw.prototype.removeHooks.call(this);
+               if (this._map) {
+                       this._map.dragging.enable();
+                       //TODO refactor: move cursor to styles
+                       this._container.style.cursor = '';
+
+                       this._map
+                               .off('mousedown', this._onMouseDown, this)
+                               .off('mousemove', this._onMouseMove, this);
+
+                       L.DomEvent.off(document, 'mouseup', this._onMouseUp);
+
+                       // If the box element doesn't exist they must not have moved the mouse, so don't need to destroy/return
+                       if (this._shape) {
+                               this._map.removeLayer(this._shape);
+                               delete this._shape;
+                       }
+               }
+               this._isDrawing = false;
+       },
+
+       _onMouseDown: function (e) {
+               this._isDrawing = true;
+               this._startLatLng = e.latlng;
+
+               L.DomEvent
+                       .on(document, 'mouseup', this._onMouseUp, this)
+                       .preventDefault(e.originalEvent);
+       },
+
+       _onMouseMove: function (e) {
+               var layerPoint = e.layerPoint,
+                               latlng = e.latlng;
+
+               this._updateLabelPosition(layerPoint);
+               if (this._isDrawing) {
+                       this._updateLabelText({ text: 'Release mouse to finish drawing.' });
+                       this._drawShape(latlng);
+               }
+       },
+
+       _onMouseUp: function (e) {
+               if (this._shape) {
+                       this._fireCreatedEvent();
+               }
+               
+               this.disable();
+       }
+});
+
+L.Circle.Draw = L.SimpleShape.Draw.extend({
+       options: {
+               shapeOptions: {
+                       stroke: true,
+                       color: '#f06eaa',
+                       weight: 4,
+                       opacity: 0.5,
+                       fill: true,
+                       fillColor: null, //same as color by default
+                       fillOpacity: 0.2,
+                       clickable: true
+               }
+       },
+
+       _initialLabelText: 'Click and drag to draw circle.',
+
+       _drawShape: function (latlng) {
+               if (!this._shape) {
+                       this._shape = new L.Circle(this._startLatLng, this._startLatLng.distanceTo(latlng), this.options.shapeOptions);
+                       this._map.addLayer(this._shape);
+               } else {
+                       this._shape.setRadius(this._startLatLng.distanceTo(latlng));
+               }
+       },
+
+       _fireCreatedEvent: function () {
+               this._map.fire(
+                       'draw:circle-created',
+                       { circ: new L.Circle(this._startLatLng, this._shape.getRadius(), this.options.shapeOptions) }
+               );
+       }
+});
+
+L.Rectangle.Draw = L.SimpleShape.Draw.extend({
+       options: {
+               shapeOptions: {
+                       stroke: true,
+                       color: '#f06eaa',
+                       weight: 4,
+                       opacity: 0.5,
+                       fill: true,
+                       fillColor: null, //same as color by default
+                       fillOpacity: 0.2,
+                       clickable: true
+               }
+       },
+       
+       _initialLabelText: 'Click and drag to draw rectangle.',
+
+       _drawShape: function (latlng) {
+               if (!this._shape) {
+                       this._shape = new L.Rectangle(new L.LatLngBounds(this._startLatLng, latlng), this.options.shapeOptions);
+                       this._map.addLayer(this._shape);
+               } else {
+                       this._shape.setBounds(new L.LatLngBounds(this._startLatLng, latlng));
+               }
+       },
+
+       _fireCreatedEvent: function () {
+               this._map.fire(
+                       'draw:rectangle-created',
+                       { rect: new L.Rectangle(this._shape.getBounds(), this.options.shapeOptions) }
+               );
+       }
+});
+
+L.Marker.Draw = L.Handler.Draw.extend({
+       options: {
+               icon: new L.Icon.Default(),
+               zIndexOffset: 2000 // This should be > than the highest z-index any markers
+       },
+       
+       addHooks: function () {
+               L.Handler.Draw.prototype.addHooks.call(this);
+               
+               if (this._map) {
+                       this._updateLabelText({ text: 'Click map to place marker.' });
+                       this._map.on('mousemove', this._onMouseMove, this);
+               }
+       },
+
+       removeHooks: function () {
+               L.Handler.Draw.prototype.removeHooks.call(this);
+               
+               if (this._map) {
+                       if (this._marker) {
+                               this._marker.off('click', this._onClick);
+                               this._map
+                                       .off('click', this._onClick)
+                                       .removeLayer(this._marker);
+                               delete this._marker;
+                       }
+
+                       this._map.off('mousemove', this._onMouseMove);
+               }
+       },
+
+       _onMouseMove: function (e) {
+               var newPos = e.layerPoint,
+                       latlng = e.latlng;
+
+               this._updateLabelPosition(newPos);
+
+               if (!this._marker) {
+                       this._marker = new L.Marker(latlng, {
+                               icon: this.options.icon,
+                               zIndexOffset: this.options.zIndexOffset
+                       });
+                       // Bind to both marker and map to make sure we get the click event.
+                       this._marker.on('click', this._onClick, this);
+                       this._map
+                               .on('click', this._onClick, this)
+                               .addLayer(this._marker);
+               }
+               else {
+                       this._marker.setLatLng(latlng);
+               }
+       },
+
+       _onClick: function (e) {
+               this._map.fire(
+                       'draw:marker-created',
+                       { marker: new L.Marker(this._marker.getLatLng(), { icon: this.options.icon }) }
+               );
+               this.disable();
+       }
+});
+
+L.Map.mergeOptions({
+       drawControl: false
+});
+
+L.Control.Draw = L.Control.extend({
+
+       options: {
+               position: 'topleft',
+               polyline: {
+                       title: 'Draw a polyline'
+               },
+               polygon: {
+                       title: 'Draw a polygon'
+               },
+               rectangle: {
+                       title: 'Draw a rectangle'
+               },
+               circle: {
+                       title: 'Draw a circle'
+               },
+               marker: {
+                       title: 'Add a marker'
+               }
+       },
+
+       handlers: {},
+       
+       initialize: function (options) {
+               L.Util.extend(this.options, options);
+       },
+       
+       onAdd: function (map) {
+               var className = 'leaflet-control-draw',
+                       container = L.DomUtil.create('div', className);
+
+               if (this.options.polyline) {
+                       this.handlers.polyline = new L.Polyline.Draw(map, this.options.polyline);
+                       this._createButton(
+                               this.options.polyline.title,
+                               className + '-polyline',
+                               container,
+                               this.handlers.polyline.enable,
+                               this.handlers.polyline
+                       );
+                       this.handlers.polyline.on('activated', this._disableInactiveModes, this);
+               }
+
+               if (this.options.polygon) {
+                       this.handlers.polygon = new L.Polygon.Draw(map, this.options.polygon);
+                       this._createButton(
+                               this.options.polygon.title,
+                               className + '-polygon',
+                               container,
+                               this.handlers.polygon.enable,
+                               this.handlers.polygon
+                       );
+                       this.handlers.polygon.on('activated', this._disableInactiveModes, this);
+               }
+
+               if (this.options.rectangle) {
+                       this.handlers.rectangle = new L.Rectangle.Draw(map, this.options.rectangle);
+                       this._createButton(
+                               this.options.rectangle.title,
+                               className + '-rectangle',
+                               container,
+                               this.handlers.rectangle.enable,
+                               this.handlers.rectangle
+                       );
+                       this.handlers.rectangle.on('activated', this._disableInactiveModes, this);
+               }
+
+               if (this.options.circle) {
+                       this.handlers.circle = new L.Circle.Draw(map, this.options.circle);
+                       this._createButton(
+                               this.options.circle.title,
+                               className + '-circle',
+                               container,
+                               this.handlers.circle.enable,
+                               this.handlers.circle
+                       );
+                       this.handlers.circle.on('activated', this._disableInactiveModes, this);
+               }
+
+               if (this.options.marker) {
+                       this.handlers.marker = new L.Marker.Draw(map, this.options.marker);
+                       this._createButton(
+                               this.options.marker.title,
+                               className + '-marker',
+                               container,
+                               this.handlers.marker.enable,
+                               this.handlers.marker
+                       );
+                       this.handlers.marker.on('activated', this._disableInactiveModes, this);
+               }
+               
+               return container;
+       },
+
+       _createButton: function (title, className, container, fn, context) {
+               var link = L.DomUtil.create('a', className, container);
+               link.href = '#';
+               link.title = title;
+
+               L.DomEvent
+                       .on(link, 'click', L.DomEvent.stopPropagation)
+                       .on(link, 'mousedown', L.DomEvent.stopPropagation)
+                       .on(link, 'dblclick', L.DomEvent.stopPropagation)
+                       .on(link, 'click', L.DomEvent.preventDefault)
+                       .on(link, 'click', fn, context);
+
+               return link;
+       },
+
+       // Need to disable the drawing modes if user clicks on another without disabling the current mode
+       _disableInactiveModes: function () {
+               for (var i in this.handlers) {
+                       // Check if is a property of this object and is enabled
+                       if (this.handlers.hasOwnProperty(i) && this.handlers[i].enabled()) {
+                               this.handlers[i].disable();
+                       }
+               }
+       }
+});
+
+L.Map.addInitHook(function () {
+       if (this.options.drawControl) {
+               this.drawControl = new L.Control.Draw();
+               this.addControl(this.drawControl);
+       }
+});
+
+
+
+}(this));
\ No newline at end of file
diff --git a/vendor/assets/leaflet/leaflet.ie.css b/vendor/assets/leaflet/leaflet.ie.css
new file mode 100644 (file)
index 0000000..9d2a52f
--- /dev/null
@@ -0,0 +1,44 @@
+.leaflet-vml-shape {\r
+       width: 1px;\r
+       height: 1px;\r
+       }\r
+.lvml {\r
+       behavior: url(#default#VML); \r
+       display: inline-block; \r
+       position: absolute;\r
+       }\r
+       \r
+.leaflet-control {\r
+       display: inline;\r
+       }\r
+\r
+.leaflet-popup-tip {\r
+       width: 21px;\r
+       _width: 27px;\r
+       margin: 0 auto;\r
+       _margin-top: -3px;\r
+       \r
+       filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);\r
+       -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";\r
+       }\r
+.leaflet-popup-tip-container {\r
+       margin-top: -1px;\r
+       }\r
+.leaflet-popup-content-wrapper, .leaflet-popup-tip {\r
+       border: 1px solid #bbb;\r
+       }\r
+\r
+.leaflet-control-zoom {\r
+       filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#3F000000',EndColorStr='#3F000000');\r
+       }\r
+.leaflet-control-zoom a {\r
+       background-color: #eee;\r
+       }\r
+.leaflet-control-zoom a:hover {\r
+       background-color: #fff;\r
+       }\r
+.leaflet-control-layers-toggle {\r
+       }\r
+.leaflet-control-attribution, .leaflet-control-layers {\r
+       background: white;\r
+       }
\ No newline at end of file
diff --git a/vendor/assets/leaflet/leaflet.js b/vendor/assets/leaflet/leaflet.js
new file mode 100644 (file)
index 0000000..2250375
--- /dev/null
@@ -0,0 +1,7629 @@
+/*
+ Copyright (c) 2010-2012, CloudMade, Vladimir Agafonkin
+ Leaflet is an open-source JavaScript library for mobile-friendly interactive maps.
+ http://leaflet.cloudmade.com
+*/
+(function (window, undefined) {
+
+var L, originalL;\r
+\r
+if (typeof exports !== undefined + '') {\r
+       L = exports;\r
+} else {\r
+       originalL = window.L;\r
+       L = {};\r
+\r
+       L.noConflict = function () {\r
+               window.L = originalL;\r
+               return this;\r
+       };\r
+\r
+       window.L = L;\r
+}\r
+\r
+L.version = '0.4.4';\r
+
+
+/*\r
+ * L.Util is a namespace for various utility functions.\r
+ */\r
+\r
+L.Util = {\r
+       extend: function (/*Object*/ dest) /*-> Object*/ {      // merge src properties into dest\r
+               var sources = Array.prototype.slice.call(arguments, 1);\r
+               for (var j = 0, len = sources.length, src; j < len; j++) {\r
+                       src = sources[j] || {};\r
+                       for (var i in src) {\r
+                               if (src.hasOwnProperty(i)) {\r
+                                       dest[i] = src[i];\r
+                               }\r
+                       }\r
+               }\r
+               return dest;\r
+       },\r
+\r
+       bind: function (fn, obj) { // (Function, Object) -> Function\r
+               var args = arguments.length > 2 ? Array.prototype.slice.call(arguments, 2) : null;\r
+               return function () {\r
+                       return fn.apply(obj, args || arguments);\r
+               };\r
+       },\r
+\r
+       stamp: (function () {\r
+               var lastId = 0, key = '_leaflet_id';\r
+               return function (/*Object*/ obj) {\r
+                       obj[key] = obj[key] || ++lastId;\r
+                       return obj[key];\r
+               };\r
+       }()),\r
+\r
+       limitExecByInterval: function (fn, time, context) {\r
+               var lock, execOnUnlock;\r
+\r
+               return function wrapperFn() {\r
+                       var args = arguments;\r
+\r
+                       if (lock) {\r
+                               execOnUnlock = true;\r
+                               return;\r
+                       }\r
+\r
+                       lock = true;\r
+\r
+                       setTimeout(function () {\r
+                               lock = false;\r
+\r
+                               if (execOnUnlock) {\r
+                                       wrapperFn.apply(context, args);\r
+                                       execOnUnlock = false;\r
+                               }\r
+                       }, time);\r
+\r
+                       fn.apply(context, args);\r
+               };\r
+       },\r
+\r
+       falseFn: function () {\r
+               return false;\r
+       },\r
+\r
+       formatNum: function (num, digits) {\r
+               var pow = Math.pow(10, digits || 5);\r
+               return Math.round(num * pow) / pow;\r
+       },\r
+\r
+       splitWords: function (str) {\r
+               return str.replace(/^\s+|\s+$/g, '').split(/\s+/);\r
+       },\r
+\r
+       setOptions: function (obj, options) {\r
+               obj.options = L.Util.extend({}, obj.options, options);\r
+               return obj.options;\r
+       },\r
+\r
+       getParamString: function (obj) {\r
+               var params = [];\r
+               for (var i in obj) {\r
+                       if (obj.hasOwnProperty(i)) {\r
+                               params.push(i + '=' + obj[i]);\r
+                       }\r
+               }\r
+               return '?' + params.join('&');\r
+       },\r
+\r
+       template: function (str, data) {\r
+               return str.replace(/\{ *([\w_]+) *\}/g, function (str, key) {\r
+                       var value = data[key];\r
+                       if (!data.hasOwnProperty(key)) {\r
+                               throw new Error('No value provided for variable ' + str);\r
+                       }\r
+                       return value;\r
+               });\r
+       },\r
+\r
+       emptyImageUrl: 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs='\r
+};\r
+\r
+(function () {\r
+\r
+       // inspired by http://paulirish.com/2011/requestanimationframe-for-smart-animating/\r
+\r
+       function getPrefixed(name) {\r
+               var i, fn,\r
+                       prefixes = ['webkit', 'moz', 'o', 'ms'];\r
+\r
+               for (i = 0; i < prefixes.length && !fn; i++) {\r
+                       fn = window[prefixes[i] + name];\r
+               }\r
+\r
+               return fn;\r
+       }\r
+\r
+       var lastTime = 0;\r
+\r
+       function timeoutDefer(fn) {\r
+               var time = +new Date(),\r
+                       timeToCall = Math.max(0, 16 - (time - lastTime));\r
+\r
+               lastTime = time + timeToCall;\r
+               return window.setTimeout(fn, timeToCall);\r
+       }\r
+\r
+       var requestFn = window.requestAnimationFrame ||\r
+                       getPrefixed('RequestAnimationFrame') || timeoutDefer;\r
+\r
+       var cancelFn = window.cancelAnimationFrame ||\r
+                       getPrefixed('CancelAnimationFrame') ||\r
+                       getPrefixed('CancelRequestAnimationFrame') ||\r
+                       function (id) {\r
+                               window.clearTimeout(id);\r
+                       };\r
+\r
+\r
+       L.Util.requestAnimFrame = function (fn, context, immediate, element) {\r
+               fn = L.Util.bind(fn, context);\r
+\r
+               if (immediate && requestFn === timeoutDefer) {\r
+                       fn();\r
+               } else {\r
+                       return requestFn.call(window, fn, element);\r
+               }\r
+       };\r
+\r
+       L.Util.cancelAnimFrame = function (id) {\r
+               if (id) {\r
+                       cancelFn.call(window, id);\r
+               }\r
+       };\r
+\r
+}());\r
+
+
+/*\r
+ * Class powers the OOP facilities of the library. Thanks to John Resig and Dean Edwards for inspiration!\r
+ */\r
+\r
+L.Class = function () {};\r
+\r
+L.Class.extend = function (/*Object*/ props) /*-> Class*/ {\r
+\r
+       // extended class with the new prototype\r
+       var NewClass = function () {\r
+               if (this.initialize) {\r
+                       this.initialize.apply(this, arguments);\r
+               }\r
+       };\r
+\r
+       // instantiate class without calling constructor\r
+       var F = function () {};\r
+       F.prototype = this.prototype;\r
+\r
+       var proto = new F();\r
+       proto.constructor = NewClass;\r
+\r
+       NewClass.prototype = proto;\r
+\r
+       //inherit parent's statics\r
+       for (var i in this) {\r
+               if (this.hasOwnProperty(i) && i !== 'prototype') {\r
+                       NewClass[i] = this[i];\r
+               }\r
+       }\r
+\r
+       // mix static properties into the class\r
+       if (props.statics) {\r
+               L.Util.extend(NewClass, props.statics);\r
+               delete props.statics;\r
+       }\r
+\r
+       // mix includes into the prototype\r
+       if (props.includes) {\r
+               L.Util.extend.apply(null, [proto].concat(props.includes));\r
+               delete props.includes;\r
+       }\r
+\r
+       // merge options\r
+       if (props.options && proto.options) {\r
+               props.options = L.Util.extend({}, proto.options, props.options);\r
+       }\r
+\r
+       // mix given properties into the prototype\r
+       L.Util.extend(proto, props);\r
+\r
+       return NewClass;\r
+};\r
+\r
+\r
+// method for adding properties to prototype\r
+L.Class.include = function (props) {\r
+       L.Util.extend(this.prototype, props);\r
+};\r
+\r
+L.Class.mergeOptions = function (options) {\r
+       L.Util.extend(this.prototype.options, options);\r
+};
+
+/*\r
+ * L.Mixin.Events adds custom events functionality to Leaflet classes\r
+ */\r
+\r
+var key = '_leaflet_events';\r
+\r
+L.Mixin = {};\r
+\r
+L.Mixin.Events = {\r
+       \r
+       addEventListener: function (types, fn, context) { // (String, Function[, Object]) or (Object[, Object])\r
+               var events = this[key] = this[key] || {},\r
+                       type, i, len;\r
+               \r
+               // Types can be a map of types/handlers\r
+               if (typeof types === 'object') {\r
+                       for (type in types) {\r
+                               if (types.hasOwnProperty(type)) {\r
+                                       this.addEventListener(type, types[type], fn);\r
+                               }\r
+                       }\r
+                       \r
+                       return this;\r
+               }\r
+               \r
+               types = L.Util.splitWords(types);\r
+               \r
+               for (i = 0, len = types.length; i < len; i++) {\r
+                       events[types[i]] = events[types[i]] || [];\r
+                       events[types[i]].push({\r
+                               action: fn,\r
+                               context: context || this\r
+                       });\r
+               }\r
+               \r
+               return this;\r
+       },\r
+\r
+       hasEventListeners: function (type) { // (String) -> Boolean\r
+               return (key in this) && (type in this[key]) && (this[key][type].length > 0);\r
+       },\r
+\r
+       removeEventListener: function (types, fn, context) { // (String[, Function, Object]) or (Object[, Object])\r
+               var events = this[key],\r
+                       type, i, len, listeners, j;\r
+               \r
+               if (typeof types === 'object') {\r
+                       for (type in types) {\r
+                               if (types.hasOwnProperty(type)) {\r
+                                       this.removeEventListener(type, types[type], fn);\r
+                               }\r
+                       }\r
+                       \r
+                       return this;\r
+               }\r
+               \r
+               types = L.Util.splitWords(types);\r
+\r
+               for (i = 0, len = types.length; i < len; i++) {\r
+\r
+                       if (this.hasEventListeners(types[i])) {\r
+                               listeners = events[types[i]];\r
+                               \r
+                               for (j = listeners.length - 1; j >= 0; j--) {\r
+                                       if (\r
+                                               (!fn || listeners[j].action === fn) &&\r
+                                               (!context || (listeners[j].context === context))\r
+                                       ) {\r
+                                               listeners.splice(j, 1);\r
+                                       }\r
+                               }\r
+                       }\r
+               }\r
+               \r
+               return this;\r
+       },\r
+\r
+       fireEvent: function (type, data) { // (String[, Object])\r
+               if (!this.hasEventListeners(type)) {\r
+                       return this;\r
+               }\r
+\r
+               var event = L.Util.extend({\r
+                       type: type,\r
+                       target: this\r
+               }, data);\r
+\r
+               var listeners = this[key][type].slice();\r
+\r
+               for (var i = 0, len = listeners.length; i < len; i++) {\r
+                       listeners[i].action.call(listeners[i].context || this, event);\r
+               }\r
+\r
+               return this;\r
+       }\r
+};\r
+\r
+L.Mixin.Events.on = L.Mixin.Events.addEventListener;\r
+L.Mixin.Events.off = L.Mixin.Events.removeEventListener;\r
+L.Mixin.Events.fire = L.Mixin.Events.fireEvent;\r
+
+
+(function () {\r
+       var ua = navigator.userAgent.toLowerCase(),\r
+               ie = !!window.ActiveXObject,\r
+               ie6 = ie && !window.XMLHttpRequest,\r
+               webkit = ua.indexOf("webkit") !== -1,\r
+               gecko = ua.indexOf("gecko") !== -1,\r
+               //Terrible browser detection to work around a safari / iOS / android browser bug. See TileLayer._addTile and debug/hacks/jitter.html\r
+               chrome = ua.indexOf("chrome") !== -1,\r
+               opera = window.opera,\r
+               android = ua.indexOf("android") !== -1,\r
+               android23 = ua.search("android [23]") !== -1,\r
+               mobile = typeof orientation !== undefined + '' ? true : false,\r
+               doc = document.documentElement,\r
+               ie3d = ie && ('transition' in doc.style),\r
+               webkit3d = webkit && ('WebKitCSSMatrix' in window) && ('m11' in new window.WebKitCSSMatrix()),\r
+               gecko3d = gecko && ('MozPerspective' in doc.style),\r
+               opera3d = opera && ('OTransition' in doc.style);\r
+\r
+       var touch = !window.L_NO_TOUCH && (function () {\r
+               var startName = 'ontouchstart';\r
+\r
+               // WebKit, etc\r
+               if (startName in doc) {\r
+                       return true;\r
+               }\r
+\r
+               // Firefox/Gecko\r
+               var div = document.createElement('div'),\r
+                       supported = false;\r
+\r
+               if (!div.setAttribute) {\r
+                       return false;\r
+               }\r
+               div.setAttribute(startName, 'return;');\r
+\r
+               if (typeof div[startName] === 'function') {\r
+                       supported = true;\r
+               }\r
+\r
+               div.removeAttribute(startName);\r
+               div = null;\r
+\r
+               return supported;\r
+       }());\r
+\r
+       var retina = (('devicePixelRatio' in window && window.devicePixelRatio > 1) || ('matchMedia' in window && window.matchMedia("(min-resolution:144dpi)").matches));\r
+\r
+       L.Browser = {\r
+               ua: ua,\r
+               ie: ie,\r
+               ie6: ie6,\r
+               webkit: webkit,\r
+               gecko: gecko,\r
+               opera: opera,\r
+               android: android,\r
+               android23: android23,\r
+\r
+               chrome: chrome,\r
+\r
+               ie3d: ie3d,\r
+               webkit3d: webkit3d,\r
+               gecko3d: gecko3d,\r
+               opera3d: opera3d,\r
+               any3d: !window.L_DISABLE_3D && (ie3d || webkit3d || gecko3d || opera3d),\r
+\r
+               mobile: mobile,\r
+               mobileWebkit: mobile && webkit,\r
+               mobileWebkit3d: mobile && webkit3d,\r
+               mobileOpera: mobile && opera,\r
+\r
+               touch: touch,\r
+\r
+               retina: retina\r
+       };\r
+}());\r
+
+
+/*\r
+ * L.Point represents a point with x and y coordinates.\r
+ */\r
+\r
+L.Point = function (/*Number*/ x, /*Number*/ y, /*Boolean*/ round) {\r
+       this.x = (round ? Math.round(x) : x);\r
+       this.y = (round ? Math.round(y) : y);\r
+};\r
+\r
+L.Point.prototype = {\r
+\r
+       clone: function () {\r
+               return new L.Point(this.x, this.y);\r
+       },\r
+\r
+       // non-destructive, returns a new point\r
+       add: function (point) {\r
+               return this.clone()._add(L.point(point));\r
+       },\r
+\r
+       // destructive, used directly for performance in situations where it's safe to modify existing point\r
+       _add: function (point) {\r
+               this.x += point.x;\r
+               this.y += point.y;\r
+               return this;\r
+       },\r
+\r
+       subtract: function (point) {\r
+               return this.clone()._subtract(L.point(point));\r
+       },\r
+\r
+       _subtract: function (point) {\r
+               this.x -= point.x;\r
+               this.y -= point.y;\r
+               return this;\r
+       },\r
+\r
+       divideBy: function (num) {\r
+               return this.clone()._divideBy(num);\r
+       },\r
+\r
+       _divideBy: function (num) {\r
+               this.x /= num;\r
+               this.y /= num;\r
+               return this;\r
+       },\r
+\r
+       multiplyBy: function (num) {\r
+               return this.clone()._multiplyBy(num);\r
+       },\r
+\r
+       _multiplyBy: function (num) {\r
+               this.x *= num;\r
+               this.y *= num;\r
+               return this;\r
+       },\r
+\r
+       round: function () {\r
+               return this.clone()._round();\r
+       },\r
+\r
+       _round: function () {\r
+               this.x = Math.round(this.x);\r
+               this.y = Math.round(this.y);\r
+               return this;\r
+       },\r
+\r
+       floor: function () {\r
+               return this.clone()._floor();\r
+       },\r
+\r
+       _floor: function () {\r
+               this.x = Math.floor(this.x);\r
+               this.y = Math.floor(this.y);\r
+               return this;\r
+       },\r
+\r
+       distanceTo: function (point) {\r
+               point = L.point(point);\r
+\r
+               var x = point.x - this.x,\r
+                       y = point.y - this.y;\r
+\r
+               return Math.sqrt(x * x + y * y);\r
+       },\r
+\r
+       toString: function () {\r
+               return 'Point(' +\r
+                               L.Util.formatNum(this.x) + ', ' +\r
+                               L.Util.formatNum(this.y) + ')';\r
+       }\r
+};\r
+\r
+L.point = function (x, y, round) {\r
+       if (x instanceof L.Point) {\r
+               return x;\r
+       }\r
+       if (x instanceof Array) {\r
+               return new L.Point(x[0], x[1]);\r
+       }\r
+       if (isNaN(x)) {\r
+               return x;\r
+       }\r
+       return new L.Point(x, y, round);\r
+};\r
+
+
+/*\r
+ * L.Bounds represents a rectangular area on the screen in pixel coordinates.\r
+ */\r
+\r
+L.Bounds = L.Class.extend({\r
+\r
+       initialize: function (a, b) {   //(Point, Point) or Point[]\r
+               if (!a) { return; }\r
+\r
+               var points = b ? [a, b] : a;\r
+\r
+               for (var i = 0, len = points.length; i < len; i++) {\r
+                       this.extend(points[i]);\r
+               }\r
+       },\r
+\r
+       // extend the bounds to contain the given point\r
+       extend: function (point) { // (Point)\r
+               point = L.point(point);\r
+\r
+               if (!this.min && !this.max) {\r
+                       this.min = point.clone();\r
+                       this.max = point.clone();\r
+               } else {\r
+                       this.min.x = Math.min(point.x, this.min.x);\r
+                       this.max.x = Math.max(point.x, this.max.x);\r
+                       this.min.y = Math.min(point.y, this.min.y);\r
+                       this.max.y = Math.max(point.y, this.max.y);\r
+               }\r
+               return this;\r
+       },\r
+\r
+       getCenter: function (round) { // (Boolean) -> Point\r
+               return new L.Point(\r
+                               (this.min.x + this.max.x) / 2,\r
+                               (this.min.y + this.max.y) / 2, round);\r
+       },\r
+\r
+       getBottomLeft: function () { // -> Point\r
+               return new L.Point(this.min.x, this.max.y);\r
+       },\r
+\r
+       getTopRight: function () { // -> Point\r
+               return new L.Point(this.max.x, this.min.y);\r
+       },\r
+\r
+       contains: function (obj) { // (Bounds) or (Point) -> Boolean\r
+               var min, max;\r
+\r
+               if (typeof obj[0] === 'number' || obj instanceof L.Point) {\r
+                       obj = L.point(obj);\r
+               } else {\r
+                       obj = L.bounds(obj);\r
+               }\r
+\r
+               if (obj instanceof L.Bounds) {\r
+                       min = obj.min;\r
+                       max = obj.max;\r
+               } else {\r
+                       min = max = obj;\r
+               }\r
+\r
+               return (min.x >= this.min.x) &&\r
+                               (max.x <= this.max.x) &&\r
+                               (min.y >= this.min.y) &&\r
+                               (max.y <= this.max.y);\r
+       },\r
+\r
+       intersects: function (bounds) { // (Bounds) -> Boolean\r
+               bounds = L.bounds(bounds);\r
+\r
+               var min = this.min,\r
+                       max = this.max,\r
+                       min2 = bounds.min,\r
+                       max2 = bounds.max;\r
+\r
+               var xIntersects = (max2.x >= min.x) && (min2.x <= max.x),\r
+                       yIntersects = (max2.y >= min.y) && (min2.y <= max.y);\r
+\r
+               return xIntersects && yIntersects;\r
+       },\r
+\r
+       isValid: function () {\r
+               return !!(this.min && this.max);\r
+       }\r
+});\r
+\r
+L.bounds = function (a, b) { // (Bounds) or (Point, Point) or (Point[])\r
+       if (!a || a instanceof L.Bounds) {\r
+               return a;\r
+       }\r
+       return new L.Bounds(a, b);\r
+};\r
+
+
+/*\r
+ * L.Transformation is an utility class to perform simple point transformations through a 2d-matrix.\r
+ */\r
+\r
+L.Transformation = L.Class.extend({\r
+       initialize: function (/*Number*/ a, /*Number*/ b, /*Number*/ c, /*Number*/ d) {\r
+               this._a = a;\r
+               this._b = b;\r
+               this._c = c;\r
+               this._d = d;\r
+       },\r
+\r
+       transform: function (point, scale) {\r
+               return this._transform(point.clone(), scale);\r
+       },\r
+\r
+       // destructive transform (faster)\r
+       _transform: function (/*Point*/ point, /*Number*/ scale) /*-> Point*/ {\r
+               scale = scale || 1;\r
+               point.x = scale * (this._a * point.x + this._b);\r
+               point.y = scale * (this._c * point.y + this._d);\r
+               return point;\r
+       },\r
+\r
+       untransform: function (/*Point*/ point, /*Number*/ scale) /*-> Point*/ {\r
+               scale = scale || 1;\r
+               return new L.Point(\r
+                       (point.x / scale - this._b) / this._a,\r
+                       (point.y / scale - this._d) / this._c);\r
+       }\r
+});\r
+
+
+/*\r
+ * L.DomUtil contains various utility functions for working with DOM.\r
+ */\r
+\r
+L.DomUtil = {\r
+       get: function (id) {\r
+               return (typeof id === 'string' ? document.getElementById(id) : id);\r
+       },\r
+\r
+       getStyle: function (el, style) {\r
+\r
+               var value = el.style[style];\r
+\r
+               if (!value && el.currentStyle) {\r
+                       value = el.currentStyle[style];\r
+               }\r
+\r
+               if (!value || value === 'auto') {\r
+                       var css = document.defaultView.getComputedStyle(el, null);\r
+                       value = css ? css[style] : null;\r
+               }\r
+\r
+               return value === 'auto' ? null : value;\r
+       },\r
+\r
+       getViewportOffset: function (element) {\r
+\r
+               var top = 0,\r
+                       left = 0,\r
+                       el = element,\r
+                       docBody = document.body,\r
+                       pos;\r
+\r
+               do {\r
+                       top += el.offsetTop || 0;\r
+                       left += el.offsetLeft || 0;\r
+                       pos = L.DomUtil.getStyle(el, 'position');\r
+\r
+                       if (el.offsetParent === docBody && pos === 'absolute') { break; }\r
+\r
+                       if (pos === 'fixed') {\r
+                               top  += docBody.scrollTop  || 0;\r
+                               left += docBody.scrollLeft || 0;\r
+                               break;\r
+                       }\r
+                       el = el.offsetParent;\r
+\r
+               } while (el);\r
+\r
+               el = element;\r
+\r
+               do {\r
+                       if (el === docBody) { break; }\r
+\r
+                       top  -= el.scrollTop  || 0;\r
+                       left -= el.scrollLeft || 0;\r
+\r
+                       el = el.parentNode;\r
+               } while (el);\r
+\r
+               return new L.Point(left, top);\r
+       },\r
+\r
+       create: function (tagName, className, container) {\r
+\r
+               var el = document.createElement(tagName);\r
+               el.className = className;\r
+\r
+               if (container) {\r
+                       container.appendChild(el);\r
+               }\r
+\r
+               return el;\r
+       },\r
+\r
+       disableTextSelection: function () {\r
+               if (document.selection && document.selection.empty) {\r
+                       document.selection.empty();\r
+               }\r
+               if (!this._onselectstart) {\r
+                       this._onselectstart = document.onselectstart;\r
+                       document.onselectstart = L.Util.falseFn;\r
+               }\r
+       },\r
+\r
+       enableTextSelection: function () {\r
+               if (document.onselectstart === L.Util.falseFn) {\r
+                       document.onselectstart = this._onselectstart;\r
+                       this._onselectstart = null;\r
+               }\r
+       },\r
+\r
+       hasClass: function (el, name) {\r
+               return (el.className.length > 0) &&\r
+                               new RegExp("(^|\\s)" + name + "(\\s|$)").test(el.className);\r
+       },\r
+\r
+       addClass: function (el, name) {\r
+               if (!L.DomUtil.hasClass(el, name)) {\r
+                       el.className += (el.className ? ' ' : '') + name;\r
+               }\r
+       },\r
+\r
+       removeClass: function (el, name) {\r
+\r
+               function replaceFn(w, match) {\r
+                       if (match === name) { return ''; }\r
+                       return w;\r
+               }\r
+\r
+               el.className = el.className\r
+                               .replace(/(\S+)\s*/g, replaceFn)\r
+                               .replace(/(^\s+|\s+$)/, '');\r
+       },\r
+\r
+       setOpacity: function (el, value) {\r
+\r
+               if ('opacity' in el.style) {\r
+                       el.style.opacity = value;\r
+\r
+               } else if (L.Browser.ie) {\r
+\r
+                       var filter = false,\r
+                               filterName = 'DXImageTransform.Microsoft.Alpha';\r
+\r
+                       // filters collection throws an error if we try to retrieve a filter that doesn't exist\r
+                       try { filter = el.filters.item(filterName); } catch (e) {}\r
+\r
+                       value = Math.round(value * 100);\r
+\r
+                       if (filter) {\r
+                               filter.Enabled = (value !== 100);\r
+                               filter.Opacity = value;\r
+                       } else {\r
+                               el.style.filter += ' progid:' + filterName + '(opacity=' + value + ')';\r
+                       }\r
+               }\r
+       },\r
+\r
+       testProp: function (props) {\r
+\r
+               var style = document.documentElement.style;\r
+\r
+               for (var i = 0; i < props.length; i++) {\r
+                       if (props[i] in style) {\r
+                               return props[i];\r
+                       }\r
+               }\r
+               return false;\r
+       },\r
+\r
+       getTranslateString: function (point) {\r
+               // on WebKit browsers (Chrome/Safari/iOS Safari/Android) using translate3d instead of translate\r
+               // makes animation smoother as it ensures HW accel is used. Firefox 13 doesn't care\r
+               // (same speed either way), Opera 12 doesn't support translate3d\r
+\r
+               var is3d = L.Browser.webkit3d,\r
+                       open = 'translate' + (is3d ? '3d' : '') + '(',\r
+                       close = (is3d ? ',0' : '') + ')';\r
+\r
+               return open + point.x + 'px,' + point.y + 'px' + close;\r
+       },\r
+\r
+       getScaleString: function (scale, origin) {\r
+\r
+               var preTranslateStr = L.DomUtil.getTranslateString(origin),\r
+                       scaleStr = ' scale(' + scale + ') ',\r
+                       postTranslateStr = L.DomUtil.getTranslateString(origin.multiplyBy(-1));\r
+\r
+               return preTranslateStr + scaleStr + postTranslateStr;\r
+       },\r
+\r
+       setPosition: function (el, point, disable3D) { // (HTMLElement, Point[, Boolean])\r
+\r
+               el._leaflet_pos = point;\r
+\r
+               if (!disable3D && L.Browser.any3d) {\r
+                       el.style[L.DomUtil.TRANSFORM] =  L.DomUtil.getTranslateString(point);\r
+\r
+                       // workaround for Android 2/3 stability (https://github.com/CloudMade/Leaflet/issues/69)\r
+                       if (L.Browser.mobileWebkit3d) {\r
+                               el.style.WebkitBackfaceVisibility = 'hidden';\r
+                       }\r
+               } else {\r
+                       el.style.left = point.x + 'px';\r
+                       el.style.top = point.y + 'px';\r
+               }\r
+       },\r
+\r
+       getPosition: function (el) {\r
+               // this method is only used for elements previously positioned using setPosition,\r
+               // so it's safe to cache the position for performance\r
+               return el._leaflet_pos;\r
+       }\r
+};\r
+\r
+\r
+// prefix style property names\r
+\r
+L.DomUtil.TRANSFORM = L.DomUtil.testProp(\r
+               ['transform', 'WebkitTransform', 'OTransform', 'MozTransform', 'msTransform']);\r
+\r
+L.DomUtil.TRANSITION = L.DomUtil.testProp(\r
+               ['transition', 'webkitTransition', 'OTransition', 'MozTransition', 'msTransition']);\r
+\r
+L.DomUtil.TRANSITION_END =\r
+               L.DomUtil.TRANSITION === 'webkitTransition' || L.DomUtil.TRANSITION === 'OTransition' ?\r
+               L.DomUtil.TRANSITION + 'End' : 'transitionend';\r
+
+
+/*\r
+       CM.LatLng represents a geographical point with latitude and longtitude coordinates.\r
+*/\r
+\r
+L.LatLng = function (rawLat, rawLng, noWrap) { // (Number, Number[, Boolean])\r
+       var lat = parseFloat(rawLat),\r
+               lng = parseFloat(rawLng);\r
+\r
+       if (isNaN(lat) || isNaN(lng)) {\r
+               throw new Error('Invalid LatLng object: (' + rawLat + ', ' + rawLng + ')');\r
+       }\r
+\r
+       if (noWrap !== true) {\r
+               lat = Math.max(Math.min(lat, 90), -90);                                 // clamp latitude into -90..90\r
+               lng = (lng + 180) % 360 + ((lng < -180 || lng === 180) ? 180 : -180);   // wrap longtitude into -180..180\r
+       }\r
+\r
+       this.lat = lat;\r
+       this.lng = lng;\r
+};\r
+\r
+L.Util.extend(L.LatLng, {\r
+       DEG_TO_RAD: Math.PI / 180,\r
+       RAD_TO_DEG: 180 / Math.PI,\r
+       MAX_MARGIN: 1.0E-9 // max margin of error for the "equals" check\r
+});\r
+\r
+L.LatLng.prototype = {\r
+       equals: function (obj) { // (LatLng) -> Boolean\r
+               if (!obj) { return false; }\r
+\r
+               obj = L.latLng(obj);\r
+\r
+               var margin = Math.max(Math.abs(this.lat - obj.lat), Math.abs(this.lng - obj.lng));\r
+               return margin <= L.LatLng.MAX_MARGIN;\r
+       },\r
+\r
+       toString: function () { // -> String\r
+               return 'LatLng(' +\r
+                               L.Util.formatNum(this.lat) + ', ' +\r
+                               L.Util.formatNum(this.lng) + ')';\r
+       },\r
+\r
+       // Haversine distance formula, see http://en.wikipedia.org/wiki/Haversine_formula\r
+       distanceTo: function (other) { // (LatLng) -> Number\r
+               other = L.latLng(other);\r
+\r
+               var R = 6378137, // earth radius in meters\r
+                       d2r = L.LatLng.DEG_TO_RAD,\r
+                       dLat = (other.lat - this.lat) * d2r,\r
+                       dLon = (other.lng - this.lng) * d2r,\r
+                       lat1 = this.lat * d2r,\r
+                       lat2 = other.lat * d2r,\r
+                       sin1 = Math.sin(dLat / 2),\r
+                       sin2 = Math.sin(dLon / 2);\r
+\r
+               var a = sin1 * sin1 + sin2 * sin2 * Math.cos(lat1) * Math.cos(lat2);\r
+\r
+               return R * 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));\r
+       }\r
+};\r
+\r
+L.latLng = function (a, b, c) { // (LatLng) or ([Number, Number]) or (Number, Number, Boolean)\r
+       if (a instanceof L.LatLng) {\r
+               return a;\r
+       }\r
+       if (a instanceof Array) {\r
+               return new L.LatLng(a[0], a[1]);\r
+       }\r
+       if (isNaN(a)) {\r
+               return a;\r
+       }\r
+       return new L.LatLng(a, b, c);\r
+};\r
+
+/*\r
+ * L.LatLngBounds represents a rectangular area on the map in geographical coordinates.\r
+ */\r
+\r
+L.LatLngBounds = L.Class.extend({\r
+       initialize: function (southWest, northEast) {   // (LatLng, LatLng) or (LatLng[])\r
+               if (!southWest) { return; }\r
+\r
+               var latlngs = northEast ? [southWest, northEast] : southWest;\r
+\r
+               for (var i = 0, len = latlngs.length; i < len; i++) {\r
+                       this.extend(latlngs[i]);\r
+               }\r
+       },\r
+\r
+       // extend the bounds to contain the given point or bounds\r
+       extend: function (obj) { // (LatLng) or (LatLngBounds)\r
+               if (typeof obj[0] === 'number' || obj instanceof L.LatLng) {\r
+                       obj = L.latLng(obj);\r
+               } else {\r
+                       obj = L.latLngBounds(obj);\r
+               }\r
+\r
+               if (obj instanceof L.LatLng) {\r
+                       if (!this._southWest && !this._northEast) {\r
+                               this._southWest = new L.LatLng(obj.lat, obj.lng, true);\r
+                               this._northEast = new L.LatLng(obj.lat, obj.lng, true);\r
+                       } else {\r
+                               this._southWest.lat = Math.min(obj.lat, this._southWest.lat);\r
+                               this._southWest.lng = Math.min(obj.lng, this._southWest.lng);\r
+\r
+                               this._northEast.lat = Math.max(obj.lat, this._northEast.lat);\r
+                               this._northEast.lng = Math.max(obj.lng, this._northEast.lng);\r
+                       }\r
+               } else if (obj instanceof L.LatLngBounds) {\r
+                       this.extend(obj._southWest);\r
+            this.extend(obj._northEast);\r
+               }\r
+               return this;\r
+       },\r
+\r
+       // extend the bounds by a percentage\r
+       pad: function (bufferRatio) { // (Number) -> LatLngBounds\r
+               var sw = this._southWest,\r
+                       ne = this._northEast,\r
+                       heightBuffer = Math.abs(sw.lat - ne.lat) * bufferRatio,\r
+                       widthBuffer = Math.abs(sw.lng - ne.lng) * bufferRatio;\r
+\r
+               return new L.LatLngBounds(\r
+                       new L.LatLng(sw.lat - heightBuffer, sw.lng - widthBuffer),\r
+                       new L.LatLng(ne.lat + heightBuffer, ne.lng + widthBuffer));\r
+       },\r
+\r
+       getCenter: function () { // -> LatLng\r
+               return new L.LatLng(\r
+                               (this._southWest.lat + this._northEast.lat) / 2,\r
+                               (this._southWest.lng + this._northEast.lng) / 2);\r
+       },\r
+\r
+       getSouthWest: function () {\r
+               return this._southWest;\r
+       },\r
+\r
+       getNorthEast: function () {\r
+               return this._northEast;\r
+       },\r
+\r
+       getNorthWest: function () {\r
+               return new L.LatLng(this._northEast.lat, this._southWest.lng, true);\r
+       },\r
+\r
+       getSouthEast: function () {\r
+               return new L.LatLng(this._southWest.lat, this._northEast.lng, true);\r
+       },\r
+\r
+       contains: function (obj) { // (LatLngBounds) or (LatLng) -> Boolean\r
+               if (typeof obj[0] === 'number' || obj instanceof L.LatLng) {\r
+                       obj = L.latLng(obj);\r
+               } else {\r
+                       obj = L.latLngBounds(obj);\r
+               }\r
+\r
+               var sw = this._southWest,\r
+                       ne = this._northEast,\r
+                       sw2, ne2;\r
+\r
+               if (obj instanceof L.LatLngBounds) {\r
+                       sw2 = obj.getSouthWest();\r
+                       ne2 = obj.getNorthEast();\r
+               } else {\r
+                       sw2 = ne2 = obj;\r
+               }\r
+\r
+               return (sw2.lat >= sw.lat) && (ne2.lat <= ne.lat) &&\r
+                               (sw2.lng >= sw.lng) && (ne2.lng <= ne.lng);\r
+       },\r
+\r
+       intersects: function (bounds) { // (LatLngBounds)\r
+               bounds = L.latLngBounds(bounds);\r
+\r
+               var sw = this._southWest,\r
+                       ne = this._northEast,\r
+                       sw2 = bounds.getSouthWest(),\r
+                       ne2 = bounds.getNorthEast();\r
+\r
+               var latIntersects = (ne2.lat >= sw.lat) && (sw2.lat <= ne.lat),\r
+                       lngIntersects = (ne2.lng >= sw.lng) && (sw2.lng <= ne.lng);\r
+\r
+               return latIntersects && lngIntersects;\r
+       },\r
+\r
+       toBBoxString: function () {\r
+               var sw = this._southWest,\r
+                       ne = this._northEast;\r
+               return [sw.lng, sw.lat, ne.lng, ne.lat].join(',');\r
+       },\r
+\r
+       equals: function (bounds) { // (LatLngBounds)\r
+               if (!bounds) { return false; }\r
+\r
+               bounds = L.latLngBounds(bounds);\r
+\r
+               return this._southWest.equals(bounds.getSouthWest()) &&\r
+                      this._northEast.equals(bounds.getNorthEast());\r
+       },\r
+\r
+       isValid: function () {\r
+               return !!(this._southWest && this._northEast);\r
+       }\r
+});\r
+\r
+//TODO International date line?\r
+\r
+L.latLngBounds = function (a, b) { // (LatLngBounds) or (LatLng, LatLng)\r
+       if (!a || a instanceof L.LatLngBounds) {\r
+               return a;\r
+       }\r
+       return new L.LatLngBounds(a, b);\r
+};\r
+
+
+/*\r
+ * L.Projection contains various geographical projections used by CRS classes.\r
+ */\r
+\r
+L.Projection = {};\r
+
+
+\r
+L.Projection.SphericalMercator = {\r
+       MAX_LATITUDE: 85.0511287798,\r
+\r
+       project: function (latlng) { // (LatLng) -> Point\r
+               var d = L.LatLng.DEG_TO_RAD,\r
+                       max = this.MAX_LATITUDE,\r
+                       lat = Math.max(Math.min(max, latlng.lat), -max),\r
+                       x = latlng.lng * d,\r
+                       y = lat * d;\r
+               y = Math.log(Math.tan((Math.PI / 4) + (y / 2)));\r
+\r
+               return new L.Point(x, y);\r
+       },\r
+\r
+       unproject: function (point) { // (Point, Boolean) -> LatLng\r
+               var d = L.LatLng.RAD_TO_DEG,\r
+                       lng = point.x * d,\r
+                       lat = (2 * Math.atan(Math.exp(point.y)) - (Math.PI / 2)) * d;\r
+\r
+               // TODO refactor LatLng wrapping\r
+               return new L.LatLng(lat, lng, true);\r
+       }\r
+};\r
+
+
+\r
+L.Projection.LonLat = {\r
+       project: function (latlng) {\r
+               return new L.Point(latlng.lng, latlng.lat);\r
+       },\r
+\r
+       unproject: function (point) {\r
+               return new L.LatLng(point.y, point.x, true);\r
+       }\r
+};\r
+
+
+\r
+L.CRS = {\r
+       latLngToPoint: function (latlng, zoom) { // (LatLng, Number) -> Point\r
+               var projectedPoint = this.projection.project(latlng),\r
+                   scale = this.scale(zoom);\r
+\r
+               return this.transformation._transform(projectedPoint, scale);\r
+       },\r
+\r
+       pointToLatLng: function (point, zoom) { // (Point, Number[, Boolean]) -> LatLng\r
+               var scale = this.scale(zoom),\r
+                   untransformedPoint = this.transformation.untransform(point, scale);\r
+\r
+               return this.projection.unproject(untransformedPoint);\r
+       },\r
+\r
+       project: function (latlng) {\r
+               return this.projection.project(latlng);\r
+       },\r
+\r
+       scale: function (zoom) {\r
+               return 256 * Math.pow(2, zoom);\r
+       }\r
+};\r
+
+
+\r
+L.CRS.EPSG3857 = L.Util.extend({}, L.CRS, {\r
+       code: 'EPSG:3857',\r
+\r
+       projection: L.Projection.SphericalMercator,\r
+       transformation: new L.Transformation(0.5 / Math.PI, 0.5, -0.5 / Math.PI, 0.5),\r
+\r
+       project: function (latlng) { // (LatLng) -> Point\r
+               var projectedPoint = this.projection.project(latlng),\r
+                       earthRadius = 6378137;\r
+               return projectedPoint.multiplyBy(earthRadius);\r
+       }\r
+});\r
+\r
+L.CRS.EPSG900913 = L.Util.extend({}, L.CRS.EPSG3857, {\r
+       code: 'EPSG:900913'\r
+});\r
+
+
+\r
+L.CRS.EPSG4326 = L.Util.extend({}, L.CRS, {\r
+       code: 'EPSG:4326',\r
+\r
+       projection: L.Projection.LonLat,\r
+       transformation: new L.Transformation(1 / 360, 0.5, -1 / 360, 0.5)\r
+});\r
+
+
+/*\r
+ * L.Map is the central class of the API - it is used to create a map.\r
+ */\r
+\r
+L.Map = L.Class.extend({\r
+\r
+       includes: L.Mixin.Events,\r
+\r
+       options: {\r
+               crs: L.CRS.EPSG3857,\r
+\r
+               /*\r
+               center: LatLng,\r
+               zoom: Number,\r
+               layers: Array,\r
+               */\r
+\r
+               fadeAnimation: L.DomUtil.TRANSITION && !L.Browser.android23,\r
+               trackResize: true,\r
+               markerZoomAnimation: L.DomUtil.TRANSITION && L.Browser.any3d\r
+       },\r
+\r
+       initialize: function (id, options) { // (HTMLElement or String, Object)\r
+               options = L.Util.setOptions(this, options);\r
+\r
+               this._initContainer(id);\r
+               this._initLayout();\r
+               this._initHooks();\r
+               this._initEvents();\r
+\r
+               if (options.maxBounds) {\r
+                       this.setMaxBounds(options.maxBounds);\r
+               }\r
+\r
+               if (options.center && options.zoom !== undefined) {\r
+                       this.setView(L.latLng(options.center), options.zoom, true);\r
+               }\r
+\r
+               this._initLayers(options.layers);\r
+       },\r
+\r
+\r
+       // public methods that modify map state\r
+\r
+       // replaced by animation-powered implementation in Map.PanAnimation.js\r
+       setView: function (center, zoom) {\r
+               this._resetView(L.latLng(center), this._limitZoom(zoom));\r
+               return this;\r
+       },\r
+\r
+       setZoom: function (zoom) { // (Number)\r
+               return this.setView(this.getCenter(), zoom);\r
+       },\r
+\r
+       zoomIn: function (delta) {\r
+               return this.setZoom(this._zoom + (delta || 1));\r
+       },\r
+\r
+       zoomOut: function (delta) {\r
+               return this.setZoom(this._zoom - (delta || 1));\r
+       },\r
+\r
+       fitBounds: function (bounds) { // (LatLngBounds)\r
+               var zoom = this.getBoundsZoom(bounds);\r
+               return this.setView(L.latLngBounds(bounds).getCenter(), zoom);\r
+       },\r
+\r
+       fitWorld: function () {\r
+               var sw = new L.LatLng(-60, -170),\r
+                   ne = new L.LatLng(85, 179);\r
+\r
+               return this.fitBounds(new L.LatLngBounds(sw, ne));\r
+       },\r
+\r
+       panTo: function (center) { // (LatLng)\r
+               return this.setView(center, this._zoom);\r
+       },\r
+\r
+       panBy: function (offset) { // (Point)\r
+               // replaced with animated panBy in Map.Animation.js\r
+               this.fire('movestart');\r
+\r
+               this._rawPanBy(L.point(offset));\r
+\r
+               this.fire('move');\r
+               return this.fire('moveend');\r
+       },\r
+\r
+       setMaxBounds: function (bounds) {\r
+               bounds = L.latLngBounds(bounds);\r
+\r
+               this.options.maxBounds = bounds;\r
+\r
+               if (!bounds) {\r
+                       this._boundsMinZoom = null;\r
+                       return this;\r
+               }\r
+\r
+               var minZoom = this.getBoundsZoom(bounds, true);\r
+\r
+               this._boundsMinZoom = minZoom;\r
+\r
+               if (this._loaded) {\r
+                       if (this._zoom < minZoom) {\r
+                               this.setView(bounds.getCenter(), minZoom);\r
+                       } else {\r
+                               this.panInsideBounds(bounds);\r
+                       }\r
+               }\r
+\r
+               return this;\r
+       },\r
+\r
+       panInsideBounds: function (bounds) {\r
+               bounds = L.latLngBounds(bounds);\r
+\r
+               var viewBounds = this.getBounds(),\r
+                   viewSw = this.project(viewBounds.getSouthWest()),\r
+                   viewNe = this.project(viewBounds.getNorthEast()),\r
+                   sw = this.project(bounds.getSouthWest()),\r
+                   ne = this.project(bounds.getNorthEast()),\r
+                   dx = 0,\r
+                   dy = 0;\r
+\r
+               if (viewNe.y < ne.y) { // north\r
+                       dy = ne.y - viewNe.y;\r
+               }\r
+               if (viewNe.x > ne.x) { // east\r
+                       dx = ne.x - viewNe.x;\r
+               }\r
+               if (viewSw.y > sw.y) { // south\r
+                       dy = sw.y - viewSw.y;\r
+               }\r
+               if (viewSw.x < sw.x) { // west\r
+                       dx = sw.x - viewSw.x;\r
+               }\r
+\r
+               return this.panBy(new L.Point(dx, dy, true));\r
+       },\r
+\r
+       addLayer: function (layer) {\r
+               // TODO method is too big, refactor\r
+\r
+               var id = L.Util.stamp(layer);\r
+\r
+               if (this._layers[id]) { return this; }\r
+\r
+               this._layers[id] = layer;\r
+\r
+               // TODO getMaxZoom, getMinZoom in ILayer (instead of options)\r
+               if (layer.options && !isNaN(layer.options.maxZoom)) {\r
+                       this._layersMaxZoom = Math.max(this._layersMaxZoom || 0, layer.options.maxZoom);\r
+               }\r
+               if (layer.options && !isNaN(layer.options.minZoom)) {\r
+                       this._layersMinZoom = Math.min(this._layersMinZoom || Infinity, layer.options.minZoom);\r
+               }\r
+\r
+               // TODO looks ugly, refactor!!!\r
+               if (this.options.zoomAnimation && L.TileLayer && (layer instanceof L.TileLayer)) {\r
+                       this._tileLayersNum++;\r
+            this._tileLayersToLoad++;\r
+            layer.on('load', this._onTileLayerLoad, this);\r
+               }\r
+\r
+               var onMapLoad = function () {\r
+                       layer.onAdd(this);\r
+                       this.fire('layeradd', {layer: layer});\r
+               };\r
+\r
+               if (this._loaded) {\r
+                       onMapLoad.call(this);\r
+               } else {\r
+                       this.on('load', onMapLoad, this);\r
+               }\r
+\r
+               return this;\r
+       },\r
+\r
+       removeLayer: function (layer) {\r
+               var id = L.Util.stamp(layer);\r
+\r
+               if (!this._layers[id]) { return; }\r
+\r
+               layer.onRemove(this);\r
+\r
+               delete this._layers[id];\r
+\r
+               // TODO looks ugly, refactor\r
+               if (this.options.zoomAnimation && L.TileLayer && (layer instanceof L.TileLayer)) {\r
+                       this._tileLayersNum--;\r
+            this._tileLayersToLoad--;\r
+            layer.off('load', this._onTileLayerLoad, this);\r
+               }\r
+\r
+               return this.fire('layerremove', {layer: layer});\r
+       },\r
+\r
+       hasLayer: function (layer) {\r
+               var id = L.Util.stamp(layer);\r
+               return this._layers.hasOwnProperty(id);\r
+       },\r
+\r
+       invalidateSize: function (animate) {\r
+               var oldSize = this.getSize();\r
+\r
+               this._sizeChanged = true;\r
+\r
+               if (this.options.maxBounds) {\r
+                       this.setMaxBounds(this.options.maxBounds);\r
+               }\r
+\r
+               if (!this._loaded) { return this; }\r
+\r
+               var offset = oldSize._subtract(this.getSize())._divideBy(2)._round();\r
+\r
+               if (animate === true) {\r
+                       this.panBy(offset);\r
+               } else {\r
+                       this._rawPanBy(offset);\r
+\r
+                       this.fire('move');\r
+\r
+                       clearTimeout(this._sizeTimer);\r
+                       this._sizeTimer = setTimeout(L.Util.bind(this.fire, this, 'moveend'), 200);\r
+               }\r
+               return this;\r
+       },\r
+\r
+       // TODO handler.addTo\r
+       addHandler: function (name, HandlerClass) {\r
+               if (!HandlerClass) { return; }\r
+\r
+               this[name] = new HandlerClass(this);\r
+\r
+               if (this.options[name]) {\r
+                       this[name].enable();\r
+               }\r
+\r
+               return this;\r
+       },\r
+\r
+\r
+       // public methods for getting map state\r
+\r
+       getCenter: function () { // (Boolean) -> LatLng\r
+               return this.layerPointToLatLng(this._getCenterLayerPoint());\r
+       },\r
+\r
+       getZoom: function () {\r
+               return this._zoom;\r
+       },\r
+\r
+       getBounds: function () {\r
+               var bounds = this.getPixelBounds(),\r
+                   sw = this.unproject(bounds.getBottomLeft()),\r
+                   ne = this.unproject(bounds.getTopRight());\r
+\r
+               return new L.LatLngBounds(sw, ne);\r
+       },\r
+\r
+       getMinZoom: function () {\r
+               var z1 = this.options.minZoom || 0,\r
+                   z2 = this._layersMinZoom || 0,\r
+                   z3 = this._boundsMinZoom || 0;\r
+\r
+               return Math.max(z1, z2, z3);\r
+       },\r
+\r
+       getMaxZoom: function () {\r
+               var z1 = this.options.maxZoom === undefined ? Infinity : this.options.maxZoom,\r
+                   z2 = this._layersMaxZoom  === undefined ? Infinity : this._layersMaxZoom;\r
+\r
+               return Math.min(z1, z2);\r
+       },\r
+\r
+       getBoundsZoom: function (bounds, inside) { // (LatLngBounds, Boolean) -> Number\r
+               bounds = L.latLngBounds(bounds);\r
+\r
+               var size = this.getSize(),\r
+                   zoom = this.options.minZoom || 0,\r
+                   maxZoom = this.getMaxZoom(),\r
+                   ne = bounds.getNorthEast(),\r
+                   sw = bounds.getSouthWest(),\r
+                   boundsSize,\r
+                   nePoint,\r
+                   swPoint,\r
+                   zoomNotFound = true;\r
+\r
+               if (inside) {\r
+                       zoom--;\r
+               }\r
+\r
+               do {\r
+                       zoom++;\r
+                       nePoint = this.project(ne, zoom);\r
+                       swPoint = this.project(sw, zoom);\r
+                       boundsSize = new L.Point(Math.abs(nePoint.x - swPoint.x), Math.abs(swPoint.y - nePoint.y));\r
+\r
+                       if (!inside) {\r
+                               zoomNotFound = boundsSize.x <= size.x && boundsSize.y <= size.y;\r
+                       } else {\r
+                               zoomNotFound = boundsSize.x < size.x || boundsSize.y < size.y;\r
+                       }\r
+               } while (zoomNotFound && zoom <= maxZoom);\r
+\r
+               if (zoomNotFound && inside) {\r
+                       return null;\r
+               }\r
+\r
+               return inside ? zoom : zoom - 1;\r
+       },\r
+\r
+       getSize: function () {\r
+               if (!this._size || this._sizeChanged) {\r
+                       this._size = new L.Point(\r
+                               this._container.clientWidth,\r
+                               this._container.clientHeight);\r
+\r
+                       this._sizeChanged = false;\r
+               }\r
+               return this._size.clone();\r
+       },\r
+\r
+       getPixelBounds: function () {\r
+               var topLeftPoint = this._getTopLeftPoint();\r
+               return new L.Bounds(topLeftPoint, topLeftPoint.add(this.getSize()));\r
+       },\r
+\r
+       getPixelOrigin: function () {\r
+               return this._initialTopLeftPoint;\r
+       },\r
+\r
+       getPanes: function () {\r
+               return this._panes;\r
+       },\r
+\r
+       getContainer: function () {\r
+               return this._container;\r
+       },\r
+\r
+\r
+       // TODO replace with universal implementation after refactoring projections\r
+\r
+       getZoomScale: function (toZoom) {\r
+               var crs = this.options.crs;\r
+               return crs.scale(toZoom) / crs.scale(this._zoom);\r
+       },\r
+\r
+       getScaleZoom: function (scale) {\r
+               return this._zoom + (Math.log(scale) / Math.LN2);\r
+       },\r
+\r
+\r
+       // conversion methods\r
+\r
+       project: function (latlng, zoom) { // (LatLng[, Number]) -> Point\r
+               zoom = zoom === undefined ? this._zoom : zoom;\r
+               return this.options.crs.latLngToPoint(L.latLng(latlng), zoom);\r
+       },\r
+\r
+       unproject: function (point, zoom) { // (Point[, Number]) -> LatLng\r
+               zoom = zoom === undefined ? this._zoom : zoom;\r
+               return this.options.crs.pointToLatLng(L.point(point), zoom);\r
+       },\r
+\r
+       layerPointToLatLng: function (point) { // (Point)\r
+               var projectedPoint = L.point(point).add(this._initialTopLeftPoint);\r
+               return this.unproject(projectedPoint);\r
+       },\r
+\r
+       latLngToLayerPoint: function (latlng) { // (LatLng)\r
+               var projectedPoint = this.project(L.latLng(latlng))._round();\r
+               return projectedPoint._subtract(this._initialTopLeftPoint);\r
+       },\r
+\r
+       containerPointToLayerPoint: function (point) { // (Point)\r
+               return L.point(point).subtract(this._getMapPanePos());\r
+       },\r
+\r
+       layerPointToContainerPoint: function (point) { // (Point)\r
+               return L.point(point).add(this._getMapPanePos());\r
+       },\r
+\r
+       containerPointToLatLng: function (point) {\r
+               var layerPoint = this.containerPointToLayerPoint(L.point(point));\r
+               return this.layerPointToLatLng(layerPoint);\r
+       },\r
+\r
+       latLngToContainerPoint: function (latlng) {\r
+               return this.layerPointToContainerPoint(this.latLngToLayerPoint(L.latLng(latlng)));\r
+       },\r
+\r
+       mouseEventToContainerPoint: function (e) { // (MouseEvent)\r
+               return L.DomEvent.getMousePosition(e, this._container);\r
+       },\r
+\r
+       mouseEventToLayerPoint: function (e) { // (MouseEvent)\r
+               return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(e));\r
+       },\r
+\r
+       mouseEventToLatLng: function (e) { // (MouseEvent)\r
+               return this.layerPointToLatLng(this.mouseEventToLayerPoint(e));\r
+       },\r
+\r
+\r
+       // map initialization methods\r
+\r
+       _initContainer: function (id) {\r
+               var container = this._container = L.DomUtil.get(id);\r
+\r
+               if (container._leaflet) {\r
+                       throw new Error("Map container is already initialized.");\r
+               }\r
+\r
+               container._leaflet = true;\r
+       },\r
+\r
+       _initLayout: function () {\r
+               var container = this._container;\r
+\r
+               container.innerHTML = '';\r
+               L.DomUtil.addClass(container, 'leaflet-container');\r
+\r
+               if (L.Browser.touch) {\r
+                       L.DomUtil.addClass(container, 'leaflet-touch');\r
+               }\r
+\r
+               if (this.options.fadeAnimation) {\r
+                       L.DomUtil.addClass(container, 'leaflet-fade-anim');\r
+               }\r
+\r
+               var position = L.DomUtil.getStyle(container, 'position');\r
+\r
+               if (position !== 'absolute' && position !== 'relative' && position !== 'fixed') {\r
+                       container.style.position = 'relative';\r
+               }\r
+\r
+               this._initPanes();\r
+\r
+               if (this._initControlPos) {\r
+                       this._initControlPos();\r
+               }\r
+       },\r
+\r
+       _initPanes: function () {\r
+               var panes = this._panes = {};\r
+\r
+               this._mapPane = panes.mapPane = this._createPane('leaflet-map-pane', this._container);\r
+\r
+               this._tilePane = panes.tilePane = this._createPane('leaflet-tile-pane', this._mapPane);\r
+               this._objectsPane = panes.objectsPane = this._createPane('leaflet-objects-pane', this._mapPane);\r
+\r
+               panes.shadowPane = this._createPane('leaflet-shadow-pane');\r
+               panes.overlayPane = this._createPane('leaflet-overlay-pane');\r
+               panes.markerPane = this._createPane('leaflet-marker-pane');\r
+               panes.popupPane = this._createPane('leaflet-popup-pane');\r
+\r
+               var zoomHide = ' leaflet-zoom-hide';\r
+\r
+               if (!this.options.markerZoomAnimation) {\r
+                       L.DomUtil.addClass(panes.markerPane, zoomHide);\r
+                       L.DomUtil.addClass(panes.shadowPane, zoomHide);\r
+                       L.DomUtil.addClass(panes.popupPane, zoomHide);\r
+               }\r
+       },\r
+\r
+       _createPane: function (className, container) {\r
+               return L.DomUtil.create('div', className, container || this._objectsPane);\r
+       },\r
+\r
+       _initializers: [],\r
+\r
+       _initHooks: function () {\r
+               var i, len;\r
+               for (i = 0, len = this._initializers.length; i < len; i++) {\r
+                       this._initializers[i].call(this);\r
+               }\r
+       },\r
+\r
+       _initLayers: function (layers) {\r
+               layers = layers ? (layers instanceof Array ? layers : [layers]) : [];\r
+\r
+               this._layers = {};\r
+               this._tileLayersNum = 0;\r
+\r
+               var i, len;\r
+\r
+               for (i = 0, len = layers.length; i < len; i++) {\r
+                       this.addLayer(layers[i]);\r
+               }\r
+       },\r
+\r
+\r
+       // private methods that modify map state\r
+\r
+       _resetView: function (center, zoom, preserveMapOffset, afterZoomAnim) {\r
+\r
+               var zoomChanged = (this._zoom !== zoom);\r
+\r
+               if (!afterZoomAnim) {\r
+                       this.fire('movestart');\r
+\r
+                       if (zoomChanged) {\r
+                               this.fire('zoomstart');\r
+                       }\r
+               }\r
+\r
+               this._zoom = zoom;\r
+\r
+               this._initialTopLeftPoint = this._getNewTopLeftPoint(center);\r
+\r
+               if (!preserveMapOffset) {\r
+                       L.DomUtil.setPosition(this._mapPane, new L.Point(0, 0));\r
+               } else {\r
+                       this._initialTopLeftPoint._add(this._getMapPanePos());\r
+               }\r
+\r
+               this._tileLayersToLoad = this._tileLayersNum;\r
+\r
+               var loading = !this._loaded;\r
+               this._loaded = true;\r
+\r
+               this.fire('viewreset', {hard: !preserveMapOffset});\r
+\r
+               this.fire('move');\r
+\r
+               if (zoomChanged || afterZoomAnim) {\r
+                       this.fire('zoomend');\r
+               }\r
+\r
+               this.fire('moveend', {hard: !preserveMapOffset});\r
+\r
+               if (loading) {\r
+                       this.fire('load');\r
+               }\r
+       },\r
+\r
+       _rawPanBy: function (offset) {\r
+               L.DomUtil.setPosition(this._mapPane, this._getMapPanePos().subtract(offset));\r
+       },\r
+\r
+\r
+       // map events\r
+\r
+       _initEvents: function () {\r
+               if (!L.DomEvent) { return; }\r
+\r
+               L.DomEvent.on(this._container, 'click', this._onMouseClick, this);\r
+\r
+               var events = ['dblclick', 'mousedown', 'mouseup', 'mouseenter', 'mouseleave', 'mousemove', 'contextmenu'],\r
+                       i, len;\r
+\r
+               for (i = 0, len = events.length; i < len; i++) {\r
+                       L.DomEvent.on(this._container, events[i], this._fireMouseEvent, this);\r
+               }\r
+\r
+               if (this.options.trackResize) {\r
+                       L.DomEvent.on(window, 'resize', this._onResize, this);\r
+               }\r
+       },\r
+\r
+       _onResize: function () {\r
+               L.Util.cancelAnimFrame(this._resizeRequest);\r
+               this._resizeRequest = L.Util.requestAnimFrame(this.invalidateSize, this, false, this._container);\r
+       },\r
+\r
+       _onMouseClick: function (e) {\r
+               if (!this._loaded || (this.dragging && this.dragging.moved())) { return; }\r
+\r
+               this.fire('preclick');\r
+               this._fireMouseEvent(e);\r
+       },\r
+\r
+       _fireMouseEvent: function (e) {\r
+               if (!this._loaded) { return; }\r
+\r
+               var type = e.type;\r
+\r
+               type = (type === 'mouseenter' ? 'mouseover' : (type === 'mouseleave' ? 'mouseout' : type));\r
+\r
+               if (!this.hasEventListeners(type)) { return; }\r
+\r
+               if (type === 'contextmenu') {\r
+                       L.DomEvent.preventDefault(e);\r
+               }\r
+\r
+               var containerPoint = this.mouseEventToContainerPoint(e),\r
+                       layerPoint = this.containerPointToLayerPoint(containerPoint),\r
+                       latlng = this.layerPointToLatLng(layerPoint);\r
+\r
+               this.fire(type, {\r
+                       latlng: latlng,\r
+                       layerPoint: layerPoint,\r
+                       containerPoint: containerPoint,\r
+                       originalEvent: e\r
+               });\r
+       },\r
+\r
+       _onTileLayerLoad: function () {\r
+               // TODO super-ugly, refactor!!!\r
+               // clear scaled tiles after all new tiles are loaded (for performance)\r
+               this._tileLayersToLoad--;\r
+               if (this._tileLayersNum && !this._tileLayersToLoad && this._tileBg) {\r
+                       clearTimeout(this._clearTileBgTimer);\r
+                       this._clearTileBgTimer = setTimeout(L.Util.bind(this._clearTileBg, this), 500);\r
+               }\r
+       },\r
+\r
+\r
+       // private methods for getting map state\r
+\r
+       _getMapPanePos: function () {\r
+               return L.DomUtil.getPosition(this._mapPane);\r
+       },\r
+\r
+       _getTopLeftPoint: function () {\r
+               if (!this._loaded) {\r
+                       throw new Error('Set map center and zoom first.');\r
+               }\r
+\r
+               return this._initialTopLeftPoint.subtract(this._getMapPanePos());\r
+       },\r
+\r
+       _getNewTopLeftPoint: function (center, zoom) {\r
+               var viewHalf = this.getSize()._divideBy(2);\r
+               // TODO round on display, not calculation to increase precision?\r
+               return this.project(center, zoom)._subtract(viewHalf)._round();\r
+       },\r
+\r
+       _latLngToNewLayerPoint: function (latlng, newZoom, newCenter) {\r
+               var topLeft = this._getNewTopLeftPoint(newCenter, newZoom).add(this._getMapPanePos());\r
+               return this.project(latlng, newZoom)._subtract(topLeft);\r
+       },\r
+\r
+       _getCenterLayerPoint: function () {\r
+               return this.containerPointToLayerPoint(this.getSize()._divideBy(2));\r
+       },\r
+\r
+       _getCenterOffset: function (center) {\r
+               return this.latLngToLayerPoint(center).subtract(this._getCenterLayerPoint());\r
+       },\r
+\r
+       _limitZoom: function (zoom) {\r
+               var min = this.getMinZoom(),\r
+                       max = this.getMaxZoom();\r
+\r
+               return Math.max(min, Math.min(max, zoom));\r
+       }\r
+});\r
+\r
+L.Map.addInitHook = function (fn) {\r
+       var args = Array.prototype.slice.call(arguments, 1);\r
+\r
+       var init = typeof fn === 'function' ? fn : function () {\r
+               this[fn].apply(this, args);\r
+       };\r
+\r
+       this.prototype._initializers.push(init);\r
+};\r
+\r
+L.map = function (id, options) {\r
+       return new L.Map(id, options);\r
+};\r
+
+
+\r
+L.Projection.Mercator = {\r
+       MAX_LATITUDE: 85.0840591556,\r
+\r
+       R_MINOR: 6356752.3142,\r
+       R_MAJOR: 6378137,\r
+\r
+       project: function (latlng) { // (LatLng) -> Point\r
+               var d = L.LatLng.DEG_TO_RAD,\r
+                       max = this.MAX_LATITUDE,\r
+                       lat = Math.max(Math.min(max, latlng.lat), -max),\r
+                       r = this.R_MAJOR,\r
+                       r2 = this.R_MINOR,\r
+                       x = latlng.lng * d * r,\r
+                       y = lat * d,\r
+                       tmp = r2 / r,\r
+                       eccent = Math.sqrt(1.0 - tmp * tmp),\r
+                       con = eccent * Math.sin(y);\r
+\r
+               con = Math.pow((1 - con) / (1 + con), eccent * 0.5);\r
+\r
+               var ts = Math.tan(0.5 * ((Math.PI * 0.5) - y)) / con;\r
+               y = -r2 * Math.log(ts);\r
+\r
+               return new L.Point(x, y);\r
+       },\r
+\r
+       unproject: function (point) { // (Point, Boolean) -> LatLng\r
+               var d = L.LatLng.RAD_TO_DEG,\r
+                       r = this.R_MAJOR,\r
+                       r2 = this.R_MINOR,\r
+                       lng = point.x * d / r,\r
+                       tmp = r2 / r,\r
+                       eccent = Math.sqrt(1 - (tmp * tmp)),\r
+                       ts = Math.exp(- point.y / r2),\r
+                       phi = (Math.PI / 2) - 2 * Math.atan(ts),\r
+                       numIter = 15,\r
+                       tol = 1e-7,\r
+                       i = numIter,\r
+                       dphi = 0.1,\r
+                       con;\r
+\r
+               while ((Math.abs(dphi) > tol) && (--i > 0)) {\r
+                       con = eccent * Math.sin(phi);\r
+                       dphi = (Math.PI / 2) - 2 * Math.atan(ts * Math.pow((1.0 - con) / (1.0 + con), 0.5 * eccent)) - phi;\r
+                       phi += dphi;\r
+               }\r
+\r
+               return new L.LatLng(phi * d, lng, true);\r
+       }\r
+};\r
+
+
+\r
+L.CRS.EPSG3395 = L.Util.extend({}, L.CRS, {\r
+       code: 'EPSG:3395',\r
+\r
+       projection: L.Projection.Mercator,\r
+\r
+       transformation: (function () {\r
+               var m = L.Projection.Mercator,\r
+                       r = m.R_MAJOR,\r
+                       r2 = m.R_MINOR;\r
+\r
+               return new L.Transformation(0.5 / (Math.PI * r), 0.5, -0.5 / (Math.PI * r2), 0.5);\r
+       }())\r
+});\r
+
+
+/*\r
+ * L.TileLayer is used for standard xyz-numbered tile layers.\r
+ */\r
+\r
+L.TileLayer = L.Class.extend({\r
+       includes: L.Mixin.Events,\r
+\r
+       options: {\r
+               minZoom: 0,\r
+               maxZoom: 18,\r
+               tileSize: 256,\r
+               subdomains: 'abc',\r
+               errorTileUrl: '',\r
+               attribution: '',\r
+               zoomOffset: 0,\r
+               opacity: 1,\r
+               /* (undefined works too)\r
+               zIndex: null,\r
+               tms: false,\r
+               continuousWorld: false,\r
+               noWrap: false,\r
+               zoomReverse: false,\r
+               detectRetina: false,\r
+               reuseTiles: false,\r
+               */\r
+               unloadInvisibleTiles: L.Browser.mobile,\r
+               updateWhenIdle: L.Browser.mobile\r
+       },\r
+\r
+       initialize: function (url, options) {\r
+               options = L.Util.setOptions(this, options);\r
+\r
+               // detecting retina displays, adjusting tileSize and zoom levels\r
+               if (options.detectRetina && L.Browser.retina && options.maxZoom > 0) {\r
+\r
+                       options.tileSize = Math.floor(options.tileSize / 2);\r
+                       options.zoomOffset++;\r
+\r
+                       if (options.minZoom > 0) {\r
+                               options.minZoom--;\r
+                       }\r
+                       this.options.maxZoom--;\r
+               }\r
+\r
+               this._url = url;\r
+\r
+               var subdomains = this.options.subdomains;\r
+\r
+               if (typeof subdomains === 'string') {\r
+                       this.options.subdomains = subdomains.split('');\r
+               }\r
+       },\r
+\r
+       onAdd: function (map) {\r
+               this._map = map;\r
+\r
+               // create a container div for tiles\r
+               this._initContainer();\r
+\r
+               // create an image to clone for tiles\r
+               this._createTileProto();\r
+\r
+               // set up events\r
+               map.on({\r
+                       'viewreset': this._resetCallback,\r
+                       'moveend': this._update\r
+               }, this);\r
+\r
+               if (!this.options.updateWhenIdle) {\r
+                       this._limitedUpdate = L.Util.limitExecByInterval(this._update, 150, this);\r
+                       map.on('move', this._limitedUpdate, this);\r
+               }\r
+\r
+               this._reset();\r
+               this._update();\r
+       },\r
+\r
+       addTo: function (map) {\r
+               map.addLayer(this);\r
+               return this;\r
+       },\r
+\r
+       onRemove: function (map) {\r
+               map._panes.tilePane.removeChild(this._container);\r
+\r
+               map.off({\r
+                       'viewreset': this._resetCallback,\r
+                       'moveend': this._update\r
+               }, this);\r
+\r
+               if (!this.options.updateWhenIdle) {\r
+                       map.off('move', this._limitedUpdate, this);\r
+               }\r
+\r
+               this._container = null;\r
+               this._map = null;\r
+       },\r
+\r
+       bringToFront: function () {\r
+               var pane = this._map._panes.tilePane;\r
+\r
+               if (this._container) {\r
+                       pane.appendChild(this._container);\r
+                       this._setAutoZIndex(pane, Math.max);\r
+               }\r
+\r
+               return this;\r
+       },\r
+\r
+       bringToBack: function () {\r
+               var pane = this._map._panes.tilePane;\r
+\r
+               if (this._container) {\r
+                       pane.insertBefore(this._container, pane.firstChild);\r
+                       this._setAutoZIndex(pane, Math.min);\r
+               }\r
+\r
+               return this;\r
+       },\r
+\r
+       getAttribution: function () {\r
+               return this.options.attribution;\r
+       },\r
+\r
+       setOpacity: function (opacity) {\r
+               this.options.opacity = opacity;\r
+\r
+               if (this._map) {\r
+                       this._updateOpacity();\r
+               }\r
+\r
+               return this;\r
+       },\r
+\r
+       setZIndex: function (zIndex) {\r
+               this.options.zIndex = zIndex;\r
+               this._updateZIndex();\r
+\r
+               return this;\r
+       },\r
+\r
+       setUrl: function (url, noRedraw) {\r
+               this._url = url;\r
+\r
+               if (!noRedraw) {\r
+                       this.redraw();\r
+               }\r
+\r
+               return this;\r
+       },\r
+\r
+       redraw: function () {\r
+               if (this._map) {\r
+                       this._map._panes.tilePane.empty = false;\r
+                       this._reset(true);\r
+                       this._update();\r
+               }\r
+               return this;\r
+       },\r
+\r
+       _updateZIndex: function () {\r
+               if (this._container && this.options.zIndex !== undefined) {\r
+                       this._container.style.zIndex = this.options.zIndex;\r
+               }\r
+       },\r
+\r
+       _setAutoZIndex: function (pane, compare) {\r
+\r
+               var layers = pane.getElementsByClassName('leaflet-layer'),\r
+                       edgeZIndex = -compare(Infinity, -Infinity), // -Ifinity for max, Infinity for min\r
+                       zIndex;\r
+\r
+               for (var i = 0, len = layers.length; i < len; i++) {\r
+\r
+                       if (layers[i] !== this._container) {\r
+                               zIndex = parseInt(layers[i].style.zIndex, 10);\r
+\r
+                               if (!isNaN(zIndex)) {\r
+                                       edgeZIndex = compare(edgeZIndex, zIndex);\r
+                               }\r
+                       }\r
+               }\r
+\r
+               this.options.zIndex = this._container.style.zIndex = (isFinite(edgeZIndex) ? edgeZIndex : 0) + compare(1, -1);\r
+       },\r
+\r
+       _updateOpacity: function () {\r
+               L.DomUtil.setOpacity(this._container, this.options.opacity);\r
+\r
+               // stupid webkit hack to force redrawing of tiles\r
+               var i,\r
+                       tiles = this._tiles;\r
+\r
+               if (L.Browser.webkit) {\r
+                       for (i in tiles) {\r
+                               if (tiles.hasOwnProperty(i)) {\r
+                                       tiles[i].style.webkitTransform += ' translate(0,0)';\r
+                               }\r
+                       }\r
+               }\r
+       },\r
+\r
+       _initContainer: function () {\r
+               var tilePane = this._map._panes.tilePane;\r
+\r
+               if (!this._container || tilePane.empty) {\r
+                       this._container = L.DomUtil.create('div', 'leaflet-layer');\r
+\r
+                       this._updateZIndex();\r
+\r
+                       tilePane.appendChild(this._container);\r
+\r
+                       if (this.options.opacity < 1) {\r
+                               this._updateOpacity();\r
+                       }\r
+               }\r
+       },\r
+\r
+       _resetCallback: function (e) {\r
+               this._reset(e.hard);\r
+       },\r
+\r
+       _reset: function (clearOldContainer) {\r
+               var key,\r
+                       tiles = this._tiles;\r
+\r
+               for (key in tiles) {\r
+                       if (tiles.hasOwnProperty(key)) {\r
+                               this.fire('tileunload', {tile: tiles[key]});\r
+                       }\r
+               }\r
+\r
+               this._tiles = {};\r
+               this._tilesToLoad = 0;\r
+\r
+               if (this.options.reuseTiles) {\r
+                       this._unusedTiles = [];\r
+               }\r
+\r
+               if (clearOldContainer && this._container) {\r
+                       this._container.innerHTML = "";\r
+               }\r
+\r
+               this._initContainer();\r
+       },\r
+\r
+       _update: function (e) {\r
+\r
+               if (!this._map) { return; }\r
+\r
+               var bounds   = this._map.getPixelBounds(),\r
+                   zoom     = this._map.getZoom(),\r
+                   tileSize = this.options.tileSize;\r
+\r
+               if (zoom > this.options.maxZoom || zoom < this.options.minZoom) {\r
+                       return;\r
+               }\r
+\r
+               var nwTilePoint = new L.Point(\r
+                               Math.floor(bounds.min.x / tileSize),\r
+                               Math.floor(bounds.min.y / tileSize)),\r
+                       seTilePoint = new L.Point(\r
+                               Math.floor(bounds.max.x / tileSize),\r
+                               Math.floor(bounds.max.y / tileSize)),\r
+                       tileBounds = new L.Bounds(nwTilePoint, seTilePoint);\r
+\r
+               this._addTilesFromCenterOut(tileBounds);\r
+\r
+               if (this.options.unloadInvisibleTiles || this.options.reuseTiles) {\r
+                       this._removeOtherTiles(tileBounds);\r
+               }\r
+       },\r
+\r
+       _addTilesFromCenterOut: function (bounds) {\r
+               var queue = [],\r
+                       center = bounds.getCenter();\r
+\r
+               var j, i, point;\r
+\r
+               for (j = bounds.min.y; j <= bounds.max.y; j++) {\r
+                       for (i = bounds.min.x; i <= bounds.max.x; i++) {\r
+                               point = new L.Point(i, j);\r
+\r
+                               if (this._tileShouldBeLoaded(point)) {\r
+                                       queue.push(point);\r
+                               }\r
+                       }\r
+               }\r
+\r
+               var tilesToLoad = queue.length;\r
+\r
+               if (tilesToLoad === 0) { return; }\r
+\r
+               // load tiles in order of their distance to center\r
+               queue.sort(function (a, b) {\r
+                       return a.distanceTo(center) - b.distanceTo(center);\r
+               });\r
+\r
+               var fragment = document.createDocumentFragment();\r
+\r
+               // if its the first batch of tiles to load\r
+               if (!this._tilesToLoad) {\r
+                       this.fire('loading');\r
+               }\r
+\r
+               this._tilesToLoad += tilesToLoad;\r
+\r
+               for (i = 0; i < tilesToLoad; i++) {\r
+                       this._addTile(queue[i], fragment);\r
+               }\r
+\r
+               this._container.appendChild(fragment);\r
+       },\r
+\r
+       _tileShouldBeLoaded: function (tilePoint) {\r
+               if ((tilePoint.x + ':' + tilePoint.y) in this._tiles) {\r
+                       return false; // already loaded\r
+               }\r
+\r
+               if (!this.options.continuousWorld) {\r
+                       var limit = this._getWrapTileNum();\r
+\r
+                       if (this.options.noWrap && (tilePoint.x < 0 || tilePoint.x >= limit) ||\r
+                                                       tilePoint.y < 0 || tilePoint.y >= limit) {\r
+                               return false; // exceeds world bounds\r
+                       }\r
+               }\r
+\r
+               return true;\r
+       },\r
+\r
+       _removeOtherTiles: function (bounds) {\r
+               var kArr, x, y, key;\r
+\r
+               for (key in this._tiles) {\r
+                       if (this._tiles.hasOwnProperty(key)) {\r
+                               kArr = key.split(':');\r
+                               x = parseInt(kArr[0], 10);\r
+                               y = parseInt(kArr[1], 10);\r
+\r
+                               // remove tile if it's out of bounds\r
+                               if (x < bounds.min.x || x > bounds.max.x || y < bounds.min.y || y > bounds.max.y) {\r
+                                       this._removeTile(key);\r
+                               }\r
+                       }\r
+               }\r
+       },\r
+\r
+       _removeTile: function (key) {\r
+               var tile = this._tiles[key];\r
+\r
+               this.fire("tileunload", {tile: tile, url: tile.src});\r
+\r
+               if (this.options.reuseTiles) {\r
+                       L.DomUtil.removeClass(tile, 'leaflet-tile-loaded');\r
+                       this._unusedTiles.push(tile);\r
+               } else if (tile.parentNode === this._container) {\r
+                       this._container.removeChild(tile);\r
+               }\r
+\r
+               if (!L.Browser.android) { //For https://github.com/CloudMade/Leaflet/issues/137\r
+                       tile.src = L.Util.emptyImageUrl;\r
+               }\r
+\r
+               delete this._tiles[key];\r
+       },\r
+\r
+       _addTile: function (tilePoint, container) {\r
+               var tilePos = this._getTilePos(tilePoint);\r
+\r
+               // get unused tile - or create a new tile\r
+               var tile = this._getTile();\r
+\r
+               // Chrome 20 layouts much faster with top/left (Verify with timeline, frames)\r
+               // android 4 browser has display issues with top/left and requires transform instead\r
+               // android 3 browser not tested\r
+               // android 2 browser requires top/left or tiles disappear on load or first drag (reappear after zoom) https://github.com/CloudMade/Leaflet/issues/866\r
+               // (other browsers don't currently care) - see debug/hacks/jitter.html for an example\r
+               L.DomUtil.setPosition(tile, tilePos, L.Browser.chrome || L.Browser.android23);\r
+\r
+               this._tiles[tilePoint.x + ':' + tilePoint.y] = tile;\r
+\r
+               this._loadTile(tile, tilePoint);\r
+\r
+               if (tile.parentNode !== this._container) {\r
+                       container.appendChild(tile);\r
+               }\r
+       },\r
+\r
+       _getZoomForUrl: function () {\r
+\r
+               var options = this.options,\r
+                       zoom = this._map.getZoom();\r
+\r
+               if (options.zoomReverse) {\r
+                       zoom = options.maxZoom - zoom;\r
+               }\r
+\r
+               return zoom + options.zoomOffset;\r
+       },\r
+\r
+       _getTilePos: function (tilePoint) {\r
+               var origin = this._map.getPixelOrigin(),\r
+                       tileSize = this.options.tileSize;\r
+\r
+               return tilePoint.multiplyBy(tileSize).subtract(origin);\r
+       },\r
+\r
+       // image-specific code (override to implement e.g. Canvas or SVG tile layer)\r
+\r
+       getTileUrl: function (tilePoint) {\r
+               this._adjustTilePoint(tilePoint);\r
+\r
+               return L.Util.template(this._url, L.Util.extend({\r
+                       s: this._getSubdomain(tilePoint),\r
+                       z: this._getZoomForUrl(),\r
+                       x: tilePoint.x,\r
+                       y: tilePoint.y\r
+               }, this.options));\r
+       },\r
+\r
+       _getWrapTileNum: function () {\r
+               // TODO refactor, limit is not valid for non-standard projections\r
+               return Math.pow(2, this._getZoomForUrl());\r
+       },\r
+\r
+       _adjustTilePoint: function (tilePoint) {\r
+\r
+               var limit = this._getWrapTileNum();\r
+\r
+               // wrap tile coordinates\r
+               if (!this.options.continuousWorld && !this.options.noWrap) {\r
+                       tilePoint.x = ((tilePoint.x % limit) + limit) % limit;\r
+               }\r
+\r
+               if (this.options.tms) {\r
+                       tilePoint.y = limit - tilePoint.y - 1;\r
+               }\r
+       },\r
+\r
+       _getSubdomain: function (tilePoint) {\r
+               var index = (tilePoint.x + tilePoint.y) % this.options.subdomains.length;\r
+               return this.options.subdomains[index];\r
+       },\r
+\r
+       _createTileProto: function () {\r
+               var img = this._tileImg = L.DomUtil.create('img', 'leaflet-tile');\r
+               img.galleryimg = 'no';\r
+\r
+               var tileSize = this.options.tileSize;\r
+               img.style.width = tileSize + 'px';\r
+               img.style.height = tileSize + 'px';\r
+       },\r
+\r
+       _getTile: function () {\r
+               if (this.options.reuseTiles && this._unusedTiles.length > 0) {\r
+                       var tile = this._unusedTiles.pop();\r
+                       this._resetTile(tile);\r
+                       return tile;\r
+               }\r
+               return this._createTile();\r
+       },\r
+\r
+       _resetTile: function (tile) {\r
+               // Override if data stored on a tile needs to be cleaned up before reuse\r
+       },\r
+\r
+       _createTile: function () {\r
+               var tile = this._tileImg.cloneNode(false);\r
+               tile.onselectstart = tile.onmousemove = L.Util.falseFn;\r
+               return tile;\r
+       },\r
+\r
+       _loadTile: function (tile, tilePoint) {\r
+               tile._layer  = this;\r
+               tile.onload  = this._tileOnLoad;\r
+               tile.onerror = this._tileOnError;\r
+\r
+               tile.src     = this.getTileUrl(tilePoint);\r
+       },\r
+\r
+    _tileLoaded: function () {\r
+        this._tilesToLoad--;\r
+        if (!this._tilesToLoad) {\r
+            this.fire('load');\r
+        }\r
+    },\r
+\r
+       _tileOnLoad: function (e) {\r
+               var layer = this._layer;\r
+\r
+               //Only if we are loading an actual image\r
+               if (this.src !== L.Util.emptyImageUrl) {\r
+                       L.DomUtil.addClass(this, 'leaflet-tile-loaded');\r
+\r
+                       layer.fire('tileload', {\r
+                               tile: this,\r
+                               url: this.src\r
+                       });\r
+               }\r
+\r
+               layer._tileLoaded();\r
+       },\r
+\r
+       _tileOnError: function (e) {\r
+               var layer = this._layer;\r
+\r
+               layer.fire('tileerror', {\r
+                       tile: this,\r
+                       url: this.src\r
+               });\r
+\r
+               var newUrl = layer.options.errorTileUrl;\r
+               if (newUrl) {\r
+                       this.src = newUrl;\r
+               }\r
+\r
+        layer._tileLoaded();\r
+    }\r
+});\r
+\r
+L.tileLayer = function (url, options) {\r
+       return new L.TileLayer(url, options);\r
+};\r
+
+
+L.TileLayer.WMS = L.TileLayer.extend({\r
+\r
+       defaultWmsParams: {\r
+               service: 'WMS',\r
+               request: 'GetMap',\r
+               version: '1.1.1',\r
+               layers: '',\r
+               styles: '',\r
+               format: 'image/jpeg',\r
+               transparent: false\r
+       },\r
+\r
+       initialize: function (url, options) { // (String, Object)\r
+\r
+               this._url = url;\r
+\r
+               var wmsParams = L.Util.extend({}, this.defaultWmsParams);\r
+\r
+               if (options.detectRetina && L.Browser.retina) {\r
+                       wmsParams.width = wmsParams.height = this.options.tileSize * 2;\r
+               } else {\r
+                       wmsParams.width = wmsParams.height = this.options.tileSize;\r
+               }\r
+\r
+               for (var i in options) {\r
+                       // all keys that are not TileLayer options go to WMS params\r
+                       if (!this.options.hasOwnProperty(i)) {\r
+                               wmsParams[i] = options[i];\r
+                       }\r
+               }\r
+\r
+               this.wmsParams = wmsParams;\r
+\r
+               L.Util.setOptions(this, options);\r
+       },\r
+\r
+       onAdd: function (map) {\r
+\r
+               var projectionKey = parseFloat(this.wmsParams.version) >= 1.3 ? 'crs' : 'srs';\r
+               this.wmsParams[projectionKey] = map.options.crs.code;\r
+\r
+               L.TileLayer.prototype.onAdd.call(this, map);\r
+       },\r
+\r
+       getTileUrl: function (tilePoint, zoom) { // (Point, Number) -> String\r
+\r
+               var map = this._map,\r
+                       crs = map.options.crs,\r
+                       tileSize = this.options.tileSize,\r
+\r
+                       nwPoint = tilePoint.multiplyBy(tileSize),\r
+                       sePoint = nwPoint.add(new L.Point(tileSize, tileSize)),\r
+\r
+                       nw = crs.project(map.unproject(nwPoint, zoom)),\r
+                       se = crs.project(map.unproject(sePoint, zoom)),\r
+\r
+                       bbox = [nw.x, se.y, se.x, nw.y].join(','),\r
+\r
+                       url = L.Util.template(this._url, {s: this._getSubdomain(tilePoint)});\r
+\r
+               return url + L.Util.getParamString(this.wmsParams) + "&bbox=" + bbox;\r
+       },\r
+\r
+       setParams: function (params, noRedraw) {\r
+\r
+               L.Util.extend(this.wmsParams, params);\r
+\r
+               if (!noRedraw) {\r
+                       this.redraw();\r
+               }\r
+\r
+               return this;\r
+       }\r
+});\r
+\r
+L.tileLayer.wms = function (url, options) {\r
+       return new L.TileLayer.WMS(url, options);\r
+};\r
+
+
+L.TileLayer.Canvas = L.TileLayer.extend({\r
+       options: {\r
+               async: false\r
+       },\r
+\r
+       initialize: function (options) {\r
+               L.Util.setOptions(this, options);\r
+       },\r
+\r
+       redraw: function () {\r
+               var i,\r
+                       tiles = this._tiles;\r
+\r
+               for (i in tiles) {\r
+                       if (tiles.hasOwnProperty(i)) {\r
+                               this._redrawTile(tiles[i]);\r
+                       }\r
+               }\r
+       },\r
+\r
+       _redrawTile: function (tile) {\r
+               this.drawTile(tile, tile._tilePoint, tile._zoom);\r
+       },\r
+\r
+       _createTileProto: function () {\r
+               var proto = this._canvasProto = L.DomUtil.create('canvas', 'leaflet-tile');\r
+\r
+               var tileSize = this.options.tileSize;\r
+               proto.width = tileSize;\r
+               proto.height = tileSize;\r
+       },\r
+\r
+       _createTile: function () {\r
+               var tile = this._canvasProto.cloneNode(false);\r
+               tile.onselectstart = tile.onmousemove = L.Util.falseFn;\r
+               return tile;\r
+       },\r
+\r
+       _loadTile: function (tile, tilePoint, zoom) {\r
+               tile._layer = this;\r
+               tile._tilePoint = tilePoint;\r
+               tile._zoom = zoom;\r
+\r
+               this.drawTile(tile, tilePoint, zoom);\r
+\r
+               if (!this.options.async) {\r
+                       this.tileDrawn(tile);\r
+               }\r
+       },\r
+\r
+       drawTile: function (tile, tilePoint, zoom) {\r
+               // override with rendering code\r
+       },\r
+\r
+       tileDrawn: function (tile) {\r
+               this._tileOnLoad.call(tile);\r
+       }\r
+});\r
+\r
+\r
+L.tileLayer.canvas = function (options) {\r
+       return new L.TileLayer.Canvas(options);\r
+};
+
+L.ImageOverlay = L.Class.extend({\r
+       includes: L.Mixin.Events,\r
+\r
+       options: {\r
+               opacity: 1\r
+       },\r
+\r
+       initialize: function (url, bounds, options) { // (String, LatLngBounds, Object)\r
+               this._url = url;\r
+               this._bounds = L.latLngBounds(bounds);\r
+\r
+               L.Util.setOptions(this, options);\r
+       },\r
+\r
+       onAdd: function (map) {\r
+               this._map = map;\r
+\r
+               if (!this._image) {\r
+                       this._initImage();\r
+               }\r
+\r
+               map._panes.overlayPane.appendChild(this._image);\r
+\r
+               map.on('viewreset', this._reset, this);\r
+\r
+               if (map.options.zoomAnimation && L.Browser.any3d) {\r
+                       map.on('zoomanim', this._animateZoom, this);\r
+               }\r
+\r
+               this._reset();\r
+       },\r
+\r
+       onRemove: function (map) {\r
+               map.getPanes().overlayPane.removeChild(this._image);\r
+\r
+               map.off('viewreset', this._reset, this);\r
+\r
+               if (map.options.zoomAnimation) {\r
+                       map.off('zoomanim', this._animateZoom, this);\r
+               }\r
+       },\r
+\r
+       addTo: function (map) {\r
+               map.addLayer(this);\r
+               return this;\r
+       },\r
+\r
+       setOpacity: function (opacity) {\r
+               this.options.opacity = opacity;\r
+               this._updateOpacity();\r
+               return this;\r
+       },\r
+\r
+       // TODO remove bringToFront/bringToBack duplication from TileLayer/Path\r
+       bringToFront: function () {\r
+               if (this._image) {\r
+                       this._map._panes.overlayPane.appendChild(this._image);\r
+               }\r
+               return this;\r
+       },\r
+\r
+       bringToBack: function () {\r
+               var pane = this._map._panes.overlayPane;\r
+               if (this._image) {\r
+                       pane.insertBefore(this._image, pane.firstChild);\r
+               }\r
+               return this;\r
+       },\r
+\r
+       _initImage: function () {\r
+               this._image = L.DomUtil.create('img', 'leaflet-image-layer');\r
+\r
+               if (this._map.options.zoomAnimation && L.Browser.any3d) {\r
+                       L.DomUtil.addClass(this._image, 'leaflet-zoom-animated');\r
+               } else {\r
+                       L.DomUtil.addClass(this._image, 'leaflet-zoom-hide');\r
+               }\r
+\r
+               this._updateOpacity();\r
+\r
+               //TODO createImage util method to remove duplication\r
+               L.Util.extend(this._image, {\r
+                       galleryimg: 'no',\r
+                       onselectstart: L.Util.falseFn,\r
+                       onmousemove: L.Util.falseFn,\r
+                       onload: L.Util.bind(this._onImageLoad, this),\r
+                       src: this._url\r
+               });\r
+       },\r
+\r
+       _animateZoom: function (e) {\r
+               var map = this._map,\r
+                       image = this._image,\r
+                   scale = map.getZoomScale(e.zoom),\r
+                   nw = this._bounds.getNorthWest(),\r
+                   se = this._bounds.getSouthEast(),\r
+\r
+                   topLeft = map._latLngToNewLayerPoint(nw, e.zoom, e.center),\r
+                   size = map._latLngToNewLayerPoint(se, e.zoom, e.center)._subtract(topLeft),\r
+                   currentSize = map.latLngToLayerPoint(se)._subtract(map.latLngToLayerPoint(nw)),\r
+                   origin = topLeft._add(size._subtract(currentSize)._divideBy(2));\r
+\r
+               image.style[L.DomUtil.TRANSFORM] = L.DomUtil.getTranslateString(origin) + ' scale(' + scale + ') ';\r
+       },\r
+\r
+       _reset: function () {\r
+               var image   = this._image,\r
+                   topLeft = this._map.latLngToLayerPoint(this._bounds.getNorthWest()),\r
+                   size    = this._map.latLngToLayerPoint(this._bounds.getSouthEast())._subtract(topLeft);\r
+\r
+               L.DomUtil.setPosition(image, topLeft);\r
+\r
+               image.style.width  = size.x + 'px';\r
+               image.style.height = size.y + 'px';\r
+       },\r
+\r
+       _onImageLoad: function () {\r
+               this.fire('load');\r
+       },\r
+\r
+       _updateOpacity: function () {\r
+               L.DomUtil.setOpacity(this._image, this.options.opacity);\r
+       }\r
+});\r
+\r
+L.imageOverlay = function (url, bounds, options) {\r
+       return new L.ImageOverlay(url, bounds, options);\r
+};\r
+
+
+L.Icon = L.Class.extend({\r
+       options: {\r
+               /*\r
+               iconUrl: (String) (required)\r
+               iconSize: (Point) (can be set through CSS)\r
+               iconAnchor: (Point) (centered by default if size is specified, can be set in CSS with negative margins)\r
+               popupAnchor: (Point) (if not specified, popup opens in the anchor point)\r
+               shadowUrl: (Point) (no shadow by default)\r
+               shadowSize: (Point)\r
+               shadowAnchor: (Point)\r
+               */\r
+               className: ''\r
+       },\r
+\r
+       initialize: function (options) {\r
+               L.Util.setOptions(this, options);\r
+       },\r
+\r
+       createIcon: function () {\r
+               return this._createIcon('icon');\r
+       },\r
+\r
+       createShadow: function () {\r
+               return this._createIcon('shadow');\r
+       },\r
+\r
+       _createIcon: function (name) {\r
+               var src = this._getIconUrl(name);\r
+\r
+               if (!src) {\r
+                       if (name === 'icon') {\r
+                               throw new Error("iconUrl not set in Icon options (see the docs).");\r
+                       }\r
+                       return null;\r
+               }\r
+\r
+               var img = this._createImg(src);\r
+               this._setIconStyles(img, name);\r
+\r
+               return img;\r
+       },\r
+\r
+       _setIconStyles: function (img, name) {\r
+               var options = this.options,\r
+                       size = L.point(options[name + 'Size']),\r
+                       anchor;\r
+\r
+               if (name === 'shadow') {\r
+                       anchor = L.point(options.shadowAnchor || options.iconAnchor);\r
+               } else {\r
+                       anchor = L.point(options.iconAnchor);\r
+               }\r
+\r
+               if (!anchor && size) {\r
+                       anchor = size.divideBy(2, true);\r
+               }\r
+\r
+               img.className = 'leaflet-marker-' + name + ' ' + options.className;\r
+\r
+               if (anchor) {\r
+                       img.style.marginLeft = (-anchor.x) + 'px';\r
+                       img.style.marginTop  = (-anchor.y) + 'px';\r
+               }\r
+\r
+               if (size) {\r
+                       img.style.width  = size.x + 'px';\r
+                       img.style.height = size.y + 'px';\r
+               }\r
+       },\r
+\r
+       _createImg: function (src) {\r
+               var el;\r
+\r
+               if (!L.Browser.ie6) {\r
+                       el = document.createElement('img');\r
+                       el.src = src;\r
+               } else {\r
+                       el = document.createElement('div');\r
+                       el.style.filter = 'progid:DXImageTransform.Microsoft.AlphaImageLoader(src="' + src + '")';\r
+               }\r
+               return el;\r
+       },\r
+\r
+       _getIconUrl: function (name) {\r
+               return this.options[name + 'Url'];\r
+       }\r
+});\r
+\r
+L.icon = function (options) {\r
+       return new L.Icon(options);\r
+};\r
+
+
+
+L.Icon.Default = L.Icon.extend({
+
+       options: {
+               iconSize: new L.Point(25, 41),
+               iconAnchor: new L.Point(12, 41),
+               popupAnchor: new L.Point(1, -34),
+
+               shadowSize: new L.Point(41, 41)
+       },
+
+       _getIconUrl: function (name) {
+               var key = name + 'Url';
+
+               if (this.options[key]) {
+                       return this.options[key];
+               }
+
+               var path = L.Icon.Default.imagePath;
+
+               if (!path) {
+                       throw new Error("Couldn't autodetect L.Icon.Default.imagePath, set it manually.");
+               }
+
+               return path + '/marker-' + name + '.png';
+       }
+});
+
+L.Icon.Default.imagePath = (function () {
+       var scripts = document.getElementsByTagName('script'),
+           leafletRe = /\/?leaflet[\-\._]?([\w\-\._]*)\.js\??/;
+
+       var i, len, src, matches;
+
+       for (i = 0, len = scripts.length; i < len; i++) {
+               src = scripts[i].src;
+               matches = src.match(leafletRe);
+
+               if (matches) {
+                       return src.split(leafletRe)[0] + '/images';
+               }
+       }
+}());
+
+
+/*\r
+ * L.Marker is used to display clickable/draggable icons on the map.\r
+ */\r
+\r
+L.Marker = L.Class.extend({\r
+\r
+       includes: L.Mixin.Events,\r
+\r
+       options: {\r
+               icon: new L.Icon.Default(),\r
+               title: '',\r
+               clickable: true,\r
+               draggable: false,\r
+               zIndexOffset: 0,\r
+               opacity: 1\r
+       },\r
+\r
+       initialize: function (latlng, options) {\r
+               L.Util.setOptions(this, options);\r
+               this._latlng = L.latLng(latlng);\r
+       },\r
+\r
+       onAdd: function (map) {\r
+               this._map = map;\r
+\r
+               map.on('viewreset', this.update, this);\r
+\r
+               this._initIcon();\r
+               this.update();\r
+\r
+               if (map.options.zoomAnimation && map.options.markerZoomAnimation) {\r
+                       map.on('zoomanim', this._animateZoom, this);\r
+               }\r
+       },\r
+\r
+       addTo: function (map) {\r
+               map.addLayer(this);\r
+               return this;\r
+       },\r
+\r
+       onRemove: function (map) {\r
+               this._removeIcon();\r
+\r
+               // TODO move to Marker.Popup.js\r
+               if (this.closePopup) {\r
+                       this.closePopup();\r
+               }\r
+\r
+               map.off({\r
+                       'viewreset': this.update,\r
+                       'zoomanim': this._animateZoom\r
+               }, this);\r
+\r
+               this._map = null;\r
+       },\r
+\r
+       getLatLng: function () {\r
+               return this._latlng;\r
+       },\r
+\r
+       setLatLng: function (latlng) {\r
+               this._latlng = L.latLng(latlng);\r
+\r
+               this.update();\r
+\r
+               if (this._popup) {\r
+                       this._popup.setLatLng(latlng);\r
+               }\r
+       },\r
+\r
+       setZIndexOffset: function (offset) {\r
+               this.options.zIndexOffset = offset;\r
+               this.update();\r
+       },\r
+\r
+       setIcon: function (icon) {\r
+               if (this._map) {\r
+                       this._removeIcon();\r
+               }\r
+\r
+               this.options.icon = icon;\r
+\r
+               if (this._map) {\r
+                       this._initIcon();\r
+                       this.update();\r
+               }\r
+       },\r
+\r
+       update: function () {\r
+               if (!this._icon) { return; }\r
+\r
+               var pos = this._map.latLngToLayerPoint(this._latlng).round();\r
+               this._setPos(pos);\r
+       },\r
+\r
+       _initIcon: function () {\r
+               var options = this.options,\r
+                   map = this._map,\r
+                   animation = (map.options.zoomAnimation && map.options.markerZoomAnimation),\r
+                   classToAdd = animation ? 'leaflet-zoom-animated' : 'leaflet-zoom-hide',\r
+                   needOpacityUpdate = false;\r
+\r
+               if (!this._icon) {\r
+                       this._icon = options.icon.createIcon();\r
+\r
+                       if (options.title) {\r
+                               this._icon.title = options.title;\r
+                       }\r
+\r
+                       this._initInteraction();\r
+                       needOpacityUpdate = (this.options.opacity < 1);\r
+\r
+                       L.DomUtil.addClass(this._icon, classToAdd);\r
+               }\r
+               if (!this._shadow) {\r
+                       this._shadow = options.icon.createShadow();\r
+\r
+                       if (this._shadow) {\r
+                               L.DomUtil.addClass(this._shadow, classToAdd);\r
+                               needOpacityUpdate = (this.options.opacity < 1);\r
+                       }\r
+               }\r
+\r
+               if (needOpacityUpdate) {\r
+                       this._updateOpacity();\r
+               }\r
+\r
+               var panes = this._map._panes;\r
+\r
+               panes.markerPane.appendChild(this._icon);\r
+\r
+               if (this._shadow) {\r
+                       panes.shadowPane.appendChild(this._shadow);\r
+               }\r
+       },\r
+\r
+       _removeIcon: function () {\r
+               var panes = this._map._panes;\r
+\r
+               panes.markerPane.removeChild(this._icon);\r
+\r
+               if (this._shadow) {\r
+                       panes.shadowPane.removeChild(this._shadow);\r
+               }\r
+\r
+               this._icon = this._shadow = null;\r
+       },\r
+\r
+       _setPos: function (pos) {\r
+               L.DomUtil.setPosition(this._icon, pos);\r
+\r
+               if (this._shadow) {\r
+                       L.DomUtil.setPosition(this._shadow, pos);\r
+               }\r
+\r
+               this._icon.style.zIndex = pos.y + this.options.zIndexOffset;\r
+       },\r
+\r
+       _animateZoom: function (opt) {\r
+               var pos = this._map._latLngToNewLayerPoint(this._latlng, opt.zoom, opt.center);\r
+\r
+               this._setPos(pos);\r
+       },\r
+\r
+       _initInteraction: function () {\r
+               if (!this.options.clickable) {\r
+                       return;\r
+               }\r
+\r
+               var icon = this._icon,\r
+                       events = ['dblclick', 'mousedown', 'mouseover', 'mouseout'];\r
+\r
+               L.DomUtil.addClass(icon, 'leaflet-clickable');\r
+               L.DomEvent.on(icon, 'click', this._onMouseClick, this);\r
+\r
+               for (var i = 0; i < events.length; i++) {\r
+                       L.DomEvent.on(icon, events[i], this._fireMouseEvent, this);\r
+               }\r
+\r
+               if (L.Handler.MarkerDrag) {\r
+                       this.dragging = new L.Handler.MarkerDrag(this);\r
+\r
+                       if (this.options.draggable) {\r
+                               this.dragging.enable();\r
+                       }\r
+               }\r
+       },\r
+\r
+       _onMouseClick: function (e) {\r
+               if (this.hasEventListeners(e.type)) {\r
+                       L.DomEvent.stopPropagation(e);\r
+               }\r
+               if (this.dragging && this.dragging.moved()) { return; }\r
+               if (this._map.dragging && this._map.dragging.moved()) { return; }\r
+               this.fire(e.type, {\r
+                       originalEvent: e\r
+               });\r
+       },\r
+\r
+       _fireMouseEvent: function (e) {\r
+               this.fire(e.type, {\r
+                       originalEvent: e\r
+               });\r
+               if (e.type !== 'mousedown') {\r
+                       L.DomEvent.stopPropagation(e);\r
+               }\r
+       },\r
+\r
+       setOpacity: function (opacity) {\r
+               this.options.opacity = opacity;\r
+               if (this._map) {\r
+                       this._updateOpacity();\r
+               }\r
+       },\r
+\r
+       _updateOpacity: function () {\r
+               L.DomUtil.setOpacity(this._icon, this.options.opacity);\r
+               if (this._shadow) {\r
+                       L.DomUtil.setOpacity(this._shadow, this.options.opacity);\r
+               }\r
+       }\r
+});\r
+\r
+L.marker = function (latlng, options) {\r
+       return new L.Marker(latlng, options);\r
+};\r
+
+
+L.DivIcon = L.Icon.extend({
+       options: {
+               iconSize: new L.Point(12, 12), // also can be set through CSS
+               /*
+               iconAnchor: (Point)
+               popupAnchor: (Point)
+               html: (String)
+               bgPos: (Point)
+               */
+               className: 'leaflet-div-icon'
+       },
+
+       createIcon: function () {
+               var div = document.createElement('div'),
+                   options = this.options;
+
+               if (options.html) {
+                       div.innerHTML = options.html;
+               }
+
+               if (options.bgPos) {
+                       div.style.backgroundPosition =
+                                       (-options.bgPos.x) + 'px ' + (-options.bgPos.y) + 'px';
+               }
+
+               this._setIconStyles(div, 'icon');
+               return div;
+       },
+
+       createShadow: function () {
+               return null;
+       }
+});
+
+L.divIcon = function (options) {
+       return new L.DivIcon(options);
+};
+
+
+\r
+L.Map.mergeOptions({\r
+       closePopupOnClick: true\r
+});\r
+\r
+L.Popup = L.Class.extend({\r
+       includes: L.Mixin.Events,\r
+\r
+       options: {\r
+               minWidth: 50,\r
+               maxWidth: 300,\r
+               maxHeight: null,\r
+               autoPan: true,\r
+               closeButton: true,\r
+               offset: new L.Point(0, 6),\r
+               autoPanPadding: new L.Point(5, 5),\r
+               className: ''\r
+       },\r
+\r
+       initialize: function (options, source) {\r
+               L.Util.setOptions(this, options);\r
+\r
+               this._source = source;\r
+       },\r
+\r
+       onAdd: function (map) {\r
+               this._map = map;\r
+\r
+               if (!this._container) {\r
+                       this._initLayout();\r
+               }\r
+               this._updateContent();\r
+\r
+               var animFade = map.options.fadeAnimation;\r
+\r
+               if (animFade) {\r
+                       L.DomUtil.setOpacity(this._container, 0);\r
+               }\r
+               map._panes.popupPane.appendChild(this._container);\r
+\r
+               map.on('viewreset', this._updatePosition, this);\r
+\r
+               if (L.Browser.any3d) {\r
+                       map.on('zoomanim', this._zoomAnimation, this);\r
+               }\r
+\r
+               if (map.options.closePopupOnClick) {\r
+                       map.on('preclick', this._close, this);\r
+               }\r
+\r
+               this._update();\r
+\r
+               if (animFade) {\r
+                       L.DomUtil.setOpacity(this._container, 1);\r
+               }\r
+       },\r
+\r
+       addTo: function (map) {\r
+               map.addLayer(this);\r
+               return this;\r
+       },\r
+\r
+       openOn: function (map) {\r
+               map.openPopup(this);\r
+               return this;\r
+       },\r
+\r
+       onRemove: function (map) {\r
+               map._panes.popupPane.removeChild(this._container);\r
+\r
+               L.Util.falseFn(this._container.offsetWidth); // force reflow\r
+\r
+               map.off({\r
+                       viewreset: this._updatePosition,\r
+                       preclick: this._close,\r
+                       zoomanim: this._zoomAnimation\r
+               }, this);\r
+\r
+               if (map.options.fadeAnimation) {\r
+                       L.DomUtil.setOpacity(this._container, 0);\r
+               }\r
+\r
+               this._map = null;\r
+       },\r
+\r
+       setLatLng: function (latlng) {\r
+               this._latlng = L.latLng(latlng);\r
+               this._update();\r
+               return this;\r
+       },\r
+\r
+       setContent: function (content) {\r
+               this._content = content;\r
+               this._update();\r
+               return this;\r
+       },\r
+\r
+       _close: function () {\r
+               var map = this._map;\r
+\r
+               if (map) {\r
+                       map._popup = null;\r
+\r
+                       map\r
+                               .removeLayer(this)\r
+                               .fire('popupclose', {popup: this});\r
+               }\r
+       },\r
+\r
+       _initLayout: function () {\r
+               var prefix = 'leaflet-popup',\r
+                       container = this._container = L.DomUtil.create('div', prefix + ' ' + this.options.className + ' leaflet-zoom-animated'),\r
+                       closeButton;\r
+\r
+               if (this.options.closeButton) {\r
+                       closeButton = this._closeButton = L.DomUtil.create('a', prefix + '-close-button', container);\r
+                       closeButton.href = '#close';\r
+                       closeButton.innerHTML = '&#215;';\r
+\r
+                       L.DomEvent.on(closeButton, 'click', this._onCloseButtonClick, this);\r
+               }\r
+\r
+               var wrapper = this._wrapper = L.DomUtil.create('div', prefix + '-content-wrapper', container);\r
+               L.DomEvent.disableClickPropagation(wrapper);\r
+\r
+               this._contentNode = L.DomUtil.create('div', prefix + '-content', wrapper);\r
+               L.DomEvent.on(this._contentNode, 'mousewheel', L.DomEvent.stopPropagation);\r
+\r
+               this._tipContainer = L.DomUtil.create('div', prefix + '-tip-container', container);\r
+               this._tip = L.DomUtil.create('div', prefix + '-tip', this._tipContainer);\r
+       },\r
+\r
+       _update: function () {\r
+               if (!this._map) { return; }\r
+\r
+               this._container.style.visibility = 'hidden';\r
+\r
+               this._updateContent();\r
+               this._updateLayout();\r
+               this._updatePosition();\r
+\r
+               this._container.style.visibility = '';\r
+\r
+               this._adjustPan();\r
+       },\r
+\r
+       _updateContent: function () {\r
+               if (!this._content) { return; }\r
+\r
+               if (typeof this._content === 'string') {\r
+                       this._contentNode.innerHTML = this._content;\r
+               } else {\r
+                       while (this._contentNode.hasChildNodes()) {\r
+                               this._contentNode.removeChild(this._contentNode.firstChild);\r
+                       }\r
+                       this._contentNode.appendChild(this._content);\r
+               }\r
+               this.fire('contentupdate');\r
+       },\r
+\r
+       _updateLayout: function () {\r
+               var container = this._contentNode,\r
+                       style = container.style;\r
+\r
+               style.width = '';\r
+               style.whiteSpace = 'nowrap';\r
+\r
+               var width = container.offsetWidth;\r
+               width = Math.min(width, this.options.maxWidth);\r
+               width = Math.max(width, this.options.minWidth);\r
+\r
+               style.width = (width + 1) + 'px';\r
+               style.whiteSpace = '';\r
+\r
+               style.height = '';\r
+\r
+               var height = container.offsetHeight,\r
+                       maxHeight = this.options.maxHeight,\r
+                       scrolledClass = 'leaflet-popup-scrolled';\r
+\r
+               if (maxHeight && height > maxHeight) {\r
+                       style.height = maxHeight + 'px';\r
+                       L.DomUtil.addClass(container, scrolledClass);\r
+               } else {\r
+                       L.DomUtil.removeClass(container, scrolledClass);\r
+               }\r
+\r
+               this._containerWidth = this._container.offsetWidth;\r
+       },\r
+\r
+       _updatePosition: function () {\r
+               var pos = this._map.latLngToLayerPoint(this._latlng),\r
+                       is3d = L.Browser.any3d,\r
+                       offset = this.options.offset;\r
+\r
+               if (is3d) {\r
+                       L.DomUtil.setPosition(this._container, pos);\r
+               }\r
+\r
+               this._containerBottom = -offset.y - (is3d ? 0 : pos.y);\r
+               this._containerLeft = -Math.round(this._containerWidth / 2) + offset.x + (is3d ? 0 : pos.x);\r
+\r
+               //Bottom position the popup in case the height of the popup changes (images loading etc)\r
+               this._container.style.bottom = this._containerBottom + 'px';\r
+               this._container.style.left = this._containerLeft + 'px';\r
+       },\r
+\r
+       _zoomAnimation: function (opt) {\r
+               var pos = this._map._latLngToNewLayerPoint(this._latlng, opt.zoom, opt.center);\r
+\r
+               L.DomUtil.setPosition(this._container, pos);\r
+       },\r
+\r
+       _adjustPan: function () {\r
+               if (!this.options.autoPan) { return; }\r
+\r
+               var map = this._map,\r
+                       containerHeight = this._container.offsetHeight,\r
+                       containerWidth = this._containerWidth,\r
+\r
+                       layerPos = new L.Point(this._containerLeft, -containerHeight - this._containerBottom);\r
+\r
+               if (L.Browser.any3d) {\r
+                       layerPos._add(L.DomUtil.getPosition(this._container));\r
+               }\r
+\r
+               var containerPos = map.layerPointToContainerPoint(layerPos),\r
+                       padding = this.options.autoPanPadding,\r
+                       size = map.getSize(),\r
+                       dx = 0,\r
+                       dy = 0;\r
+\r
+               if (containerPos.x < 0) {\r
+                       dx = containerPos.x - padding.x;\r
+               }\r
+               if (containerPos.x + containerWidth > size.x) {\r
+                       dx = containerPos.x + containerWidth - size.x + padding.x;\r
+               }\r
+               if (containerPos.y < 0) {\r
+                       dy = containerPos.y - padding.y;\r
+               }\r
+               if (containerPos.y + containerHeight > size.y) {\r
+                       dy = containerPos.y + containerHeight - size.y + padding.y;\r
+               }\r
+\r
+               if (dx || dy) {\r
+                       map.panBy(new L.Point(dx, dy));\r
+               }\r
+       },\r
+\r
+       _onCloseButtonClick: function (e) {\r
+               this._close();\r
+               L.DomEvent.stop(e);\r
+       }\r
+});\r
+\r
+L.popup = function (options, source) {\r
+       return new L.Popup(options, source);\r
+};\r
+
+
+/*\r
+ * Popup extension to L.Marker, adding openPopup & bindPopup methods.\r
+ */\r
+\r
+L.Marker.include({\r
+       openPopup: function () {\r
+               if (this._popup && this._map) {\r
+                       this._popup.setLatLng(this._latlng);\r
+                       this._map.openPopup(this._popup);\r
+               }\r
+\r
+               return this;\r
+       },\r
+\r
+       closePopup: function () {\r
+               if (this._popup) {\r
+                       this._popup._close();\r
+               }\r
+               return this;\r
+       },\r
+\r
+       bindPopup: function (content, options) {\r
+               var anchor = L.point(this.options.icon.options.popupAnchor) || new L.Point(0, 0);\r
+\r
+               anchor = anchor.add(L.Popup.prototype.options.offset);\r
+\r
+               if (options && options.offset) {\r
+                       anchor = anchor.add(options.offset);\r
+               }\r
+\r
+               options = L.Util.extend({offset: anchor}, options);\r
+\r
+               if (!this._popup) {\r
+                       this.on('click', this.openPopup, this);\r
+               }\r
+\r
+               this._popup = new L.Popup(options, this)\r
+                       .setContent(content);\r
+\r
+               return this;\r
+       },\r
+\r
+       unbindPopup: function () {\r
+               if (this._popup) {\r
+                       this._popup = null;\r
+                       this.off('click', this.openPopup);\r
+               }\r
+               return this;\r
+       }\r
+});\r
+
+
+\r
+L.Map.include({\r
+       openPopup: function (popup) {\r
+               this.closePopup();\r
+\r
+               this._popup = popup;\r
+\r
+               return this\r
+                       .addLayer(popup)\r
+                       .fire('popupopen', {popup: this._popup});\r
+       },\r
+\r
+       closePopup: function () {\r
+               if (this._popup) {\r
+                       this._popup._close();\r
+               }\r
+               return this;\r
+       }\r
+});
+
+/*\r
+ * L.LayerGroup is a class to combine several layers so you can manipulate the group (e.g. add/remove it) as one layer.\r
+ */\r
+\r
+L.LayerGroup = L.Class.extend({\r
+       initialize: function (layers) {\r
+               this._layers = {};\r
+\r
+               var i, len;\r
+\r
+               if (layers) {\r
+                       for (i = 0, len = layers.length; i < len; i++) {\r
+                               this.addLayer(layers[i]);\r
+                       }\r
+               }\r
+       },\r
+\r
+       addLayer: function (layer) {\r
+               var id = L.Util.stamp(layer);\r
+\r
+               this._layers[id] = layer;\r
+\r
+               if (this._map) {\r
+                       this._map.addLayer(layer);\r
+               }\r
+\r
+               return this;\r
+       },\r
+\r
+       removeLayer: function (layer) {\r
+               var id = L.Util.stamp(layer);\r
+\r
+               delete this._layers[id];\r
+\r
+               if (this._map) {\r
+                       this._map.removeLayer(layer);\r
+               }\r
+\r
+               return this;\r
+       },\r
+\r
+       clearLayers: function () {\r
+               this.eachLayer(this.removeLayer, this);\r
+               return this;\r
+       },\r
+\r
+       invoke: function (methodName) {\r
+               var args = Array.prototype.slice.call(arguments, 1),\r
+                       i, layer;\r
+\r
+               for (i in this._layers) {\r
+                       if (this._layers.hasOwnProperty(i)) {\r
+                               layer = this._layers[i];\r
+\r
+                               if (layer[methodName]) {\r
+                                       layer[methodName].apply(layer, args);\r
+                               }\r
+                       }\r
+               }\r
+\r
+               return this;\r
+       },\r
+\r
+       onAdd: function (map) {\r
+               this._map = map;\r
+               this.eachLayer(map.addLayer, map);\r
+       },\r
+\r
+       onRemove: function (map) {\r
+               this.eachLayer(map.removeLayer, map);\r
+               this._map = null;\r
+       },\r
+\r
+       addTo: function (map) {\r
+               map.addLayer(this);\r
+               return this;\r
+       },\r
+\r
+       eachLayer: function (method, context) {\r
+               for (var i in this._layers) {\r
+                       if (this._layers.hasOwnProperty(i)) {\r
+                               method.call(context, this._layers[i]);\r
+                       }\r
+               }\r
+       }\r
+});\r
+\r
+L.layerGroup = function (layers) {\r
+       return new L.LayerGroup(layers);\r
+};\r
+
+
+/*\r
+ * L.FeatureGroup extends L.LayerGroup by introducing mouse events and bindPopup method shared between a group of layers.\r
+ */\r
+\r
+L.FeatureGroup = L.LayerGroup.extend({\r
+       includes: L.Mixin.Events,\r
+\r
+       addLayer: function (layer) {\r
+               if (this._layers[L.Util.stamp(layer)]) {\r
+                       return this;\r
+               }\r
+\r
+               layer.on('click dblclick mouseover mouseout mousemove contextmenu', this._propagateEvent, this);\r
+\r
+               L.LayerGroup.prototype.addLayer.call(this, layer);\r
+\r
+               if (this._popupContent && layer.bindPopup) {\r
+                       layer.bindPopup(this._popupContent);\r
+               }\r
+\r
+               return this;\r
+       },\r
+\r
+       removeLayer: function (layer) {\r
+               layer.off('click dblclick mouseover mouseout mousemove contextmenu', this._propagateEvent, this);\r
+\r
+               L.LayerGroup.prototype.removeLayer.call(this, layer);\r
+\r
+               if (this._popupContent) {\r
+                       return this.invoke('unbindPopup');\r
+               } else {\r
+                       return this;\r
+               }\r
+       },\r
+\r
+       bindPopup: function (content) {\r
+               this._popupContent = content;\r
+               return this.invoke('bindPopup', content);\r
+       },\r
+\r
+       setStyle: function (style) {\r
+               return this.invoke('setStyle', style);\r
+       },\r
+\r
+       bringToFront: function () {\r
+               return this.invoke('bringToFront');\r
+       },\r
+\r
+       bringToBack: function () {\r
+               return this.invoke('bringToBack');\r
+       },\r
+\r
+       getBounds: function () {\r
+               var bounds = new L.LatLngBounds();\r
+               this.eachLayer(function (layer) {\r
+                       bounds.extend(layer instanceof L.Marker ? layer.getLatLng() : layer.getBounds());\r
+               }, this);\r
+               return bounds;\r
+       },\r
+\r
+       _propagateEvent: function (e) {\r
+               e.layer  = e.target;\r
+               e.target = this;\r
+\r
+               this.fire(e.type, e);\r
+       }\r
+});\r
+\r
+L.featureGroup = function (layers) {\r
+       return new L.FeatureGroup(layers);\r
+};\r
+
+
+/*\r
+ * L.Path is a base class for rendering vector paths on a map. It's inherited by Polyline, Circle, etc.\r
+ */\r
+\r
+L.Path = L.Class.extend({\r
+       includes: [L.Mixin.Events],\r
+\r
+       statics: {\r
+               // how much to extend the clip area around the map view\r
+               // (relative to its size, e.g. 0.5 is half the screen in each direction)\r
+               // set in such way that SVG element doesn't exceed 1280px (vector layers flicker on dragend if it is)\r
+               CLIP_PADDING: L.Browser.mobile ?\r
+                       Math.max(0, Math.min(0.5,\r
+                               (1280 / Math.max(window.innerWidth, window.innerHeight) - 1) / 2))\r
+                       : 0.5\r
+       },\r
+\r
+       options: {\r
+               stroke: true,\r
+               color: '#0033ff',\r
+               dashArray: null,\r
+               weight: 5,\r
+               opacity: 0.5,\r
+\r
+               fill: false,\r
+               fillColor: null, //same as color by default\r
+               fillOpacity: 0.2,\r
+\r
+               clickable: true\r
+       },\r
+\r
+       initialize: function (options) {\r
+               L.Util.setOptions(this, options);\r
+       },\r
+\r
+       onAdd: function (map) {\r
+               this._map = map;\r
+\r
+               if (!this._container) {\r
+                       this._initElements();\r
+                       this._initEvents();\r
+               }\r
+\r
+               this.projectLatlngs();\r
+               this._updatePath();\r
+\r
+               if (this._container) {\r
+                       this._map._pathRoot.appendChild(this._container);\r
+               }\r
+\r
+               map.on({\r
+                       'viewreset': this.projectLatlngs,\r
+                       'moveend': this._updatePath\r
+               }, this);\r
+       },\r
+\r
+       addTo: function (map) {\r
+               map.addLayer(this);\r
+               return this;\r
+       },\r
+\r
+       onRemove: function (map) {\r
+               map._pathRoot.removeChild(this._container);\r
+\r
+               this._map = null;\r
+\r
+               if (L.Browser.vml) {\r
+                       this._container = null;\r
+                       this._stroke = null;\r
+                       this._fill = null;\r
+               }\r
+\r
+               map.off({\r
+                       'viewreset': this.projectLatlngs,\r
+                       'moveend': this._updatePath\r
+               }, this);\r
+       },\r
+\r
+       projectLatlngs: function () {\r
+               // do all projection stuff here\r
+       },\r
+\r
+       setStyle: function (style) {\r
+               L.Util.setOptions(this, style);\r
+\r
+               if (this._container) {\r
+                       this._updateStyle();\r
+               }\r
+\r
+               return this;\r
+       },\r
+\r
+       redraw: function () {\r
+               if (this._map) {\r
+                       this.projectLatlngs();\r
+                       this._updatePath();\r
+               }\r
+               return this;\r
+       }\r
+});\r
+\r
+L.Map.include({\r
+       _updatePathViewport: function () {\r
+               var p = L.Path.CLIP_PADDING,\r
+                       size = this.getSize(),\r
+                       panePos = L.DomUtil.getPosition(this._mapPane),\r
+                       min = panePos.multiplyBy(-1)._subtract(size.multiplyBy(p)._round()),\r
+                       max = min.add(size.multiplyBy(1 + p * 2)._round());\r
+\r
+               this._pathViewport = new L.Bounds(min, max);\r
+       }\r
+});\r
+
+
+L.Path.SVG_NS = 'http://www.w3.org/2000/svg';\r
+\r
+L.Browser.svg = !!(document.createElementNS && document.createElementNS(L.Path.SVG_NS, 'svg').createSVGRect);\r
+\r
+L.Path = L.Path.extend({\r
+       statics: {\r
+               SVG: L.Browser.svg\r
+       },\r
+\r
+       bringToFront: function () {\r
+               var root = this._map._pathRoot,\r
+                       path = this._container;\r
+\r
+               if (path && root.lastChild !== path) {\r
+                       root.appendChild(path);\r
+               }\r
+               return this;\r
+       },\r
+\r
+       bringToBack: function () {\r
+               var root = this._map._pathRoot,\r
+                       path = this._container,\r
+                       first = root.firstChild;\r
+\r
+               if (path && first !== path) {\r
+                       root.insertBefore(path, first);\r
+               }\r
+               return this;\r
+       },\r
+\r
+       getPathString: function () {\r
+               // form path string here\r
+       },\r
+\r
+       _createElement: function (name) {\r
+               return document.createElementNS(L.Path.SVG_NS, name);\r
+       },\r
+\r
+       _initElements: function () {\r
+               this._map._initPathRoot();\r
+               this._initPath();\r
+               this._initStyle();\r
+       },\r
+\r
+       _initPath: function () {\r
+               this._container = this._createElement('g');\r
+\r
+               this._path = this._createElement('path');\r
+               this._container.appendChild(this._path);\r
+       },\r
+\r
+       _initStyle: function () {\r
+               if (this.options.stroke) {\r
+                       this._path.setAttribute('stroke-linejoin', 'round');\r
+                       this._path.setAttribute('stroke-linecap', 'round');\r
+               }\r
+               if (this.options.fill) {\r
+                       this._path.setAttribute('fill-rule', 'evenodd');\r
+               }\r
+               this._updateStyle();\r
+       },\r
+\r
+       _updateStyle: function () {\r
+               if (this.options.stroke) {\r
+                       this._path.setAttribute('stroke', this.options.color);\r
+                       this._path.setAttribute('stroke-opacity', this.options.opacity);\r
+                       this._path.setAttribute('stroke-width', this.options.weight);\r
+                       if (this.options.dashArray) {\r
+                               this._path.setAttribute('stroke-dasharray', this.options.dashArray);\r
+                       } else {\r
+                               this._path.removeAttribute('stroke-dasharray');\r
+                       }\r
+               } else {\r
+                       this._path.setAttribute('stroke', 'none');\r
+               }\r
+               if (this.options.fill) {\r
+                       this._path.setAttribute('fill', this.options.fillColor || this.options.color);\r
+                       this._path.setAttribute('fill-opacity', this.options.fillOpacity);\r
+               } else {\r
+                       this._path.setAttribute('fill', 'none');\r
+               }\r
+       },\r
+\r
+       _updatePath: function () {\r
+               var str = this.getPathString();\r
+               if (!str) {\r
+                       // fix webkit empty string parsing bug\r
+                       str = 'M0 0';\r
+               }\r
+               this._path.setAttribute('d', str);\r
+       },\r
+\r
+       // TODO remove duplication with L.Map\r
+       _initEvents: function () {\r
+               if (this.options.clickable) {\r
+                       if (L.Browser.svg || !L.Browser.vml) {\r
+                               this._path.setAttribute('class', 'leaflet-clickable');\r
+                       }\r
+\r
+                       L.DomEvent.on(this._container, 'click', this._onMouseClick, this);\r
+\r
+                       var events = ['dblclick', 'mousedown', 'mouseover', 'mouseout', 'mousemove', 'contextmenu'];\r
+                       for (var i = 0; i < events.length; i++) {\r
+                               L.DomEvent.on(this._container, events[i], this._fireMouseEvent, this);\r
+                       }\r
+               }\r
+       },\r
+\r
+       _onMouseClick: function (e) {\r
+               if (this._map.dragging && this._map.dragging.moved()) {\r
+                       return;\r
+               }\r
+\r
+               this._fireMouseEvent(e);\r
+\r
+               if (this.hasEventListeners(e.type)) {\r
+                       L.DomEvent.stopPropagation(e);\r
+               }\r
+       },\r
+\r
+       _fireMouseEvent: function (e) {\r
+               if (!this.hasEventListeners(e.type)) {\r
+                       return;\r
+               }\r
+\r
+               if (e.type === 'contextmenu') {\r
+                       L.DomEvent.preventDefault(e);\r
+               }\r
+\r
+               var map = this._map,\r
+                       containerPoint = map.mouseEventToContainerPoint(e),\r
+                       layerPoint = map.containerPointToLayerPoint(containerPoint),\r
+                       latlng = map.layerPointToLatLng(layerPoint);\r
+\r
+               this.fire(e.type, {\r
+                       latlng: latlng,\r
+                       layerPoint: layerPoint,\r
+                       containerPoint: containerPoint,\r
+                       originalEvent: e\r
+               });\r
+       }\r
+});\r
+\r
+L.Map.include({\r
+       _initPathRoot: function () {\r
+               if (!this._pathRoot) {\r
+                       this._pathRoot = L.Path.prototype._createElement('svg');\r
+                       this._panes.overlayPane.appendChild(this._pathRoot);\r
+\r
+                       if (this.options.zoomAnimation && L.Browser.any3d) {\r
+                               this._pathRoot.setAttribute('class', ' leaflet-zoom-animated');\r
+\r
+                               this.on({\r
+                                       'zoomanim': this._animatePathZoom,\r
+                                       'zoomend': this._endPathZoom\r
+                               });\r
+                       } else {\r
+                               this._pathRoot.setAttribute('class', ' leaflet-zoom-hide');\r
+                       }\r
+\r
+                       this.on('moveend', this._updateSvgViewport);\r
+                       this._updateSvgViewport();\r
+               }\r
+       },\r
+\r
+       _animatePathZoom: function (opt) {\r
+               var scale = this.getZoomScale(opt.zoom),\r
+                       offset = this._getCenterOffset(opt.center).divideBy(1 - 1 / scale),\r
+                       viewportPos = this.containerPointToLayerPoint(this.getSize().multiplyBy(-L.Path.CLIP_PADDING)),\r
+                       origin = viewportPos.add(offset).round();\r
+\r
+               this._pathRoot.style[L.DomUtil.TRANSFORM] = L.DomUtil.getTranslateString((origin.multiplyBy(-1).add(L.DomUtil.getPosition(this._pathRoot)).multiplyBy(scale).add(origin))) + ' scale(' + scale + ') ';\r
+\r
+               this._pathZooming = true;\r
+       },\r
+\r
+       _endPathZoom: function () {\r
+               this._pathZooming = false;\r
+       },\r
+\r
+       _updateSvgViewport: function () {\r
+               if (this._pathZooming) {\r
+                       // Do not update SVGs while a zoom animation is going on otherwise the animation will break.\r
+                       // When the zoom animation ends we will be updated again anyway\r
+                       // This fixes the case where you do a momentum move and zoom while the move is still ongoing.\r
+                       return;\r
+               }\r
+\r
+               this._updatePathViewport();\r
+\r
+               var vp = this._pathViewport,\r
+                       min = vp.min,\r
+                       max = vp.max,\r
+                       width = max.x - min.x,\r
+                       height = max.y - min.y,\r
+                       root = this._pathRoot,\r
+                       pane = this._panes.overlayPane;\r
+\r
+               // Hack to make flicker on drag end on mobile webkit less irritating\r
+               if (L.Browser.mobileWebkit) {\r
+                       pane.removeChild(root);\r
+               }\r
+\r
+               L.DomUtil.setPosition(root, min);\r
+               root.setAttribute('width', width);\r
+               root.setAttribute('height', height);\r
+               root.setAttribute('viewBox', [min.x, min.y, width, height].join(' '));\r
+\r
+               if (L.Browser.mobileWebkit) {\r
+                       pane.appendChild(root);\r
+               }\r
+       }\r
+});\r
+
+
+/*\r
+ * Popup extension to L.Path (polylines, polygons, circles), adding bindPopup method.\r
+ */\r
+\r
+L.Path.include({\r
+\r
+       bindPopup: function (content, options) {\r
+\r
+               if (!this._popup || this._popup.options !== options) {\r
+                       this._