X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/15b104f4ff4614aa78c01180b6a9b89dd5a1400f..a90302aecf579ca29fa5ea0b1e9d03f81b8bbde4:/app/assets/javascripts/user.js?ds=sidebyside diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js index 1c73d3430..495470f2f 100644 --- a/app/assets/javascripts/user.js +++ b/app/assets/javascripts/user.js @@ -1,45 +1,54 @@ -//= require leaflet.locate +//= require leaflet.locatecontrol/src/L.Control.Locate $(document).ready(function () { + var defaultHomeZoom = 12; + var map, marker, deleted_lat, deleted_lon; + if ($("#map").length) { - var map = L.map("map", { + map = L.map("map", { attributionControl: false, zoomControl: false }).addLayer(new L.OSM.Mapnik()); - var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright'; + var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright"; - L.OSM.zoom({position: position}) + L.OSM.zoom({ position: position }) .addTo(map); var locate = L.control.locate({ position: position, - icon: 'icon geolocate', - iconLoading: 'icon geolocate', + icon: "icon geolocate", + iconLoading: "icon geolocate", strings: { - title: I18n.t('javascripts.map.locate.title'), - popup: I18n.t('javascripts.map.locate.popup') + title: I18n.t("javascripts.map.locate.title"), + popup: function (options) { + return I18n.t("javascripts.map.locate." + options.unit + "Popup", { count: options.distance }); + } } }).addTo(map); var locateContainer = locate.getContainer(); $(locateContainer) - .removeClass('leaflet-control-locate leaflet-bar') - .addClass('control-locate') + .removeClass("leaflet-control-locate leaflet-bar") + .addClass("control-locate") .children("a") - .attr('href', '#') - .removeClass('leaflet-bar-part leaflet-bar-part-single') - .addClass('control-button'); + .attr("href", "#") + .removeClass("leaflet-bar-part leaflet-bar-part-single") + .addClass("control-button"); if (OSM.home) { - map.setView([OSM.home.lat, OSM.home.lon], 12); + map.setView([OSM.home.lat, OSM.home.lon], defaultHomeZoom); } else { map.setView([0, 0], 0); } if ($("#map").hasClass("set_location")) { - var marker = L.marker([0, 0], {icon: OSM.getUserIcon()}); + marker = L.marker([0, 0], { + icon: OSM.getUserIcon(), + keyboard: false, + interactive: false + }); if (OSM.home) { marker.setLatLng([OSM.home.lat, OSM.home.lon]); @@ -47,30 +56,112 @@ $(document).ready(function () { } map.on("click", function (e) { - if ($('#updatehome').is(':checked')) { - var zoom = map.getZoom(), - precision = OSM.zoomPrecision(zoom), - location = e.latlng.wrap(); + if (!$("#updatehome").is(":checked")) return; + + var zoom = map.getZoom(), + precision = OSM.zoomPrecision(zoom), + location = e.latlng.wrap(); + + $("#home_lat").val(location.lat.toFixed(precision)); + $("#home_lon").val(location.lng.toFixed(precision)); + + deleted_lat = null; + deleted_lon = null; + respondToHomeUpdate(); + }).on("moveend", function () { + var lat = $("#home_lat").val().trim(), + lon = $("#home_lon").val().trim(), + location; + + try { + if (lat && lon) { + location = L.latLng(lat, lon); + } + } catch (error) { + // keep location undefined + } - $('#homerow').removeClass(); - $('#home_lat').val(location.lat.toFixed(precision)); - $('#home_lon').val(location.lng.toFixed(precision)); + $("#home_show").prop("disabled", !location || isCloseEnoughToMapCenter(location)); + }); - marker.setLatLng(e.latlng); - marker.addTo(map); - } + $("#home_lat, #home_lon").on("input", function () { + deleted_lat = null; + deleted_lon = null; + respondToHomeUpdate(); + }); + + $("#home_show").click(function () { + var lat = $("#home_lat").val(), + lon = $("#home_lon").val(); + + map.setView([lat, lon], defaultHomeZoom); + }); + + $("#home_delete").click(function () { + var lat = $("#home_lat").val(), + lon = $("#home_lon").val(); + + $("#home_lat, #home_lon").val(""); + deleted_lat = lat; + deleted_lon = lon; + respondToHomeUpdate(); + $("#home_undelete").trigger("focus"); + }); + + $("#home_undelete").click(function () { + $("#home_lat").val(deleted_lat); + $("#home_lon").val(deleted_lon); + deleted_lat = null; + deleted_lon = null; + respondToHomeUpdate(); + $("#home_delete").trigger("focus"); }); } else { $("[data-user]").each(function () { - var user = $(this).data('user'); + var user = $(this).data("user"); if (user.lon && user.lat) { - L.marker([user.lat, user.lon], {icon: OSM.getUserIcon(user.icon)}).addTo(map) - .bindPopup(user.description); + L.marker([user.lat, user.lon], { icon: OSM.getUserIcon(user.icon) }).addTo(map) + .bindPopup(user.description, { minWidth: 200 }); } }); } } + function respondToHomeUpdate() { + var lat = $("#home_lat").val().trim(), + lon = $("#home_lon").val().trim(), + location; + + try { + if (lat && lon) { + location = L.latLng(lat, lon); + } + $("#home_lat, #home_lon").removeClass("is-invalid"); + } catch (error) { + if (lat && isNaN(lat)) $("#home_lat").addClass("is-invalid"); + if (lon && isNaN(lon)) $("#home_lon").addClass("is-invalid"); + } + + $("#home_message").toggleClass("invisible", Boolean(location)); + $("#home_show").prop("hidden", !location); + $("#home_delete").prop("hidden", !location); + $("#home_undelete").prop("hidden", !(!location && deleted_lat && deleted_lon)); + if (location) { + marker.setLatLng([lat, lon]); + marker.addTo(map); + map.panTo([lat, lon]); + } else { + marker.removeFrom(map); + } + } + + function isCloseEnoughToMapCenter(location) { + var inputPt = map.latLngToContainerPoint(location), + centerPt = map.latLngToContainerPoint(map.getCenter()); + + return centerPt.distanceTo(inputPt) < 10; + } + function updateAuthUID() { var provider = $("select#user_auth_provider").val(); @@ -85,6 +176,10 @@ $(document).ready(function () { $("select#user_auth_provider").on("change", updateAuthUID); + $("input#user_avatar").on("change", function () { + $("#user_avatar_action_new").prop("checked", true); + }); + function enableAuth() { $("#auth_prompt").hide(); $("#auth_field").show(); @@ -117,7 +212,15 @@ $(document).ready(function () { $("input[name=legale]").change(function () { var url = $(this).data("url"); - $("#contributorTerms").html(""); + $("#contributorTerms").html("