X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1a51f2187127f7376e2118b5a4ced49123b0504a..286bffa3dba448f4364c6798f35003d8c6eefc4a:/app/assets/javascripts/welcome.js?ds=inline diff --git a/app/assets/javascripts/welcome.js b/app/assets/javascripts/welcome.js index 5409c9ec9..56c454ac4 100644 --- a/app/assets/javascripts/welcome.js +++ b/app/assets/javascripts/welcome.js @@ -2,40 +2,27 @@ $(document).ready(function() { var params = OSM.params(); if (params.lat && params.lon) { - $('.edit-located').show(); - - $.ajax({ - url: "http://nominatim.openstreetmap.org/reverse", - data: { - lat: params.lat, - lon: params.lon, - zoom: 10 - }, - success: function(xml) { - var result = $(xml).find('result'); - if (result.length) { - $('.edit-located').hide(); - $('.edit-geocoded').show(); - $('.edit-geocoded-location').text(result.text()); - } - } - }); + params.lat = parseFloat(params.lat); + params.lon = parseFloat(params.lon); + params.zoom = params.zoom || 17; - $('.start-mapping').on('click', function(e) { - window.location = '/edit?zoom=17&lat=' + params.lat + '&lon=' + params.lon; - }); + var url = '/edit'; - } else if (navigator.geolocation) { - $('.edit-geolocated').show(); - - function geoSuccess(position) { - window.location = '/edit?zoom=17&lat=' + position.coords.latitude + '&lon=' + position.coords.longitude; + if (params.editor) { + url += '?editor=' + params.editor; } - function geoError() { - $('.start-mapping') - .removeClass('loading') - .addClass('error'); + url += OSM.formatHash(params); + + $('.start-mapping').attr('href', url); + + } else if (navigator.geolocation) { + function geoSuccess(position) { + window.location = '/edit' + OSM.formatHash({ + zoom: 17, + lat: position.coords.latitude, + lon: position.coords.longitude + }); } $('.start-mapping').on('click', function(e) { @@ -46,9 +33,15 @@ $(document).ready(function() { // handle firefox's weird implementation // https://bugzilla.mozilla.org/show_bug.cgi?id=675533 - window.setTimeout(geoError, 4000); + window.setTimeout(manualEdit, 4000); - navigator.geolocation.getCurrentPosition(geoSuccess, geoError); + navigator.geolocation.getCurrentPosition(geoSuccess, manualEdit); }); + } else { + manualEdit(); + } + + function manualEdit() { + window.location = '/?edit_help=1' } });