Remove parseFloat calls and restructure

diff --git a/app/assets/javascripts/fixthemap.js b/app/assets/javascripts/fixthemap.js
index 47ba9baf4da556ea4b30dfd38d173575dec960f3..221b5355fe30283b1a960932365f43e06dfba994 100644 (file)
--- a/app/assets/javascripts/fixthemap.js
+++ b/app/assets/javascripts/fixthemap.js
@@ -2,11 +2,7 @@ $(document).ready(function () {
   var params = OSM.params();
 
   var url = "/note/new";
   var params = OSM.params();
 
   var url = "/note/new";

-  if (params.lat && params.lon) {
-    params.lat = parseFloat(params.lat);
-    params.lon = parseFloat(params.lon);
-    params.zoom = params.zoom || 17;
-    url += OSM.formatHash(params);
-  }
+  if (!params.zoom) params.zoom = 17;
+  if (params.lat && params.lon) url += OSM.formatHash(params);

   $(".icon.note").attr("href", url);
 });
   $(".icon.note").attr("href", url);
 });

diff --git a/app/assets/javascripts/welcome.js b/app/assets/javascripts/welcome.js
index 35a1fdc4bdfc6a864e05ea52a2f5a37859f05daf..77d1d513c3e5ba6f64b8fc24c5429cfdd70be335 100644 (file)
--- a/app/assets/javascripts/welcome.js
+++ b/app/assets/javascripts/welcome.js
@@ -2,28 +2,14 @@ $(document).ready(function () {
   var params = OSM.params();
 
   if (params.lat && params.lon) {
   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";
 
     var url = "/edit";
 

-    if (params.editor) {
-      url += "?editor=" + params.editor;
-    }
-
+    if (params.editor) url += "?editor=" + params.editor;
+    if (!params.zoom) params.zoom = 17;

     url += OSM.formatHash(params);
 
     $(".start-mapping").attr("href", url);
   } else {
     url += OSM.formatHash(params);
 
     $(".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) {
       e.preventDefault();
       $(".start-mapping").addClass("loading");
     $(".start-mapping").on("click", function (e) {
       e.preventDefault();
       $(".start-mapping").addClass("loading");


@@ -40,6 +26,14 @@ $(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";
   }
   function manualEdit() {
     window.location = "/?edit_help=1";
   }