cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use double quotes consistently in javascript code

Browse source
This commit is contained in:
Tom Hughes 2019-04-06 15:59:34 +01:00
parent 87127d41e9
commit eb7678145a
29 changed files with 650 additions and 649 deletions
Download patch file Download diff file Expand all files Collapse all files

98
app/assets/javascripts/index/directions.js
View file

@ -9,13 +9,13 @@ OSM.Directions = function (map) {
var popup = L.popup({autoPanPadding: [100, 100]});
var polyline = L.polyline([], {
color: '#03f',
color: "#03f",
opacity: 0.3,
weight: 10
});
var highlight = L.polyline([], {
color: '#ff0',
color: "#ff0",
opacity: 0.5,
weight: 12
});
@ -31,15 +31,15 @@ OSM.Directions = function (map) {
var engines = OSM.Directions.engines;
engines.sort(function (a, b) {
a = I18n.t('javascripts.directions.engines.' + a.id);
b = I18n.t('javascripts.directions.engines.' + b.id);
a = I18n.t("javascripts.directions.engines." + a.id);
b = I18n.t("javascripts.directions.engines." + b.id);
return a.localeCompare(b);
});
var select = $('select.routing_engines');
var select = $("select.routing_engines");
engines.forEach(function(engine, i) {
select.append("<option value='" + i + "'>" + I18n.t('javascripts.directions.engines.' + engine.id) + "</option>");
select.append("<option value='" + i + "'>" + I18n.t("javascripts.directions.engines." + engine.id) + "</option>");
});
function Endpoint(input, iconUrl) {
@ -58,8 +58,8 @@ OSM.Directions = function (map) {
autoPan: true
});
endpoint.marker.on('drag dragend', function (e) {
var dragging = (e.type === 'drag');
endpoint.marker.on("drag dragend", function (e) {
var dragging = (e.type === "drag");
if (dragging && !chosenEngine.draggable) return;
if (dragging && awaitingRoute) return;
endpoint.setLatLng(e.target.getLatLng());
@ -102,12 +102,12 @@ OSM.Directions = function (map) {
endpoint.awaitingGeocode = true;
$.getJSON(OSM.NOMINATIM_URL + 'search?q=' + encodeURIComponent(endpoint.value) + '&format=json', function (json) {
$.getJSON(OSM.NOMINATIM_URL + "search?q=" + encodeURIComponent(endpoint.value) + "&format=json", function (json) {
endpoint.awaitingGeocode = false;
endpoint.hasGeocode = true;
if (json.length === 0) {
input.addClass("error");
alert(I18n.t('javascripts.directions.errors.no_place', {place: endpoint.value}));
alert(I18n.t("javascripts.directions.errors.no_place", {place: endpoint.value}));
return;
}
@ -170,7 +170,7 @@ OSM.Directions = function (map) {
var m = Math.round(s / 60);
var h = Math.floor(m / 60);
m -= h * 60;
return h + ":" + (m < 10 ? '0' : '') + m;
return h + ":" + (m < 10 ? "0" : "") + m;
}
function findEngine(id) {
@ -212,14 +212,14 @@ OSM.Directions = function (map) {
OSM.router.replace("/directions?" + querystring.stringify({
engine: chosenEngine.id,
route: o.lat.toFixed(precision) + ',' + o.lng.toFixed(precision) + ';' +
d.lat.toFixed(precision) + ',' + d.lng.toFixed(precision)
route: o.lat.toFixed(precision) + "," + o.lng.toFixed(precision) + ";" +
d.lat.toFixed(precision) + "," + d.lng.toFixed(precision)
}));
// copy loading item to sidebar and display it. we copy it, rather than
// just using it in-place and replacing it in case it has to be used
// again.
$('#sidebar_content').html($('.directions_form .loader_copy').html());
$("#sidebar_content").html($(".directions_form .loader_copy").html());
map.setSidebarOverlaid(false);
awaitingRoute = chosenEngine.getRoute([o, d], function (err, route) {
@ -229,7 +229,7 @@ OSM.Directions = function (map) {
map.removeLayer(polyline);
if (reportErrors) {
$('#sidebar_content').html('<p class="search_results_error">' + I18n.t('javascripts.directions.errors.no_route') + '</p>');
$("#sidebar_content").html("<p class=\"search_results_error\">" + I18n.t("javascripts.directions.errors.no_route") + "</p>");
}
return;
@ -243,19 +243,19 @@ OSM.Directions = function (map) {
map.fitBounds(polyline.getBounds().pad(0.05));
}
var html = '<h2><a class="geolink" href="#">' +
'<span class="icon close"></span></a>' + I18n.t('javascripts.directions.directions') +
'</h2><p id="routing_summary">' +
I18n.t('javascripts.directions.distance') + ': ' + formatDistance(route.distance) + '. ' +
I18n.t('javascripts.directions.time') + ': ' + formatTime(route.time) + '.';
if (typeof route.ascend !== 'undefined' && typeof route.descend !== 'undefined') {
html += '<br />' +
I18n.t('javascripts.directions.ascend') + ': ' + Math.round(route.ascend) + 'm. ' +
I18n.t('javascripts.directions.descend') + ': ' + Math.round(route.descend) +'m.';
var html = "<h2><a class=\"geolink\" href=\"#\">" +
"<span class=\"icon close\"></span></a>" + I18n.t("javascripts.directions.directions") +
"</h2><p id=\"routing_summary\">" +
I18n.t("javascripts.directions.distance") + ": " + formatDistance(route.distance) + ". " +
I18n.t("javascripts.directions.time") + ": " + formatTime(route.time) + ".";
if (typeof route.ascend !== "undefined" && typeof route.descend !== "undefined") {
html += "<br />" +
I18n.t("javascripts.directions.ascend") + ": " + Math.round(route.ascend) + "m. " +
I18n.t("javascripts.directions.descend") + ": " + Math.round(route.descend) +"m.";
}
html += '</p><table id="turnbyturn" />';
html += "</p><table id=\"turnbyturn\" />";
$('#sidebar_content')
$("#sidebar_content")
.html(html);
// Add each row
@ -283,7 +283,7 @@ OSM.Directions = function (map) {
row.append("<td class='instruction'>" + instruction);
row.append("<td class='distance'>" + dist);
row.on('click', function () {
row.on("click", function () {
popup
.setLatLng(ll)
.setContent("<p>" + instruction + "</p>")
@ -298,32 +298,32 @@ OSM.Directions = function (map) {
map.removeLayer(highlight);
});
$('#turnbyturn').append(row);
$("#turnbyturn").append(row);
});
$('#sidebar_content').append('<p id="routing_credit">' +
I18n.t('javascripts.directions.instructions.courtesy', {link: chosenEngine.creditline}) +
'</p>');
$("#sidebar_content").append("<p id=\"routing_credit\">" +
I18n.t("javascripts.directions.instructions.courtesy", {link: chosenEngine.creditline}) +
"</p>");
$('#sidebar_content a.geolink').on('click', function(e) {
$("#sidebar_content a.geolink").on("click", function(e) {
e.preventDefault();
map.removeLayer(polyline);
$('#sidebar_content').html('');
$("#sidebar_content").html("");
map.setSidebarOverlaid(true);
// TODO: collapse width of sidebar back to previous
});
});
}
var chosenEngineIndex = findEngine('fossgis_osrm_car');
if ($.cookie('_osm_directions_engine')) {
chosenEngineIndex = findEngine($.cookie('_osm_directions_engine'));
var chosenEngineIndex = findEngine("fossgis_osrm_car");
if ($.cookie("_osm_directions_engine")) {
chosenEngineIndex = findEngine($.cookie("_osm_directions_engine"));
}
setEngine(chosenEngineIndex);
select.on("change", function (e) {
chosenEngine = engines[e.target.selectedIndex];
$.cookie('_osm_directions_engine', chosenEngine.id, { expires: expiry, path: '/' });
$.cookie("_osm_directions_engine", chosenEngine.id, { expires: expiry, path: "/" });
if (map.hasLayer(polyline)) {
getRoute(true, true);
}
@ -334,11 +334,11 @@ OSM.Directions = function (map) {
getRoute(true, true);
});
$(".routing_marker").on('dragstart', function (e) {
$(".routing_marker").on("dragstart", function (e) {
var dt = e.originalEvent.dataTransfer;
dt.effectAllowed = 'move';
var dragData = { type: $(this).data('type') };
dt.setData('text', JSON.stringify(dragData));
dt.effectAllowed = "move";
var dragData = { type: $(this).data("type") };
dt.setData("text", JSON.stringify(dragData));
if (dt.setDragImage) {
var img = $("<img>").attr("src", $(e.originalEvent.target).attr("src"));
dt.setDragImage(img.get(0), 12, 21);
@ -351,26 +351,26 @@ OSM.Directions = function (map) {
$(".search_form").hide();
$(".directions_form").show();
$("#map").on('dragend dragover', function (e) {
$("#map").on("dragend dragover", function (e) {
e.preventDefault();
});
$("#map").on('drop', function (e) {
$("#map").on("drop", function (e) {
e.preventDefault();
var oe = e.originalEvent;
var dragData = JSON.parse(oe.dataTransfer.getData('text'));
var dragData = JSON.parse(oe.dataTransfer.getData("text"));
var type = dragData.type;
var pt = L.DomEvent.getMousePosition(oe, map.getContainer()); // co-ordinates of the mouse pointer at present
pt.y += 20;
var ll = map.containerPointToLatLng(pt);
endpoints[type === 'from' ? 0 : 1].setLatLng(ll);
endpoints[type === "from" ? 0 : 1].setLatLng(ll);
getRoute(true, true);
});
var params = querystring.parse(location.search.substring(1)),
route = (params.route || '').split(';'),
from = route[0] && L.latLng(route[0].split(',')),
to = route[1] && L.latLng(route[1].split(','));
route = (params.route || "").split(";"),
from = route[0] && L.latLng(route[0].split(",")),
to = route[1] && L.latLng(route[1].split(","));
if (params.engine) {
var engineIndex = findEngine(params.engine);
@ -395,7 +395,7 @@ OSM.Directions = function (map) {
page.unload = function() {
$(".search_form").show();
$(".directions_form").hide();
$("#map").off('dragend dragover drop');
$("#map").off("dragend dragover drop");
map
.removeLayer(popup)