Merge branch 'leaflet'
authorTom Hughes <tom@compton.nu>
Fri, 23 Nov 2012 10:41:45 +0000 (10:41 +0000)
committerTom Hughes <tom@compton.nu>
Fri, 23 Nov 2012 10:41:45 +0000 (10:41 +0000)
61 files changed:
Vendorfile [new file with mode: 0644]
app/assets/images/arrow.png [deleted file]
app/assets/images/map_sprite.png [moved from app/assets/openlayers/theme/openstreetmap/img/map_sprite.png with 100% similarity]
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/marker-yellow.png [new file with mode: 0644]
app/assets/javascripts/application.js
app/assets/javascripts/browse.js
app/assets/javascripts/changeset.js
app/assets/javascripts/diary_entry.js
app/assets/javascripts/embed.js [new file with mode: 0644]
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/SimpleLayerSwitcher.js [deleted file]
app/assets/openlayers/SimplePanZoom.js [deleted file]
app/assets/openlayers/theme/openstreetmap/SimpleLayerSwitcher.css.scss [deleted file]
app/assets/openlayers/theme/openstreetmap/SimplePanZoom.css.scss [deleted file]
app/assets/openlayers/theme/openstreetmap/img/carat.png [deleted file]
app/assets/openlayers/theme/openstreetmap/img/missing-tile.png [deleted file]
app/assets/openlayers/theme/openstreetmap/style.css.scss [deleted file]
app/assets/stylesheets/common.css.scss
app/assets/stylesheets/embed.css.scss [new file with mode: 0644]
app/assets/stylesheets/large.css
app/assets/stylesheets/leaflet-all.css.scss [new file with mode: 0644]
app/assets/stylesheets/leaflet.pan.css.scss [new file with mode: 0644]
app/assets/stylesheets/leaflet.zoom.css.scss [new file with mode: 0644]
app/assets/stylesheets/print.css
app/assets/stylesheets/small.css.scss
app/controllers/export_controller.rb
app/views/browse/start.html.erb
app/views/export/embed.html.erb [new file with mode: 0644]
app/views/layouts/_head.html.erb
app/views/user/_contact.html.erb
app/views/user/view.html.erb
config/environments/production.rb
config/locales/en.yml
config/routes.rb
public/export/embed.html [deleted file]
test/functional/export_controller_test.rb
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/img/filter-icon.png [new file with mode: 0644]
vendor/assets/leaflet/img/move-handle.png [new file with mode: 0644]
vendor/assets/leaflet/img/resize-handle.png [new file with mode: 0644]
vendor/assets/leaflet/leaflet.css [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.locationfilter.css [new file with mode: 0644]
vendor/assets/leaflet/leaflet.locationfilter.js [new file with mode: 0644]
vendor/assets/leaflet/leaflet.osm.js [new file with mode: 0644]
vendor/assets/leaflet/leaflet.pan.js [new file with mode: 0644]
vendor/assets/leaflet/leaflet.zoom.js [new file with mode: 0644]

diff --git a/Vendorfile b/Vendorfile
new file mode 100644 (file)
index 0000000..d7779f8
--- /dev/null
@@ -0,0 +1,28 @@
+folder 'vendor/assets' do
+  folder 'leaflet' do
+    from 'https://github.com/CloudMade/Leaflet.git' do
+      file 'leaflet.css', 'dist/leaflet.css'
+      file 'leaflet.ie.css', 'dist/leaflet.ie.css'
+      file 'leaflet.js', 'dist/leaflet-src.js'
+      folder 'images', 'dist/images'
+    end
+
+    from 'https://github.com/tripbirds/leaflet-locationfilter.git' do
+      file 'leaflet.locationfilter.css', 'src/locationfilter.css'
+      file 'leaflet.locationfilter.js', 'src/locationfilter.js'
+      folder 'img', 'src/img'
+    end
+
+    from 'https://github.com/kartena/Leaflet.Pancontrol.git' do
+      file 'leaflet.pan.js', 'src/L.Control.Pan.js'
+    end
+
+    from 'https://github.com/kartena/Leaflet.zoomslider.git' do
+      file 'leaflet.zoom.js', 'src/L.Control.Zoomslider.js'
+    end
+
+    from 'https://github.com/jfirebaugh/leaflet-osm.git' do
+      file 'leaflet.osm.js', 'leaflet-osm.js'
+    end
+  end
+end
diff --git a/app/assets/images/arrow.png b/app/assets/images/arrow.png
deleted file mode 100644 (file)
index aa9b58f..0000000
Binary files a/app/assets/images/arrow.png and /dev/null differ
diff --git a/app/assets/images/marker-blue.png b/app/assets/images/marker-blue.png
new file mode 100644 (file)
index 0000000..7614b7c
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..56a0b1c
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..46c7018
Binary files /dev/null and b/app/assets/images/marker-red.png differ
diff --git a/app/assets/images/marker-yellow.png b/app/assets/images/marker-yellow.png
new file mode 100644 (file)
index 0000000..eb6d6ef
Binary files /dev/null and b/app/assets/images/marker-yellow.png differ
index c52c072a754fa941a33b61b920aebe96e7b3ffe0..8d6c13503095b9d3282446ade0e19637116a9b4a 100644 (file)
@@ -4,7 +4,11 @@
 //= require jquery.timers
 //= require jquery.cookie
 //= require augment
-//= require openlayers
+//= require leaflet
+//= require leaflet.osm
+//= require leaflet.locationfilter
+//= require leaflet.pan
+//= require leaflet.zoom
 //= require i18n/translations
 //= require osm
 //= require piwik
index 1c0b1b47993287bd03378cee90c9ad9b85a610be..f92950c238510c3ee6893a4863c2265103d6d92c 100644 (file)
@@ -22,15 +22,17 @@ $(document).ready(function () {
   }
 
   var map = createMap("small_map", {
-    controls: [ new OpenLayers.Control.Navigation() ]
+    layerControl: false,
+    panZoomControl: false,
+    attributionControl: false
   });
 
   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 +42,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 +59,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 +70,15 @@ $(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.getWestLng(),
+                    extent.getSouthLat(),
+                    extent.getEastLng(),
+                    extent.getNorthLat(),
+                    object);
       } else {
         $("#small_map").hide();
       }
index ba6e541b6b3b2ff202592b579692c5baa0fbbd3b..6ad1fd7fac35ce5da0b01d5edfd7c65f1ce4c302 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 c16930480e5ff75f7d3f0ba041d302c8ffa4d44d..291c8652382a85ab4cee1414eb6ce5d962a8bfef 100644 (file)
@@ -2,18 +2,15 @@ $(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);
+      map.removeLayer(marker);
     }
 
-    marker = addMarkerToMap(lonlat, null, I18n.t('diary_entry.edit.marker_text'));
+    marker = L.marker(e.latlng, {icon: getUserIcon()}).addTo(map)
+      .bindPopup(I18n.t('diary_entry.edit.marker_text'));
   }
 
   $("#usemap").click(function (e) {
@@ -23,15 +20,16 @@ $(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'));
+      marker = L.marker(centre, {icon: getUserIcon()}).addTo(map)
+        .bindPopup(I18n.t('diary_entry.edit.marker_text'));
     }
 
-    map.events.register("click", map, setLocation);
+    map.on("click", setLocation);
   });
 });
diff --git a/app/assets/javascripts/embed.js b/app/assets/javascripts/embed.js
new file mode 100644 (file)
index 0000000..914eabb
--- /dev/null
@@ -0,0 +1,38 @@
+//= require leaflet
+//= require leaflet.osm
+
+window.onload = function () {
+  var query = (window.location.search || '?').substr(1),
+      args  = {};
+
+  query.replace(/([^&=]+)=?([^&]*)(?:&+|$)/g, function(match, key, value) {
+    value = value.split(",");
+    if (value.length == 1)
+      value = value[0];
+    args[key] = value;
+  });
+
+  var map = L.map("map");
+  map.attributionControl.setPrefix('');
+
+  if (!args.layer || args.layer == "mapnik" || args.layer == "osmarender") {
+    new L.OSM.Mapnik().addTo(map);
+  } else if (args.layer == "cyclemap" || args.layer == "cycle map") {
+    new L.OSM.CycleMap().addTo(map);
+  } else if (args.layer == "transportmap") {
+    new L.OSM.TransportMap().addTo(map);
+  } else if (args.layer == "mapquest") {
+    new L.OSM.MapQuestOpen().addTo(map);
+  }
+
+  if (args.marker) {
+    L.marker(args.marker).addTo(map);
+  }
+
+  if (args.bbox) {
+    map.fitBounds([L.latLng(args.bbox[1], args.bbox[0]),
+                   L.latLng(args.bbox[3], args.bbox[2])])
+  } else {
+    map.fitWorld();
+  }  
+};
index 85f5dab0dac16bf5e958e4b90a9fe8f5204cbba5..8afd3269d61d2aabf6ba3b4822f480ef4bab4fbe 100644 (file)
@@ -3,24 +3,29 @@
 //= 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);
+  L.control.scale().addTo(map);
+
+  map.attributionControl.setPrefix(permalinks);
+
+  map.on("moveend baselayerchange", 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 +34,7 @@ $(document).ready(function () {
   }
 
   if (params.marker) {
-    marker = addMarkerToMap(new OpenLayers.LonLat(params.mlon, params.mlat));
+    marker = L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map);
   }
 
   if (params.object) {
@@ -38,46 +43,56 @@ $(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) {
-      removeMarkerFromMap(marker);
+      map.removeLayer(marker);
     }
 
-    marker = addMarkerToMap(centre, getArrowIcon());
-
-    return false;
+    marker = L.marker(centre, {icon: getUserIcon()}).addTo(map);
   });
 
   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'));
@@ -92,25 +107,18 @@ $(document).ready(function () {
     remoteEditHandler();
   }
 
-  $(window).resize(function() {
-    var centre = map.getCenter();
-    var zoom = map.getZoom();
-
-    handleResize();
-
-    map.setCenter(centre, zoom);
-  });
+  $(window).resize(handleResize);
 
   $("#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.getWestLng(),
+      minlat: bounds.getSouthLat(),
+      maxlon: bounds.getEastLng(),
+      maxlat: bounds.getNorthLat()
     }, openSidebar);
 
     return false;
index 1792c8577f5b250ed547791f8c6bc32eea18dbb1..6371f559b1b9807843622232e2a3823da28267de 100644 (file)
@@ -11,153 +11,99 @@ $(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.DataLayer(null, {
+      styles: {
+        way: {
+          weight: 3,
+          color: "#000000",
+          opacity: 0.4
+        },
+        area: {
+          weight: 3,
+          color: "#ff0000"
+        },
+        node: {
+          color: "#00ff00"
+        }
+      }
+    });
 
-    map.dataLayer.active = true;
+    dataLayer.addTo(map);
 
-    $("#sidebar_title").html(I18n.t('browse.start_rjs.data_frame_title'));
-    $("#sidebar_content").html(sidebarHtml);
+    dataLayer.isWayArea = function () {
+      return !areasHidden && L.OSM.DataLayer.prototype.isWayArea.apply(this, arguments);
+    };
 
-    openSidebar();
+    var locationFilter = new L.LocationFilter({
+      enableButton: false,
+      adjustButton: false
+    }).addTo(map);
 
-    var vectors = new OpenLayers.Layer.Vector();
+    locationFilter.on("change", getData);
 
-    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);
+    $("#sidebar_title").html(I18n.t('browse.start_rjs.data_frame_title'));
+    $("#sidebar_content").html(sidebarHtml);
 
-    map.events.register("moveend", map, updateData);
-    map.events.triggerEvent("moveend");
+    openSidebar();
 
-    $("#browse_select_view").click(useMap);
+    map.on("moveend", updateData);
+    updateData();
 
-    $("#browse_select_box").click(startDrag);
+    $("#browse_filter_toggle").toggle(enableFilter, disableFilter);
 
     $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
-    $("#browse_hide_areas_box").show();
-    $("#browse_hide_areas_box").click(hideAreas);
+    $("#browse_hide_areas_box").toggle(hideAreas, showAreas);
 
     function updateData() {
-      if (browseMode == "auto") {
+      if (!locationFilter.isEnabled()) {
         if (map.getZoom() >= 15) {
-            useMap(false);
+          var bounds = map.getBounds();
+          if (!browseBounds || !browseBounds.contains(bounds)) {
+            browseBounds = bounds;
+            getData();
+          }
         } 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.removeLayer(locationFilter);
+      map.off("moveend", updateData);
+      locationFilter.off("change", getData);
     });
 
-    function startDrag() {
-      $("#browse_select_box").html(I18n.t('browse.start_rjs.drag_a_box'));
-
-      browseBoxControl.activate();
-
-      return false;
+    function enableFilter() {
+      $("#browse_filter_toggle").html(I18n.t('browse.start_rjs.view_data'));
+      locationFilter.setBounds(map.getBounds().pad(-0.2));
+      locationFilter.enable();
+      getData();
     }
 
-    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);
-
-        browseMode = "auto";
-
-        $("#browse_select_view").hide();
-      }
-
-      return false;
+    function disableFilter() {
+      $("#browse_filter_toggle").html(I18n.t('browse.start_rjs.manually_select'));
+      locationFilter.disable();
+      getData();
     }
 
     function hideAreas() {
       $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.show_areas'));
-      $("#browse_hide_areas_box").show();
-      $("#browse_hide_areas_box").click(showAreas);
-
       areasHidden = true;
-
-      useMap(true);
+      getData();
     }
 
     function showAreas() {
       $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
-      $("#browse_hide_areas_box").show();
-      $("#browse_hide_areas_box").click(hideAreas);
-
       areasHidden = false;
-
-      useMap(true);
-    }
-
-    function endDrag(bbox) {
-      var bounds = bbox.getBounds();
-      var projected = unproj(bounds);
-
-      browseBoxControl.deactivate();
-      browseBounds = projected;
-      getData(bounds);
-
-      browseMode = "manual";
-
-      $("#browse_select_box").html(I18n.t('browse.start_rjs.manually_select'));
-      $("#browse_select_view").show();
+      getData();
     }
 
     function displayFeatureWarning(count, limit, callback) {
@@ -179,148 +125,84 @@ $(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 bounds = locationFilter.isEnabled() ? locationFilter.getBounds() : map.getBounds();
+      var size = bounds.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();
+      var url = "/api/" + OSM.API_VERSION + "/map?bbox=" + bounds.toBBOX();
 
-      var formatOptions = {
-        checkTags: true,
-        interestingTagsExclude: ['source','source_ref','source:ref','history','attribution','created_by','tiger:county','tiger:tlid','tiger:upload_uuid']
-      };
+      /*
+       * 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;
 
-      if (areasHidden) formatOptions.areaTags = [];
+      /*@cc_on
+        if (navigator.appVersion < 8) {
+          maxFeatures = 100;
+        } else if (navigator.appVersion < 9) {
+          maxFeatures = 500;
+        }
+      @*/
 
-      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 });
-      }
+          $("#browse_content").empty();
+          dataLayer.clearLayers();
+          selectedLayer = null;
 
-      browseActiveFeature = null;
-    }
+          var features = dataLayer.buildFeatures(xml);
 
-    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
-          });
-        }
+          function addFeatures() {
+            dataLayer.addData(features);
 
-        browseObjectList = $(JST["templates/browse/feature_list"]({
-          features: features,
-          url: this.protocol.url
-        }))[0];
+            layersById = {};
 
-        loadObjectList();
-      }
+            dataLayer.eachLayer(function (layer) {
+              var feature = layer.feature;
+              layersById[feature.id] = layer;
+              $.extend(feature, {
+                typeName: featureTypeName(feature),
+                url: "/browse/" + feature.type + "/" + feature.id,
+                name: featureName(feature)
+              });
+            });
+
+            browseObjectList = $(JST["templates/browse/feature_list"]({
+              features: features,
+              url: url
+            }))[0];
+
+            loadObjectList();
+          }
+
+          if (features.length < maxFeatures) {
+            addFeatures();
+          } else {
+            displayFeatureWarning(features.length, maxFeatures, addFeatures);
+          }
+        }
+      });
     }
 
     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());
+      if (locationFilter.isEnabled()) {
+        map.panTo(layer.getBounds().getCenter());
       }
 
       return false;
@@ -333,19 +215,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) {
@@ -354,35 +232,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'),
@@ -392,7 +276,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)
@@ -401,57 +285,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) {
@@ -464,4 +317,4 @@ $(document).ready(function () {
       $("#browse_status").hide();
     }
   }
-});
\ No newline at end of file
+});
index 8696338ab403fade93cbf53eb34100bf792f6d46..31a981ec9a15b34ff87d183e9b3f91b58b6ce676 100644 (file)
@@ -11,44 +11,24 @@ $(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;
 
-    transform = new OpenLayers.Control.TransformFeature(vectors, {
-      rotate: false,
-      irregular: true
-    });
-    transform.events.register("transformcomplete", transform, transformComplete);
-    map.addControl(transform);
+    var locationFilter = new L.LocationFilter({
+      enableButton: false,
+      adjustButton: false
+    }).addTo(map);
 
-    map.events.register("moveend", map, mapMoved);
-    map.events.register("changebaselayer", map, htmlUrlChanged);
+    locationFilter.on("change", filterChanged);
+
+    map.on("moveend", mapMoved);
+    map.on("baselayerchange", htmlUrlChanged);
 
     $("#sidebar_title").html(I18n.t('export.start_rjs.export'));
     $("#sidebar_content").html(sidebarHtml);
 
     $("#maxlat,#minlon,#maxlon,#minlat").change(boundsChanged);
 
-    $("#drag_box").click(startDrag);
+    $("#drag_box").click(enableFilter);
 
     $("#add_marker").click(startMarker);
 
@@ -58,107 +38,96 @@ $(document).ready(function () {
 
     openSidebar();
 
-    if (map.baseLayer.name == "Mapnik") {
+    if (getMapBaseLayer().keyid == "mapnik") {
       $("#format_mapnik").prop("checked", true);
     }
 
+    setBounds(map.getBounds());
     formatChanged();
-    setBounds(map.getExtent());
 
     $("body").removeClass("site-index").addClass("site-export");
 
     $("#sidebar").one("closed", function () {
       $("body").removeClass("site-export").addClass("site-index");
 
-      clearBox();
+      map.removeLayer(locationFilter);
       clearMarker();
-      map.events.unregister("moveend", map, mapMoved);
-      map.events.unregister("changebaselayer", map, htmlUrlChanged);
-      map.removeLayer(vectors);
+
+      map.off("moveend", mapMoved);
+      map.off("baselayerchange", htmlUrlChanged);
+      locationFilter.off("change", filterChanged);
     });
 
-    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 getScale() {
+      var bounds = map.getBounds(),
+        centerLat = bounds.getCenter().lat,
+        halfWorldMeters = 6378137 * Math.PI * Math.cos(centerLat * Math.PI / 180),
+        meters = halfWorldMeters * (bounds.getNorthEast().lng - bounds.getSouthWest().lng) / 180,
+        pixelsPerMeter = map.getSize().x / meters,
+        metersPerPixel = 1 / (92 * 39.3701);
+      return Math.round(1 / (pixelsPerMeter * metersPerPixel));
     }
 
-    function boundsChanged() {
-      var bounds = getMercatorBounds();
+    function getMercatorBounds() {
+      var bounds = getBounds();
+      return L.bounds(L.CRS.EPSG3857.project(bounds.getSouthWest()),
+                      L.CRS.EPSG3857.project(bounds.getNorthEast()));
+    }
 
-      map.events.unregister("moveend", map, mapMoved);
-      map.zoomToExtent(bounds);
+    function boundsChanged() {
+      var bounds = getBounds();
 
-      clearBox();
-      drawBox(bounds);
+      map.fitBounds(bounds);
+      locationFilter.setBounds(bounds);
 
+      enableFilter();
       validateControls();
       mapnikSizeChanged();
     }
 
-    function startDrag() {
-      $("#drag_box").html(I18n.t('export.start_rjs.drag_a_box'));
-
-      clearBox();
-      box.activate();
-    };
-
-    function endDrag(bbox) {
-      var bounds = bbox.getBounds();
-
-      map.events.unregister("moveend", map, mapMoved);
-      setBounds(bounds);
-      drawBox(bounds);
-      box.deactivate();
-      validateControls();
+    function enableFilter() {
+      if (!locationFilter.getBounds().isValid()) {
+        locationFilter.setBounds(map.getBounds().pad(-0.2));
+      }
 
-      $("#drag_box").html(I18n.t('export.start_rjs.manually_select'));
+      $("#drag_box").hide();
+      locationFilter.enable();
     }
 
-    function transformComplete(event) {
-      setBounds(event.feature.geometry.bounds);
+    function filterChanged() {
+      setBounds(locationFilter.getBounds());
       validateControls();
     }
 
     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;
 
-      $("#marker_lon").val(geom.x.toFixed(5));
-      $("#marker_lat").val(geom.y.toFixed(5));
+      if (marker) {
+        map.removeLayer(marker);
+      }
+
+      marker = L.marker(latlng).addTo(map);
+
+      $("#marker_lon").val(latlng.lng.toFixed(5));
+      $("#marker_lat").val(latlng.lat.toFixed(5));
 
       htmlUrlChanged();
     }
@@ -168,49 +137,35 @@ $(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());
-      validateControls();
+      if (!locationFilter.isEnabled()) {
+        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();
-    }
-
-    function drawBox(bounds) {
-      var feature = new OpenLayers.Feature.Vector(bounds.toGeometry());
-
-      vectors.addFeatures(feature);
-      transform.setFeature(feature);
-    }
-
     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 +175,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 +185,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 +199,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 +213,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 +232,7 @@ $(document).ready(function () {
       }
 
       if ($("#format_mapnik").prop("checked")) {
-        $("#mapnik_scale").val(roundScale(map.getScale()));
+        $("#mapnik_scale").val(getScale());
         $("#export_mapnik").show();
 
         mapnikSizeChanged();
@@ -306,8 +262,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 1e4138b70fc7b449b4ba3cae54f5cf8c9b4a93df..9722cf4cf0511f684c95ff7b651a4d06393cf9dd 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 baselayerchange", updateMapKey);
     });
 
-    map.events.register("zoomend", map, updateMapKey);
-    map.events.register("changelayer", map, updateMapKey);
-
-    e.preventDefault();
+    map.on("zoomend baselayerchange", updateMapKey);
   });
 });
index c06c9c8eaf809cf0aecc9733da766b0458aeff2a..393e9cae7d3e88f3b3a01b718e084fe37a8934e2 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;
+  }
+});
+
+L.Icon.Default.imagePath = <%= "#{asset_prefix}/images".to_json %>;
+
 var map;
-var markers;
-var vectors;
-var popup;
+
+var layers = [
+  {
+    klass: L.OSM.Mapnik,
+    attribution: "",
+    keyid: "mapnik",
+    layerCode: "M",
+    name: I18n.t("javascripts.map.base.standard")
+  },
+  {
+    klass: L.OSM.CycleMap,
+    attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
+    keyid: "cyclemap",
+    layerCode: "C",
+    name: I18n.t("javascripts.map.base.cycle_map")
+  },
+  {
+    klass: L.OSM.TransportMap,
+    attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
+    keyid: "transportmap",
+    layerCode: "T",
+    name: I18n.t("javascripts.map.base.transport_map")
+  },
+  {
+    klass: L.OSM.MapQuestOpen,
+    attribution: "Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>",
+    keyid: "mapquest",
+    layerCode: "Q",
+    name: I18n.t("javascripts.map.base.mapquest")
+  }
+];
 
 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;
-}
+  options = $.extend({zoomControl: true, panZoomControl: true, layerControl: true}, options);
 
-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);
+  map = L.map(divName, $.extend({}, options, {panControl: false, zoomsliderControl: false, maxZoom: 18}));
 
-   return icon;
-}
+  if (map.attributionControl) {
+    map.attributionControl.setPrefix('');
+  }
 
-function addMarkerToMap(position, icon, description) {
-   var marker = new OpenLayers.Marker(proj(position), icon);
+  if (options.panZoomControl) {
+    new L.Control.Pan().addTo(map);
+    new L.Control.Zoomslider({stepHeight: 7}).addTo(map);
+  }
 
-   markers.addMarker(marker);
+  var layersControl = L.control.layers();
 
-   if (description) {
-       marker.events.register("mouseover", marker, function() {
-           openMapPopup(marker, description);
-       });
-   }
+  if (options.layerControl) {
+    layersControl.addTo(map);
+  }
 
-   return marker;
+  for (var i = 0; i < layers.length; i++) {
+    layers[i].layer = new (layers[i].klass)(layers[i]);
+    layersControl.addBaseLayer(layers[i].layer, layers[i].name);
+  }
+
+  layers[0].layer.addTo(map);
+
+  $("#" + divName).on("resized", function () {
+    map.invalidateSize();
+  });
+
+  return map;
+}
+
+function getUserIcon(url) {
+  return L.icon({
+    iconUrl: url || <%= asset_path('marker-red.png').to_json %>,
+    iconSize: [25, 41],
+    iconAnchor: [12, 41],
+    popupAnchor: [1, -34],
+    shadowUrl: <%= asset_path('images/marker-shadow.png').to_json %>,
+    shadowSize: [41, 41]
+  });
 }
 
 function 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.DataLayer(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);
+      layer.addTo(map);
+    }
+  });
 }
 
-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 addBoxToMap(bounds) {
+  var box = L.rectangle(bounds, {
+    weight: 2,
+    color: '#e90',
+    fillOpacity: 0
+  });
 
-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;
-}
+  box.addTo(map);
 
