Move zoomPrecision function to the OSM namespace

[rails.git] / app / assets / javascripts / application.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 37172f4398849e9bc990ac5f5c77d3375e07e159..75b48ac8715362aaa4fdb8dfd48735f4deeb4386 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -20,11 +20,7 @@
 
 var querystring = require('querystring-component');
 
-function zoomPrecision(zoom) {
-    return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
-}
-
-function remoteEditHandler(bbox, select) {
+function remoteEditHandler(bbox, object) {
   var loaded = false,
       query = {
           left: bbox.getWest() - 0.0001,
@@ -33,7 +29,7 @@ function remoteEditHandler(bbox, select) {
           bottom: bbox.getSouth() - 0.0001
       };
 
-  if (select) query.select = select;
+  if (object) query.select = object.type + object.id;
 
   var iframe = $('<iframe>')
     .hide()
@@ -64,12 +60,12 @@ function updateLinks(loc, zoom, layers, object) {
       args = querystring.parse(link.search.substring(1)),
       editlink = $(link).hasClass("editlink");
 
-    if (object && editlink) {
-      delete args['node'];
-      delete args['way'];
-      delete args['relation'];
-      delete args['changeset'];
+    delete args['node'];
+    delete args['way'];
+    delete args['relation'];
+    delete args['changeset'];
 
+    if (object && editlink) {
       args[object.type] = object.id;
     }
 
@@ -78,7 +74,7 @@ function updateLinks(loc, zoom, layers, object) {
 
     args = {
       lat: loc.lat,
-      lon: loc.lon || loc.lng,
+      lon: 'lon' in loc ? loc.lon : loc.lng,
       zoom: zoom
     };