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

Enable a few more eslint checks

Browse source
This commit is contained in:
Tom Hughes 2019-07-14 12:08:02 +01:00
parent c4c0e8105a
commit 492a640530
8 changed files with 44 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/index.js
View file

@ -32,6 +32,8 @@ $(document).ready(function () {
});
OSM.loadSidebarContent = function (path, callback) {
var content_path = path;
map.setSidebarOverlaid(false);
clearTimeout(loaderTimeout);
@ -42,17 +44,17 @@ $(document).ready(function () {
// IE<10 doesn't respect Vary: X-Requested-With header, so
// prevent caching the XHR response as a full-page URL.
if (path.indexOf("?") >= 0) {
path += "&xhr=1";
if (content_path.indexOf("?") >= 0) {
content_path += "&xhr=1";
} else {
path += "?xhr=1";
content_path += "?xhr=1";
}
$("#sidebar_content")
.empty();
$.ajax({
url: path,
url: content_path,
dataType: "html",
complete: function (xhr) {
clearTimeout(loaderTimeout);

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

@ -3,7 +3,7 @@
OSM.Directions = function (map) {
var awaitingGeocode; // true if the user has requested a route, but we're waiting on a geocode result
var awaitingRoute; // true if we've asked the engine for a route and are waiting to hear back
var awaitingRoute; // true if we've asked the engine for a route and are waiting to hear back
var chosenEngine;
var popup = L.popup({ autoPanPadding: [100, 100] });
@ -31,9 +31,9 @@ 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);
return a.localeCompare(b);
var localised_a = I18n.t("javascripts.directions.engines." + a.id),
localised_b = I18n.t("javascripts.directions.engines." + b.id);
return localised_a.localeCompare(localised_b);
});
var select = $("select.routing_engines");
@ -260,11 +260,11 @@ OSM.Directions = function (map) {
// Add each row
route.steps.forEach(function (step) {
var ll = step[0],
direction = step[1],
var ll = step[0],
direction = step[1],
instruction = step[2],
dist = step[3],
lineseg = step[4];
dist = step[3],
lineseg = step[4];
if (dist < 5) {
dist = "";
@ -360,7 +360,7 @@ OSM.Directions = function (map) {
var oe = e.originalEvent;
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
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);

2
app/assets/javascripts/index/history.js
View file

@ -101,7 +101,7 @@ OSM.History = function (map) {
topRight = map.project(L.latLng(changeset.bbox.maxlat, changeset.bbox.maxlon)),
width = topRight.x - bottomLeft.x,
height = bottomLeft.y - topRight.y,
minSize = 20; // Min width/height of changeset in pixels
minSize = 20; // Min width/height of changeset in pixels
if (width < minSize) {
bottomLeft.x -= ((minSize - width) / 2);

3
app/assets/javascripts/index/notes.js
View file

@ -39,7 +39,8 @@ OSM.initializeNotes = function (map) {
}
});
function updateMarker(marker, feature) {
function updateMarker(old_marker, feature) {
var marker = old_marker;
if (marker) {
marker.setIcon(noteIcons[feature.properties.status]);
} else {

2
app/assets/javascripts/index/query.js
View file

@ -153,7 +153,7 @@ OSM.Query = function (map) {
}), featureStyle);
} else if (feature.type === "relation" && feature.members) {
geometry = L.featureGroup(feature.members.map(featureGeometry).filter(function (geometry) {
return geometry !== undefined;
return typeof geometry !== "undefined";
}));
}

26
app/assets/javascripts/leaflet.map.js
View file

@ -71,11 +71,11 @@ L.OSM.Map = L.Map.extend({
},
updateLayers: function (layerParam) {
layerParam = layerParam || "M";
var layersAdded = "";
var layers = layerParam || "M",
layersAdded = "";
for (var i = this.baseLayers.length - 1; i >= 0; i--) {
if (layerParam.indexOf(this.baseLayers[i].options.code) >= 0) {
if (layers.indexOf(this.baseLayers[i].options.code) >= 0) {
this.addLayer(this.baseLayers[i]);
layersAdded = layersAdded + this.baseLayers[i].options.code;
} else if (i === 0 && layersAdded === "") {
@ -152,15 +152,17 @@ L.OSM.Map = L.Map.extend({
// Called to interlace the bits in x and y, making a Morton code.
function interlace(x, y) {
x = (x | (x << 8)) & 0x00ff00ff;
x = (x | (x << 4)) & 0x0f0f0f0f;
x = (x | (x << 2)) & 0x33333333;
x = (x | (x << 1)) & 0x55555555;
y = (y | (y << 8)) & 0x00ff00ff;
y = (y | (y << 4)) & 0x0f0f0f0f;
y = (y | (y << 2)) & 0x33333333;
y = (y | (y << 1)) & 0x55555555;
return (x << 1) | y;
var interlaced_x = x,
interlaced_y = y;
interlaced_x = (interlaced_x | (interlaced_x << 8)) & 0x00ff00ff;
interlaced_x = (interlaced_x | (interlaced_x << 4)) & 0x0f0f0f0f;
interlaced_x = (interlaced_x | (interlaced_x << 2)) & 0x33333333;
interlaced_x = (interlaced_x | (interlaced_x << 1)) & 0x55555555;
interlaced_y = (interlaced_y | (interlaced_y << 8)) & 0x00ff00ff;
interlaced_y = (interlaced_y | (interlaced_y << 4)) & 0x0f0f0f0f;
interlaced_y = (interlaced_y | (interlaced_y << 2)) & 0x33333333;
interlaced_y = (interlaced_y | (interlaced_y << 1)) & 0x55555555;
return (interlaced_x << 1) | interlaced_y;
}
var params = {};

6
app/assets/javascripts/router.js
View file

@ -47,10 +47,10 @@
move the map without the hash changing.
*/
OSM.Router = function (map, rts) {
var escapeRegExp = /[-{}[\]+?.,\\^$|#\s]/g;
var escapeRegExp = /[-{}[\]+?.,\\^$|#\s]/g;
var optionalParam = /\((.*?)\)/g;
var namedParam = /(\(\?)?:\w+/g;
var splatParam = /\*\w+/g;
var namedParam = /(\(\?)?:\w+/g;
var splatParam = /\*\w+/g;
function Route(path, controller) {
var regexp = new RegExp("^" +