-function closeMapPopup() {
-   if (popup) {
-      map.removePopup(popup);
-   }
+  return box;
 }
 
-function removeMarkerFromMap(marker){
-   markers.removeMarker(marker);
-}
-
-function proj(x) {
-    return x.clone().transform(epsg4326, map.getProjectionObject());
-}
-
-function unproj(x) {
-    return x.clone().transform(map.getProjectionObject(), epsg4326);
-}
-
-function setMapCenter(center, zoom) {
-   zoom = parseInt(zoom, 10);
-   var numzoom = map.getNumZoomLevels();
-   if (zoom >= numzoom) zoom = numzoom - 1;
-   map.setCenter(proj(center), zoom);
-}
-
-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 < map.layers.length; i++) {
-      if (map.layers[i].layerCode && map.layers[i].getVisibility()) {
-         layerConfig += map.layers[i].layerCode;
-      }
-   }
+  for (var i = 0; i < layers.length; i++) {
+    if (map.hasLayer(layers[i].layer)) {
+      return 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) >= 0) {
+      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 77cb86a8d210b670e9a9c2ba1a350f678001d936..25456d04ebb080b46564fb359b5801fac551c163 100644 (file)
@@ -1,41 +1,39 @@
 $(document).ready(function () {
-  var map = createMap("map");
+  var map = createMap("map", {
+    zoomControl: true,
+    panZoomControl: false
+  });
 
   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;
+    var marker = L.marker([0, 0], {icon: getUserIcon()});
 
     if (OSM.home) {
-      marker = addMarkerToMap(new OpenLayers.LonLat(OSM.home.lon, OSM.home.lat));
+      marker.setLatLng([OSM.home.lat, OSM.home.lon]);
+      marker.addTo(map);
     }
 
-    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);
-
-        if (marker) {
-          removeMarkerFromMap(marker);
-        }
+        $('#home_lat').val(e.latlng.lat);
+        $('#home_lon').val(e.latlng.lng);
 
-        marker = addMarkerToMap(lonlat);
+        marker.setLatLng(e.latlng);
+        marker.addTo(map);
       }
     });
   } 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);
+        L.marker([user.lat, user.lon], {icon: getUserIcon(user.icon)}).addTo(map)
+          .bindPopup(user.description);
       }
     });
   }
diff --git a/app/assets/openlayers/SimpleLayerSwitcher.js b/app/assets/openlayers/SimpleLayerSwitcher.js
deleted file mode 100644 (file)
index db3c720..0000000
+++ /dev/null
@@ -1,175 +0,0 @@
-var SimpleLayerSwitcher = OpenLayers.Class(OpenLayers.Control, {
-    layerStates: null,
-    layersDiv: null,
-    ascending: true,
-
-    initialize: function(options) {
-        OpenLayers.Control.prototype.initialize.apply(this, arguments);
-        this.layerStates = [];
-    },
-
-    destroy: function() {
-        OpenLayers.Event.stopObservingElement(this.div);
-
-        //clear out layers info and unregister their events 
-        this.map.events.un({
-            "addlayer": this.redraw,
-            "changelayer": this.redraw,
-            "removelayer": this.redraw,
-            "changebaselayer": this.redraw,
-            scope: this
-        });
-        OpenLayers.Control.prototype.destroy.apply(this, arguments);
-    },
-
-    setMap: function(map) {
-        OpenLayers.Control.prototype.setMap.apply(this, arguments);
-
-        this.map.events.on({
-            "addlayer": this.redraw,
-            "changelayer": this.redraw,
-            "removelayer": this.redraw,
-            "changebaselayer": this.redraw,
-            scope: this
-        });
-    },
-
-    draw: function() {
-        OpenLayers.Control.prototype.draw.apply(this);
-        this.loadContents();
-        this.redraw();
-        return this.div;
-    },
-
-    checkRedraw: function() {
-        var redraw = false;
-        if ( !this.layerStates.length ||
-             (this.map.layers.length != this.layerStates.length) ) {
-            redraw = true;
-        } else {
-            for (var i=0, len=this.layerStates.length; i<len; i++) {
-                var layerState = this.layerStates[i];
-                var layer = this.map.layers[i];
-                if ( (layerState.name != layer.name) ||
-                     (layerState.inRange != layer.inRange) ||
-                     (layerState.id != layer.id) ||
-                     (layerState.visibility != layer.visibility) ) {
-                    redraw = true;
-                    break;
-                }
-            }
-        }
-        return redraw;
-    },
-
-    redraw: function() {
-        if (!this.checkRedraw()) {
-            return this.div;
-        }
-
-        this.div.innerHTML = '';
-        var len = this.map.layers.length;
-        this.layerStates = [];
-        for (var i = 0; i < this.map.layers.length; i++) {
-            var layer = this.map.layers[i];
-            this.layerStates[i] = {
-                'name': layer.name,
-                'visibility': layer.visibility,
-                'inRange': layer.inRange,
-                'id': layer.id
-            };
-        }
-
-        var layers = this.map.layers.slice();
-        if (!this.ascending) { layers.reverse(); }
-        for (var i = 0; i < layers.length; i++) {
-            var layer = layers[i];
-            var baseLayer = layer.isBaseLayer;
-
-            if (layer.displayInLayerSwitcher && baseLayer) {
-                var on = (baseLayer) ? (layer == this.map.baseLayer)
-                          : layer.getVisibility();
-                var layerElem = document.createElement('a');
-                layerElem.id = this.id + '_input_' + layer.name;
-                layerElem.innerHTML = layer.name;
-                layerElem.href = '#';
-
-                OpenLayers.Element.addClass(layerElem, 'basey');
-                OpenLayers.Element.addClass(layerElem,
-                    'basey-' + (on ? 'on' : 'off'));
-
-                if (!baseLayer && !layer.inRange) {
-                    layerElem.disabled = true;
-                }
-                var context = {
-                    'layer': layer
-                };
-                OpenLayers.Event.observe(layerElem, 'mouseup',
-                    OpenLayers.Function.bindAsEventListener(
-                        this.onInputClick,
-                        context)
-                );
-
-                this.div.appendChild(layerElem);
-            }
-        }
-
-        return this.div;
-    },
-
-    onInputClick: function(e) {
-        if (this.layer.isBaseLayer) {
-            this.layer.map.setBaseLayer(this.layer);
-        } else {
-            this.layer.setVisibility(!this.layer.getVisibility());
-        }
-        OpenLayers.Event.stop(e);
-    },
-
-    updateMap: function() {
-
-        // set the newly selected base layer
-        for(var i=0, len=this.baseLayers.length; i<len; i++) {
-            var layerEntry = this.baseLayers[i];
-            if (layerEntry.inputElem.checked) {
-                this.map.setBaseLayer(layerEntry.layer, false);
-            }
-        }
-
-        // set the correct visibilities for the overlays
-        for(var i=0, len=this.dataLayers.length; i<len; i++) {
-            var layerEntry = this.dataLayers[i];
-            layerEntry.layer.setVisibility(layerEntry.inputElem.checked);
-        }
-
-    },
-
-    loadContents: function() {
-        //configure main div
-        OpenLayers.Event.observe(this.div, 'mouseup',
-            OpenLayers.Function.bindAsEventListener(this.mouseUp, this));
-        OpenLayers.Event.observe(this.div, 'click',
-                      this.ignoreEvent);
-        OpenLayers.Event.observe(this.div, 'mousedown',
-            OpenLayers.Function.bindAsEventListener(this.mouseDown, this));
-        OpenLayers.Event.observe(this.div, 'dblclick', this.ignoreEvent);
-    },
-
-    ignoreEvent: function(evt) {
-        OpenLayers.Event.stop(evt);
-    },
-
-    mouseDown: function(evt) {
-        this.isMouseDown = true;
-        this.ignoreEvent(evt);
-    },
-
-    mouseUp: function(evt) {
-        if (this.isMouseDown) {
-            this.isMouseDown = false;
-            this.ignoreEvent(evt);
-        }
-    },
-
-    CLASS_NAME: "SimpleLayerSwitcher"
-});
diff --git a/app/assets/openlayers/SimplePanZoom.js b/app/assets/openlayers/SimplePanZoom.js
deleted file mode 100644 (file)
index 83f6b9d..0000000
+++ /dev/null
@@ -1,356 +0,0 @@
-/* Copyright (c) 2006-2012 by OpenLayers Contributors (see authors.txt for 
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Control/PanZoom.js
- */
-
-/**
- * Class: OpenLayers.Control.PanZoomBar
- * The PanZoomBar is a visible control composed of a
- * <OpenLayers.Control.PanPanel> and a <OpenLayers.Control.ZoomBar>. 
- * By default it is displayed in the upper left corner of the map as 4
- * directional arrows above a vertical slider.
- *
- * Inherits from:
- *  - <OpenLayers.Control.PanZoom>
- */
-OpenLayers.Control.SimplePanZoom = OpenLayers.Class(OpenLayers.Control.PanZoom, {
-
-    /** 
-     * APIProperty: zoomStopWidth
-     */
-    zoomStopWidth: 18,
-
-    /** 
-     * APIProperty: zoomStopHeight
-     */
-    zoomStopHeight: 7,
-
-    /** 
-     * Property: slider
-     */
-    slider: null,
-
-    /** 
-     * Property: sliderEvents
-     * {<OpenLayers.Events>}
-     */
-    sliderEvents: null,
-
-    /** 
-     * Property: zoombarDiv
-     * {DOMElement}
-     */
-    zoombarDiv: null,
-
-    /** 
-     * APIProperty: zoomWorldIcon
-     * {Boolean}
-     */
-    zoomWorldIcon: false,
-
-    /**
-     * APIProperty: panIcons
-     * {Boolean} Set this property to false not to display the pan icons. If
-     * false the zoom world icon is placed under the zoom bar. Defaults to
-     * true.
-     */
-    panIcons: true,
-
-    /**
-     * APIProperty: forceFixedZoomLevel
-     * {Boolean} Force a fixed zoom level even though the map has 
-     *     fractionalZoom
-     */
-    forceFixedZoomLevel: false,
-
-    /**
-     * Property: mouseDragStart
-     * {<OpenLayers.Pixel>}
-     */
-    mouseDragStart: null,
-
-    /**
-     * Property: deltaY
-     * {Number} The cumulative vertical pixel offset during a zoom bar drag.
-     */
-    deltaY: null,
-
-    /**
-     * Property: zoomStart
-     * {<OpenLayers.Pixel>}
-     */
-    zoomStart: null,
-
-    /**
-     * Constructor: OpenLayers.Control.PanZoomBar
-     */ 
-    buttons: null,
-
-    /**
-     * APIMethod: destroy
-     */
-    destroy: function() {
-
-        this._removeZoomBar();
-
-        this.map.events.un({
-            "changebaselayer": this.redraw,
-            "updatesize": this.redraw,
-            scope: this
-        });
-
-        OpenLayers.Control.PanZoom.prototype.destroy.apply(this, arguments);
-
-        delete this.mouseDragStart;
-        delete this.zoomStart;
-    },
-    
-    /**
-     * Method: setMap
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>} 
-     */
-    setMap: function(map) {
-        OpenLayers.Control.PanZoom.prototype.setMap.apply(this, arguments);
-        this.map.events.on({
-            "changebaselayer": this.redraw,
-            "updatesize": this.redraw,
-            scope: this
-        });
-    },
-
-    /** 
-     * Method: redraw
-     * clear the div and start over.
-     */
-    redraw: function() {
-        if (this.div !== null) {
-            this.removeButtons();
-            this._removeZoomBar();
-        }  
-        this.draw();
-        this.moveZoomBar();
-    },
-    
-    /**
-    * Method: draw 
-    *
-    * Parameters:
-    * px - {<OpenLayers.Pixel>} 
-    */
-    draw: function(px) {
-        // initialize our internal div
-        OpenLayers.Control.prototype.draw.apply(this, arguments);
-        px = this.position.clone();
-
-        // place the controls
-        this.buttons = [];
-        var ids = ['panup', 'panleft', 'panright', 'pandown', 'zoomout', 'zoomin'];
-
-        for (var i = 0; i < ids.length; i++) {
-            var b = document.createElement('div');
-            b.id = ids[i];
-            b.action = ids[i];
-            b.className = 'button olButton';
-            this.div.appendChild(b);
-            this.buttons.push(b);
-        }
-
-        this._addZoomBar();
-        return this.div;
-    },
-
-    /** 
-    * Method: _addZoomBar
-    * 
-    * Parameters:
-    * centered - {<OpenLayers.Pixel>} where zoombar drawing is to start.
-    */
-    _addZoomBar:function() {
-        var id = this.id + "_" + this.map.id;
-        var zoomsToEnd = this.map.getNumZoomLevels() - 1 - this.map.getZoom();
-        var slider = document.createElement('div');
-        slider.id = 'slider';
-        slider.className = 'button';
-        slider.style.cursor = 'move';
-        this.slider = slider;
-        
-        this.sliderEvents = new OpenLayers.Events(this, slider, null, true,
-            { includeXY: true });
-        this.sliderEvents.on({
-            "touchstart": this.zoomBarDown,
-            "touchmove": this.zoomBarDrag,
-            "touchend": this.zoomBarUp,
-            "mousedown": this.zoomBarDown,
-            "mousemove": this.zoomBarDrag,
-            "mouseup": this.zoomBarUp
-        });
-        
-        var height = this.zoomStopHeight * (this.map.getNumZoomLevels());
-        
-        // this is the background image
-        var div = document.createElement('div');
-        div.className = 'button olButton';
-        div.id = 'zoombar';
-        this.zoombarDiv = div;
-        
-        this.div.appendChild(div);
-        this.startTop = 75;
-        this.div.appendChild(slider);
-
-        this.map.events.register("zoomend", this, this.moveZoomBar);
-    },
-    
-    /**
-     * Method: _removeZoomBar
-     */
-    _removeZoomBar: function() {
-        this.sliderEvents.un({
-            "touchstart": this.zoomBarDown,
-            "touchmove": this.zoomBarDrag,
-            "touchend": this.zoomBarUp,
-            "mousedown": this.zoomBarDown,
-            "mousemove": this.zoomBarDrag,
-            "mouseup": this.zoomBarUp
-        });
-        this.sliderEvents.destroy();
-        
-        this.div.removeChild(this.zoombarDiv);
-        this.zoombarDiv = null;
-        this.div.removeChild(this.slider);
-        this.slider = null;
-        
-        this.map.events.unregister("zoomend", this, this.moveZoomBar);
-    },
-    
-    /**
-     * Method: onButtonClick
-     *
-     * Parameters:
-     * evt - {Event}
-     */
-    onButtonClick: function(evt) {
-        OpenLayers.Control.PanZoom.prototype.onButtonClick.apply(this, arguments);
-        if (evt.buttonElement === this.zoombarDiv) {
-            var levels = evt.buttonXY.y / this.zoomStopHeight;
-            if (this.forceFixedZoomLevel || !this.map.fractionalZoom) {
-                levels = Math.floor(levels);
-            } 
-            var zoom = (this.map.getNumZoomLevels() - 1) - levels; 
-            zoom = Math.min(Math.max(zoom, 0), this.map.getNumZoomLevels() - 1);
-            this.map.zoomTo(zoom);
-        }
-    },
-    
-    /**
-     * Method: passEventToSlider
-     * This function is used to pass events that happen on the div, or the map,
-     * through to the slider, which then does its moving thing.
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>} 
-     */
-    passEventToSlider:function(evt) {
-        this.sliderEvents.handleBrowserEvent(evt);
-    },
-    
-    /*
-     * Method: zoomBarDown
-     * event listener for clicks on the slider
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>} 
-     */
-    zoomBarDown:function(evt) {
-        if (!OpenLayers.Event.isLeftClick(evt) && !OpenLayers.Event.isSingleTouch(evt)) {
-            return;
-        }
-        this.map.events.on({
-            "touchmove": this.passEventToSlider,
-            "mousemove": this.passEventToSlider,
-            "mouseup": this.passEventToSlider,
-            scope: this
-        });
-        this.mouseDragStart = evt.xy.clone();
-        this.zoomStart = evt.xy.clone();
-        this.div.style.cursor = "move";
-        // reset the div offsets just in case the div moved
-        this.zoombarDiv.offsets = null; 
-        OpenLayers.Event.stop(evt);
-    },
-    
-    /*
-     * Method: zoomBarDrag
-     * This is what happens when a click has occurred, and the client is
-     * dragging.  Here we must ensure that the slider doesn't go beyond the
-     * bottom/top of the zoombar div, as well as moving the slider to its new
-     * visual location
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>}
-     */
-    zoomBarDrag: function(evt) {
-        if (this.mouseDragStart !== null) {
-            var deltaY = this.mouseDragStart.y - evt.xy.y;
-            var offsets = OpenLayers.Util.pagePosition(this.zoombarDiv);
-            if ((evt.clientY - offsets[1]) > 0 && 
-                (evt.clientY - offsets[1]) < 140) {
-                var newTop = parseInt(this.slider.style.top, 10) - deltaY;
-                this.slider.style.top = newTop + "px";
-                this.mouseDragStart = evt.xy.clone();
-            }
-            // set cumulative displacement
-            this.deltaY = this.zoomStart.y - evt.xy.y;
-            OpenLayers.Event.stop(evt);
-        }
-    },
-
-    /*
-     * Method: zoomBarUp
-     * Perform cleanup when a mouseup event is received -- discover new zoom
-     * level and switch to it.
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>}
-     */
-    zoomBarUp: function(evt) {
-        if (!OpenLayers.Event.isLeftClick(evt) && evt.type !== "touchend") {
-            return;
-        }
-        if (this.mouseDragStart) {
-            this.div.style.cursor = "";
-            this.map.events.un({
-                "touchmove": this.passEventToSlider,
-                "mouseup": this.passEventToSlider,
-                "mousemove": this.passEventToSlider,
-                scope: this
-            });
-            var zoomLevel = this.map.zoom;
-            zoomLevel += this.deltaY/this.zoomStopHeight;
-            zoomLevel = Math.max(Math.round(zoomLevel), 0);
-            this.map.zoomTo(zoomLevel);
-            this.mouseDragStart = null;
-            this.zoomStart = null;
-            this.deltaY = 0;
-            OpenLayers.Event.stop(evt);
-        }
-    },
-
-    /*
-    * Method: moveZoomBar
-    * Change the location of the slider to match the current zoom level.
-    */
-    moveZoomBar:function() {
-        var newTop =
-            ((this.map.getNumZoomLevels()-1) - this.map.getZoom()) *
-            this.zoomStopHeight + this.startTop;
-        this.slider.style.top = newTop + "px";
-    },
-    CLASS_NAME: "OpenLayers.Control.SimplePanZoom"
-});
diff --git a/app/assets/openlayers/theme/openstreetmap/SimpleLayerSwitcher.css.scss b/app/assets/openlayers/theme/openstreetmap/SimpleLayerSwitcher.css.scss
deleted file mode 100644 (file)
index 48e730f..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-.SimpleLayerSwitcher {
-  position: absolute;
-  top: 10px;
-  right: 10px;
-  background: #fff;
-  border: 1px solid #ccc;
-  min-width: 150px;
-  background: #fff;
-}
-
-.SimpleLayerSwitcher a.basey {
-  display: block;
-  text-decoration: none;
-  color: #838383;
-  padding: 2px 5px 2px 20px;
-}
-
-.SimpleLayerSwitcher a.basey-on {
-  color: #000;
-  background-color: #fff;
-  background-image: image-url("theme/openstreetmap/img/carat.png");
-  background-repeat: no-repeat;
-  background-position: 7px 9px;
-}
-
-.SimpleLayerSwitcher a.basey-off {
-  display: none;
-}
-
-.SimpleLayerSwitcher:hover a {
-  border-top: 1px solid #eee;
-}
-
-.SimpleLayerSwitcher a:hover {
-  background-color: #f5f5f5;
-}
-
-.SimpleLayerSwitcher:hover a:first-child {
-  border-top: none;
-}
-
-.SimpleLayerSwitcher:hover a.basey-off {
-  display: block;
-}
diff --git a/app/assets/openlayers/theme/openstreetmap/SimplePanZoom.css.scss b/app/assets/openlayers/theme/openstreetmap/SimplePanZoom.css.scss
deleted file mode 100644 (file)
index 2788221..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-.olControlSimplePanZoom {
-  top: 10px;
-  right: 10px;
-}
-
-.olControlSimplePanZoom .button {
-  background-image: image-url("theme/openstreetmap/img/map_sprite.png");
-  position: absolute;
-  background-repeat: no-repeat;
-  cursor: hand;
-  cursor: pointer;
-}
-
-.olControlSimplePanZoom #panup {
-  left: 10px;
-  width: 25px;
-  height: 13px;
-  background-position: -15px -5px;
-}
-
-.olControlSimplePanZoom #pandown {
-  left: 10px;
-  top: 36px;
-  width: 25px;
-  height: 15px;
-  background-position: -15px -40px;
-}
-
-.olControlSimplePanZoom #panleft {
-  top: 13px;
-  width: 25px;
-  height: 24px;
-  left: 0px;
-  background-position: -5px -17px;
-}
-
-.olControlSimplePanZoom #panright {
-  top: 13px;
-  width: 25px;
-  height: 24px;
-  left: 25px;
-  background-position: -30px -17px;
-}
-
-.olControlSimplePanZoom #zoomin {
-  top: 50px;
-  width: 26px;
-  height: 20px;
-  left: 10px;
-  background-position: -15px -61px;
-}
-
-.olControlSimplePanZoom #zoomout {
-  top: 210px;
-  width: 26px;
-  height: 20px;
-  left: 10px;
-  background-position: -15px -220px;
-}
-
-.olControlSimplePanZoom #slider {
-  top: 75px;
-  width: 25px;
-  height: 10px;
-  left: 10px;
-  -webkit-transition: top 100ms linear;
-  -moz-transition: top 100ms linear;
-  -o-transition: top 100ms linear;
-  background-position: -77px -58px;
-  pointer: move;
-  cursor: move;
-}
-
-.olControlSimplePanZoom #zoombar {
-  top: 70px;
-  width: 26px;
-  height: 140px;
-  left: 10px;
-  background-position: -15px -80px;
-}
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/img/missing-tile.png b/app/assets/openlayers/theme/openstreetmap/img/missing-tile.png
deleted file mode 100644 (file)
index e6c5461..0000000
Binary files a/app/assets/openlayers/theme/openstreetmap/img/missing-tile.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 2837270fdf654fd035841a0b6b29dc08c7cab25c..217bb0c669c341463fea61a90296d7e466bad1b6 100644 (file)
@@ -430,7 +430,7 @@ body.site-export #tabnav a#exportanchor {
   left: 15px;
 }
 
-/* Rules for OpenLayers maps */
+/* Rules for Leaflet maps */
 
 #map {
   margin: 0px;
@@ -438,13 +438,6 @@ body.site-export #tabnav a#exportanchor {
   padding: 0px;
 }
 
-.olControlAttribution {
-  bottom: 15px !important;
-  left: 0px !important;
-  right: 0px !important;
-  text-align: center;
-}
-
 #permalink {
   z-index: 10000;
   position: absolute;
@@ -460,11 +453,13 @@ body.site-export #tabnav a#exportanchor {
   padding: 5px;
 }
 
-.site-index #map .SimpleLayerSwitcher,
-.site-index #map .olControlSimplePanZoom,
-.site-export #map .SimpleLayerSwitcher,
-.site-export #map .olControlSimplePanZoom {
+.site-index .leaflet-top,
+.site-export .leaflet-top {
   top: 40px !important;
+
+  .leaflet-control {
+    margin-top: 0px !important;
+  }
 }
 
 .site-index #map .olControlScaleLine,
@@ -1098,16 +1093,21 @@ p#contributorGuidance {
 
 /* Rules for the user map */
 
