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

Fix some eslint errors (quotes, spacing and parseInt radix) on .js.erb files

Browse source 
These have been flagged by eslint-plugin-erb, and need to be fixed before
that plugin can be enabled.
This commit is contained in:
Andy Allan 2025-01-24 14:22:06 +00:00
parent 8cf77a2f36
commit 6b06be5e5d
3 changed files with 64 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/edit/id.js.erb
View file

@ -10,15 +10,15 @@ $(document).ready(function () {
var params = {}; var params = {};
if (mapParams.object) { if (mapParams.object) {
params.id = mapParams.object.type + '/' + mapParams.object.id; params.id = mapParams.object.type + "/" + mapParams.object.id;
mapParams = OSM.parseHash(location.hash); mapParams = OSM.parseHash(location.hash);
if (mapParams.center) { if (mapParams.center) {
params.map = mapParams.zoom + '/' + mapParams.center.lat + '/' + mapParams.center.lng; params.map = mapParams.zoom + "/" + mapParams.center.lat + "/" + mapParams.center.lng;
} }
} else if (id.data("lat") && id.data("lon")) { } else if (id.data("lat") && id.data("lon")) {
params.map = "16/" + id.data("lat") + "/" + id.data("lon"); params.map = "16/" + id.data("lat") + "/" + id.data("lon");
} else { } else {
params.map = (mapParams.zoom || 17) + '/' + mapParams.lat + '/' + mapParams.lon; params.map = (mapParams.zoom || 17) + "/" + mapParams.lat + "/" + mapParams.lon;
} }
if (hashParams.background) params.background = hashParams.background; if (hashParams.background) params.background = hashParams.background;

36
app/assets/javascripts/embed.js.erb
View file

@ -15,13 +15,13 @@ I18n.default_locale = <%= I18n.default_locale.to_json %>;
I18n.fallbacks = true; I18n.fallbacks = true;
window.onload = function () { window.onload = function () {
var query = (window.location.search || '?').slice(1), var query = (window.location.search || "?").slice(1),
args = {}; args = {};
var pairs = query.split('&'); var pairs = query.split("&");
for (var i = 0; i < pairs.length; i++) { for (var i = 0; i < pairs.length; i++) {
var parts = pairs[i].split('='); var parts = pairs[i].split("=");
args[parts[0]] = decodeURIComponent(parts[1] || ''); args[parts[0]] = decodeURIComponent(parts[1] || "");
} }
var mapnikOptions = { var mapnikOptions = {
@ -37,7 +37,7 @@ window.onload = function () {
}; };
var map = L.map("map"); var map = L.map("map");
map.attributionControl.setPrefix(''); map.attributionControl.setPrefix("");
map.removeControl(map.attributionControl); map.removeControl(map.attributionControl);
if (args.layer === "cyclosm") { if (args.layer === "cyclosm") {
@ -53,19 +53,21 @@ window.onload = function () {
} }
if (args.marker) { if (args.marker) {
L.marker(args.marker.split(','), {icon: L.icon({ L.marker(args.marker.split(","), { icon: L.icon({
iconUrl: <%= asset_path('leaflet/dist/images/marker-icon.png').to_json %>, iconUrl: <%= asset_path('leaflet/dist/images/marker-icon.png').to_json %>,
iconSize: new L.Point(25, 41), iconSize: new L.Point(25, 41),
iconAnchor: new L.Point(12, 41), iconAnchor: new L.Point(12, 41),
shadowUrl: <%= asset_path('leaflet/dist/images/marker-shadow.png').to_json %>, shadowUrl: <%= asset_path('leaflet/dist/images/marker-shadow.png').to_json %>,
shadowSize: new L.Point(41, 41) shadowSize: new L.Point(41, 41)
})}).addTo(map); }) }).addTo(map);
} }
if (args.bbox) { if (args.bbox) {
var bbox = args.bbox.split(','); var bbox = args.bbox.split(",");
map.fitBounds([L.latLng(bbox[1], bbox[0]), map.fitBounds([
L.latLng(bbox[3], bbox[2])]); L.latLng(bbox[1], bbox[0]),
L.latLng(bbox[3], bbox[2])
]);
} else { } else {
map.fitWorld(); map.fitWorld();
} }
@ -75,14 +77,14 @@ window.onload = function () {
L.Control.OSMReportAProblem = L.Control.Attribution.extend({ L.Control.OSMReportAProblem = L.Control.Attribution.extend({
options: { options: {
position: 'bottomright', position: "bottomright",
prefix: '<a href="https://www.openstreetmap.org/fixthemap?lat={x}&lon={y}&zoom={z}" target="_blank">'+I18n.t('javascripts.embed.report_problem')+'</a>' prefix: "<a href=\"https://www.openstreetmap.org/fixthemap?lat={x}&lon={y}&zoom={z}\" target=\"_blank\">" + I18n.t("javascripts.embed.report_problem") + "</a>"
}, },
onAdd: function (map) { onAdd: function (map) {
var container = L.Control.Attribution.prototype.onAdd.call(this, map); var container = L.Control.Attribution.prototype.onAdd.call(this, map);
map.on('moveend', this._update, this); map.on("moveend", this._update, this);
return container; return container;
}, },
@ -92,8 +94,8 @@ L.Control.OSMReportAProblem = L.Control.Attribution.extend({
this._container.innerHTML = this._container.innerHTML =
this._container.innerHTML this._container.innerHTML
.replace('{x}', this._map.getCenter().lat) .replace("{x}", this._map.getCenter().lat)
.replace('{y}', this._map.getCenter().lng) .replace("{y}", this._map.getCenter().lng)
.replace('{z}', this._map.getZoom()); .replace("{z}", this._map.getZoom());
} }
}); });

85
app/assets/javascripts/osm.js.erb
View file

@ -58,16 +58,16 @@ OSM = {
return url; return url;
}, },
params: function(search) { params: function (search) {
var params = {}; var params = {};
search = (search || window.location.search).replace('?', '').split(/&|;/); search = (search || window.location.search).replace("?", "").split(/&|;/);
for (var i = 0; i < search.length; ++i) { for (var i = 0; i < search.length; ++i) {
var pair = search[i], var pair = search[i],
j = pair.indexOf('='), j = pair.indexOf("="),
key = pair.slice(0, j), key = pair.slice(0, j),
val = pair.slice(++j); val = pair.slice(++j);
try { try {
params[key] = decodeURIComponent(val); params[key] = decodeURIComponent(val);
@ -90,18 +90,18 @@ OSM = {
// Old-style object parameters; still in use for edit links e.g. /edit?way=1234 // Old-style object parameters; still in use for edit links e.g. /edit?way=1234
if (params.node) { if (params.node) {
mapParams.object = {type: 'node', id: parseInt(params.node)}; mapParams.object = { type: "node", id: parseInt(params.node, 10) };
} else if (params.way) { } else if (params.way) {
mapParams.object = {type: 'way', id: parseInt(params.way)}; mapParams.object = { type: "way", id: parseInt(params.way, 10) };
} else if (params.relation) { } else if (params.relation) {
mapParams.object = {type: 'relation', id: parseInt(params.relation)}; mapParams.object = { type: "relation", id: parseInt(params.relation, 10) };
} else if (params.note) { } else if (params.note) {
mapParams.object = {type: 'note', id: parseInt(params.note)}; mapParams.object = { type: "note", id: parseInt(params.note, 10) };
} }
var hash = OSM.parseHash(location.hash); var hash = OSM.parseHash(location.hash);
const loc = Cookies.get('_osm_location')?.split("|"); const loc = Cookies.get("_osm_location")?.split("|");
// Decide on a map starting position. Various ways of doing this. // Decide on a map starting position. Various ways of doing this.
if (hash.center) { if (hash.center) {
@ -109,7 +109,7 @@ OSM = {
mapParams.lat = hash.center.lat; mapParams.lat = hash.center.lat;
mapParams.zoom = hash.zoom; mapParams.zoom = hash.zoom;
} else if (params.bbox) { } else if (params.bbox) {
var bbox = params.bbox.split(','); var bbox = params.bbox.split(",");
mapParams.bounds = L.latLngBounds( mapParams.bounds = L.latLngBounds(
[parseFloat(bbox[1]), parseFloat(bbox[0])], [parseFloat(bbox[1]), parseFloat(bbox[0])],
[parseFloat(bbox[3]), parseFloat(bbox[2])]); [parseFloat(bbox[3]), parseFloat(bbox[2])]);
@ -120,28 +120,27 @@ OSM = {
} else if (params.mlon && params.mlat) { } else if (params.mlon && params.mlat) {
mapParams.lon = parseFloat(params.mlon); mapParams.lon = parseFloat(params.mlon);
mapParams.lat = parseFloat(params.mlat); mapParams.lat = parseFloat(params.mlat);
mapParams.zoom = parseInt(params.zoom || 12); mapParams.zoom = parseInt(params.zoom || 12, 10);
} else if (loc) { } else if (loc) {
mapParams.lon = parseFloat(loc[0]); mapParams.lon = parseFloat(loc[0]);
mapParams.lat = parseFloat(loc[1]); mapParams.lat = parseFloat(loc[1]);
mapParams.zoom = parseInt(loc[2]); mapParams.zoom = parseInt(loc[2], 10);
} else if (OSM.home) { } else if (OSM.home) {
mapParams.lon = OSM.home.lon; mapParams.lon = OSM.home.lon;
mapParams.lat = OSM.home.lat; mapParams.lat = OSM.home.lat;
mapParams.zoom = 10; mapParams.zoom = 10;
} else if (OSM.location) { } else if (OSM.location) {
mapParams.bounds = L.latLngBounds( mapParams.bounds = L.latLngBounds(
[OSM.location.minlat, [OSM.location.minlat, OSM.location.minlon],
OSM.location.minlon], [OSM.location.maxlat, OSM.location.maxlon]
[OSM.location.maxlat, );
OSM.location.maxlon]);
} else { } else {
mapParams.lon = -0.1; mapParams.lon = -0.1;
mapParams.lat = 51.5; mapParams.lat = 51.5;
mapParams.zoom = parseInt(params.zoom || 5); mapParams.zoom = parseInt(params.zoom || 5, 10);
} }
mapParams.layers = hash.layers || (loc && loc[3]) || ''; mapParams.layers = hash.layers || (loc && loc[3]) || "";
var scale = parseFloat(params.scale); var scale = parseFloat(params.scale);
if (scale > 0) { if (scale > 0) {
@ -151,20 +150,20 @@ OSM = {
return mapParams; return mapParams;
}, },
parseHash: function(hash) { parseHash: function (hash) {
var args = {}; var args = {};
var i = hash.indexOf('#'); var i = hash.indexOf("#");
if (i < 0) { if (i < 0) {
return args; return args;
} }
hash = Qs.parse(hash.slice(i + 1)); hash = Qs.parse(hash.slice(i + 1));
var map = (hash.map || '').split('/'), var map = (hash.map || "").split("/"),
zoom = parseInt(map[0], 10), zoom = parseInt(map[0], 10),
lat = parseFloat(map[1]), lat = parseFloat(map[1]),
lon = parseFloat(map[2]); lon = parseFloat(map[2]);
if (!isNaN(zoom) && !isNaN(lat) && !isNaN(lon)) { if (!isNaN(zoom) && !isNaN(lat) && !isNaN(lon)) {
args.center = new L.LatLng(lat, lon); args.center = new L.LatLng(lat, lon);
@ -178,7 +177,7 @@ OSM = {
return args; return args;
}, },
formatHash: function(args) { formatHash: function (args) {
var center, zoom, layers; var center, zoom, layers;
if (args instanceof L.Map) { if (args instanceof L.Map) {
@ -188,44 +187,44 @@ OSM = {
} else { } else {
center = args.center || L.latLng(args.lat, args.lon); center = args.center || L.latLng(args.lat, args.lon);
zoom = args.zoom; zoom = args.zoom;
layers = args.layers || ''; layers = args.layers || "";
} }
center = center.wrap(); center = center.wrap();
layers = layers.replace('M', ''); layers = layers.replace("M", "");
var precision = OSM.zoomPrecision(zoom), var precision = OSM.zoomPrecision(zoom),
hash = '#map=' + zoom + hash = "#map=" + zoom +
'/' + center.lat.toFixed(precision) + "/" + center.lat.toFixed(precision) +
'/' + center.lng.toFixed(precision); "/" + center.lng.toFixed(precision);
if (layers) { if (layers) {
hash += '&layers=' + layers; hash += "&layers=" + layers;
} }
return hash; return hash;
}, },
zoomPrecision: function(zoom) { zoomPrecision: function (zoom) {
var pixels = Math.pow(2, 8 + zoom); var pixels = Math.pow(2, 8 + zoom);
var degrees = 180; var degrees = 180;
return Math.ceil(Math.log10(pixels / degrees)); return Math.ceil(Math.log10(pixels / degrees));
}, },
locationCookie: function(map) { locationCookie: function (map) {
var center = map.getCenter().wrap(), var center = map.getCenter().wrap(),
zoom = map.getZoom(), zoom = map.getZoom(),
precision = OSM.zoomPrecision(zoom); precision = OSM.zoomPrecision(zoom);
return [center.lng.toFixed(precision), center.lat.toFixed(precision), zoom, map.getLayersCode()].join('|'); return [center.lng.toFixed(precision), center.lat.toFixed(precision), zoom, map.getLayersCode()].join("|");
}, },
distance: function(latlng1, latlng2) { distance: function (latlng1, latlng2) {
var lat1 = latlng1.lat * Math.PI / 180, var lat1 = latlng1.lat * Math.PI / 180,
lng1 = latlng1.lng * Math.PI / 180, lng1 = latlng1.lng * Math.PI / 180,
lat2 = latlng2.lat * Math.PI / 180, lat2 = latlng2.lat * Math.PI / 180,
lng2 = latlng2.lng * Math.PI / 180, lng2 = latlng2.lng * Math.PI / 180,
latdiff = lat2 - lat1, latdiff = lat2 - lat1,
lngdiff = lng2 - lng1; lngdiff = lng2 - lng1;
return 6372795 * 2 * Math.asin( return 6372795 * 2 * Math.asin(
Math.sqrt( Math.sqrt(