From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 24 Jul 2013 00:32:54 +0000 (-0700)
Subject: zoomPrecision doesn't need to be higher-order
X-Git-Tag: live~4803^2~3
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b28511faca45d8d8abc0d3c2fde5a501bbe94062?hp=b5800b4c2f51e265b51f6b0cd45728b8d7db86aa

zoomPrecision doesn't need to be higher-order
---

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index e54498834..18b1515c5 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -23,10 +23,7 @@
 var querystring = require('querystring-component');
 
 function zoomPrecision(zoom) {
-    var decimals = Math.pow(10, Math.floor(zoom/3));
-    return function(x) {
-         return Math.round(x * decimals) / decimals;
-    };
+    return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
 }
 
 function normalBounds(bounds) {
@@ -62,18 +59,17 @@ function remoteEditHandler(bbox, select) {
  * view tab and various other links
  */
 function updatelinks(loc, zoom, layers, bounds, object) {
-  var toPrecision = zoomPrecision(zoom);
+  var precision = zoomPrecision(zoom);
   bounds = normalBounds(bounds);
-  var node;
 
-  var lat = toPrecision(loc.lat),
-      lon = toPrecision(loc.lon || loc.lng);
+  var lat = loc.lat.toFixed(precision),
+      lon = (loc.lon || loc.lng).toFixed(precision);
 
   if (bounds) {
-    var minlon = toPrecision(bounds.getWest()),
-        minlat = toPrecision(bounds.getSouth()),
-        maxlon = toPrecision(bounds.getEast()),
-        maxlat = toPrecision(bounds.getNorth());
+    var minlon = bounds.getWest().toFixed(precision),
+        minlat = bounds.getSouth().toFixed(precision),
+        maxlon = bounds.getEast().toFixed(precision),
+        maxlat = bounds.getNorth().toFixed(precision);
   }
 
   $(".geolink").each(setGeolink);
diff --git a/app/assets/javascripts/index/export.js b/app/assets/javascripts/index/export.js
index 417dfabd3..47830f8be 100644
--- a/app/assets/javascripts/index/export.js
+++ b/app/assets/javascripts/index/export.js
@@ -150,12 +150,12 @@ function initializeExport(map) {
     }
 
     function setBounds(bounds) {
-      var toPrecision = zoomPrecision(map.getZoom());
+      var precision = zoomPrecision(map.getZoom());
 
-      $("#minlon").val(toPrecision(bounds.getWest()));
-      $("#minlat").val(toPrecision(bounds.getSouth()));
-      $("#maxlon").val(toPrecision(bounds.getEast()));
-      $("#maxlat").val(toPrecision(bounds.getNorth()));
+      $("#minlon").val(bounds.getWest().toFixed(precision));
+      $("#minlat").val(bounds.getSouth().toFixed(precision));
+      $("#maxlon").val(bounds.getEast().toFixed(precision));
+      $("#maxlat").val(bounds.getNorth().toFixed(precision));
 
       mapnikSizeChanged();
       htmlUrlChanged();
diff --git a/app/assets/javascripts/leaflet.extend.js.erb b/app/assets/javascripts/leaflet.extend.js.erb
index f1abfb4ba..91cb12091 100644
--- a/app/assets/javascripts/leaflet.extend.js.erb
+++ b/app/assets/javascripts/leaflet.extend.js.erb
@@ -31,17 +31,17 @@ L.extend(L.Map.prototype, {
   getUrl: function(marker) {
     var center = this.getCenter(),
         zoom = this.getZoom(),
-        toZoom = zoomPrecision(zoom),
+        precision = zoomPrecision(zoom),
         params = {
-          lat: toZoom(center.lat),
-          lon: toZoom(center.lng),
+          lat: center.lat.toFixed(precision),
+          lon: center.lng.toFixed(precision),
           zoom: zoom,
           layers: this.getLayersCode()
         };
 
     if (marker && this.hasLayer(marker)) {
-      params.mlat = toZoom(marker.getLatLng().lat);
-      params.mlon = toZoom(marker.getLatLng().lng);
+      params.mlat = marker.getLatLng().lat.toFixed(precision);
+      params.mlon = marker.getLatLng().lng.toFixed(precision);
     }
 
     return 'http://' + OSM.SERVER_URL + '/?' + querystring.stringify(params);