-.user_map .olControlSimplePanZoom {
+.user_map .leaflet-control-pan,
+.user_map .leaflet-control-zoomslider {
   display: none;
 }
 
-.user_map .olControlZoom {
+.user_map .leaflet-control-zoom {
   display: block;
 }
 
 /* Rules for user popups on maps */
 
+.user_popup {
+  min-width: 200px;
+}
+
 .user_popup p {
   padding-top: 3px;
   padding-bottom: 3px;
diff --git a/app/assets/stylesheets/embed.css.scss b/app/assets/stylesheets/embed.css.scss
new file mode 100644 (file)
index 0000000..024f73d
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ *= require leaflet
+ */
+
+html {
+  width: 100%;
+  height: 100%;
+}
+
+body {
+  width: 100%;
+  height: 100%;
+  margin: 0px;
+}
+
+#map {
+  width: 100%;
+  height: 100%;
+}
+
+.leaflet-control-zoom-in {
+  background-image: image-url("images/zoom-in.png");
+}
+
+.leaflet-control-zoom-out {
+  background-image: image-url("images/zoom-out.png");
+}
index ca58badc4097e70c98bd0a854377025756070b29..5ffaee985561db98a56138059649c8922dfaedd0 100644 (file)
@@ -8,6 +8,6 @@
 
 /* Rules for OpenLayers maps */
 
-.olControlZoom {
+.leaflet-control-zoom {
   display: none;
 }
diff --git a/app/assets/stylesheets/leaflet-all.css.scss b/app/assets/stylesheets/leaflet-all.css.scss
new file mode 100644 (file)
index 0000000..3d9c381
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+ *= require leaflet
+ *= require leaflet.locationfilter
+ *= require leaflet.pan
+ *= require leaflet.zoom
+ */
+
+/* Override to serve images through the asset pipeline. */
+.leaflet-control-zoom-in {
+  background-image: image-url("images/zoom-in.png");
+}
+
+.leaflet-control-zoom-out {
+  background-image: image-url("images/zoom-out.png");
+}
+
+.leaflet-control-layers-toggle {
+  background-image: image-url("images/layers.png");
+}
+
+div.leaflet-marker-icon.location-filter.resize-marker {
+  background-image: image-url("img/resize-handle.png");
+}
+
+div.leaflet-marker-icon.location-filter.move-marker {
+  background-image: image-url("img/move-handle.png");
+}
+
+/* Override to better match the pan/zoom control. */
+.leaflet-control-layers {
+  box-shadow: 0px 0px 3px #666;
+  background: #fff;
+  border-radius: 3px;
+}
+
+/* Override some conflicting styles.
+   https://github.com/openstreetmap/openstreetmap-website/pull/121#issuecomment-10206946 */
+.leaflet-popup-content img.user_thumbnail {
+  max-width: 50px !important;
+}
+
+.user_popup p {
+  margin: 0px 2px 0px 55px !important;
+}
diff --git a/app/assets/stylesheets/leaflet.pan.css.scss b/app/assets/stylesheets/leaflet.pan.css.scss
new file mode 100644 (file)
index 0000000..4b5aa65
--- /dev/null
@@ -0,0 +1,41 @@
+.leaflet-control-pan-up,
+.leaflet-control-pan-down,
+.leaflet-control-pan-left,
+.leaflet-control-pan-right {
+  background-image: image-url("map_sprite.png");
+  position: absolute;
+  background-repeat: no-repeat;
+  cursor: hand;
+  cursor: pointer;
+}
+
+.leaflet-control-pan-up {
+  left: 10px;
+  width: 25px;
+  height: 13px;
+  background-position: -15px -5px;
+}
+
+.leaflet-control-pan-down {
+  left: 10px;
+  top: 36px;
+  width: 25px;
+  height: 15px;
+  background-position: -15px -40px;
+}
+
+.leaflet-control-pan-left {
+  left: 0px;
+  top: 13px;
+  width: 25px;
+  height: 24px;
+  background-position: -5px -17px;
+}
+
+.leaflet-control-pan-right {
+  left: 25px;
+  top: 13px;
+  width: 25px;
+  height: 24px;
+  background-position: -30px -17px;
+}
diff --git a/app/assets/stylesheets/leaflet.zoom.css.scss b/app/assets/stylesheets/leaflet.zoom.css.scss
new file mode 100644 (file)
index 0000000..1482e35
--- /dev/null
@@ -0,0 +1,46 @@
+.leaflet-control-zoomslider-in,
+.leaflet-control-zoomslider-out,
+.leaflet-control-zoomslider-slider,
+.leaflet-control-zoomslider-slider-knob {
+  background-image: image-url("map_sprite.png");
+  position: absolute;
+  background-repeat: no-repeat;
+  cursor: hand;
+  cursor: pointer;
+}
+
+.leaflet-control-zoomslider-in {
+  top: 50px;
+  width: 26px;
+  height: 20px;
+  left: 10px;
+  background-position: -15px -61px;
+}
+
+.leaflet-control-zoomslider-out {
+  top: 202px;
+  width: 26px;
+  height: 20px;
+  left: 10px;
+  background-position: -15px -220px;
+}
+
+.leaflet-control-zoomslider-slider {
+  top: 70px;
+  width: 26px;
+  height: 132px;
+  left: 10px;
+  background-position: -15px -84px;
+}
+
+.leaflet-control-zoomslider-slider-knob {
+  top: 0px;
+  width: 25px;
+  height: 10px;
+  -webkit-transition: top 100ms linear;
+  -moz-transition: top 100ms linear;
+  -o-transition: top 100ms linear;
+  background-position: -77px -58px;
+  pointer: move;
+  cursor: move;
+}
index 367bd4fa566ddb6a8f8435618e60c6b771b98559..72c3255eb49869e1e64094004d432fa4fc514622 100644 (file)
   display: none;
 }
 
-.olControlZoom {
+.leaflet-control {
   display: none;
 }
 
-.olControlSimplePanZoom {
-  display: none;
-}
-
-.SimpleLayerSwitcher {
-  display: none;
-}
-
-.olControlScaleLine {
-  display: none !important;
-}
-
-.olControlAttribution {
-  display: none !important;
-}
-
 #map {
   border: 1px solid black;
   margin: auto !important;
index ba9e59d968a70fc2f5bcd1699def1cf2836b2672..e690924b57d927e5e77ea19778bb3a6041ebf2fb 100644 (file)
@@ -95,14 +95,12 @@ h1 {
   border: 0;
 }
 
-.olControlSimplePanZoom {
+.leaflet-control-pan, .leaflet-control-zoomslider {
   display: none;
 }
 
-.site-index #map .olControlZoom,
-.site-index #map .SimpleLayerSwitcher,
-.site-export #map .olControlZoom,
-.site-export #map .SimpleLayerSwitcher {
+.site-index .leaflet-top,
+.site-export .leaflet-top {
   top: 8px !important;
 }
 
index 2102a5704f4b29560387f2a4a2c2e5c84639a4fb..074a92ce82635a50e1bbc5ac5eb8ed960de7d347 100644 (file)
@@ -3,6 +3,8 @@ class ExportController < ApplicationController
   before_filter :authorize_web
   before_filter :set_locale
 
+  caches_page :embed
+
   def start
   end
 
@@ -23,4 +25,7 @@ class ExportController < ApplicationController
       redirect_to "http://parent.tile.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}"
     end
   end
+
+  def embed
+  end
 end
index 3777d710a3c04fdad917db673ed06374a23eee28..b0315dad99ba6155b14fa7cfe2be35581065806e 100644 (file)
@@ -1,11 +1,9 @@
 <div>
   <div style="text-align: center">
     <p style="margin-top: 10px; margin-bottom: 20px">
-      <a id="browse_select_view" href="#"><%= t'browse.start.view_data' %></a>
+      <a id="browse_filter_toggle" href="#"><%= t'browse.start_rjs.manually_select' %></a>
       <br />
-      <a id="browse_select_box" href="#"><%= t'browse.start.manually_select' %></a>  
-      <br />
-      <a id="browse_hide_areas_box" href="#"><%= t'browse.start.hide_areas' %></a>  
+      <a id="browse_hide_areas_box" href="#"><%= t'browse.start_rjs.hide_areas' %></a>
     </p>
   </div>
   <div id="browse_status" style="text-align: center; display: none">
diff --git a/app/views/export/embed.html.erb b/app/views/export/embed.html.erb
new file mode 100644 (file)
index 0000000..b683c26
--- /dev/null
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="utf-8">
+    <title>OpenStreetMap Embedded</title>
+    <%= stylesheet_link_tag "embed", :media=> "screen" %>
+    <!--[if IE]>
+    <%= stylesheet_link_tag "leaflet.ie", :media=> "screen" %>
+    <![endif]-->
+    <%= javascript_include_tag "embed" %>
+  </head>
+  <body>
+    <div id="map"></div>
+  </body>
+</html>
index 88ad3eb392735684341bd5418656f1f7c76a54ce..19bed2bd3f7640eacc5ac3cc11e3197d0c4c9c4d 100644 (file)
@@ -5,7 +5,11 @@
   <%= 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-all", :media => "screen, print" %>
+  <!--[if IE]>
+    <%= stylesheet_link_tag "leaflet.ie" %>
+    <%= stylesheet_link_tag "large-#{dir}", :media => "screen" %>
+  <![endif]-->
   <%= 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 82ca579d9fc9ac5aaa7958c9b91ebc45f48e8dd4..1a28c21bd925e558e9a7125fb92e70c84662b25d 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 114f9b90af67ba6673f9cc36b7e7c953d84b0865..a8fce11cadffdfb9bf23b7888fa0d430f90e6df8 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"})
       }
     %>
index 56e8f08e99ac7ca71b38af765d8e454bc142de9e..c0854d3a4661276245529fa7fe3a8104e536be6c 100644 (file)
@@ -61,6 +61,8 @@ OpenStreetMap::Application.configure do
   config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css )
   config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css )
   config.assets.precompile += %w( browse.css theme/openstreetmap/style.css )
+  config.assets.precompile += %w( leaflet-all.css leaflet.ie.css )
+  config.assets.precompile += %w( embed.js embed.css )
 
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
index 1f5a741b7af85777cd8ced4c794f4b3c809359f8..0c21b90275d5ee383ef30a90d46517115b500172 100644 (file)
@@ -219,14 +219,11 @@ en:
       relation_title: "Relation: %{relation_name}"
       download_xml: "Download XML"
       view_history: "View history"
-    start:
-      view_data: "View data for current map view"
-      manually_select: "Manually select a different area"
     start_rjs:
       data_layer_name: "Browse Map Data"
       data_frame_title: "Data"
       zoom_or_select: "Zoom in or select an area of the map to view"
-      drag_a_box: "Drag a box on the map to select an area"
+      view_data: "View data for current map view"
       manually_select: "Manually select a different area"
       hide_areas: "Hide areas"
       show_areas: "Show areas"
index 9725c0d1256707a7fd651fc505a30944b579efd9..1cdaaea4068ec15ef2ca584c94c810f60c86634f 100644 (file)
@@ -203,6 +203,7 @@ OpenStreetMap::Application.routes.draw do
   # export
   match '/export/start' => 'export#start', :via => :get
   match '/export/finish' => 'export#finish', :via => :post
+  match '/export/embed' => 'export#embed', :via => :get
 
   # messages
   match '/user/:display_name/inbox' => 'message#inbox', :via => :get, :as => "inbox"
diff --git a/public/export/embed.html b/public/export/embed.html
deleted file mode 100644 (file)
index c0036b6..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta charset="utf-8">
-    <title>OpenStreetMap Embedded</title>
-    <style type="text/css">
-        html {
-            width: 100%;
-            height: 100%;
-       }
-        body {
-            width: 100%;
-            height: 100%;
-            margin: 0px;
-        }
-        #map {
-            width: 100%;
-            height: 100%;
-        }
-        .olControlAttribution {
-            bottom: 3px!important;
-        }
-    </style>
-    <script src="/openlayers/OpenLayers.js" type="text/javascript"></script>
-    <script src="/openlayers/OpenStreetMap.js" type="text/javascript"></script>
-    <script type="text/javascript">
-    <!--
-        var map, layer;
-        function init(){
-            map = new OpenLayers.Map ("map", {
-              controls: [
-                  new OpenLayers.Control.Attribution(),
-                  new OpenLayers.Control.Navigation()
-              ],
-              numZoomLevels: 20,
-              displayProjection: new OpenLayers.Projection("EPSG:4326")
-            });
-
-            var attribution = '© <a target="_parent" href="http://www.openstreetmap.org">OpenStreetMap</a> and contributors, under an <a target="_parent" href="http://www.openstreetmap.org/copyright">open license</a>';
-            var args = OpenLayers.Util.getParameters();
-            if (!args.layer || args.layer == "mapnik" || args.layer == "osmarender") {
-                var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", {
-                   wrapDateLine: true,
-                   attribution: attribution
-                });
-                map.addLayer(mapnik);
-            } else if (args.layer == "cyclemap" || args.layer == "cycle map") {
-                var cyclemap = new OpenLayers.Layer.OSM.CycleMap("Cycle Map", {
-                   wrapDateLine: true,
-                   attribution: attribution
-                });
-                map.addLayer(cyclemap);
-            } else if (args.layer == "transportmap") {
-                var transportmap = new OpenLayers.Layer.OSM.TransportMap("Transport Map", {
-                   wrapDateLine: true,
-                   attribution: attribution
-                });
-                map.addLayer(transportmap);
-            } else if (args.layer == "mapquest") {
-                var mapquestmap = new OpenLayers.Layer.OSM("MapQuest Open Map", [
-                    "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"], {
-                   wrapDateLine: true,
-                   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'>"
-                });
-                map.addLayer(mapquestmap);
-            }
-
-            if (args.marker) {
-                var markers = new OpenLayers.Layer.Markers();
-                map.addLayer(markers);
-                markers.addMarker(new OpenLayers.Marker(new OpenLayers.LonLat(args.marker[1], args.marker[0]).transform(map.displayProjection, map.getProjectionObject())));
-                map.marker = true;
-            }
-
-            if (args.bbox) {
-                var bounds = OpenLayers.Bounds.fromArray(args.bbox).transform(map.displayProjection, map.getProjectionObject());
-                map.zoomToExtent(bounds)
-            } else {
-                map.zoomToMaxExtent();
-            }
-
-            var size = map.getSize();
-            if (size.h > 320) {
-                map.addControl(new OpenLayers.Control.PanZoomBar());
-            } else {
-                map.addControl(new OpenLayers.Control.Zoom());
-            }
-        }
-    // -->
-    </script>
-  </head>
-
-  <body onload="init()">
-    <div id="map"></div>
-  </body>
-</html>
index af9d2818392d364772ba096e30273be58f1531fe..61a307643414f212a506c188038d72fce6f37c07 100644 (file)
@@ -13,6 +13,10 @@ class ExportControllerTest < ActionController::TestCase
       { :path => "/export/finish", :method => :post },
       { :controller => "export", :action => "finish" }
     )
