Merge remote-tracking branch 'upstream/pull/5621'

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

diff --git a/app/assets/javascripts/welcome.js b/app/assets/javascripts/welcome.js
index 5ba0d7cd2183e28f3ffcbaa88d5901eefece4531..77d1d513c3e5ba6f64b8fc24c5429cfdd70be335 100644 (file)
--- a/app/assets/javascripts/welcome.js
+++ b/app/assets/javascripts/welcome.js
@@ -1,33 +1,18 @@
-$(document).ready(function() {
+$(document).ready(function () {
   var params = OSM.params();
 
   if (params.lat && params.lon) {
-    params.lat = parseFloat(params.lat);
-    params.lon = parseFloat(params.lon);
-    params.zoom = params.zoom || 17;
-
-    var url = '/edit';
-
-    if (params.editor) {
-      url += '?editor=' + params.editor;
-    }
+    var url = "/edit";
 
+    if (params.editor) url += "?editor=" + params.editor;
+    if (!params.zoom) params.zoom = 17;
     url += OSM.formatHash(params);
 
-    $('.start-mapping').attr('href', url);
-
+    $(".start-mapping").attr("href", url);
   } else {
-    var geoSuccess = function (position) {
-      window.location = '/edit' + OSM.formatHash({
-        zoom: 17,
-        lat: position.coords.latitude,
-        lon: position.coords.longitude
-      });
-    };
-
-    $('.start-mapping').on('click', function(e) {
+    $(".start-mapping").on("click", function (e) {
       e.preventDefault();
-      $('.start-mapping').addClass('loading');
+      $(".start-mapping").addClass("loading");
 
       if (navigator.geolocation) {
         // handle firefox's weird implementation
@@ -41,7 +26,15 @@ $(document).ready(function() {
     });
   }
 
+  function geoSuccess(position) {
+    window.location = "/edit" + OSM.formatHash({
+      zoom: 17,
+      lat: position.coords.latitude,
+      lon: position.coords.longitude
+    });
+  }
+
   function manualEdit() {
-    window.location = '/?edit_help=1';
+    window.location = "/?edit_help=1";
   }
 });