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

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

Browse source
This commit is contained in:
Tom Hughes 2024-12-10 18:57:31 +00:00
commit 4d6df34c4b
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -207,7 +207,7 @@ $(document).ready(function () {
if (OSM.MATOMO) {
map.on("layeradd", function (e) {
if (e.layer.options) {
var goal = OSM.MATOMO.goals[e.layer.options.keyid];
var goal = OSM.MATOMO.goals[e.layer.options.layerId];
if (goal) {
$("body").trigger("matomogoal", goal);

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

@ -26,8 +26,6 @@ L.OSM.Map = L.Map.extend({
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") {
@ -134,7 +132,7 @@ L.OSM.Map = L.Map.extend({
getMapBaseLayerId: function () {
var baseLayerId;
this.eachLayer(function (layer) {
if (layer.options && layer.options.keyid) baseLayerId = layer.options.keyid;
if (layer.options && layer.options.layerId) baseLayerId = layer.options.layerId;
});
return baseLayerId;
},