Replace various Leaflet extensions with new builtin methods

[rails.git] / app / assets / javascripts / index / export.js

diff --git a/app/assets/javascripts/index/export.js b/app/assets/javascripts/index/export.js
index 31a981ec9a15b34ff87d183e9b3f91b58b6ce676..52af96ebb7ad20d120ce60b9c84e234a17b104df 100644 (file)
--- a/app/assets/javascripts/index/export.js
+++ b/app/assets/javascripts/index/export.js
@@ -67,7 +67,7 @@ $(document).ready(function () {
       var bounds = map.getBounds(),
         centerLat = bounds.getCenter().lat,
         halfWorldMeters = 6378137 * Math.PI * Math.cos(centerLat * Math.PI / 180),
       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,
+        meters = halfWorldMeters * (bounds.getEast() - bounds.getWest()) / 180,

         pixelsPerMeter = map.getSize().x / meters,
         metersPerPixel = 1 / (92 * 39.3701);
       return Math.round(1 / (pixelsPerMeter * metersPerPixel));
         pixelsPerMeter = map.getSize().x / meters,
         metersPerPixel = 1 / (92 * 39.3701);
       return Math.round(1 / (pixelsPerMeter * metersPerPixel));


@@ -152,10 +152,10 @@ $(document).ready(function () {
     function setBounds(bounds) {
       var toPrecision = zoomPrecision(map.getZoom());
 
     function setBounds(bounds) {
       var toPrecision = zoomPrecision(map.getZoom());
 

-      $("#minlon").val(toPrecision(bounds.getWestLng()));
-      $("#minlat").val(toPrecision(bounds.getSouthLat()));
-      $("#maxlon").val(toPrecision(bounds.getEastLng()));
-      $("#maxlat").val(toPrecision(bounds.getNorthLat()));
+      $("#minlon").val(toPrecision(bounds.getWest()));
+      $("#minlat").val(toPrecision(bounds.getSouth()));
+      $("#maxlon").val(toPrecision(bounds.getEast()));
+      $("#maxlat").val(toPrecision(bounds.getNorth()));

 
       mapnikSizeChanged();
       htmlUrlChanged();
 
       mapnikSizeChanged();
       htmlUrlChanged();


@@ -188,7 +188,7 @@ $(document).ready(function () {
       var bounds = getBounds();
       var layerName = getMapBaseLayer().keyid;
 
       var bounds = getBounds();
       var layerName = getMapBaseLayer().keyid;
 

-      var url = "http://" + OSM.SERVER_URL + "/export/embed.html?bbox=" + bounds.toBBOX() + "&layer=" + layerName;
+      var url = "http://" + OSM.SERVER_URL + "/export/embed.html?bbox=" + bounds.toBBoxString() + "&layer=" + layerName;

       var markerUrl = "";
 
       if ($("#marker_lat").val() && $("#marker_lon").val()) {
       var markerUrl = "";
 
       if ($("#marker_lat").val() && $("#marker_lon").val()) {


@@ -254,16 +254,16 @@ $(document).ready(function () {
     }
 
     function maxMapnikScale() {
     }
 
     function maxMapnikScale() {

-      var bounds = getMercatorBounds();
+      var size = getMercatorBounds().getSize();

 
 

-      return Math.floor(Math.sqrt(bounds.getWidth() * bounds.getHeight() / 0.3136));
+      return Math.floor(Math.sqrt(size.x * size.y / 0.3136));

     }
 
     function mapnikImageSize(scale) {
     }
 
     function mapnikImageSize(scale) {

-      var bounds = getMercatorBounds();
+      var size = getMercatorBounds().getSize();

 
 

-      return {w: Math.round(bounds.getWidth() / scale / 0.00028),
-              h: Math.round(bounds.getHeight() / scale / 0.00028)};
+      return {w: Math.round(size.x / scale / 0.00028),
+              h: Math.round(size.y / scale / 0.00028)};

     }
 
     function roundScale(scale) {
     }
 
     function roundScale(scale) {