X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/14136b27c2e242ae3913b427113f5294be4b76e0..d423ae91370b08dcad6ccba041c2e234659531ec:/app/assets/javascripts/application.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index f66f231ef..09ae367f4 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -9,7 +9,6 @@
 //= require osm
 //= require leaflet
 //= require leaflet.osm
-//= require leaflet.hash
 //= require leaflet.map
 //= require leaflet.zoom
 //= require leaflet.locationfilter
@@ -21,25 +20,24 @@
 
 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,
-          top: bbox.getNorth() + 0.0001,
-          right: bbox.getEast() + 0.0001,
-          bottom: bbox.getSouth() - 0.0001
-      };
+    url = document.location.protocol === "https:" ?
+            "https://127.0.0.1:8112/load_and_zoom?" :
+            "http://127.0.0.1:8111/load_and_zoom?",
+    query = {
+        left: bbox.getWest() - 0.0001,
+        top: bbox.getNorth() + 0.0001,
+        right: bbox.getEast() + 0.0001,
+        bottom: bbox.getSouth() - 0.0001
+    };
 
-  if (select) query.select = select;
+  if (object) query.select = object.type + object.id;
 
   var iframe = $('<iframe>')
     .hide()
     .appendTo('body')
-    .attr("src", "http://127.0.0.1:8111/load_and_zoom?" + querystring.stringify(query))
+    .attr("src", url + querystring.stringify(query))
     .on('load', function() {
       $(this).remove();
       loaded = true;
@@ -59,20 +57,27 @@ function remoteEditHandler(bbox, select) {
  * Called as the user scrolls/zooms around to maniplate hrefs of the
  * view tab and various other links
  */
-function updatelinks(loc, zoom, layers, object) {
+function updateLinks(loc, zoom, layers, object) {
   $(".geolink").each(function(index, link) {
     var href = link.href.split(/[?#]/)[0],
       args = querystring.parse(link.search.substring(1)),
       editlink = $(link).hasClass("editlink");
 
-    if (object && editlink) args[object.type] = object.id;
+    delete args['node'];
+    delete args['way'];
+    delete args['relation'];
+    delete args['changeset'];
+
+    if (object && editlink) {
+      args[object.type] = object.id;
+    }
 
     var query = querystring.stringify(args);
     if (query) href += '?' + query;
 
     args = {
       lat: loc.lat,
-      lon: loc.lon || loc.lng,
+      lon: 'lon' in loc ? loc.lon : loc.lng,
       zoom: zoom
     };
 
@@ -95,12 +100,6 @@ function updatelinks(loc, zoom, layers, object) {
       I18n.t('javascripts.site.edit_disabled_tooltip') : '');
 }
 
-// generate a cookie-safe string of map state
-function cookieContent(map) {
-  var center = map.getCenter().wrap();
-  return [center.lng, center.lat, map.getZoom(), map.getLayersCode()].join('|');
-}
-
 function escapeHTML(string) {
   var htmlEscapes = {
     '&': '&amp;',
@@ -122,15 +121,7 @@ function minimiseMap() {
   $("#content").removeClass("maximised");
 }
 
-/*
- * Forms which have been cached by rails may have the wrong
- * authenticity token, so patch up any forms with the correct
- * token taken from the page header.
- */
 $(document).ready(function () {
-  var auth_token = $("meta[name=csrf-token]").attr("content");
-  $("form input[name=authenticity_token]").val(auth_token);
-
   $("#menu-icon").on("click", function(e) {
     e.preventDefault();
     $("header").toggleClass("closed");