+    assert_routing(
+      { :path => "/export/embed", :method => :get },
+      { :controller => "export", :action => "embed" }
+    )
   end
 
   def test_start
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/img/filter-icon.png b/vendor/assets/leaflet/img/filter-icon.png
new file mode 100644 (file)
index 0000000..981d82a
Binary files /dev/null and b/vendor/assets/leaflet/img/filter-icon.png differ
diff --git a/vendor/assets/leaflet/img/move-handle.png b/vendor/assets/leaflet/img/move-handle.png
new file mode 100644 (file)
index 0000000..d6b557a
Binary files /dev/null and b/vendor/assets/leaflet/img/move-handle.png differ
diff --git a/vendor/assets/leaflet/img/resize-handle.png b/vendor/assets/leaflet/img/resize-handle.png
new file mode 100644 (file)
index 0000000..6caa604
Binary files /dev/null and b/vendor/assets/leaflet/img/resize-handle.png differ
diff --git a/vendor/assets/leaflet/leaflet.css b/vendor/assets/leaflet/leaflet.css
new file mode 100644 (file)
index 0000000..938a1be
--- /dev/null
@@ -0,0 +1,401 @@
+/* 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 {\r
+       position: absolute;\r
+       left: 0;\r
+       }\r
+.leaflet-container {\r
+       overflow: hidden;\r
+       -ms-touch-action: none;\r
+       }\r
+.leaflet-tile,\r
+.leaflet-marker-icon,\r
+.leaflet-marker-shadow {\r
+       -webkit-user-select: none;\r
+          -moz-user-select: none;\r
+               user-select: none;\r
+       }\r
+.leaflet-marker-icon,\r
+.leaflet-marker-shadow {\r
+       display: block;\r
+       }\r
+/* map is broken in FF if you have max-width: 100% on tiles */\r
+.leaflet-container img {\r
+       max-width: none !important;\r
+       }\r
+/* stupid Android 2 doesn't understand "max-width: none" properly */\r
+.leaflet-container img.leaflet-image-layer {\r
+       max-width: 15000px !important;\r
+       }\r
+.leaflet-tile {\r
+       filter: inherit;\r
+       visibility: hidden;\r
+       }\r
+.leaflet-tile-loaded {\r
+       visibility: inherit;\r
+       }\r
+.leaflet-zoom-box {\r
+       width: 0;\r
+       height: 0;\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
+\r
+/* control positioning */\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
+\r
+/* zoom and fade animations */\r
+\r
+.leaflet-fade-anim .leaflet-tile,\r
+.leaflet-fade-anim .leaflet-popup {\r
+       opacity: 0;\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,\r
+.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,0,0.25,1);\r
+          -moz-transition:    -moz-transform 0.25s cubic-bezier(0,0,0.25,1);\r
+            -o-transition:      -o-transform 0.25s cubic-bezier(0,0,0.25,1);\r
+               transition:         transform 0.25s cubic-bezier(0,0,0.25,1);\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
+/* cursors */\r
+\r
+.leaflet-clickable {\r
+       cursor: pointer;\r
+       }\r
+.leaflet-container {\r
+       cursor: -webkit-grab;\r
+       cursor:    -moz-grab;\r
+       }\r
+.leaflet-popup-pane,\r
+.leaflet-control {\r
+       cursor: auto;\r
+       }\r
+.leaflet-dragging,\r
+.leaflet-dragging .leaflet-clickable,\r
+.leaflet-dragging .leaflet-container {\r
+       cursor: move;\r
+       cursor: -webkit-grabbing;\r
+       cursor:    -moz-grabbing;\r
+       }\r
+\r
+\r
+/* visual tweaks */\r
+\r
+.leaflet-container {\r
+       background: #ddd;\r
+       outline: 0;\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
+\r
+\r
+/* general typography */\r
+.leaflet-container {\r
+       font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;\r
+}\r
+\r
+\r
+/* zoom control */\r
+\r
+.leaflet-control-zoom {\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
+       width: 19px;\r
+       height: 19px;\r
+       background-color: rgba(255, 255, 255, 0.75);\r
+       -webkit-border-radius: 4px;\r
+               border-radius: 4px;\r
+       }\r
+.leaflet-control-zoom a,\r
+.leaflet-control-layers-toggle {\r
+       background-position: 50% 50%;\r
+       background-repeat: no-repeat;\r
+       display: block;\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
+\r
+/* layers control */\r
+\r
+.leaflet-control-layers {\r
+       box-shadow: 0 1px 7px #999;\r
+       background: #f8f8f9;\r
+       -webkit-border-radius: 8px;\r
+               border-radius: 8px;\r
+       }\r
+.leaflet-control-layers-toggle {\r
+       background-image: url(images/layers.png);\r
+       width: 36px;\r
+       height: 36px;\r
+       }\r
+.leaflet-touch .leaflet-control-layers-toggle {\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
+       color: #333;\r
+       background: #fff;\r
+       }\r
+.leaflet-control-layers-selector {\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
+\r
+/* attribution and scale controls */\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
+.leaflet-control-attribution,\r
+.leaflet-control-scale-line {\r
+       padding: 0 5px;\r
+       color: #333;\r
+       }\r
+.leaflet-container .leaflet-control-attribution,\r
+.leaflet-container .leaflet-control-scale {\r
+       font-size: 11px;\r
+       }\r
+.leaflet-left .leaflet-control-scale {\r
+       margin-left: 5px;\r
+       }\r
+.leaflet-bottom .leaflet-control-scale {\r
+       margin-bottom: 5px;\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
+/* popup */\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
+       -webkit-border-radius: 20px;\r
+               border-radius: 20px;\r
+       }\r
+.leaflet-popup-content {\r
+       margin: 14px 20px;\r
+       line-height: 1.4;\r
+       }\r
+.leaflet-popup-content p {\r
+       margin: 18px 0;\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
+       -webkit-transform: rotate(45deg);\r
+          -moz-transform: rotate(45deg);\r
+           -ms-transform: rotate(45deg);\r
+            -o-transform: rotate(45deg);\r
+               transform: rotate(45deg);\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-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-scrolled {\r
+       overflow: auto;\r
+       border-bottom: 1px solid #ddd;\r
+       border-top: 1px solid #ddd;\r
+       }\r
+\r
+\r
+/* div icon */\r
+\r
+.leaflet-div-icon {\r
+       background: #fff;\r
+       border: 1px solid #666;\r
+       }\r
+.leaflet-editing-icon {\r
+       -webkit-border-radius: 2px;\r
+               border-radius: 2px;\r
+       }\r
diff --git a/vendor/assets/leaflet/leaflet.ie.css b/vendor/assets/leaflet/leaflet.ie.css
new file mode 100644 (file)
index 0000000..5b65c40
--- /dev/null
@@ -0,0 +1,47 @@
+.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
+       }\r
+.leaflet-zoom-box {\r
+       filter: alpha(opacity=50);\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..5503592
--- /dev/null
@@ -0,0 +1,8008 @@
+/*
+ Copyright (c) 2010-2012, CloudMade, Vladimir Agafonkin
+ Leaflet is an open-source JavaScript library for mobile-friendly interactive maps.
+ http://leafletjs.com
+*/
+(function (window, undefined) {
+
+var L, originalL;
+
+if (typeof exports !== undefined + '') {
+       L = exports;
+} else {
+       originalL = window.L;
+       L = {};
+
+       L.noConflict = function () {
+               window.L = originalL;
+               return this;
+       };
+
+       window.L = L;
+}
+
+L.version = '0.4.4';
+
+
+/*
+ * L.Util is a namespace for various utility functions.
+ */
+
+L.Util = {
+       extend: function (dest) { // (Object[, Object, ...]) ->
+               var sources = Array.prototype.slice.call(arguments, 1),
+                   i, j, len, src;
+
+               for (j = 0, len = sources.length; j < len; j++) {
+                       src = sources[j] || {};
+                       for (i in src) {
+                               if (src.hasOwnProperty(i)) {
+                                       dest[i] = src[i];
+                               }
+                       }
+               }
+               return dest;
+       },
+
+       bind: function (fn, obj) { // (Function, Object) -> Function
+               var args = arguments.length > 2 ? Array.prototype.slice.call(arguments, 2) : null;
+               return function () {
+                       return fn.apply(obj, args || arguments);
+               };
+       },
+
+       stamp: (function () {
+               var lastId = 0, key = '_leaflet_id';
+               return function (/*Object*/ obj) {
+                       obj[key] = obj[key] || ++lastId;
+                       return obj[key];
+               };
+       }()),
+
+       limitExecByInterval: function (fn, time, context) {
+               var lock, execOnUnlock;
+
+               return function wrapperFn() {
+                       var args = arguments;
+
+                       if (lock) {
+                               execOnUnlock = true;
+                               return;
+                       }
+
+                       lock = true;
+
+                       setTimeout(function () {
+                               lock = false;
+
+                               if (execOnUnlock) {
+                                       wrapperFn.apply(context, args);
+                                       execOnUnlock = false;
+                               }
+                       }, time);
+
+                       fn.apply(context, args);
+               };
+       },
+
+       falseFn: function () {
+               return false;
+       },
+
+       formatNum: function (num, digits) {
+               var pow = Math.pow(10, digits || 5);
+               return Math.round(num * pow) / pow;
+       },
+
+       splitWords: function (str) {
+               return str.replace(/^\s+|\s+$/g, '').split(/\s+/);
+       },
+
+       setOptions: function (obj, options) {
+               obj.options = L.extend({}, obj.options, options);
+               return obj.options;
+       },
+
+       getParamString: function (obj) {
+               var params = [];
+               for (var i in obj) {
+                       if (obj.hasOwnProperty(i)) {
+                               params.push(i + '=' + obj[i]);
+                       }
+               }
+               return '?' + params.join('&');
+       },
+
+       template: function (str, data) {
+               return str.replace(/\{ *([\w_]+) *\}/g, function (str, key) {
+                       var value = data[key];
+                       if (!data.hasOwnProperty(key)) {
+                               throw new Error('No value provided for variable ' + str);
+                       }
+                       return value;
+               });
+       },
+
+       emptyImageUrl: 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs='
+};
+
+(function () {
+
+       // inspired by http://paulirish.com/2011/requestanimationframe-for-smart-animating/
+
+       function getPrefixed(name) {
+               var i, fn,
+                   prefixes = ['webkit', 'moz', 'o', 'ms'];
+
+               for (i = 0; i < prefixes.length && !fn; i++) {
+                       fn = window[prefixes[i] + name];
+               }
+
+               return fn;
+       }
+
+       var lastTime = 0;
+
+       function timeoutDefer(fn) {
+               var time = +new Date(),
+                   timeToCall = Math.max(0, 16 - (time - lastTime));
+
+               lastTime = time + timeToCall;
+               return window.setTimeout(fn, timeToCall);
+       }
+
+       var requestFn = window.requestAnimationFrame ||
+               getPrefixed('RequestAnimationFrame') || timeoutDefer;
+
+       var cancelFn = window.cancelAnimationFrame ||
+               getPrefixed('CancelAnimationFrame') ||
+               getPrefixed('CancelRequestAnimationFrame') ||
+               function (id) { window.clearTimeout(id); };
+
+
+       L.Util.requestAnimFrame = function (fn, context, immediate, element) {
+               fn = L.bind(fn, context);
+
+               if (immediate && requestFn === timeoutDefer) {
+                       fn();
+               } else {
+                       return requestFn.call(window, fn, element);
+               }
+       };
+
+       L.Util.cancelAnimFrame = function (id) {
+               if (id) {
+                       cancelFn.call(window, id);
+               }
+       };
+
+}());
+
+// shortcuts for most used utility functions
+L.extend = L.Util.extend;
+L.bind = L.Util.bind;
+L.stamp = L.Util.stamp;
+L.setOptions = L.Util.setOptions;
+
+
+/*
+ * Class powers the OOP facilities of the library. Thanks to John Resig and Dean Edwards for inspiration!
+ */
+
+L.Class = function () {};
+
+L.Class.extend = function (/*Object*/ props) /*-> Class*/ {
+
+       // extended class with the new prototype
+       var NewClass = function () {
+               if (this.initialize) {
+                       this.initialize.apply(this, arguments);
+               }
+       };
+
+       // instantiate class without calling constructor
+       var F = function () {};
+       F.prototype = this.prototype;
+
+       var proto = new F();
+       proto.constructor = NewClass;
+
+       NewClass.prototype = proto;
+
+       //inherit parent's statics
+       for (var i in this) {
+               if (this.hasOwnProperty(i) && i !== 'prototype') {
+                       NewClass[i] = this[i];
+               }
+       }
+
+       // mix static properties into the class
+       if (props.statics) {
+               L.extend(NewClass, props.statics);
+               delete props.statics;
+       }
+
+       // mix includes into the prototype
+       if (props.includes) {
+               L.Util.extend.apply(null, [proto].concat(props.includes));
+               delete props.includes;
+       }
+
+       // merge options
+       if (props.options && proto.options) {
+               props.options = L.extend({}, proto.options, props.options);
+       }
+
+       // mix given properties into the prototype
+       L.extend(proto, props);
+
+       return NewClass;
+};
+
+
+// method for adding properties to prototype
+L.Class.include = function (props) {
+       L.extend(this.prototype, props);
+};
+
+L.Class.mergeOptions = function (options) {
+       L.extend(this.prototype.options, options);
+};
+
+
+/*
+ * L.Mixin.Events adds custom events functionality to Leaflet classes
+ */
+
+var key = '_leaflet_events';
+
+L.Mixin = {};
+
+L.Mixin.Events = {
+
+       addEventListener: function (types, fn, context) { // (String, Function[, Object]) or (Object[, Object])
+               var events = this[key] = this[key] || {},
+                       type, i, len;
+
+               // Types can be a map of types/handlers
+               if (typeof types === 'object') {
+                       for (type in types) {
+                               if (types.hasOwnProperty(type)) {
+                                       this.addEventListener(type, types[type], fn);
+                               }
+                       }
+
+                       return this;
+               }
+
+               types = L.Util.splitWords(types);
+
+               for (i = 0, len = types.length; i < len; i++) {
+                       events[types[i]] = events[types[i]] || [];
+                       events[types[i]].push({
+                               action: fn,
+                               context: context || this
+                       });
+               }
+
+               return this;
+       },
+
+       hasEventListeners: function (type) { // (String) -> Boolean
+               return (key in this) && (type in this[key]) && (this[key][type].length > 0);
+       },
+
+       removeEventListener: function (types, fn, context) { // (String[, Function, Object]) or (Object[, Object])
+               var events = this[key],
+                       type, i, len, listeners, j;
+
+               if (typeof types === 'object') {
+                       for (type in types) {
+                               if (types.hasOwnProperty(type)) {
+                                       this.removeEventListener(type, types[type], fn);
+                               }
+                       }
+
+                       return this;
+               }
+
+               types = L.Util.splitWords(types);
+
+               for (i = 0, len = types.length; i < len; i++) {
+
+                       if (this.hasEventListeners(types[i])) {
+                               listeners = events[types[i]];
+
+                               for (j = listeners.length - 1; j >= 0; j--) {
+                                       if (
+                                               (!fn || listeners[j].action === fn) &&
+                                               (!context || (listeners[j].context === context))
+                                       ) {
+                                               listeners.splice(j, 1);
+                                       }
+                               }
+                       }
+               }
+
+               return this;
+       },
+
+       fireEvent: function (type, data) { // (String[, Object])
+               if (!this.hasEventListeners(type)) {
+                       return this;
+               }
+
+               var event = L.extend({
+                       type: type,
+                       target: this
+               }, data);
+
+               var listeners = this[key][type].slice();
+
+               for (var i = 0, len = listeners.length; i < len; i++) {
+                       listeners[i].action.call(listeners[i].context || this, event);
+               }
+
+               return this;
+       }
+};
+
+L.Mixin.Events.on = L.Mixin.Events.addEventListener;
+L.Mixin.Events.off = L.Mixin.Events.removeEventListener;
+L.Mixin.Events.fire = L.Mixin.Events.fireEvent;
+
+
+(function () {
+
+       var ie = !!window.ActiveXObject,
+           // http://tanalin.com/en/articles/ie-version-js/
+           ie6 = ie && !window.XMLHttpRequest,
+           ie7 = ie && !document.querySelector,
+
+           // terrible browser detection to work around Safari / iOS / Android browser bugs
+           // see TileLayer._addTile and debug/hacks/jitter.html
+
+           ua = navigator.userAgent.toLowerCase(),
+           webkit = ua.indexOf("webkit") !== -1,
+           chrome = ua.indexOf("chrome") !== -1,
+           android = ua.indexOf("android") !== -1,
+           android23 = ua.search("android [23]") !== -1,
+
+           mobile = typeof orientation !== undefined + '',
+           msTouch = (window.navigator && window.navigator.msPointerEnabled && window.navigator.msMaxTouchPoints),
+           retina = (('devicePixelRatio' in window && window.devicePixelRatio > 1) ||
+                     ('matchMedia' in window && window.matchMedia("(min-resolution:144dpi)").matches)),
+
+           doc = document.documentElement,
+           ie3d = ie && ('transition' in doc.style),
+           webkit3d = ('WebKitCSSMatrix' in window) && ('m11' in new window.WebKitCSSMatrix()),
+           gecko3d = 'MozPerspective' in doc.style,
+           opera3d = 'OTransition' in doc.style,
+           any3d = !window.L_DISABLE_3D && (ie3d || webkit3d || gecko3d || opera3d);
+
+
+       var touch = !window.L_NO_TOUCH && (function () {
+
+               var startName = 'ontouchstart';
+
+               // IE10+ (We simulate these into touch* events in L.DomEvent and L.DomEvent.MsTouch) or WebKit, etc.
+               if (msTouch || (startName in doc)) {
+                       return true;
+               }
+
+               // Firefox/Gecko
+               var div = document.createElement('div'),
+                   supported = false;
+
+               if (!div.setAttribute) {
+                       return false;
+               }
+               div.setAttribute(startName, 'return;');
+
+               if (typeof div[startName] === 'function') {
+                       supported = true;
+               }
+
+               div.removeAttribute(startName);
+               div = null;
+
+               return supported;
+       }());
+
+
+       L.Browser = {
+               ie6: ie6,
+               ie7: ie7,
+               webkit: webkit,
+
+               android: android,
+               android23: android23,
+
+               chrome: chrome,
+
+               ie3d: ie3d,
+               webkit3d: webkit3d,
+               gecko3d: gecko3d,
+               opera3d: opera3d,
+               any3d: any3d,
+
+               mobile: mobile,
+               mobileWebkit: mobile && webkit,
+               mobileWebkit3d: mobile && webkit3d,
+               mobileOpera: mobile && window.opera,
+
+               touch: touch,
+               msTouch: msTouch,
+
+               retina: retina
+       };
+
+}());
+
+
+/*
+ * L.Point represents a point with x and y coordinates.
+ */
+
+L.Point = function (/*Number*/ x, /*Number*/ y, /*Boolean*/ round) {
+       this.x = (round ? Math.round(x) : x);
+       this.y = (round ? Math.round(y) : y);
+};
+
+L.Point.prototype = {
+
+       clone: function () {
+               return new L.Point(this.x, this.y);
+       },
+
+       // non-destructive, returns a new point
+       add: function (point) {
+               return this.clone()._add(L.point(point));
+       },
+
+       // destructive, used directly for performance in situations where it's safe to modify existing point
+       _add: function (point) {
+               this.x += point.x;
+               this.y += point.y;
+               return this;
+       },
+
+       subtract: function (point) {
+               return this.clone()._subtract(L.point(point));
+       },
+
+       _subtract: function (point) {
+               this.x -= point.x;
+               this.y -= point.y;
+               return this;
+       },
+
+       divideBy: function (num) {
+               return this.clone()._divideBy(num);
+       },
+
+       _divideBy: function (num) {
+               this.x /= num;
+               this.y /= num;
+               return this;
+       },
+
+       multiplyBy: function (num) {
+               return this.clone()._multiplyBy(num);
+       },
+
+       _multiplyBy: function (num) {
+               this.x *= num;
+               this.y *= num;
+               return this;
+       },
+
+       round: function () {
+               return this.clone()._round();
+       },
+
+       _round: function () {
+               this.x = Math.round(this.x);
+               this.y = Math.round(this.y);
+               return this;
+       },
+
+       floor: function () {
+               return this.clone()._floor();
+       },
+
+       _floor: function () {
+               this.x = Math.floor(this.x);
+               this.y = Math.floor(this.y);
+               return this;
+       },
+
+       distanceTo: function (point) {
+               point = L.point(point);
+
+               var x = point.x - this.x,
+                   y = point.y - this.y;
+
+               return Math.sqrt(x * x + y * y);
+       },
+
+       toString: function () {
+               return 'Point(' +
+                       L.Util.formatNum(this.x) + ', ' +
+                       L.Util.formatNum(this.y) + ')';
+       }
+};
+
+L.point = function (x, y, round) {
+       if (x instanceof L.Point) {
+               return x;
+       }
+       if (x instanceof Array) {
+               return new L.Point(x[0], x[1]);
+       }
+       if (isNaN(x)) {
+               return x;
+       }
+       return new L.Point(x, y, round);
+};
+
+
+/*
+ * L.Bounds represents a rectangular area on the screen in pixel coordinates.
+ */
+
+L.Bounds = L.Class.extend({
+
+       initialize: function (a, b) {   //(Point, Point) or Point[]
+               if (!a) { return; }
+
+               var points = b ? [a, b] : a;
+
+               for (var i = 0, len = points.length; i < len; i++) {
+                       this.extend(points[i]);
+               }
+       },
+
+       // extend the bounds to contain the given point
+       extend: function (point) { // (Point)
+               point = L.point(point);
+
+               if (!this.min && !this.max) {
+                       this.min = point.clone();
+                       this.max = point.clone();
+               } else {
+                       this.min.x = Math.min(point.x, this.min.x);
+                       this.max.x = Math.max(point.x, this.max.x);
+                       this.min.y = Math.min(point.y, this.min.y);
+                       this.max.y = Math.max(point.y, this.max.y);
+               }
+               return this;
+       },
+
+       getCenter: function (round) { // (Boolean) -> Point
+               return new L.Point(
+                       (this.min.x + this.max.x) / 2,
+                       (this.min.y + this.max.y) / 2, round);
+       },
+
+       getBottomLeft: function () { // -> Point
+               return new L.Point(this.min.x, this.max.y);
+       },
+
+       getTopRight: function () { // -> Point
+               return new L.Point(this.max.x, this.min.y);
+       },
+
+       contains: function (obj) { // (Bounds) or (Point) -> Boolean
+               var min, max;
+
+               if (typeof obj[0] === 'number' || obj instanceof L.Point) {
+                       obj = L.point(obj);
+               } else {
+                       obj = L.bounds(obj);
+               }
+
+               if (obj instanceof L.Bounds) {
+                       min = obj.min;
+                       max = obj.max;
+               } else {
+                       min = max = obj;
+               }
+
+               return (min.x >= this.min.x) &&
+                      (max.x <= this.max.x) &&
+                      (min.y >= this.min.y) &&
+                      (max.y <= this.max.y);
+       },
+
+       intersects: function (bounds) { // (Bounds) -> Boolean
+               bounds = L.bounds(bounds);
+
+               var min = this.min,
+                   max = this.max,
+                   min2 = bounds.min,
+                   max2 = bounds.max,
+                   xIntersects = (max2.x >= min.x) && (min2.x <= max.x),
+                   yIntersects = (max2.y >= min.y) && (min2.y <= max.y);
+
+               return xIntersects && yIntersects;
+       },
+
+       isValid: function () {
+               return !!(this.min && this.max);
+       }
+});
+
+L.bounds = function (a, b) { // (Bounds) or (Point, Point) or (Point[])
+       if (!a || a instanceof L.Bounds) {
+               return a;
+       }
+       return new L.Bounds(a, b);
+};
+
+
+/*
+ * L.Transformation is an utility class to perform simple point transformations through a 2d-matrix.
+ */
+
+L.Transformation = L.Class.extend({
+       initialize: function (/*Number*/ a, /*Number*/ b, /*Number*/ c, /*Number*/ d) {
+               this._a = a;
+               this._b = b;
+               this._c = c;
+               this._d = d;
+       },
+
+       transform: function (point, scale) {
+               return this._transform(point.clone(), scale);
+       },
+
+       // destructive transform (faster)
+       _transform: function (/*Point*/ point, /*Number*/ scale) /*-> Point*/ {
+               scale = scale || 1;
+               point.x = scale * (this._a * point.x + this._b);
+               point.y = scale * (this._c * point.y + this._d);
+               return point;
+       },
+
+       untransform: function (/*Point*/ point, /*Number*/ scale) /*-> Point*/ {
+               scale = scale || 1;
+               return new L.Point(
+                       (point.x / scale - this._b) / this._a,
+                       (point.y / scale - this._d) / this._c);
+       }
+});
+
+
+/*
+ * L.DomUtil contains various utility functions for working with DOM.
+ */
+
+L.DomUtil = {
+       get: function (id) {
+               return (typeof id === 'string' ? document.getElementById(id) : id);
+       },
+
+       getStyle: function (el, style) {
+
+               var value = el.style[style];
+
+               if (!value && el.currentStyle) {
+                       value = el.currentStyle[style];
+               }
+
+               if ((!value || value === 'auto') && document.defaultView) {
+                       var css = document.defaultView.getComputedStyle(el, null);
+                       value = css ? css[style] : null;
+               }
+
+               return value === 'auto' ? null : value;
+       },
+
+       getViewportOffset: function (element) {
+
+               var top = 0,
+                   left = 0,
+                   el = element,
+                   docBody = document.body,
+                   pos,
+                   ie7 = L.Browser.ie7;
+
+               do {
+                       top  += el.offsetTop  || 0;
+                       left += el.offsetLeft || 0;
+                       pos = L.DomUtil.getStyle(el, 'position');
+
+                       if (el.offsetParent === docBody && pos === 'absolute') { break; }
+
+                       if (pos === 'fixed') {
+                               top  += docBody.scrollTop  || 0;
+                               left += docBody.scrollLeft || 0;
+                               break;
+                       }
+                       el = el.offsetParent;
+
+               } while (el);
+
+               el = element;
+
+               do {
+                       if (el === docBody) { break; }
+
+                       top  -= el.scrollTop  || 0;
+                       left -= el.scrollLeft || 0;
+
+                       // webkit (and ie <= 7) handles RTL scrollLeft different to everyone else
+                       // https://code.google.com/p/closure-library/source/browse/trunk/closure/goog/style/bidi.js
+                       if (!L.DomUtil.documentIsLtr() && (L.Browser.webkit || ie7)) {
+                               left += el.scrollWidth - el.clientWidth;
+
+                               // ie7 shows the scrollbar by default and provides clientWidth counting it, so we
+                               // need to add it back in if it is visible; scrollbar is on the left as we are RTL
+                               if (ie7 && L.DomUtil.getStyle(el, 'overflow-y') !== 'hidden' &&
+                                          L.DomUtil.getStyle(el, 'overflow') !== 'hidden') {
+                                       left += 17;
+                               }
+                       }
+
+                       el = el.parentNode;
+               } while (el);
+
+               return new L.Point(left, top);
+       },
+
+       documentIsLtr: function () {
+               if (!L.DomUtil._docIsLtrCached) {
+                       L.DomUtil._docIsLtrCached = true;
+                       L.DomUtil._docIsLtr = L.DomUtil.getStyle(document.body, 'direction') === "ltr";
+               }
+               return L.DomUtil._docIsLtr;
+       },
+
+       create: function (tagName, className, container) {
+
+               var el = document.createElement(tagName);
+               el.className = className;
+
+               if (container) {
+                       container.appendChild(el);
+               }
+
+               return el;
+       },
+
+       disableTextSelection: function () {
+               if (document.selection && document.selection.empty) {
+                       document.selection.empty();
+               }
+               if (!this._onselectstart) {
+                       this._onselectstart = document.onselectstart;
+                       document.onselectstart = L.Util.falseFn;
+               }
+       },
+
+       enableTextSelection: function () {
+               if (document.onselectstart === L.Util.falseFn) {
+                       document.onselectstart = this._onselectstart;
+                       this._onselectstart = null;
+               }
+       },
+
+       hasClass: function (el, name) {
+               return (el.className.length > 0) &&
+                       new RegExp("(^|\\s)" + name + "(\\s|$)").test(el.className);
+       },
+
+       addClass: function (el, name) {
+               if (!L.DomUtil.hasClass(el, name)) {
+                       el.className += (el.className ? ' ' : '') + name;
+               }
+       },
+
+       removeClass: function (el, name) {
+
+               function replaceFn(w, match) {
+                       if (match === name) { return ''; }
+                       return w;
+               }
+
+               el.className = el.className
+                       .replace(/(\S+)\s*/g, replaceFn)
+                       .replace(/(^\s+|\s+$)/, '');
+       },
+
+       setOpacity: function (el, value) {
+
+               if ('opacity' in el.style) {
+                       el.style.opacity = value;
+
+               } else if ('filter' in el.style) {
+
+                       var filter = false,
+                           filterName = 'DXImageTransform.Microsoft.Alpha';
+
+                       // filters collection throws an error if we try to retrieve a filter that doesn't exist
+                       try { filter = el.filters.item(filterName); } catch (e) {}
+
+                       value = Math.round(value * 100);
+
+                       if (filter) {
+                               filter.Enabled = (value !== 100);
+                               filter.Opacity = value;
+                       } else {
+                               el.style.filter += ' progid:' + filterName + '(opacity=' + value + ')';
+                       }
+               }
+       },
+
+       testProp: function (props) {
+
+               var style = document.documentElement.style;
+
+               for (var i = 0; i < props.length; i++) {
+                       if (props[i] in style) {
+                               return props[i];
+                       }
+               }
+               return false;
+       },
+
+       getTranslateString: function (point) {
+               // on WebKit browsers (Chrome/Safari/iOS Safari/Android) using translate3d instead of translate
+               // makes animation smoother as it ensures HW accel is used. Firefox 13 doesn't care
+               // (same speed either way), Opera 12 doesn't support translate3d
+
+               var is3d = L.Browser.webkit3d,
+                   open = 'translate' + (is3d ? '3d' : '') + '(',
+                   close = (is3d ? ',0' : '') + ')';
+
+               return open + point.x + 'px,' + point.y + 'px' + close;
+       },
+
+       getScaleString: function (scale, origin) {
+
+               var preTranslateStr = L.DomUtil.getTranslateString(origin.add(origin.multiplyBy(-1 * scale))),
+                   scaleStr = ' scale(' + scale + ') ';
+
+               return preTranslateStr + scaleStr;
+       },
+
+       setPosition: function (el, point, disable3D) { // (HTMLElement, Point[, Boolean])
+
+               el._leaflet_pos = point;
+
+               if (!disable3D && L.Browser.any3d) {
+                       el.style[L.DomUtil.TRANSFORM] =  L.DomUtil.getTranslateString(point);
+
+                       // workaround for Android 2/3 stability (https://github.com/CloudMade/Leaflet/issues/69)
+                       if (L.Browser.mobileWebkit3d) {
+                               el.style.WebkitBackfaceVisibility = 'hidden';
+                       }
+               } else {
+                       el.style.left = point.x + 'px';
+                       el.style.top = point.y + 'px';
+               }
+       },
+
+       getPosition: function (el) {
+               // this method is only used for elements previously positioned using setPosition,
+               // so it's safe to cache the position for performance
+               return el._leaflet_pos;
+       }
+};
+
+
+// prefix style property names
+
+L.DomUtil.TRANSFORM = L.DomUtil.testProp(
+        ['transform', 'WebkitTransform', 'OTransform', 'MozTransform', 'msTransform']);
+
+L.DomUtil.TRANSITION = L.DomUtil.testProp(
+        ['transition', 'webkitTransition', 'OTransition', 'MozTransition', 'msTransition']);
+
+L.DomUtil.TRANSITION_END =
+        L.DomUtil.TRANSITION === 'webkitTransition' || L.DomUtil.TRANSITION === 'OTransition' ?
+        L.DomUtil.TRANSITION + 'End' : 'transitionend';
+
+
+/*
+       CM.LatLng represents a geographical point with latitude and longtitude coordinates.
+*/
+
+L.LatLng = function (rawLat, rawLng, noWrap) { // (Number, Number[, Boolean])
+       var lat = parseFloat(rawLat),
+           lng = parseFloat(rawLng);
+
+       if (isNaN(lat) || isNaN(lng)) {
+               throw new Error('Invalid LatLng object: (' + rawLat + ', ' + rawLng + ')');
+       }
+
+       if (noWrap !== true) {
+               lat = Math.max(Math.min(lat, 90), -90);                                 // clamp latitude into -90..90
+               lng = (lng + 180) % 360 + ((lng < -180 || lng === 180) ? 180 : -180);   // wrap longtitude into -180..180
+       }
+
+       this.lat = lat;
+       this.lng = lng;
+};
+
+L.extend(L.LatLng, {
+       DEG_TO_RAD: Math.PI / 180,
+       RAD_TO_DEG: 180 / Math.PI,
+       MAX_MARGIN: 1.0E-9 // max margin of error for the "equals" check
+});
+
+L.LatLng.prototype = {
+       equals: function (obj) { // (LatLng) -> Boolean
+               if (!obj) { return false; }
+
+               obj = L.latLng(obj);
+
+               var margin = Math.max(Math.abs(this.lat - obj.lat), Math.abs(this.lng - obj.lng));
+               return margin <= L.LatLng.MAX_MARGIN;
+       },
+
+       toString: function (precision) { // -> String
+               return 'LatLng(' +
+                       L.Util.formatNum(this.lat, precision) + ', ' +
+                       L.Util.formatNum(this.lng, precision) + ')';
+       },
+
+       // Haversine distance formula, see http://en.wikipedia.org/wiki/Haversine_formula
+       distanceTo: function (other) { // (LatLng) -> Number
+               other = L.latLng(other);
+
+               var R = 6378137, // earth radius in meters
+                   d2r = L.LatLng.DEG_TO_RAD,
+                   dLat = (other.lat - this.lat) * d2r,
+                   dLon = (other.lng - this.lng) * d2r,
+                   lat1 = this.lat * d2r,
+                   lat2 = other.lat * d2r,
+                   sin1 = Math.sin(dLat / 2),
+                   sin2 = Math.sin(dLon / 2);
+
+               var a = sin1 * sin1 + sin2 * sin2 * Math.cos(lat1) * Math.cos(lat2);
+
+               return R * 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+       }
+};
+
+L.latLng = function (a, b, c) { // (LatLng) or ([Number, Number]) or (Number, Number, Boolean)
+       if (a instanceof L.LatLng) {
+               return a;
+       }
+       if (a instanceof Array) {
+               return new L.LatLng(a[0], a[1]);
+       }
+       if (isNaN(a)) {
+               return a;
+       }
+       return new L.LatLng(a, b, c);
+};
+
+
+
+/*
+ * L.LatLngBounds represents a rectangular area on the map in geographical coordinates.
+ */
+
+L.LatLngBounds = L.Class.extend({
+       initialize: function (southWest, northEast) {   // (LatLng, LatLng) or (LatLng[])
+               if (!southWest) { return; }
+
+               var latlngs = northEast ? [southWest, northEast] : southWest;
+
+               for (var i = 0, len = latlngs.length; i < len; i++) {
+                       this.extend(latlngs[i]);
+               }
+       },
+
+       // extend the bounds to contain the given point or bounds
+       extend: function (obj) { // (LatLng) or (LatLngBounds)
+               if (typeof obj[0] === 'number' || obj instanceof L.LatLng) {
+                       obj = L.latLng(obj);
+               } else {
+                       obj = L.latLngBounds(obj);
+               }
+
+               if (obj instanceof L.LatLng) {
+                       if (!this._southWest && !this._northEast) {
+                               this._southWest = new L.LatLng(obj.lat, obj.lng, true);
+                               this._northEast = new L.LatLng(obj.lat, obj.lng, true);
+                       } else {
+                               this._southWest.lat = Math.min(obj.lat, this._southWest.lat);
+                               this._southWest.lng = Math.min(obj.lng, this._southWest.lng);
+
+                               this._northEast.lat = Math.max(obj.lat, this._northEast.lat);
+                               this._northEast.lng = Math.max(obj.lng, this._northEast.lng);
+                       }
+               } else if (obj instanceof L.LatLngBounds) {
+                       this.extend(obj._southWest);
+                       this.extend(obj._northEast);
+               }
+               return this;
+       },
+
+       // extend the bounds by a percentage
+       pad: function (bufferRatio) { // (Number) -> LatLngBounds
+               var sw = this._southWest,
+                   ne = this._northEast,
+                   heightBuffer = Math.abs(sw.lat - ne.lat) * bufferRatio,
+                   widthBuffer = Math.abs(sw.lng - ne.lng) * bufferRatio;
+
+               return new L.LatLngBounds(
+                       new L.LatLng(sw.lat - heightBuffer, sw.lng - widthBuffer),
+                       new L.LatLng(ne.lat + heightBuffer, ne.lng + widthBuffer));
+       },
+
+       getCenter: function () { // -> LatLng
+               return new L.LatLng(
+                       (this._southWest.lat + this._northEast.lat) / 2,
+                       (this._southWest.lng + this._northEast.lng) / 2);
+       },
+
+       getSouthWest: function () {
+               return this._southWest;
+       },
+
+       getNorthEast: function () {
+               return this._northEast;
+       },
+
+       getNorthWest: function () {
+               return new L.LatLng(this._northEast.lat, this._southWest.lng, true);
+       },
+
+       getSouthEast: function () {
+               return new L.LatLng(this._southWest.lat, this._northEast.lng, true);
+       },
+
+       contains: function (obj) { // (LatLngBounds) or (LatLng) -> Boolean
+               if (typeof obj[0] === 'number' || obj instanceof L.LatLng) {
+                       obj = L.latLng(obj);
+               } else {
+                       obj = L.latLngBounds(obj);
+               }
+
+               var sw = this._southWest,
+                   ne = this._northEast,
+                   sw2, ne2;
+
+               if (obj instanceof L.LatLngBounds) {
+                       sw2 = obj.getSouthWest();
+                       ne2 = obj.getNorthEast();
+               } else {
+                       sw2 = ne2 = obj;
+               }
+
+               return (sw2.lat >= sw.lat) && (ne2.lat <= ne.lat) &&
+                      (sw2.lng >= sw.lng) && (ne2.lng <= ne.lng);
+       },
+
+       intersects: function (bounds) { // (LatLngBounds)
+               bounds = L.latLngBounds(bounds);
+
+               var sw = this._southWest,
+                   ne = this._northEast,
+                   sw2 = bounds.getSouthWest(),
+                   ne2 = bounds.getNorthEast(),
+
+                   latIntersects = (ne2.lat >= sw.lat) && (sw2.lat <= ne.lat),
+                   lngIntersects = (ne2.lng >= sw.lng) && (sw2.lng <= ne.lng);
+
+               return latIntersects && lngIntersects;
+       },
+
+       toBBoxString: function () {
+               var sw = this._southWest,
+                   ne = this._northEast;
+
+               return [sw.lng, sw.lat, ne.lng, ne.lat].join(',');
+       },
+
+       equals: function (bounds) { // (LatLngBounds)
+               if (!bounds) { return false; }
+
+               bounds = L.latLngBounds(bounds);
+
+               return this._southWest.equals(bounds.getSouthWest()) &&
+                      this._northEast.equals(bounds.getNorthEast());
+       },
+
+       isValid: function () {
+               return !!(this._southWest && this._northEast);
+       }
+});
+
+//TODO International date line?
+
+L.latLngBounds = function (a, b) { // (LatLngBounds) or (LatLng, LatLng)
+       if (!a || a instanceof L.LatLngBounds) {
+               return a;
+       }
+       return new L.LatLngBounds(a, b);
+};
+
+
+/*
+ * L.Projection contains various geographical projections used by CRS classes.
+ */
+
+L.Projection = {};
+
+
+
+L.Projection.SphericalMercator = {
+       MAX_LATITUDE: 85.0511287798,
+
+       project: function (latlng) { // (LatLng) -> Point
+               var d = L.LatLng.DEG_TO_RAD,
+                   max = this.MAX_LATITUDE,
+                   lat = Math.max(Math.min(max, latlng.lat), -max),
+                   x = latlng.lng * d,
+                   y = lat * d;
+
+               y = Math.log(Math.tan((Math.PI / 4) + (y / 2)));
+
+               return new L.Point(x, y);
+       },
+
+       unproject: function (point) { // (Point, Boolean) -> LatLng
+               var d = L.LatLng.RAD_TO_DEG,
+                   lng = point.x * d,
+                   lat = (2 * Math.atan(Math.exp(point.y)) - (Math.PI / 2)) * d;
+
+               // TODO refactor LatLng wrapping
+               return new L.LatLng(lat, lng, true);
+       }
+};
+
+
+
+L.Projection.LonLat = {
+       project: function (latlng) {
+               return new L.Point(latlng.lng, latlng.lat);
+       },
+
+       unproject: function (point) {
+               return new L.LatLng(point.y, point.x, true);
+       }
+};
+
+
+
+L.CRS = {
+       latLngToPoint: function (latlng, zoom) { // (LatLng, Number) -> Point
+               var projectedPoint = this.projection.project(latlng),
+                   scale = this.scale(zoom);
+
+               return this.transformation._transform(projectedPoint, scale);
+       },
+
+       pointToLatLng: function (point, zoom) { // (Point, Number[, Boolean]) -> LatLng
+               var scale = this.scale(zoom),
+                   untransformedPoint = this.transformation.untransform(point, scale);
+
+               return this.projection.unproject(untransformedPoint);
+       },
+
+       project: function (latlng) {
+               return this.projection.project(latlng);
+       },
+
+       scale: function (zoom) {
+               return 256 * Math.pow(2, zoom);
+       }
+};
+
+
+
+L.CRS.Simple = L.extend({}, L.CRS, {
+       projection: L.Projection.LonLat,
+       transformation: new L.Transformation(1, 0, 1, 0)
+});
+
+
+
+L.CRS.EPSG3857 = L.extend({}, L.CRS, {
+       code: 'EPSG:3857',
+
+       projection: L.Projection.SphericalMercator,
+       transformation: new L.Transformation(0.5 / Math.PI, 0.5, -0.5 / Math.PI, 0.5),
+
+       project: function (latlng) { // (LatLng) -> Point
+               var projectedPoint = this.projection.project(latlng),
+                   earthRadius = 6378137;
+               return projectedPoint.multiplyBy(earthRadius);
+       }
+});
+
+L.CRS.EPSG900913 = L.extend({}, L.CRS.EPSG3857, {
+       code: 'EPSG:900913'
+});
+
+
+
+L.CRS.EPSG4326 = L.extend({}, L.CRS, {
+       code: 'EPSG:4326',
+
+       projection: L.Projection.LonLat,
+       transformation: new L.Transformation(1 / 360, 0.5, -1 / 360, 0.5)
+});
+
+
+/*
+ * L.Map is the central class of the API - it is used to create a map.
+ */
+
+L.Map = L.Class.extend({
+
+       includes: L.Mixin.Events,
+
+       options: {
+               crs: L.CRS.EPSG3857,
+
+               /*
+               center: LatLng,
+               zoom: Number,
+               layers: Array,
+               */
+
+               fadeAnimation: L.DomUtil.TRANSITION && !L.Browser.android23,
+               trackResize: true,
+               markerZoomAnimation: L.DomUtil.TRANSITION && L.Browser.any3d
+       },
+
+       initialize: function (id, options) { // (HTMLElement or String, Object)
+               options = L.setOptions(this, options);
+
+               this._initContainer(id);
+               this._initLayout();
+               this._initHooks();
+               this._initEvents();
+
+               if (options.maxBounds) {
+                       this.setMaxBounds(options.maxBounds);
+               }
+
+               if (options.center && options.zoom !== undefined) {
+                       this.setView(L.latLng(options.center), options.zoom, true);
+               }
+
+               this._initLayers(options.layers);
+       },
+
+
+       // public methods that modify map state
+
+       // replaced by animation-powered implementation in Map.PanAnimation.js
+       setView: function (center, zoom) {
+               this._resetView(L.latLng(center), this._limitZoom(zoom));
+               return this;
+       },
+
+       setZoom: function (zoom) { // (Number)
+               return this.setView(this.getCenter(), zoom);
+       },
+
+       zoomIn: function (delta) {
+               return this.setZoom(this._zoom + (delta || 1));
+       },
+
+       zoomOut: function (delta) {
+               return this.setZoom(this._zoom - (delta || 1));
+       },
+
+       fitBounds: function (bounds) { // (LatLngBounds)
+               var zoom = this.getBoundsZoom(bounds);
+               return this.setView(L.latLngBounds(bounds).getCenter(), zoom);
+       },
+
+       fitWorld: function () {
+               var sw = new L.LatLng(-60, -170),
+                   ne = new L.LatLng(85, 179);
+
+               return this.fitBounds(new L.LatLngBounds(sw, ne));
+       },
+
+       panTo: function (center) { // (LatLng)
+               return this.setView(center, this._zoom);
+       },
+
+       panBy: function (offset) { // (Point)
+               // replaced with animated panBy in Map.Animation.js
+               this.fire('movestart');
+
+               this._rawPanBy(L.point(offset));
+
+               this.fire('move');
+               return this.fire('moveend');
+       },
+
+       setMaxBounds: function (bounds) {
+               bounds = L.latLngBounds(bounds);
+
+               this.options.maxBounds = bounds;
+
+               if (!bounds) {
+                       this._boundsMinZoom = null;
+                       return this;
+               }
+
+               var minZoom = this.getBoundsZoom(bounds, true);
+
+               this._boundsMinZoom = minZoom;
+
+               if (this._loaded) {
+                       if (this._zoom < minZoom) {
+                               this.setView(bounds.getCenter(), minZoom);
+                       } else {
+                               this.panInsideBounds(bounds);
+                       }
+               }
+
+               return this;
+       },
+
+       panInsideBounds: function (bounds) {
+               bounds = L.latLngBounds(bounds);
+
+               var viewBounds = this.getBounds(),
+                   viewSw = this.project(viewBounds.getSouthWest()),
+                   viewNe = this.project(viewBounds.getNorthEast()),
+                   sw = this.project(bounds.getSouthWest()),
+                   ne = this.project(bounds.getNorthEast()),
+                   dx = 0,
+                   dy = 0;
+
+               if (viewNe.y < ne.y) { // north
+                       dy = ne.y - viewNe.y;
+               }
+               if (viewNe.x > ne.x) { // east
+                       dx = ne.x - viewNe.x;
+               }
+               if (viewSw.y > sw.y) { // south
+                       dy = sw.y - viewSw.y;
+               }
+               if (viewSw.x < sw.x) { // west
+                       dx = sw.x - viewSw.x;
+               }
+
+               return this.panBy(new L.Point(dx, dy, true));
+       },
+
+       addLayer: function (layer) {
+               // TODO method is too big, refactor
+
+               var id = L.stamp(layer);
+
+               if (this._layers[id]) { return this; }
+
+               this._layers[id] = layer;
+
+               // TODO getMaxZoom, getMinZoom in ILayer (instead of options)
+               if (layer.options && !isNaN(layer.options.maxZoom)) {
+                       this._layersMaxZoom = Math.max(this._layersMaxZoom || 0, layer.options.maxZoom);
+               }
+               if (layer.options && !isNaN(layer.options.minZoom)) {
+                       this._layersMinZoom = Math.min(this._layersMinZoom || Infinity, layer.options.minZoom);
+               }
+
+               // TODO looks ugly, refactor!!!
+               if (this.options.zoomAnimation && L.TileLayer && (layer instanceof L.TileLayer)) {
+                       this._tileLayersNum++;
+            this._tileLayersToLoad++;
+            layer.on('load', this._onTileLayerLoad, this);
+               }
+
+               this.whenReady(function () {
+                       layer.onAdd(this);
+                       this.fire('layeradd', {layer: layer});
+               }, this);
+
+               return this;
+       },
+
+       removeLayer: function (layer) {
+               var id = L.stamp(layer);
+
+               if (!this._layers[id]) { return; }
+
+               layer.onRemove(this);
+
+               delete this._layers[id];
+
+               // TODO looks ugly, refactor
+               if (this.options.zoomAnimation && L.TileLayer && (layer instanceof L.TileLayer)) {
+                       this._tileLayersNum--;
+            this._tileLayersToLoad--;
+            layer.off('load', this._onTileLayerLoad, this);
+               }
+
+               return this.fire('layerremove', {layer: layer});
+       },
+
+       hasLayer: function (layer) {
+               var id = L.stamp(layer);
+               return this._layers.hasOwnProperty(id);
+       },
+
+       invalidateSize: function (animate) {
+               var oldSize = this.getSize();
+
+               this._sizeChanged = true;
+
+               if (this.options.maxBounds) {
+                       this.setMaxBounds(this.options.maxBounds);
+               }
+
+               if (!this._loaded) { return this; }
+
+               var offset = oldSize._subtract(this.getSize())._divideBy(2)._round();
+
+               if (animate === true) {
+                       this.panBy(offset);
+               } else {
+                       this._rawPanBy(offset);
+
+                       this.fire('move');
+
+                       clearTimeout(this._sizeTimer);
+                       this._sizeTimer = setTimeout(L.bind(this.fire, this, 'moveend'), 200);
+               }
+               return this;
+       },
+
+       // TODO handler.addTo
+       addHandler: function (name, HandlerClass) {
+               if (!HandlerClass) { return; }
+
+               this[name] = new HandlerClass(this);
+
+               if (this.options[name]) {
+                       this[name].enable();
+               }
+
+               return this;
+       },
+
+
+       // public methods for getting map state
+
+       getCenter: function () { // (Boolean) -> LatLng
+               return this.layerPointToLatLng(this._getCenterLayerPoint());
+       },
+
+       getZoom: function () {
+               return this._zoom;
+       },
+
+       getBounds: function () {
+               var bounds = this.getPixelBounds(),
+                   sw = this.unproject(bounds.getBottomLeft()),
+                   ne = this.unproject(bounds.getTopRight());
+
+               return new L.LatLngBounds(sw, ne);
+       },
+
+       getMinZoom: function () {
+               var z1 = this.options.minZoom || 0,
+                   z2 = this._layersMinZoom || 0,
+                   z3 = this._boundsMinZoom || 0;
+
+               return Math.max(z1, z2, z3);
+       },
+
+       getMaxZoom: function () {
+               var z1 = this.options.maxZoom === undefined ? Infinity : this.options.maxZoom,
+                   z2 = this._layersMaxZoom  === undefined ? Infinity : this._layersMaxZoom;
+
+               return Math.min(z1, z2);
+       },
+
+       getBoundsZoom: function (bounds, inside) { // (LatLngBounds, Boolean) -> Number
+               bounds = L.latLngBounds(bounds);
+
+               var size = this.getSize(),
+                   zoom = this.options.minZoom || 0,
+                   maxZoom = this.getMaxZoom(),
+                   ne = bounds.getNorthEast(),
+                   sw = bounds.getSouthWest(),
+                   boundsSize,
+                   nePoint,
+                   swPoint,
+                   zoomNotFound = true;
+
+               if (inside) {
+                       zoom--;
+               }
+
+               do {
+                       zoom++;
+                       nePoint = this.project(ne, zoom);
+                       swPoint = this.project(sw, zoom);
+
+                       boundsSize = new L.Point(
+                               Math.abs(nePoint.x - swPoint.x),
+                               Math.abs(swPoint.y - nePoint.y));
+
+                       if (!inside) {
+                               zoomNotFound = boundsSize.x <= size.x && boundsSize.y <= size.y;
+                       } else {
+                               zoomNotFound = boundsSize.x < size.x || boundsSize.y < size.y;
+                       }
+               } while (zoomNotFound && zoom <= maxZoom);
+
+               if (zoomNotFound && inside) {
+                       return null;
+               }
+
+               return inside ? zoom : zoom - 1;
+       },
+
+       getSize: function () {
+               if (!this._size || this._sizeChanged) {
+                       this._size = new L.Point(
+                               this._container.clientWidth,
+                               this._container.clientHeight);
+
+                       this._sizeChanged = false;
+               }
+               return this._size.clone();
+       },
+
+       getPixelBounds: function () {
+               var topLeftPoint = this._getTopLeftPoint();
+               return new L.Bounds(topLeftPoint, topLeftPoint.add(this.getSize()));
+       },
+
+       getPixelOrigin: function () {
+               return this._initialTopLeftPoint;
+       },
+
+       getPanes: function () {
+               return this._panes;
+       },
+
+       getContainer: function () {
+               return this._container;
+       },
+
+
+       // TODO replace with universal implementation after refactoring projections
+
+       getZoomScale: function (toZoom) {
+               var crs = this.options.crs;
+               return crs.scale(toZoom) / crs.scale(this._zoom);
+       },
+
+       getScaleZoom: function (scale) {
+               return this._zoom + (Math.log(scale) / Math.LN2);
+       },
+
+
+       // conversion methods
+
+       project: function (latlng, zoom) { // (LatLng[, Number]) -> Point
+               zoom = zoom === undefined ? this._zoom : zoom;
+               return this.options.crs.latLngToPoint(L.latLng(latlng), zoom);
+       },
+
+       unproject: function (point, zoom) { // (Point[, Number]) -> LatLng
+               zoom = zoom === undefined ? this._zoom : zoom;
+               return this.options.crs.pointToLatLng(L.point(point), zoom);
+       },
+
+       layerPointToLatLng: function (point) { // (Point)
+               var projectedPoint = L.point(point).add(this._initialTopLeftPoint);
+               return this.unproject(projectedPoint);
+       },
+
+       latLngToLayerPoint: function (latlng) { // (LatLng)
+               var projectedPoint = this.project(L.latLng(latlng))._round();
+               return projectedPoint._subtract(this._initialTopLeftPoint);
+       },
+
+       containerPointToLayerPoint: function (point) { // (Point)
+               return L.point(point).subtract(this._getMapPanePos());
+       },
+
+       layerPointToContainerPoint: function (point) { // (Point)
+               return L.point(point).add(this._getMapPanePos());
+       },
+
+       containerPointToLatLng: function (point) {
+               var layerPoint = this.containerPointToLayerPoint(L.point(point));
+               return this.layerPointToLatLng(layerPoint);
+       },
+
+       latLngToContainerPoint: function (latlng) {
+               return this.layerPointToContainerPoint(this.latLngToLayerPoint(L.latLng(latlng)));
+       },
+
+       mouseEventToContainerPoint: function (e) { // (MouseEvent)
+               return L.DomEvent.getMousePosition(e, this._container);
+       },
+
+       mouseEventToLayerPoint: function (e) { // (MouseEvent)
+               return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(e));
+       },
+
+       mouseEventToLatLng: function (e) { // (MouseEvent)
+               return this.layerPointToLatLng(this.mouseEventToLayerPoint(e));
+       },
+
+
+       // map initialization methods
+
+       _initContainer: function (id) {
+               var container = this._container = L.DomUtil.get(id);
+
+               if (container._leaflet) {
+                       throw new Error("Map container is already initialized.");
+               }
+
+               container._leaflet = true;
+       },
+
+       _initLayout: function () {
+               var container = this._container;
+
+               container.innerHTML = '';
+               L.DomUtil.addClass(container, 'leaflet-container');
+
+               if (L.Browser.touch) {
+                       L.DomUtil.addClass(container, 'leaflet-touch');
+               }
+
+               if (this.options.fadeAnimation) {
+                       L.DomUtil.addClass(container, 'leaflet-fade-anim');
+               }
+
+               var position = L.DomUtil.getStyle(container, 'position');
+
+               if (position !== 'absolute' && position !== 'relative' && position !== 'fixed') {
+                       container.style.position = 'relative';
+               }
+
+               this._initPanes();
+
+               if (this._initControlPos) {
+                       this._initControlPos();
+               }
+       },
+
+       _initPanes: function () {
+               var panes = this._panes = {};
+
+               this._mapPane = panes.mapPane = this._createPane('leaflet-map-pane', this._container);
+
+               this._tilePane = panes.tilePane = this._createPane('leaflet-tile-pane', this._mapPane);
+               panes.objectsPane = this._createPane('leaflet-objects-pane', this._mapPane);
+               panes.shadowPane = this._createPane('leaflet-shadow-pane');
+               panes.overlayPane = this._createPane('leaflet-overlay-pane');
+               panes.markerPane = this._createPane('leaflet-marker-pane');
+               panes.popupPane = this._createPane('leaflet-popup-pane');
+
+               var zoomHide = ' leaflet-zoom-hide';
+
+               if (!this.options.markerZoomAnimation) {
+                       L.DomUtil.addClass(panes.markerPane, zoomHide);
+                       L.DomUtil.addClass(panes.shadowPane, zoomHide);
+                       L.DomUtil.addClass(panes.popupPane, zoomHide);
+               }
+       },
+
+       _createPane: function (className, container) {
+               return L.DomUtil.create('div', className, container || this._panes.objectsPane);
+       },
+
+       _initializers: [],
+
+       _initHooks: function () {
+               var i, len;
+               for (i = 0, len = this._initializers.length; i < len; i++) {
+                       this._initializers[i].call(this);
+               }
+       },
+
+       _initLayers: function (layers) {
+               layers = layers ? (layers instanceof Array ? layers : [layers]) : [];
+
+               this._layers = {};
+               this._tileLayersNum = 0;
+
+               var i, len;
+
+               for (i = 0, len = layers.length; i < len; i++) {
+                       this.addLayer(layers[i]);
+               }
+       },
+
+
+       // private methods that modify map state
+
+       _resetView: function (center, zoom, preserveMapOffset, afterZoomAnim) {
+
+               var zoomChanged = (this._zoom !== zoom);
+
+               if (!afterZoomAnim) {
+                       this.fire('movestart');
+
+                       if (zoomChanged) {
+                               this.fire('zoomstart');
+                       }
+               }
+
+               this._zoom = zoom;
+
+               this._initialTopLeftPoint = this._getNewTopLeftPoint(center);
+
+               if (!preserveMapOffset) {
+                       L.DomUtil.setPosition(this._mapPane, new L.Point(0, 0));
+               } else {
+                       this._initialTopLeftPoint._add(this._getMapPanePos());
+               }
+
+               this._tileLayersToLoad = this._tileLayersNum;
+
+               var loading = !this._loaded;
+               this._loaded = true;
+
+               this.fire('viewreset', {hard: !preserveMapOffset});
+
+               this.fire('move');
+
+               if (zoomChanged || afterZoomAnim) {
+                       this.fire('zoomend');
+               }
+
+               this.fire('moveend', {hard: !preserveMapOffset});
+
+               if (loading) {
+                       this.fire('load');
+               }
+       },
+
+       _rawPanBy: function (offset) {
+               L.DomUtil.setPosition(this._mapPane, this._getMapPanePos().subtract(offset));
+       },
+
+
+       // map events
+
+       _initEvents: function () {
+               if (!L.DomEvent) { return; }
+
+               L.DomEvent.on(this._container, 'click', this._onMouseClick, this);
+
+               var events = ['dblclick', 'mousedown', 'mouseup', 'mouseenter',
+                             'mouseleave', 'mousemove', 'contextmenu'],
+                   i, len;
+
+               for (i = 0, len = events.length; i < len; i++) {
+                       L.DomEvent.on(this._container, events[i], this._fireMouseEvent, this);
+               }
+
+               if (this.options.trackResize) {
+                       L.DomEvent.on(window, 'resize', this._onResize, this);
+               }
+       },
+
+       _onResize: function () {
+               L.Util.cancelAnimFrame(this._resizeRequest);
+               this._resizeRequest = L.Util.requestAnimFrame(
+                       this.invalidateSize, this, false, this._container);
+       },
+
+       _onMouseClick: function (e) {
+               if (!this._loaded || (this.dragging && this.dragging.moved())) { return; }
+
+               this.fire('preclick');
+               this._fireMouseEvent(e);
+       },
+
+       _fireMouseEvent: function (e) {
+               if (!this._loaded) { return; }
+
+               var type = e.type;
+
+               type = (type === 'mouseenter' ? 'mouseover' : (type === 'mouseleave' ? 'mouseout' : type));
+
+               if (!this.hasEventListeners(type)) { return; }
+
+               if (type === 'contextmenu') {
+                       L.DomEvent.preventDefault(e);
+               }
+
+               var containerPoint = this.mouseEventToContainerPoint(e),
+                   layerPoint = this.containerPointToLayerPoint(containerPoint),
+                   latlng = this.layerPointToLatLng(layerPoint);
+
+               this.fire(type, {
+                       latlng: latlng,
+                       layerPoint: layerPoint,
+                       containerPoint: containerPoint,
+                       originalEvent: e
+               });
+       },
+
+       _onTileLayerLoad: function () {
+               // TODO super-ugly, refactor!!!
+               // clear scaled tiles after all new tiles are loaded (for performance)
+               this._tileLayersToLoad--;
+               if (this._tileLayersNum && !this._tileLayersToLoad && this._tileBg) {
+                       clearTimeout(this._clearTileBgTimer);
+                       this._clearTileBgTimer = setTimeout(L.bind(this._clearTileBg, this), 500);
+               }
+       },
+
+       whenReady: function (callback, context) {
+               if (this._loaded) {
+                       callback.call(context || this, this);
+               } else {
+                       this.on('load', callback, context);
+               }
+               return this;
+       },
+
+
+       // private methods for getting map state
+
+       _getMapPanePos: function () {
+               return L.DomUtil.getPosition(this._mapPane);
+       },
+
+       _getTopLeftPoint: function () {
+               if (!this._loaded) {
+                       throw new Error('Set map center and zoom first.');
+               }
+
+               return this._initialTopLeftPoint.subtract(this._getMapPanePos());
+       },
+
+       _getNewTopLeftPoint: function (center, zoom) {
+               var viewHalf = this.getSize()._divideBy(2);
+               // TODO round on display, not calculation to increase precision?
+               return this.project(center, zoom)._subtract(viewHalf)._round();
+       },
+
+       _latLngToNewLayerPoint: function (latlng, newZoom, newCenter) {
+               var topLeft = this._getNewTopLeftPoint(newCenter, newZoom).add(this._getMapPanePos());
+               return this.project(latlng, newZoom)._subtract(topLeft);
+       },
+
+       _getCenterLayerPoint: function () {
+               return this.containerPointToLayerPoint(this.getSize()._divideBy(2));
+       },
+
+       _getCenterOffset: function (center) {
+               return this.latLngToLayerPoint(center).subtract(this._getCenterLayerPoint());
+       },
+
+       _limitZoom: function (zoom) {
+               var min = this.getMinZoom(),
+                   max = this.getMaxZoom();
+
+               return Math.max(min, Math.min(max, zoom));
+       }
+});
+
+L.Map.addInitHook = function (fn) {
+       var args = Array.prototype.slice.call(arguments, 1);
+
+       var init = typeof fn === 'function' ? fn : function () {
+               this[fn].apply(this, args);
+       };
+
+       this.prototype._initializers.push(init);
+};
+
+L.map = function (id, options) {
+       return new L.Map(id, options);
+};
+
+
+
+L.Projection.Mercator = {
+       MAX_LATITUDE: 85.0840591556,
+
+       R_MINOR: 6356752.3142,
+       R_MAJOR: 6378137,
+
+       project: function (latlng) { // (LatLng) -> Point
+               var d = L.LatLng.DEG_TO_RAD,
+                   max = this.MAX_LATITUDE,
+                   lat = Math.max(Math.min(max, latlng.lat), -max),
+                   r = this.R_MAJOR,
+                   r2 = this.R_MINOR,
+                   x = latlng.lng * d * r,
+                   y = lat * d,
+                   tmp = r2 / r,
+                   eccent = Math.sqrt(1.0 - tmp * tmp),
+                   con = eccent * Math.sin(y);
+
+               con = Math.pow((1 - con) / (1 + con), eccent * 0.5);
+
+               var ts = Math.tan(0.5 * ((Math.PI * 0.5) - y)) / con;
+               y = -r2 * Math.log(ts);
+
+               return new L.Point(x, y);
+       },
+
+       unproject: function (point) { // (Point, Boolean) -> LatLng
+               var d = L.LatLng.RAD_TO_DEG,
+                   r = this.R_MAJOR,
+                   r2 = this.R_MINOR,
+                   lng = point.x * d / r,
+                   tmp = r2 / r,
+                   eccent = Math.sqrt(1 - (tmp * tmp)),
+                   ts = Math.exp(- point.y / r2),
+                   phi = (Math.PI / 2) - 2 * Math.atan(ts),
+                   numIter = 15,
+                   tol = 1e-7,
+                   i = numIter,
+                   dphi = 0.1,
+                   con;
+
+               while ((Math.abs(dphi) > tol) && (--i > 0)) {
+                       con = eccent * Math.sin(phi);
+                       dphi = (Math.PI / 2) - 2 * Math.atan(ts *
+                                   Math.pow((1.0 - con) / (1.0 + con), 0.5 * eccent)) - phi;
+                       phi += dphi;
+               }
+
+               return new L.LatLng(phi * d, lng, true);
+       }
+};
+
+
+
+L.CRS.EPSG3395 = L.extend({}, L.CRS, {
+       code: 'EPSG:3395',
+
+       projection: L.Projection.Mercator,
+
+       transformation: (function () {
+               var m = L.Projection.Mercator,
+                   r = m.R_MAJOR,
+                   r2 = m.R_MINOR;
+
+               return new L.Transformation(0.5 / (Math.PI * r), 0.5, -0.5 / (Math.PI * r2), 0.5);
+       }())
+});
+
+
+/*
+ * L.TileLayer is used for standard xyz-numbered tile layers.
+ */
+
+L.TileLayer = L.Class.extend({
+       includes: L.Mixin.Events,
+
+       options: {
+               minZoom: 0,
+               maxZoom: 18,
+               tileSize: 256,
+               subdomains: 'abc',
+               errorTileUrl: '',
+               attribution: '',
+               zoomOffset: 0,
+               opacity: 1,
+               /* (undefined works too)
+               zIndex: null,
+               tms: false,
+               continuousWorld: false,
+               noWrap: false,
+               zoomReverse: false,
+               detectRetina: false,
+               reuseTiles: false,
+               */
+               unloadInvisibleTiles: L.Browser.mobile,
+               updateWhenIdle: L.Browser.mobile
+       },
+
+       initialize: function (url, options) {
+               options = L.setOptions(this, options);
+
+               // detecting retina displays, adjusting tileSize and zoom levels
+               if (options.detectRetina && L.Browser.retina && options.maxZoom > 0) {
+
+                       options.tileSize = Math.floor(options.tileSize / 2);
+                       options.zoomOffset++;
+
+                       if (options.minZoom > 0) {
+                               options.minZoom--;
+                       }
+                       this.options.maxZoom--;
+               }
+
+               this._url = url;
+
+               var subdomains = this.options.subdomains;
+
+               if (typeof subdomains === 'string') {
+                       this.options.subdomains = subdomains.split('');
+               }
+       },
+
+       onAdd: function (map) {
+               this._map = map;
+
+               // create a container div for tiles
+               this._initContainer();
+
+               // create an image to clone for tiles
+               this._createTileProto();
+
+               // set up events
+               map.on({
+                       'viewreset': this._resetCallback,
+                       'moveend': this._update
+               }, this);
+
+               if (!this.options.updateWhenIdle) {
+                       this._limitedUpdate = L.Util.limitExecByInterval(this._update, 150, this);
+                       map.on('move', this._limitedUpdate, this);
+               }
+
+               this._reset();
+               this._update();
+       },
+
+       addTo: function (map) {
+               map.addLayer(this);
+               return this;
+       },
+
+       onRemove: function (map) {
+               map._panes.tilePane.removeChild(this._container);
+
+               map.off({
+                       'viewreset': this._resetCallback,
+                       'moveend': this._update
+               }, this);
+
+               if (!this.options.updateWhenIdle) {
+                       map.off('move', this._limitedUpdate, this);
+               }
+
+               this._container = null;
+               this._map = null;
+       },
+
+       bringToFront: function () {
+               var pane = this._map._panes.tilePane;
+
+               if (this._container) {
+                       pane.appendChild(this._container);
+                       this._setAutoZIndex(pane, Math.max);
+               }
+
+               return this;
+       },
+
+       bringToBack: function () {
+               var pane = this._map._panes.tilePane;
+
+               if (this._container) {
+                       pane.insertBefore(this._container, pane.firstChild);
+                       this._setAutoZIndex(pane, Math.min);
+               }
+
+               return this;
+       },
+
+       getAttribution: function () {
+               return this.options.attribution;
+       },
+
+       setOpacity: function (opacity) {
+               this.options.opacity = opacity;
+
+               if (this._map) {
+                       this._updateOpacity();
+               }
+
+               return this;
+       },
+
+       setZIndex: function (zIndex) {
+               this.options.zIndex = zIndex;
+               this._updateZIndex();
+
+               return this;
+       },
+
+       setUrl: function (url, noRedraw) {
+               this._url = url;
+
+               if (!noRedraw) {
+                       this.redraw();
+               }
+
+               return this;
+       },
+
+       redraw: function () {
+               if (this._map) {
+                       this._map._panes.tilePane.empty = false;
+                       this._reset(true);
+                       this._update();
+               }
+               return this;
+       },
+
+       _updateZIndex: function () {
+               if (this._container && this.options.zIndex !== undefined) {
+                       this._container.style.zIndex = this.options.zIndex;
+               }
+       },
+
+       _setAutoZIndex: function (pane, compare) {
+
+               var layers = pane.getElementsByClassName('leaflet-layer'),
+                   edgeZIndex = -compare(Infinity, -Infinity), // -Ifinity for max, Infinity for min
+                   zIndex, i, len;
+
+               for (i = 0, len = layers.length; i < len; i++) {
+
+                       if (layers[i] !== this._container) {
+                               zIndex = parseInt(layers[i].style.zIndex, 10);
+
+                               if (!isNaN(zIndex)) {
+                                       edgeZIndex = compare(edgeZIndex, zIndex);
+                               }
+                       }
+               }
+
+               this.options.zIndex = this._container.style.zIndex =
+                       (isFinite(edgeZIndex) ? edgeZIndex : 0) + compare(1, -1);
+       },
+
+       _updateOpacity: function () {
+               L.DomUtil.setOpacity(this._container, this.options.opacity);
+
+               // stupid webkit hack to force redrawing of tiles
+               var i,
+                   tiles = this._tiles;
+
+               if (L.Browser.webkit) {
+                       for (i in tiles) {
+                               if (tiles.hasOwnProperty(i)) {
+                                       tiles[i].style.webkitTransform += ' translate(0,0)';
+                               }
+                       }
+               }
+       },
+
+       _initContainer: function () {
+               var tilePane = this._map._panes.tilePane;
+
+               if (!this._container || tilePane.empty) {
+                       this._container = L.DomUtil.create('div', 'leaflet-layer');
+
+                       this._updateZIndex();
+
+                       tilePane.appendChild(this._container);
+
+                       if (this.options.opacity < 1) {
+                               this._updateOpacity();
+                       }
+               }
+       },
+
+       _resetCallback: function (e) {
+               this._reset(e.hard);
+       },
+
+       _reset: function (clearOldContainer) {
+               var tiles = this._tiles;
+
+               for (var key in tiles) {
+                       if (tiles.hasOwnProperty(key)) {
+                               this.fire('tileunload', {tile: tiles[key]});
+                       }
+               }
+
+               this._tiles = {};
+               this._tilesToLoad = 0;
+
+               if (this.options.reuseTiles) {
+                       this._unusedTiles = [];
+               }
+
+               if (clearOldContainer && this._container) {
+                       this._container.innerHTML = "";
+               }
+
+               this._initContainer();
+       },
+
+       _update: function (e) {
+
+               if (!this._map) { return; }
+
+               var bounds = this._map.getPixelBounds(),
+                   zoom = this._map.getZoom(),
+                   tileSize = this.options.tileSize;
+
+               if (zoom > this.options.maxZoom || zoom < this.options.minZoom) {
+                       return;
+               }
+
+               var nwTilePoint = new L.Point(
+                       Math.floor(bounds.min.x / tileSize),
+                       Math.floor(bounds.min.y / tileSize)),
+
+                   seTilePoint = new L.Point(
+                       Math.floor(bounds.max.x / tileSize),
+                       Math.floor(bounds.max.y / tileSize)),
+
+                   tileBounds = new L.Bounds(nwTilePoint, seTilePoint);
+
+               this._addTilesFromCenterOut(tileBounds);
+
+               if (this.options.unloadInvisibleTiles || this.options.reuseTiles) {
+                       this._removeOtherTiles(tileBounds);
+               }
+       },
+
+       _addTilesFromCenterOut: function (bounds) {
+               var queue = [],
+                   center = bounds.getCenter();
+
+               var j, i, point;
+
+               for (j = bounds.min.y; j <= bounds.max.y; j++) {
+                       for (i = bounds.min.x; i <= bounds.max.x; i++) {
+                               point = new L.Point(i, j);
+
+                               if (this._tileShouldBeLoaded(point)) {
+                                       queue.push(point);
+                               }
+                       }
+               }
+
+               var tilesToLoad = queue.length;
+
+               if (tilesToLoad === 0) { return; }
+
+               // load tiles in order of their distance to center
+               queue.sort(function (a, b) {
+                       return a.distanceTo(center) - b.distanceTo(center);
+               });
+
+               var fragment = document.createDocumentFragment();
+
+               // if its the first batch of tiles to load
+               if (!this._tilesToLoad) {
+                       this.fire('loading');
+               }
+
+               this._tilesToLoad += tilesToLoad;
+
+               for (i = 0; i < tilesToLoad; i++) {
+                       this._addTile(queue[i], fragment);
+               }
+
+               this._container.appendChild(fragment);
+       },
+
+       _tileShouldBeLoaded: function (tilePoint) {
+               if ((tilePoint.x + ':' + tilePoint.y) in this._tiles) {
+                       return false; // already loaded
+               }
+
+               if (!this.options.continuousWorld) {
+                       var limit = this._getWrapTileNum();
+
+                       if (this.options.noWrap && (tilePoint.x < 0 || tilePoint.x >= limit) ||
+                                                       tilePoint.y < 0 || tilePoint.y >= limit) {
+                               return false; // exceeds world bounds
+                       }
+               }
+
+               return true;
+       },
+
+       _removeOtherTiles: function (bounds) {
+               var kArr, x, y, key;
+
+               for (key in this._tiles) {
+                       if (this._tiles.hasOwnProperty(key)) {
+                               kArr = key.split(':');
+                               x = parseInt(kArr[0], 10);
+                               y = parseInt(kArr[1], 10);
+
+                               // remove tile if it's out of bounds
+                               if (x < bounds.min.x || x > bounds.max.x || y < bounds.min.y || y > bounds.max.y) {
+                                       this._removeTile(key);
+                               }
+                       }
+               }
+       },
+
+       _removeTile: function (key) {
+               var tile = this._tiles[key];
+
+               this.fire("tileunload", {tile: tile, url: tile.src});
+
+               if (this.options.reuseTiles) {
+                       L.DomUtil.removeClass(tile, 'leaflet-tile-loaded');
+                       this._unusedTiles.push(tile);
+
+               } else if (tile.parentNode === this._container) {
+                       this._container.removeChild(tile);
+               }
+
+               // for https://github.com/CloudMade/Leaflet/issues/137
+               if (!L.Browser.android) {
+                       tile.src = L.Util.emptyImageUrl;
+               }
+
+               delete this._tiles[key];
+       },
+
+       _addTile: function (tilePoint, container) {
+               var tilePos = this._getTilePos(tilePoint);
+
+               // get unused tile - or create a new tile
+               var tile = this._getTile();
+
+               /*
+               Chrome 20 layouts much faster with top/left (verify with timeline, frames)
+               Android 4 browser has display issues with top/left and requires transform instead
+               Android 3 browser not tested
+               Android 2 browser requires top/left or tiles disappear on load or first drag
+               (reappear after zoom) https://github.com/CloudMade/Leaflet/issues/866
+               (other browsers don't currently care) - see debug/hacks/jitter.html for an example
+               */
+               L.DomUtil.setPosition(tile, tilePos, L.Browser.chrome || L.Browser.android23);
+
+               this._tiles[tilePoint.x + ':' + tilePoint.y] = tile;
+
+               this._loadTile(tile, tilePoint);
+
+               if (tile.parentNode !== this._container) {
+                       container.appendChild(tile);
+               }
+       },
+
+       _getZoomForUrl: function () {
+
+               var options = this.options,
+                   zoom = this._map.getZoom();
+
+               if (options.zoomReverse) {
+                       zoom = options.maxZoom - zoom;
+               }
+
+               return zoom + options.zoomOffset;
+       },
+
+       _getTilePos: function (tilePoint) {
+               var origin = this._map.getPixelOrigin(),
+                   tileSize = this.options.tileSize;
+
+               return tilePoint.multiplyBy(tileSize).subtract(origin);
+       },
+
+       // image-specific code (override to implement e.g. Canvas or SVG tile layer)
+
+       getTileUrl: function (tilePoint) {
+               this._adjustTilePoint(tilePoint);
+
+               return L.Util.template(this._url, L.extend({
+                       s: this._getSubdomain(tilePoint),
+                       z: this._getZoomForUrl(),
+                       x: tilePoint.x,
+                       y: tilePoint.y
+               }, this.options));
+       },
+
+       _getWrapTileNum: function () {
+               // TODO refactor, limit is not valid for non-standard projections
+               return Math.pow(2, this._getZoomForUrl());
+       },
+
+       _adjustTilePoint: function (tilePoint) {
+
+               var limit = this._getWrapTileNum();
+
+               // wrap tile coordinates
+               if (!this.options.continuousWorld && !this.options.noWrap) {
+                       tilePoint.x = ((tilePoint.x % limit) + limit) % limit;
+               }
+
+               if (this.options.tms) {
+                       tilePoint.y = limit - tilePoint.y - 1;
+               }
+       },
+
+       _getSubdomain: function (tilePoint) {
+               var index = (tilePoint.x + tilePoint.y) % this.options.subdomains.length;
+               return this.options.subdomains[index];
+       },
+
+       _createTileProto: function () {
+               var img = this._tileImg = L.DomUtil.create('img', 'leaflet-tile');
+               img.style.width = img.style.height = this.options.tileSize + 'px';
+               img.galleryimg = 'no';
+       },
+
+       _getTile: function () {
+               if (this.options.reuseTiles && this._unusedTiles.length > 0) {
+                       var tile = this._unusedTiles.pop();
+                       this._resetTile(tile);
+                       return tile;
+               }
+               return this._createTile();
+       },
+
+       _resetTile: function (tile) {
+               // Override if data stored on a tile needs to be cleaned up before reuse
+       },
+
+       _createTile: function () {
+               var tile = this._tileImg.cloneNode(false);
+               tile.onselectstart = tile.onmousemove = L.Util.falseFn;
+               return tile;
+       },
+
+       _loadTile: function (tile, tilePoint) {
+               tile._layer  = this;
+               tile.onload  = this._tileOnLoad;
+               tile.onerror = this._tileOnError;
+
+               tile.src     = this.getTileUrl(tilePoint);
+       },
+
+    _tileLoaded: function () {
+        this._tilesToLoad--;
+        if (!this._tilesToLoad) {
+            this.fire('load');
+        }
+    },
+
+       _tileOnLoad: function (e) {
+               var layer = this._layer;
+
+               //Only if we are loading an actual image
+               if (this.src !== L.Util.emptyImageUrl) {
+                       L.DomUtil.addClass(this, 'leaflet-tile-loaded');
+
+                       layer.fire('tileload', {
+                               tile: this,
+                               url: this.src
+                       });
+               }
+
+               layer._tileLoaded();
+       },
+
+       _tileOnError: function (e) {
+               var layer = this._layer;
+
+               layer.fire('tileerror', {
+                       tile: this,
+                       url: this.src
+               });
+
+               var newUrl = layer.options.errorTileUrl;
+               if (newUrl) {
+                       this.src = newUrl;
+               }
+
+        layer._tileLoaded();
+    }
+});
+
+L.tileLayer = function (url, options) {
+       return new L.TileLayer(url, options);
+};
+
+
+L.TileLayer.WMS = L.TileLayer.extend({
+
+       defaultWmsParams: {
+               service: 'WMS',
+               request: 'GetMap',
+               version: '1.1.1',
+               layers: '',
+               styles: '',
+               format: 'image/jpeg',
+               transparent: false
+       },
+
+       initialize: function (url, options) { // (String, Object)
+
+               this._url = url;
+
+               var wmsParams = L.extend({}, this.defaultWmsParams);
+
+               if (options.detectRetina && L.Browser.retina) {
+                       wmsParams.width = wmsParams.height = this.options.tileSize * 2;
+               } else {
+                       wmsParams.width = wmsParams.height = this.options.tileSize;
+               }
+
+               for (var i in options) {
+                       // all keys that are not TileLayer options go to WMS params
+                       if (!this.options.hasOwnProperty(i)) {
+                               wmsParams[i] = options[i];
+                       }
+               }
+
+               this.wmsParams = wmsParams;
+
+               L.setOptions(this, options);
+       },
+
+       onAdd: function (map) {
+
+               var projectionKey = parseFloat(this.wmsParams.version) >= 1.3 ? 'crs' : 'srs';
+               this.wmsParams[projectionKey] = map.options.crs.code;
+
+               L.TileLayer.prototype.onAdd.call(this, map);
+       },
+
+       getTileUrl: function (tilePoint, zoom) { // (Point, Number) -> String
+
+               var map = this._map,
+                   crs = map.options.crs,
+                   tileSize = this.options.tileSize,
+
+                   nwPoint = tilePoint.multiplyBy(tileSize),
+                   sePoint = nwPoint.add(new L.Point(tileSize, tileSize)),
+
+                   nw = crs.project(map.unproject(nwPoint, zoom)),
+                   se = crs.project(map.unproject(sePoint, zoom)),
+
+                   bbox = [nw.x, se.y, se.x, nw.y].join(','),
+
+                   url = L.Util.template(this._url, {s: this._getSubdomain(tilePoint)});
+
+               return url + L.Util.getParamString(this.wmsParams) + "&bbox=" + bbox;
+       },
+
+       setParams: function (params, noRedraw) {
+
+               L.extend(this.wmsParams, params);
+
+               if (!noRedraw) {
+                       this.redraw();
+               }
+
+               return this;
+       }
+});
+
+L.tileLayer.wms = function (url, options) {
+       return new L.TileLayer.WMS(url, options);
+};
+
+
+L.TileLayer.Canvas = L.TileLayer.extend({
+       options: {
+               async: false
+       },
+
+       initialize: function (options) {
+               L.setOptions(this, options);
+       },
+
+       redraw: function () {
+               var tiles = this._tiles;
+
+               for (var i in tiles) {
+                       if (tiles.hasOwnProperty(i)) {
+                               this._redrawTile(tiles[i]);
+                       }
+               }
+       },
+
+       _redrawTile: function (tile) {
+               this.drawTile(tile, tile._tilePoint, this._map._zoom);
+       },
+
+       _createTileProto: function () {
+               var proto = this._canvasProto = L.DomUtil.create('canvas', 'leaflet-tile');
+               proto.width = proto.height = this.options.tileSize;
+       },
+
+       _createTile: function () {
+               var tile = this._canvasProto.cloneNode(false);
+               tile.onselectstart = tile.onmousemove = L.Util.falseFn;
+               return tile;
+       },
+
+       _loadTile: function (tile, tilePoint) {
+               tile._layer = this;
+               tile._tilePoint = tilePoint;
+
+               this._redrawTile(tile);
+
+               if (!this.options.async) {
+                       this.tileDrawn(tile);
+               }
+       },
+
+       drawTile: function (tile, tilePoint) {
+               // override with rendering code
+       },
+
+       tileDrawn: function (tile) {
+               this._tileOnLoad.call(tile);
+       }
+});
+
+
+L.tileLayer.canvas = function (options) {
+       return new L.TileLayer.Canvas(options);
+};
+
+
+L.ImageOverlay = L.Class.extend({
+       includes: L.Mixin.Events,
+
+       options: {
+               opacity: 1
+       },
+
+       initialize: function (url, bounds, options) { // (String, LatLngBounds, Object)
+               this._url = url;
+               this._bounds = L.latLngBounds(bounds);
+
+               L.setOptions(this, options);
+       },
+
+       onAdd: function (map) {
+               this._map = map;
+
+               if (!this._image) {
+                       this._initImage();
+               }
+
+               map._panes.overlayPane.appendChild(this._image);
+
+               map.on('viewreset', this._reset, this);
+
+               if (map.options.zoomAnimation && L.Browser.any3d) {
+                       map.on('zoomanim', this._animateZoom, this);
+               }
+
+               this._reset();
+       },
+
+       onRemove: function (map) {
+               map.getPanes().overlayPane.removeChild(this._image);
+
+               map.off('viewreset', this._reset, this);
+
+               if (map.options.zoomAnimation) {
+                       map.off('zoomanim', this._animateZoom, this);
+               }
+       },
+
+       addTo: function (map) {
+               map.addLayer(this);
+               return this;
+       },
+
+       setOpacity: function (opacity) {
+               this.options.opacity = opacity;
+               this._updateOpacity();
+               return this;
+       },
+
+       // TODO remove bringToFront/bringToBack duplication from TileLayer/Path
+       bringToFront: function () {
+               if (this._image) {
+                       this._map._panes.overlayPane.appendChild(this._image);
+               }
+               return this;
+       },
+
+       bringToBack: function () {
+               var pane = this._map._panes.overlayPane;
+               if (this._image) {
+                       pane.insertBefore(this._image, pane.firstChild);
+               }
+               return this;
+       },
+
+       _initImage: function () {
+               this._image = L.DomUtil.create('img', 'leaflet-image-layer');
+
+               if (this._map.options.zoomAnimation && L.Browser.any3d) {
+                       L.DomUtil.addClass(this._image, 'leaflet-zoom-animated');
+               } else {
+                       L.DomUtil.addClass(this._image, 'leaflet-zoom-hide');
+               }
+
+               this._updateOpacity();
+
+               //TODO createImage util method to remove duplication
+               L.extend(this._image, {
+                       galleryimg: 'no',
+                       onselectstart: L.Util.falseFn,
+                       onmousemove: L.Util.falseFn,
+                       onload: L.bind(this._onImageLoad, this),
+                       src: this._url
+               });
+       },
+
+       _animateZoom: function (e) {
+               var map = this._map,
+                   image = this._image,
+                   scale = map.getZoomScale(e.zoom),
+                   nw = this._bounds.getNorthWest(),
+                   se = this._bounds.getSouthEast(),
+
+                   topLeft = map._latLngToNewLayerPoint(nw, e.zoom, e.center),
+                   size = map._latLngToNewLayerPoint(se, e.zoom, e.center)._subtract(topLeft),
+                   currentSize = map.latLngToLayerPoint(se)._subtract(map.latLngToLayerPoint(nw)),
+                   origin = topLeft._add(size._subtract(currentSize)._divideBy(2));
+
+               image.style[L.DomUtil.TRANSFORM] =
+                       L.DomUtil.getTranslateString(origin) + ' scale(' + scale + ') ';
+       },
+
+       _reset: function () {
+               var image   = this._image,
+                   topLeft = this._map.latLngToLayerPoint(this._bounds.getNorthWest()),
+                   size    = this._map.latLngToLayerPoint(this._bounds.getSouthEast())._subtract(topLeft);
+
+               L.DomUtil.setPosition(image, topLeft);
+
+               image.style.width  = size.x + 'px';
+               image.style.height = size.y + 'px';
+       },
+
+       _onImageLoad: function () {
+               this.fire('load');
+       },
+
+       _updateOpacity: function () {
+               L.DomUtil.setOpacity(this._image, this.options.opacity);
+       }
+});
+
+L.imageOverlay = function (url, bounds, options) {
+       return new L.ImageOverlay(url, bounds, options);
+};
+
+
+L.Icon = L.Class.extend({
+       options: {
+               /*
+               iconUrl: (String) (required)
+               iconSize: (Point) (can be set through CSS)
+               iconAnchor: (Point) (centered by default, can be set in CSS with negative margins)
+               popupAnchor: (Point) (if not specified, popup opens in the anchor point)
+               shadowUrl: (Point) (no shadow by default)
+               shadowSize: (Point)
+               shadowAnchor: (Point)
+               */
+               className: ''
+       },
+
+       initialize: function (options) {
+               L.setOptions(this, options);
+       },
+
+       createIcon: function () {
+               return this._createIcon('icon');
+       },
+
+       createShadow: function () {
+               return this._createIcon('shadow');
+       },
+
+       _createIcon: function (name) {
+               var src = this._getIconUrl(name);
+
+               if (!src) {
+                       if (name === 'icon') {
+                               throw new Error("iconUrl not set in Icon options (see the docs).");
+                       }
+                       return null;
+               }
+
+               var img = this._createImg(src);
+               this._setIconStyles(img, name);
+
+               return img;
+       },
+
+       _setIconStyles: function (img, name) {
+               var options = this.options,
+                   size = L.point(options[name + 'Size']),
+                   anchor;
+
+               if (name === 'shadow') {
+                       anchor = L.point(options.shadowAnchor || options.iconAnchor);
+               } else {
+                       anchor = L.point(options.iconAnchor);
+               }
+
+               if (!anchor && size) {
+                       anchor = size.divideBy(2, true);
+               }
+
+               img.className = 'leaflet-marker-' + name + ' ' + options.className;
+
+               if (anchor) {
+                       img.style.marginLeft = (-anchor.x) + 'px';
+                       img.style.marginTop  = (-anchor.y) + 'px';
+               }
+
+               if (size) {
+                       img.style.width  = size.x + 'px';
+                       img.style.height = size.y + 'px';
+               }
+       },
+
+       _createImg: function (src) {
+               var el;
+
+               if (!L.Browser.ie6) {
+                       el = document.createElement('img');
+                       el.src = src;
+               } else {
+                       el = document.createElement('div');
+                       el.style.filter =
+                               'progid:DXImageTransform.Microsoft.AlphaImageLoader(src="' + src + '")';
+               }
+               return el;
+       },
+
+       _getIconUrl: function (name) {
+               return this.options[name + 'Url'];
+       }
+});
+
+L.icon = function (options) {
+       return new L.Icon(options);
+};
+
+
+
+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';
+               }
+       }
+}());
+
+
+/*
+ * L.Marker is used to display clickable/draggable icons on the map.
+ */
+
+L.Marker = L.Class.extend({
+
+       includes: L.Mixin.Events,
+
+       options: {
+               icon: new L.Icon.Default(),
+               title: '',
+               clickable: true,
+               draggable: false,
+               zIndexOffset: 0,
+               opacity: 1,
+               riseOnHover: false,
+               riseOffset: 250
+       },
+
+       initialize: function (latlng, options) {
+               L.setOptions(this, options);
+               this._latlng = L.latLng(latlng);
+       },
+
+       onAdd: function (map) {
+               this._map = map;
+
+               map.on('viewreset', this.update, this);
+
+               this._initIcon();
+               this.update();
+
+               if (map.options.zoomAnimation && map.options.markerZoomAnimation) {
+                       map.on('zoomanim', this._animateZoom, this);
+               }
+       },
+
+       addTo: function (map) {
+               map.addLayer(this);
+               return this;
+       },
+
+       onRemove: function (map) {
+               this._removeIcon();
+
+               this.fire('remove');
+
+               map.off({
+                       'viewreset': this.update,
+                       'zoomanim': this._animateZoom
+               }, this);
+
+               this._map = null;
+       },
+
+       getLatLng: function () {
+               return this._latlng;
+       },
+
+       setLatLng: function (latlng) {
+               this._latlng = L.latLng(latlng);
+
+               this.update();
+
+               this.fire('move', { latlng: this._latlng });
+       },
+
+       setZIndexOffset: function (offset) {
+               this.options.zIndexOffset = offset;
+               this.update();
+       },
+
+       setIcon: function (icon) {
+               if (this._map) {
+                       this._removeIcon();
+               }
+
+               this.options.icon = icon;
+
+               if (this._map) {
+                       this._initIcon();
+                       this.update();
+               }
+       },
+
+       update: function () {
+               if (!this._icon) { return; }
+
+               var pos = this._map.latLngToLayerPoint(this._latlng).round();
+               this._setPos(pos);
+       },
+
+       _initIcon: function () {
+               var options = this.options,
+                   map = this._map,
+                   animation = (map.options.zoomAnimation && map.options.markerZoomAnimation),
+                   classToAdd = animation ? 'leaflet-zoom-animated' : 'leaflet-zoom-hide',
+                   needOpacityUpdate = false;
+
+               if (!this._icon) {
+                       this._icon = options.icon.createIcon();
+
+                       if (options.title) {
+                               this._icon.title = options.title;
+                       }
+
+                       this._initInteraction();
+                       needOpacityUpdate = (this.options.opacity < 1);
+
+                       L.DomUtil.addClass(this._icon, classToAdd);
+
+                       if (options.riseOnHover) {
+                               L.DomEvent
+                                       .on(this._icon, 'mouseover', this._bringToFront, this)
+                                       .on(this._icon, 'mouseout', this._resetZIndex, this);
+                       }
+               }
+
+               if (!this._shadow) {
+                       this._shadow = options.icon.createShadow();
+
+                       if (this._shadow) {
+                               L.DomUtil.addClass(this._shadow, classToAdd);
+                               needOpacityUpdate = (this.options.opacity < 1);
+                       }
+               }
+
+               if (needOpacityUpdate) {
+                       this._updateOpacity();
+               }
+
+               var panes = this._map._panes;
+
+               panes.markerPane.appendChild(this._icon);
+
+               if (this._shadow) {
+                       panes.shadowPane.appendChild(this._shadow);
+               }
+       },
+
+       _removeIcon: function () {
+               var panes = this._map._panes;
+
+               if (this.options.riseOnHover) {
+                       L.DomEvent
+                           .off(this._icon, 'mouseover', this._bringToFront)
+                           .off(this._icon, 'mouseout', this._resetZIndex);
+               }
+
+               panes.markerPane.removeChild(this._icon);
+
+               if (this._shadow) {
+                       panes.shadowPane.removeChild(this._shadow);
+               }
+
+               this._icon = this._shadow = null;
+       },
+
+       _setPos: function (pos) {
+               L.DomUtil.setPosition(this._icon, pos);
+
+               if (this._shadow) {
+                       L.DomUtil.setPosition(this._shadow, pos);
+               }
+
+               this._zIndex = pos.y + this.options.zIndexOffset;
+
+               this._resetZIndex();
+       },
+
+       _updateZIndex: function (offset) {
+               this._icon.style.zIndex = this._zIndex + offset;
+       },
+
+       _animateZoom: function (opt) {
+               var pos = this._map._latLngToNewLayerPoint(this._latlng, opt.zoom, opt.center);
+
+               this._setPos(pos);
+       },
+
+       _initInteraction: function () {
+               if (!this.options.clickable) {
+                       return;
+               }
+
+               var icon = this._icon,
+                   events = ['dblclick', 'mousedown', 'mouseover', 'mouseout'];
+
+               L.DomUtil.addClass(icon, 'leaflet-clickable');
+               L.DomEvent.on(icon, 'click', this._onMouseClick, this);
+
+               for (var i = 0; i < events.length; i++) {
+                       L.DomEvent.on(icon, events[i], this._fireMouseEvent, this);
+               }
+
+               if (L.Handler.MarkerDrag) {
+                       this.dragging = new L.Handler.MarkerDrag(this);
+
+                       if (this.options.draggable) {
+                               this.dragging.enable();
+                       }
+               }
+       },
+
+       _onMouseClick: function (e) {
+               var wasDragged = this.dragging && this.dragging.moved();
+               if (this.hasEventListeners(e.type) || wasDragged) {
+                       L.DomEvent.stopPropagation(e);
+               }
+               if (wasDragged) { return; }
+               if (this._map.dragging && this._map.dragging.moved()) { return; }
+               this.fire(e.type, {
+                       originalEvent: e
+               });
+       },
+
+       _fireMouseEvent: function (e) {
+               this.fire(e.type, {
+                       originalEvent: e
+               });
+               if (e.type !== 'mousedown') {
+                       L.DomEvent.stopPropagation(e);
+               }
+       },
+
+       setOpacity: function (opacity) {
+               this.options.opacity = opacity;
+               if (this._map) {
+                       this._updateOpacity();
+               }
+       },
+
+       _updateOpacity: function () {
+               L.DomUtil.setOpacity(this._icon, this.options.opacity);
+               if (this._shadow) {
+                       L.DomUtil.setOpacity(this._shadow, this.options.opacity);
+               }
+       },
+
+       _bringToFront: function () {
+               this._updateZIndex(this.options.riseOffset);
+       },
+
+       _resetZIndex: function () {
+               this._updateZIndex(0);
+       }
+});
+
+L.marker = function (latlng, options) {
+       return new L.Marker(latlng, options);
+};
+
+
+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);
+};
+
+
+
+L.Map.mergeOptions({
+       closePopupOnClick: true
+});
+
+L.Popup = L.Class.extend({
+       includes: L.Mixin.Events,
+
+       options: {
+               minWidth: 50,
+               maxWidth: 300,
+               maxHeight: null,
+               autoPan: true,
+               closeButton: true,
+               offset: new L.Point(0, 6),
+               autoPanPadding: new L.Point(5, 5),
+               className: ''
+       },
+
+       initialize: function (options, source) {
+               L.setOptions(this, options);
+
+               this._source = source;
+       },
+
+       onAdd: function (map) {
+               this._map = map;
+
+               if (!this._container) {
+                       this._initLayout();
+               }
+               this._updateContent();
+
+               var animFade = map.options.fadeAnimation;
+
+               if (animFade) {
+                       L.DomUtil.setOpacity(this._container, 0);
+               }
+               map._panes.popupPane.appendChild(this._container);
+
+               map.on('viewreset', this._updatePosition, this);
+
+               if (L.Browser.any3d) {
+                       map.on('zoomanim', this._zoomAnimation, this);
+               }
+
+               if (map.options.closePopupOnClick) {
+                       map.on('preclick', this._close, this);
+               }
+
+               this._update();
+
+               if (animFade) {
+                       L.DomUtil.setOpacity(this._container, 1);
+               }
+       },
+
+       addTo: function (map) {
+               map.addLayer(this);
+               return this;
+       },
+
+       openOn: function (map) {
+               map.openPopup(this);
+               return this;
+       },
+
+       onRemove: function (map) {
+               map._panes.popupPane.removeChild(this._container);
+
+               L.Util.falseFn(this._container.offsetWidth); // force reflow
+
+               map.off({
+                       viewreset: this._updatePosition,
+                       preclick: this._close,
+                       zoomanim: this._zoomAnimation
+               }, this);
+
+               if (map.options.fadeAnimation) {
+                       L.DomUtil.setOpacity(this._container, 0);
+               }
+
+               this._map = null;
+       },
+
+       setLatLng: function (latlng) {
+               this._latlng = L.latLng(latlng);
+               this._update();
+               return this;
+       },
+
+       setContent: function (content) {
+               this._content = content;
+               this._update();
+               return this;
+       },
+
+       _close: function () {
+               var map = this._map;
+
+               if (map) {
+                       map._popup = null;
+
+                       map
+                           .removeLayer(this)
+                           .fire('popupclose', {popup: this});
+               }
+       },
+
+       _initLayout: function () {
+               var prefix = 'leaflet-popup',
+                       containerClass = prefix + ' ' + this.options.className + ' leaflet-zoom-animated',
+                       container = this._container = L.DomUtil.create('div', containerClass),
+                       closeButton;
+
+               if (this.options.closeButton) {
+                       closeButton = this._closeButton =
+                               L.DomUtil.create('a', prefix + '-close-button', container);
+                       closeButton.href = '#close';
+                       closeButton.innerHTML = '&#215;';
+
+                       L.DomEvent.on(closeButton, 'click', this._onCloseButtonClick, this);
+               }
+
+               var wrapper = this._wrapper =
+                       L.DomUtil.create('div', prefix + '-content-wrapper', container);
+               L.DomEvent.disableClickPropagation(wrapper);
+
+               this._contentNode = L.DomUtil.create('div', prefix + '-content', wrapper);
+               L.DomEvent.on(this._contentNode, 'mousewheel', L.DomEvent.stopPropagation);
+
+               this._tipContainer = L.DomUtil.create('div', prefix + '-tip-container', container);
+               this._tip = L.DomUtil.create('div', prefix + '-tip', this._tipContainer);
+       },
+
+       _update: function () {
+               if (!this._map) { return; }
+
+               this._container.style.visibility = 'hidden';
+
+               this._updateContent();
+               this._updateLayout();
+               this._updatePosition();
+
+               this._container.style.visibility = '';
+
+               this._adjustPan();
+       },
+
+       _updateContent: function () {
+               if (!this._content) { return; }
+
+               if (typeof this._content === 'string') {
+                       this._contentNode.innerHTML = this._content;
+               } else {
+                       while (this._contentNode.hasChildNodes()) {
+                               this._contentNode.removeChild(this._contentNode.firstChild);
+                       }
+                       this._contentNode.appendChild(this._content);
+               }
+               this.fire('contentupdate');
+       },
+
+       _updateLayout: function () {
+               var container = this._contentNode,
+                   style = container.style;
+
+               style.width = '';
+               style.whiteSpace = 'nowrap';
+
+               var width = container.offsetWidth;
+               width = Math.min(width, this.options.maxWidth);
+               width = Math.max(width, this.options.minWidth);
+
+               style.width = (width + 1) + 'px';
+               style.whiteSpace = '';
+
+               style.height = '';
+
+               var height = container.offsetHeight,
+                   maxHeight = this.options.maxHeight,
+                   scrolledClass = 'leaflet-popup-scrolled';
+
+               if (maxHeight && height > maxHeight) {
+                       style.height = maxHeight + 'px';
+                       L.DomUtil.addClass(container, scrolledClass);
+               } else {
+                       L.DomUtil.removeClass(container, scrolledClass);
+               }
+
+               this._containerWidth = this._container.offsetWidth;
+       },
+
+       _updatePosition: function () {
+               if (!this._map) { return; }
+
+               var pos = this._map.latLngToLayerPoint(this._latlng),
+                   is3d = L.Browser.any3d,
+                   offset = this.options.offset;
+
+               if (is3d) {
+                       L.DomUtil.setPosition(this._container, pos);
+               }
+
+               this._containerBottom = -offset.y - (is3d ? 0 : pos.y);
+               this._containerLeft = -Math.round(this._containerWidth / 2) + offset.x + (is3d ? 0 : pos.x);
+
+               //Bottom position the popup in case the height of the popup changes (images loading etc)
+               this._container.style.bottom = this._containerBottom + 'px';
+               this._container.style.left = this._containerLeft + 'px';
+       },
+
+       _zoomAnimation: function (opt) {
+               var pos = this._map._latLngToNewLayerPoint(this._latlng, opt.zoom, opt.center);
+
+               L.DomUtil.setPosition(this._container, pos);
+       },
+
+       _adjustPan: function () {
+               if (!this.options.autoPan) { return; }
+
+               var map = this._map,
+                   containerHeight = this._container.offsetHeight,
+                   containerWidth = this._containerWidth,
+
+                   layerPos = new L.Point(this._containerLeft, -containerHeight - this._containerBottom);
+
+               if (L.Browser.any3d) {
+                       layerPos._add(L.DomUtil.getPosition(this._container));
+               }
+
+               var containerPos = map.layerPointToContainerPoint(layerPos),
+                   padding = this.options.autoPanPadding,
+                   size = map.getSize(),
+                   dx = 0,
+                   dy = 0;
+
+               if (containerPos.x < 0) {
+                       dx = containerPos.x - padding.x;
+               }
+               if (containerPos.x + containerWidth > size.x) {
+                       dx = containerPos.x + containerWidth - size.x + padding.x;
+               }
+               if (containerPos.y < 0) {
+                       dy = containerPos.y - padding.y;
+               }
+               if (containerPos.y + containerHeight > size.y) {
+                       dy = containerPos.y + containerHeight - size.y + padding.y;
+               }
+
+               if (dx || dy) {
+                       map.panBy(new L.Point(dx, dy));
+               }
+       },
+
+       _onCloseButtonClick: function (e) {
+               this._close();
+               L.DomEvent.stop(e);
+       }
+});
+
+L.popup = function (options, source) {
+       return new L.Popup(options, source);
+};
+
+
+/*
+ * Popup extension to L.Marker, adding openPopup & bindPopup methods.
+ */
+
+L.Marker.include({
+       openPopup: function () {
+               if (this._popup && this._map) {
+                       this._popup.setLatLng(this._latlng);
+                       this._map.openPopup(this._popup);
+               }
+
+               return this;
+       },
+
+       closePopup: function () {
+               if (this._popup) {
+                       this._popup._close();
+               }
+               return this;
+       },
+
+       bindPopup: function (content, options) {
+               var anchor = L.point(this.options.icon.options.popupAnchor) || new L.Point(0, 0);
+
+               anchor = anchor.add(L.Popup.prototype.options.offset);
+
+               if (options && options.offset) {
+                       anchor = anchor.add(options.offset);
+               }
+
+               options = L.extend({offset: anchor}, options);
+
+               if (!this._popup) {
+                       this
+                           .on('click', this.openPopup, this)
+                           .on('remove', this.closePopup, this)
+                           .on('move', this._movePopup, this);
+               }
+
+               this._popup = new L.Popup(options, this)
+                       .setContent(content);
+
+               return this;
+       },
+
+       unbindPopup: function () {
+               if (this._popup) {
+                       this._popup = null;
+                       this
+                           .off('click', this.openPopup)
+                           .off('remove', this.closePopup)
+                           .off('move', this._movePopup);
+               }
+               return this;
+       },
+
+       _movePopup: function (e) {
+               this._popup.setLatLng(e.latlng);
+       }
+});
+
+
+
+L.Map.include({
+       openPopup: function (popup) {
+               this.closePopup();
+
+               this._popup = popup;
+
+               return this
+                   .addLayer(popup)
+                   .fire('popupopen', {popup: this._popup});
+       },
+
+       closePopup: function () {
+               if (this._popup) {
+                       this._popup._close();
+               }
+               return this;
+       }
+});
+
+
+/*
+ * L.LayerGroup is a class to combine several layers so you can manipulate the group (e.g. add/remove it) as one layer.
+ */
+
+L.LayerGroup = L.Class.extend({
+       initialize: function (layers) {
+               this._layers = {};
+
+               var i, len;
+
+               if (layers) {
+                       for (i = 0, len = layers.length; i < len; i++) {
+                               this.addLayer(layers[i]);
+                       }
+               }
+       },
+
+       addLayer: function (layer) {
+               var id = L.stamp(layer);
+
+               this._layers[id] = layer;
+
+               if (this._map) {
+                       this._map.addLayer(layer);
+               }
+
+               return this;
+       },
+
+       removeLayer: function (layer) {
+               var id = L.stamp(layer);
+
+               delete this._layers[id];
+
+               if (this._map) {
+                       this._map.removeLayer(layer);
+               }
+
+               return this;
+       },
+
+       clearLayers: function () {
+               this.eachLayer(this.removeLayer, this);
+               return this;
+       },
+
+       invoke: function (methodName) {
+               var args = Array.prototype.slice.call(arguments, 1),
+                   i, layer;
+
+               for (i in this._layers) {
+                       if (this._layers.hasOwnProperty(i)) {
+                               layer = this._layers[i];
+
+                               if (layer[methodName]) {
+                                       layer[methodName].apply(layer, args);
+                               }
+                       }
+               }
+
+               return this;
+       },
+
+       onAdd: function (map) {
+               this._map = map;
+               this.eachLayer(map.addLayer, map);
+       },
+
+       onRemove: function (map) {
+               this.eachLayer(map.removeLayer, map);
+               this._map = null;
+       },
+
+       addTo: function (map) {
+               map.addLayer(this);
+               return this;
+       },
+
+       eachLayer: function (method, context) {
+               for (var i in this._layers) {
+                       if (this._layers.hasOwnProperty(i)) {
+                               method.call(context, this._layers[i]);
+                       }
+               }
+       }
+});
+
+L.layerGroup = function (layers) {
+       return new L.LayerGroup(layers);
+};
+
+
+/*
+ * L.FeatureGroup extends L.LayerGroup by introducing mouse events and bindPopup method shared between a group of layers.
+ */
+
+L.FeatureGroup = L.LayerGroup.extend({
+       includes: L.Mixin.Events,
+
+       statics: {
+               EVENTS: 'click dblclick mouseover mouseout mousemove contextmenu'
+       },
+
+       addLayer: function (layer) {
+               if (this._layers[L.stamp(layer)]) {
+                       return this;
+               }
+
+               layer.on(L.FeatureGroup.EVENTS, this._propagateEvent, this);
+
+               L.LayerGroup.prototype.addLayer.call(this, layer);
+
+               if (this._popupContent && layer.bindPopup) {
+                       layer.bindPopup(this._popupContent);
+               }
+
+               return this.fire('layeradd', {layer: layer});
+       },
+
+       removeLayer: function (layer) {
+               layer.off(L.FeatureGroup.EVENTS, this._propagateEvent, this);
+
+               L.LayerGroup.prototype.removeLayer.call(this, layer);
+
+
+               if (this._popupContent) {
+                       this.invoke('unbindPopup');
+               }
+
+               return this.fire('layerremove', {layer: layer});
+       },
+
+       bindPopup: function (content) {
+               this._popupContent = content;
+               return this.invoke('bindPopup', content);
+       },
+
+       setStyle: function (style) {
+               return this.invoke('setStyle', style);
+       },
+
+       bringToFront: function () {
+               return this.invoke('bringToFront');
+       },
+
+       bringToBack: function () {
+               return this.invoke('bringToBack');
+       },
+
+       getBounds: function () {
+               var bounds = new L.LatLngBounds();
+
+               this.eachLayer(function (layer) {
+                       bounds.extend(layer instanceof L.Marker ? layer.getLatLng() : layer.getBounds());
+               });
+
+               return bounds;
+       },
+
+       _propagateEvent: function (e) {
+               e.layer  = e.target;
+               e.target = this;
+
+               this.fire(e.type, e);
+       }
+});
+
+L.featureGroup = function (layers) {
+       return new L.FeatureGroup(layers);
+};
+
+
+/*
+ * L.Path is a base class for rendering vector paths on a map. Inherited by Polyline, Circle, etc.
+ */
+
+L.Path = L.Class.extend({
+       includes: [L.Mixin.Events],
+
+       statics: {
+               // how much to extend the clip area around the map view
+               // (relative to its size, e.g. 0.5 is half the screen in each direction)
+               // set it so that SVG element doesn't exceed 1280px (vectors flicker on dragend if it is)
+               CLIP_PADDING: L.Browser.mobile ?
+                       Math.max(0, Math.min(0.5,
+                               (1280 / Math.max(window.innerWidth, window.innerHeight) - 1) / 2)) : 0.5
+       },
+
+       options: {
+               stroke: true,
+               color: '#0033ff',
+               dashArray: null,
+               weight: 5,
+               opacity: 0.5,
+
+               fill: false,
+               fillColor: null, //same as color by default
+               fillOpacity: 0.2,
+
+               clickable: true
+       },
+
+       initialize: function (options) {
+               L.setOptions(this, options);
+       },
+
+       onAdd: function (map) {
+               this._map = map;
+
+               if (!this._container) {
+                       this._initElements();
+                       this._initEvents();
+               }
+
+               this.projectLatlngs();
+               this._updatePath();
+
+               if (this._container) {
+                       this._map._pathRoot.appendChild(this._container);
+               }
+
+               map.on({
+                       'viewreset': this.projectLatlngs,
+                       'moveend': this._updatePath
+               }, this);
+       },
+
+       addTo: function (map) {
+               map.addLayer(this);
+               return this;
+       },
+
+       onRemove: function (map) {
+               map._pathRoot.removeChild(this._container);
+
+               this._map = null;
+
+               if (L.Browser.vml) {
+                       this._container = null;
+                       this._stroke = null;
+                       this._fill = null;
+               }
+
+               this.fire('remove');
+
+               map.off({
+                       'viewreset': this.projectLatlngs,
+                       'moveend': this._updatePath
+               }, this);
+       },
+
+       projectLatlngs: function () {
+               // do all projection stuff here
+       },
+
+       setStyle: function (style) {
+               L.setOptions(this, style);
+
+               if (this._container) {
+                       this._updateStyle();
+               }
+
+               return this;
+       },
+
+       redraw: function () {
+               if (this._map) {
+                       this.projectLatlngs();
+                       this._updatePath();
+               }
+               return this;
+       }
+});
+
+L.Map.include({
+       _updatePathViewport: function () {
+               var p = L.Path.CLIP_PADDING,
+                   size = this.getSize(),
+                   panePos = L.DomUtil.getPosition(this._mapPane),
+                   min = panePos.multiplyBy(-1)._subtract(size.multiplyBy(p)._round()),
+                   max = min.add(size.multiplyBy(1 + p * 2)._round());
+
+               this._pathViewport = new L.Bounds(min, max);
+       }
+});
+
+
+L.Path.SVG_NS = 'http://www.w3.org/2000/svg';
+
+L.Browser.svg = !!(document.createElementNS && document.createElementNS(L.Path.SVG_NS, 'svg').createSVGRect);
+
+L.Path = L.Path.extend({
+       statics: {
+               SVG: L.Browser.svg
+       },
+
+       bringToFront: function () {
+               var root = this._map._pathRoot,
+                   path = this._container;
+
+               if (path && root.lastChild !== path) {
+                       root.appendChild(path);
+               }
+               return this;
+       },
+
+       bringToBack: function () {
+               var root = this._map._pathRoot,
+                   path = this._container,
+                   first = root.firstChild;
+
+               if (path && first !== path) {
+                       root.insertBefore(path, first);
+               }
+               return this;
+       },
+
+       getPathString: function () {
+               // form path string here
+       },
+
+       _createElement: function (name) {
+               return document.createElementNS(L.Path.SVG_NS, name);
+       },
+
+       _initElements: function () {
+               this._map._initPathRoot();
+               this._initPath();
+               this._initStyle();
+       },
+
+       _initPath: function () {
+               this._container = this._createElement('g');
+
+               this._path = this._createElement('path');
+               this._container.appendChild(this._path);
+       },
+
+       _initStyle: function () {
+               if (this.options.stroke) {
+                       this._path.setAttribute('stroke-linejoin', 'round');
+                       this._path.setAttribute('stroke-linecap', 'round');
+               }
+               if (this.options.fill) {
+                       this._path.setAttribute('fill-rule', 'evenodd');
+               }
+               this._updateStyle();
+       },
+
+       _updateStyle: function () {
+               if (this.options.stroke) {
+                       this._path.setAttribute('stroke', this.options.color);
+                       this._path.setAttribute('stroke-opacity', this.options.opacity);
+                       this._path.setAttribute('stroke-width', this.options.weight);
+                       if (this.options.dashArray) {
+                               this._path.setAttribute('stroke-dasharray', this.options.dashArray);
+                       } else {
+                               this._path.removeAttribute('stroke-dasharray');
+                       }
+               } else {
+                       this._path.setAttribute('stroke', 'none');
+               }
+               if (this.options.fill) {
+                       this._path.setAttribute('fill', this.options.fillColor || this.options.color);
+                       this._path.setAttribute('fill-opacity', this.options.fillOpacity);
+               } else {
+                       this._path.setAttribute('fill', 'none');
+               }
+       },
+
+       _updatePath: function () {
+               var str = this.getPathString();
+               if (!str) {
+                       // fix webkit empty string parsing bug
+                       str = 'M0 0';
+               }
+               this._path.setAttribute('d', str);
+       },
+
+       // TODO remove duplication with L.Map
+       _initEvents: function () {
+               if (this.options.clickable) {
+                       if (L.Browser.svg || !L.Browser.vml) {
+                               this._path.setAttribute('class', 'leaflet-clickable');
+                       }
+
+                       L.DomEvent.on(this._container, 'click', this._onMouseClick, this);
+
+                       var events = ['dblclick', 'mousedown', 'mouseover',
+                                     'mouseout', 'mousemove', 'contextmenu'];
+                       for (var i = 0; i < events.length; i++) {
+                               L.DomEvent.on(this._container, events[i], this._fireMouseEvent, this);
+                       }
+               }
+       },
+
+       _onMouseClick: function (e) {
+               if (this._map.dragging && this._map.dragging.moved()) { return; }
+
+               this._fireMouseEvent(e);
+       },
+
+       _fireMouseEvent: function (e) {
+               if (!this.hasEventListeners(e.type)) { return; }
+
+               var map = this._map,
+                   containerPoint = map.mouseEventToContainerPoint(e),
+                   layerPoint = map.containerPointToLayerPoint(containerPoint),
+                   latlng = map.layerPointToLatLng(layerPoint);
+
+               this.fire(e.type, {
+                       latlng: latlng,
+                       layerPoint: layerPoint,
+                       containerPoint: containerPoint,
+                       originalEvent: e
+               });
+
+               if (e.type === 'contextmenu') {
+                       L.DomEvent.preventDefault(e);
+               }
+               if (e.type !== 'mousemove') {
+                       L.DomEvent.stopPropagation(e);
+               }
+       }
+});
+
+L.Map.include({
+       _initPathRoot: function () {
+               if (!this._pathRoot) {
+                       this._pathRoot = L.Path.prototype._createElement('svg');
+                       this._panes.overlayPane.appendChild(this._pathRoot);
+
+                       if (this.options.zoomAnimation && L.Browser.any3d) {
+                               this._pathRoot.setAttribute('class', ' leaflet-zoom-animated');
+
+                               this.on({
+                                       'zoomanim': this._animatePathZoom,
+                                       'zoomend': this._endPathZoom
+                               });
+                       } else {
+                               this._pathRoot.setAttribute('class', ' leaflet-zoom-hide');
+                       }
+
+                       this.on('moveend', this._updateSvgViewport);
+                       this._updateSvgViewport();
+               }
+       },
+
+       _animatePathZoom: function (opt) {
+               var scale = this.getZoomScale(opt.zoom),
+                   offset = this._getCenterOffset(opt.center),
+                   translate = offset.multiplyBy(-scale)._add(this._pathViewport.min);
+
+               this._pathRoot.style[L.DomUtil.TRANSFORM] =
+                       L.DomUtil.getTranslateString(translate) + ' scale(' + scale + ') ';
+
+               this._pathZooming = true;
+       },
+
+       _endPathZoom: function () {
+               this._pathZooming = false;
+       },
+
+       _updateSvgViewport: function () {
+
+               if (this._pathZooming) {
+                       // Do not update SVGs while a zoom animation is going on otherwise the animation will break.
+                       // When the zoom animation ends we will be updated again anyway
+                       // This fixes the case where you do a momentum move and zoom while the move is still ongoing.
+                       return;
+               }
+
+               this._updatePathViewport();
+
+               var vp = this._pathViewport,
+                   min = vp.min,
+                   max = vp.max,
+                   width = max.x - min.x,
+                   height = max.y - min.y,
+                   root = this._pathRoot,
+                   pane = this._panes.overlayPane;
+
+               // Hack to make flicker on drag end on mobile webkit less irritating
+               if (L.Browser.mobileWebkit) {
+                       pane.removeChild(root);
+               }
+
+               L.DomUtil.setPosition(root, min);
+               root.setAttribute('width', width);
+               root.setAttribute('height', height);
+               root.setAttribute('viewBox', [min.x, min.y, width, height].join(' '));
+
+               if (L.Browser.mobileWebkit) {
+                       pane.appendChild(root);
+               }
+       }
+});
+
+
+/*
+ * Popup extension to L.Path (polylines, polygons, circles), adding bindPopup method.
+ */
+
+L.Path.include({
+
+       bindPopup: function (content, options) {
+
+               if (!this._popup || options) {
+                       this._popup = new L.Popup(options, this);
+               }
+
+               this._popup.setContent(content);
+
+               if (!this._popupHandlersAdded) {
+                       this
+                           .on('click', this._openPopup, this)
+                           .on('remove', this.closePopup, this);
+
+                       this._popupHandlersAdded = true;
+               }
+
+               return this;
+       },
+
+       unbindPopup: function () {
+               if (this._popup) {
+                       this._popup = null;
+                       this
+                           .off('click', this.openPopup)
+                           .off('remove', this.closePopup);
+
+                       this._popupHandlersAdded = false;
+               }
+               return this;
+       },
+
+       openPopup: function (latlng) {
+
+               if (this._popup) {
+                       // open the popup from one of the path's points if not specified
+                       latlng = latlng || this._latlng ||
+                                this._latlngs[Math.floor(this._latlngs.length / 2)];
+
+                       this._openPopup({latlng: latlng});
+               }
+
+               return this;
+       },
+
+       closePopup: function () {
+               if (this._popup) {
+                       this._popup._close();
+               }
+               return this;
+       },
+
+       _openPopup: function (e) {
+               this._popup.setLatLng(e.latlng);
+               this._map.openPopup(this._popup);
+       }
+});
+
+
+/*
+ * Vector rendering for IE6-8 through VML.
+ * Thanks to Dmitry Baranovsky and his Raphael library for inspiration!
+ */
+
+L.Browser.vml = !L.Browser.svg && (function () {
+       try {
+               var div = document.createElement('div');
+               div.innerHTML = '<v:shape adj="1"/>';
+
+               var shape = div.firstChild;
+               shape.style.behavior = 'url(#default#VML)';
+
+               return shape && (typeof shape.adj === 'object');
+
+       } catch (e) {
+               return false;
+       }
+}());
+
+L.Path = L.Browser.svg || !L.Browser.vml ? L.Path : L.Path.extend({
+       statics: {
+               VML: true,
+               CLIP_PADDING: 0.02
+       },
+
+       _createElement: (function () {
+               try {
+                       document.namespaces.add('lvml', 'urn:schemas-microsoft-com:vml');
+                       return function (name) {
+                               return document.createElement('<lvml:' + name + ' class="lvml">');
+                       };
+               } catch (e) {
+                       return function (name) {
+                               return document.createElement(
+                                       '<' + name + ' xmlns="urn:schemas-microsoft.com:vml" class="lvml">');
+                       };
+               }
+       }()),
+
+       _initPath: function () {
+               var container = this._container = this._createElement('shape');
+               L.DomUtil.addClass(container, 'leaflet-vml-shape');
+               if (this.options.clickable) {
+                       L.DomUtil.addClass(container, 'leaflet-clickable');
+               }
+               container.coordsize = '1 1';
+
+               this._path = this._createElement('path');
+               container.appendChild(this._path);
+
+               this._map._pathRoot.appendChild(container);
+       },
+
+       _initStyle: function () {
+               this._updateStyle();
+       },
+
+       _updateStyle: function () {
+               var stroke = this._stroke,
+                   fill = this._fill,
+                   options = this.options,
+                   container = this._container;
+
+               container.stroked = options.stroke;
+               container.filled = options.fill;
+
+               if (options.stroke) {
+                       if (!stroke) {
+                               stroke = this._stroke = this._createElement('stroke');
+                               stroke.endcap = 'round';
+                               container.appendChild(stroke);
+                       }
+                       stroke.weight = options.weight + 'px';
+                       stroke.color = options.color;
+                       stroke.opacity = options.opacity;
+                       if (options.dashArray) {
+                               stroke.dashStyle = options.dashArray.replace(/ *, */g, ' ');
+                       } else {
+                               stroke.dashStyle = '';
+                       }
+               } else if (stroke) {
+                       container.removeChild(stroke);
+                       this._stroke = null;
+               }
+
+               if (options.fill) {
+                       if (!fill) {
+                               fill = this._fill = this._createElement('fill');
+                               container.appendChild(fill);
+                       }
+                       fill.color = options.fillColor || options.color;
+                       fill.opacity = options.fillOpacity;
+               } else if (fill) {
+                       container.removeChild(fill);
+                       this._fill = null;
+               }
+       },
+
+       _updatePath: function () {
+               var style = this._container.style;
+
+               style.display = 'none';
+               this._path.v = this.getPathString() + ' '; // the space fixes IE empty path string bug
+               style.display = '';
+       }
+});
+
+L.Map.include(L.Browser.svg || !L.Browser.vml ? {} : {
+       _initPathRoot: function () {
+               if (this._pathRoot) { return; }
+
+               var root = this._pathRoot = document.createElement('div');
+               root.className = 'leaflet-vml-container';
+               this._panes.overlayPane.appendChild(root);
+
+               this.on('moveend', this._updatePathViewport);
+               this._updatePathViewport();
+       }
+});
+
+
+/*
+ * Vector rendering for all browsers that support canvas.
+ */
+
+L.Browser.canvas = (function () {
+       return !!document.createElement('canvas').getContext;
+}());
+
+L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path : L.Path.extend({
+       statics: {
+               //CLIP_PADDING: 0.02, // not sure if there's a need to set it to a small value
+               CANVAS: true,
+               SVG: false
+       },
+
+       redraw: function () {
+               if (this._map) {
+                       this.projectLatlngs();
+                       this._requestUpdate();
+               }
+               return this;
+       },
+
+       setStyle: function (style) {
+               L.setOptions(this, style);
+
+               if (this._map) {
+                       this._updateStyle();
+                       this._requestUpdate();
+               }
+               return this;
+       },
+
+       onRemove: function (map) {
+               map
+                   .off('viewreset', this.projectLatlngs, this)
+                   .off('moveend', this._updatePath, this);
+
+               this._requestUpdate();
+
+               this._map = null;
+       },
+
+       _requestUpdate: function () {
+               if (this._map && !L.Path._updateRequest) {
+                       L.Path._updateRequest = L.Util.requestAnimFrame(this._fireMapMoveEnd, this._map);
+               }
+       },
+
+       _fireMapMoveEnd: function () {
+               L.Path._updateRequest = null;
+               this.fire('moveend');
+       },
+
+       _initElements: function () {
+               this._map._initPathRoot();
+               this._ctx = this._map._canvasCtx;
+       },
+
+       _updateStyle: function () {
+               var options = this.options;
+
+               if (options.stroke) {
+                       this._ctx.lineWidth = options.weight;
+                       this._ctx.strokeStyle = options.color;
+               }
+               if (options.fill) {
+                       this._ctx.fillStyle = options.fillColor || options.color;
+               }
+       },
+
+       _drawPath: function () {
+               var i, j, len, len2, point, drawMethod;
+
+               this._ctx.beginPath();
+
+               for (i = 0, len = this._parts.length; i < len; i++) {
+                       for (j = 0, len2 = this._parts[i].length; j < len2; j++) {
+                               point = this._parts[i][j];
+                               drawMethod = (j === 0 ? 'move' : 'line') + 'To';
+
+                               this._ctx[drawMethod](point.x, point.y);
+                       }
+                       // TODO refactor ugly hack
+                       if (this instanceof L.Polygon) {
+                               this._ctx.closePath();
+                       }
+               }
+       },
+
+       _checkIfEmpty: function () {
+               return !this._parts.length;
+       },
+
+       _updatePath: function () {
+               if (this._checkIfEmpty()) { return; }
+
+               var ctx = this._ctx,
+                   options = this.options;
+
+               this._drawPath();
+               ctx.save();
+               this._updateStyle();
+
+               if (options.fill) {
+                       if (options.fillOpacity < 1) {
+                               ctx.globalAlpha = options.fillOpacity;
+                       }
+                       ctx.fill();
+               }
+
+               if (options.stroke) {
+                       if (options.opacity < 1) {
+                               ctx.globalAlpha = options.opacity;
+                       }
+                       ctx.stroke();
+               }
+
+               ctx.restore();
+
+               // TODO optimization: 1 fill/stroke for all features with equal style instead of 1 for each feature
+       },
+
+       _initEvents: function () {
+               if (this.options.clickable) {
+                       // TODO hand cursor
+                       // TODO mouseover, mouseout, dblclick
+                       this._map.on('click', this._onClick, this);
+               }
+       },
+
+       _onClick: function (e) {
+               if (this._containsPoint(e.layerPoint)) {
+                       this.fire('click', e);
+               }
+       }
+});
+
+L.Map.include((L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? {} : {
+       _initPathRoot: function () {
+               var root = this._pathRoot,
+                   ctx;
+
+               if (!root) {
+                       root = this._pathRoot = document.createElement("canvas");
+                       root.style.position = 'absolute';
+                       ctx = this._canvasCtx = root.getContext('2d');
+
+                       ctx.lineCap = "round";
+                       ctx.lineJoin = "round";
+
+                       this._panes.overlayPane.appendChild(root);
+
+                       if (this.options.zoomAnimation) {
+                               this._pathRoot.className = 'leaflet-zoom-animated';
+                               this.on('zoomanim', this._animatePathZoom);
+                               this.on('zoomend', this._endPathZoom);
+                       }
+                       this.on('moveend', this._updateCanvasViewport);
+                       this._updateCanvasViewport();
+               }
+       },
+
+       _updateCanvasViewport: function () {
+               // don't redraw while zooming. See _updateSvgViewport for more details
+               if (this._pathZooming) { return; }
+               this._updatePathViewport();
+
+               var vp = this._pathViewport,
+                   min = vp.min,
+                   size = vp.max.subtract(min),
+                   root = this._pathRoot;
+
+               //TODO check if this works properly on mobile webkit
+               L.DomUtil.setPosition(root, min);
+               root.width = size.x;
+               root.height = size.y;
+               root.getContext('2d').translate(-min.x, -min.y);
+       }
+});
+
+
+/*
+ * L.LineUtil contains different utility functions for line segments
+ * and polylines (clipping, simplification, distances, etc.)
+ */
+
+L.LineUtil = {
+
+       // Simplify polyline with vertex reduction and Douglas-Peucker simplification.
+       // Improves rendering performance dramatically by lessening the number of points to draw.
+
+       simplify: function (/*Point[]*/ points, /*Number*/ tolerance) {
+               if (!tolerance || !points.length) {
+                       return points.slice();
+               }
+
+               var sqTolerance = tolerance * tolerance;
+
+               // stage 1: vertex reduction
+               points = this._reducePoints(points, sqTolerance);
+
+               // stage 2: Douglas-Peucker simplification
+               points = this._simplifyDP(points, sqTolerance);
+
+               return points;
+       },
+
+       // distance from a point to a segment between two points
+       pointToSegmentDistance:  function (/*Point*/ p, /*Point*/ p1, /*Point*/ p2) {
+               return Math.sqrt(this._sqClosestPointOnSegment(p, p1, p2, true));
+       },
+
+       closestPointOnSegment: function (/*Point*/ p, /*Point*/ p1, /*Point*/ p2) {
+               return this._sqClosestPointOnSegment(p, p1, p2);
+       },
+
+       // Douglas-Peucker simplification, see http://en.wikipedia.org/wiki/Douglas-Peucker_algorithm
+       _simplifyDP: function (points, sqTolerance) {
+
+               var len = points.length,
+                   ArrayConstructor = typeof Uint8Array !== undefined + '' ? Uint8Array : Array,
+                   markers = new ArrayConstructor(len);
+
+               markers[0] = markers[len - 1] = 1;
+
+               this._simplifyDPStep(points, markers, sqTolerance, 0, len - 1);
+
+               var i,
+                   newPoints = [];
+
+               for (i = 0; i < len; i++) {
+                       if (markers[i]) {
+                               newPoints.push(points[i]);
+                       }
+               }
+
+               return newPoints;
+       },
+
+       _simplifyDPStep: function (points, markers, sqTolerance, first, last) {
+
+               var maxSqDist = 0,
+                   index, i, sqDist;
+
+               for (i = first + 1; i <= last - 1; i++) {
+                       sqDist = this._sqClosestPointOnSegment(points[i], points[first], points[last], true);
+
+                       if (sqDist > maxSqDist) {
+                               index = i;
+                               maxSqDist = sqDist;
+                       }
+               }
+
+               if (maxSqDist > sqTolerance) {
+                       markers[index] = 1;
+
+                       this._simplifyDPStep(points, markers, sqTolerance, first, index);
+                       this._simplifyDPStep(points, markers, sqTolerance, index, last);
+               }
+       },
+
+       // reduce points that are too close to each other to a single point
+       _reducePoints: function (points, sqTolerance) {
+               var reducedPoints = [points[0]];
+
+               for (var i = 1, prev = 0, len = points.length; i < len; i++) {
+                       if (this._sqDist(points[i], points[prev]) > sqTolerance) {
+                               reducedPoints.push(points[i]);
+                               prev = i;
+                       }
+               }
+               if (prev < len - 1) {
+                       reducedPoints.push(points[len - 1]);
+               }
+               return reducedPoints;
+       },
+
+       /*jshint bitwise:false */ // temporarily allow bitwise oprations
+
+       // Cohen-Sutherland line clipping algorithm.
+       // Used to avoid rendering parts of a polyline that are not currently visible.
+
+       clipSegment: function (a, b, bounds, useLastCode) {
+               var min = bounds.min,
+                   max = bounds.max,
+
+                   codeA = useLastCode ? this._lastCode : this._getBitCode(a, bounds),
+                   codeB = this._getBitCode(b, bounds),
+
+                   codeOut, p, newCode;
+
+               // save 2nd code to avoid calculating it on the next segment
+               this._lastCode = codeB;
+
+               while (true) {
+                       // if a,b is inside the clip window (trivial accept)
+                       if (!(codeA | codeB)) {
+                               return [a, b];
+                       // if a,b is outside the clip window (trivial reject)
+                       } else if (codeA & codeB) {
+                               return false;
+                       // other cases
+                       } else {
+                               codeOut = codeA || codeB,
+                               p = this._getEdgeIntersection(a, b, codeOut, bounds),
+                               newCode = this._getBitCode(p, bounds);
+
+                               if (codeOut === codeA) {
+                                       a = p;
+                                       codeA = newCode;
+                               } else {
+                                       b = p;
+                                       codeB = newCode;
+                               }
+                       }
+               }
+       },
+
+       _getEdgeIntersection: function (a, b, code, bounds) {
+               var dx = b.x - a.x,
+                   dy = b.y - a.y,
+                   min = bounds.min,
+                   max = bounds.max;
+
+               if (code & 8) { // top
+                       return new L.Point(a.x + dx * (max.y - a.y) / dy, max.y);
+               } else if (code & 4) { // bottom
+                       return new L.Point(a.x + dx * (min.y - a.y) / dy, min.y);
+               } else if (code & 2) { // right
+                       return new L.Point(max.x, a.y + dy * (max.x - a.x) / dx);
+               } else if (code & 1) { // left
+                       return new L.Point(min.x, a.y + dy * (min.x - a.x) / dx);
+               }
+       },
+
+       _getBitCode: function (/*Point*/ p, bounds) {
+               var code = 0;
+
+               if (p.x < bounds.min.x) { // left
+                       code |= 1;
+               } else if (p.x > bounds.max.x) { // right
+                       code |= 2;
+               }
+               if (p.y < bounds.min.y) { // bottom
+                       code |= 4;
+               } else if (p.y > bounds.max.y) { // top
+                       code |= 8;
+               }
+
+               return code;
+       },
+
+       /*jshint bitwise:true */
+
+       // square distance (to avoid unnecessary Math.sqrt calls)
+       _sqDist: function (p1, p2) {
+               var dx = p2.x - p1.x,
+                   dy = p2.y - p1.y;
+               return dx * dx + dy * dy;
+       },
+
+       // return closest point on segment or distance to that point
+       _sqClosestPointOnSegment: function (p, p1, p2, sqDist) {
+               var x = p1.x,
+                   y = p1.y,
+                   dx = p2.x - x,
+                   dy = p2.y - y,
+                   dot = dx * dx + dy * dy,
+                   t;
+
+               if (dot > 0) {
+                       t = ((p.x - x) * dx + (p.y - y) * dy) / dot;
+
+                       if (t > 1) {
+                               x = p2.x;
+                               y = p2.y;
+                       } else if (t > 0) {
+                               x += dx * t;
+                               y += dy * t;
+                       }
+               }
+
+               dx = p.x - x;
+               dy = p.y - y;
+
+               return sqDist ? dx * dx + dy * dy : new L.Point(x, y);
+       }
+};
+
+
+L.Polyline = L.Path.extend({
+       initialize: function (latlngs, options) {
+               L.Path.prototype.initialize.call(this, options);
+
+               this._latlngs = this._convertLatLngs(latlngs);
+
+               // TODO refactor: move to Polyline.Edit.js
+               if (L.Handler.PolyEdit) {
+                       this.editing = new L.Handler.PolyEdit(this);
+
+                       if (this.options.editable) {
+                               this.editing.enable();
+                       }
+               }
+       },
+
+       options: {
+               // how much to simplify the polyline on each zoom level
+               // more = better performance and smoother look, less = more accurate
+               smoothFactor: 1.0,
+               noClip: false
+       },
+
+       projectLatlngs: function () {
+               this._originalPoints = [];
+
+               for (var i = 0, len = this._latlngs.length; i < len; i++) {
+                       this._originalPoints[i] = this._map.latLngToLayerPoint(this._latlngs[i]);
+               }
+       },
+
+       getPathString: function () {
+               for (var i = 0, len = this._parts.length, str = ''; i < len; i++) {
+                       str += this._getPathPartStr(this._parts[i]);
+               }
+               return str;
+       },
+
+       getLatLngs: function () {
+               return this._latlngs;
+       },
+
+       setLatLngs: function (latlngs) {
+               this._latlngs = this._convertLatLngs(latlngs);
+               return this.redraw();
+       },
+
+       addLatLng: function (latlng) {
+               this._latlngs.push(L.latLng(latlng));
+               return this.redraw();
+       },
+
+       spliceLatLngs: function (index, howMany) {
+               var removed = [].splice.apply(this._latlngs, arguments);
+               this._convertLatLngs(this._latlngs);
+               this.redraw();
+               return removed;
+       },
+
+       closestLayerPoint: function (p) {
+               var minDistance = Infinity, parts = this._parts, p1, p2, minPoint = null;
+
+               for (var j = 0, jLen = parts.length; j < jLen; j++) {
+                       var points = parts[j];
+                       for (var i = 1, len = points.length; i < len; i++) {
+                               p1 = points[i - 1];
+                               p2 = points[i];
+                               var sqDist = L.LineUtil._sqClosestPointOnSegment(p, p1, p2, true);
+                               if (sqDist < minDistance) {
+                                       minDistance = sqDist;
+                                       minPoint = L.LineUtil._sqClosestPointOnSegment(p, p1, p2);
+                               }
+                       }
+               }
+               if (minPoint) {
+                       minPoint.distance = Math.sqrt(minDistance);
+               }
+               return minPoint;
+       },
+
+       getBounds: function () {
+               var bounds = new L.LatLngBounds(),
+                   latLngs = this.getLatLngs(),
+                   i, len;
+
+               for (i = 0, len = latLngs.length; i < len; i++) {
+                       bounds.extend(latLngs[i]);
+               }
+
+               return bounds;
+       },
+
+       // TODO refactor: move to Polylin