X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/44629832dd0207d7b0f50b93f1d00b4373dd4d49..a1a3b2c87e53c095d43bb9835590dc525122a062:/app/assets/javascripts/welcome.js?ds=sidebyside diff --git a/app/assets/javascripts/welcome.js b/app/assets/javascripts/welcome.js index 88b153af2..77d1d513c 100644 --- a/app/assets/javascripts/welcome.js +++ b/app/assets/javascripts/welcome.js @@ -1,45 +1,40 @@ -$(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 { - function geoSuccess(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'); - - // handle firefox's weird implementation - // https://bugzilla.mozilla.org/show_bug.cgi?id=675533 - window.setTimeout(manualEdit, 4000); + $(".start-mapping").addClass("loading"); if (navigator.geolocation) { + // handle firefox's weird implementation + // https://bugzilla.mozilla.org/show_bug.cgi?id=675533 + window.setTimeout(manualEdit, 4000); + navigator.geolocation.getCurrentPosition(geoSuccess, manualEdit); + } else { + manualEdit(); } }); } + 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"; } });