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

Merge remote-tracking branch 'upstream/pull/5386'

Browse source
This commit is contained in:
Tom Hughes 2024-12-08 11:27:18 +00:00
commit bf4d8fc2d0
2 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/leaflet.layers.js
View file

@ -29,7 +29,7 @@ L.OSM.layers = function (options) {
map.whenReady(function () {
var miniMap = L.map(mapContainer[0], { attributionControl: false, zoomControl: false, keyboard: false })
.addLayer(new layer.constructor({ apikey: layer.options.apikey }));
.addLayer(new layer.constructor(layer.options));
miniMap.dragging.disable();
miniMap.touchZoom.disable();

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

@ -20,17 +20,26 @@ L.OSM.Map = L.Map.extend({
for (const layerDefinition of OSM.LAYER_DEFINITIONS) {
if (layerDefinition.apiKeyId && !OSM[layerDefinition.apiKeyId]) continue;
const layerOptions = {
attribution: makeAttribution(layerDefinition.credit),
code: layerDefinition.code,
keyid: layerDefinition.keyId,
name: I18n.t(`javascripts.map.base.${layerDefinition.nameId}`)
};
if (layerDefinition.apiKeyId) {
layerOptions.apikey = OSM[layerDefinition.apiKeyId];
let layerConstructor = L.OSM.TileLayer;
const layerOptions = {};
for (const [property, value] of Object.entries(layerDefinition)) {
if (property === "credit") {
layerOptions.attribution = makeAttribution(value);
} else if (property === "keyId") {
layerOptions.keyid = value;
} else if (property === "nameId") {
layerOptions.name = I18n.t(`javascripts.map.base.${value}`);
} else if (property === "apiKeyId") {
layerOptions.apikey = OSM[value];
} else if (property === "leafletOsmId") {
layerConstructor = L.OSM[value];
} else {
layerOptions[property] = value;
}
}
const layer = new L.OSM[layerDefinition.leafletOsmId](layerOptions);
const layer = new layerConstructor(layerOptions);
this.baseLayers.push(layer);
}