X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e6dbf56d43de52513a9e80367d8c2eb4e7bc21a1..dbe84a97bf48789e0f32a185f701840fc68063bd:/app/assets/javascripts/index/directions.js?ds=sidebyside diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js index ee44ad4c4..ef37e73ca 100644 --- a/app/assets/javascripts/index/directions.js +++ b/app/assets/javascripts/index/directions.js @@ -157,7 +157,7 @@ OSM.Directions = function (map) { })); }); - $(".directions_form .close").on("click", function (e) { + $(".directions_form .btn-close").on("click", function (e) { e.preventDefault(); var route_from = endpoints[0].value; if (route_from) { @@ -169,14 +169,18 @@ OSM.Directions = function (map) { function formatDistance(m) { if (m < 1000) { - return Math.round(m) + "m"; + return I18n.t("javascripts.directions.distance_m", { distance: Math.round(m) }); } else if (m < 10000) { - return (m / 1000.0).toFixed(1) + "km"; + return I18n.t("javascripts.directions.distance_km", { distance: (m / 1000.0).toFixed(1) }); } else { - return Math.round(m / 1000) + "km"; + return I18n.t("javascripts.directions.distance_km", { distance: Math.round(m / 1000) }); } } + function formatHeight(m) { + return I18n.t("javascripts.directions.distance_m", { distance: Math.round(m) }); + } + function formatTime(s) { var m = Math.round(s / 60); var h = Math.floor(m / 60); @@ -240,7 +244,7 @@ OSM.Directions = function (map) { map.removeLayer(polyline); if (reportErrors) { - $("#sidebar_content").html("
" + I18n.t("javascripts.directions.errors.no_route") + "
"); + $("#sidebar_content").html("" + + var distanceText = $("
").append(
I18n.t("javascripts.directions.distance") + ": " + formatDistance(route.distance) + ". " +
- I18n.t("javascripts.directions.time") + ": " + formatTime(route.time) + ".";
+ I18n.t("javascripts.directions.time") + ": " + formatTime(route.time) + ".");
if (typeof route.ascend !== "undefined" && typeof route.descend !== "undefined") {
- html += "
" +
- I18n.t("javascripts.directions.ascend") + ": " + Math.round(route.ascend) + "m. " +
- I18n.t("javascripts.directions.descend") + ": " + Math.round(route.descend) + "m.";
+ distanceText.append(
+ $("
"),
+ I18n.t("javascripts.directions.ascend") + ": " + formatHeight(route.ascend) + ". " +
+ I18n.t("javascripts.directions.descend") + ": " + formatHeight(route.descend) + ".");
}
- html += "