Skip to content

Commit 1fb034d

Browse files
committed
make map.ts compliant to latest leaflet version
1 parent b16b470 commit 1fb034d

File tree

3 files changed

+23
-17
lines changed

3 files changed

+23
-17
lines changed

lib/map.ts

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -138,28 +138,34 @@ export const Map = function (linkScale: (t: any) => any, sidebar: ReturnType<typ
138138
labelLayer.redraw();
139139
});
140140

141-
map.on("baselayerchange", function (e) {
142-
map.options.maxZoom = e.layer.options.maxZoom;
143-
clientLayer.options.maxZoom = map.options.maxZoom;
144-
labelLayer.options.maxZoom = map.options.maxZoom;
145-
if (map.getZoom() > map.options.maxZoom) {
146-
map.setZoom(map.options.maxZoom);
141+
map.on("baselayerchange", function (e: any & { name: string }) {
142+
const selectedLayer = baseLayers[e.name];
143+
if (selectedLayer && selectedLayer.options.maxZoom !== undefined) {
144+
const maxZoom = selectedLayer.options.maxZoom;
145+
map.options.maxZoom = maxZoom;
146+
clientLayer.options.maxZoom = maxZoom;
147+
labelLayer.options.maxZoom = maxZoom;
148+
149+
if (map.getZoom() > maxZoom) {
150+
map.setZoom(maxZoom);
151+
}
147152
}
148153

149154
let html_tag: Element = document.querySelector("html");
150155
let class_list = html_tag.classList;
156+
const mode = selectedLayer?.options?.mode;
151157
class_list.forEach(function (item) {
152158
if (item.startsWith("theme_")) {
153159
class_list.remove(item);
154160
}
155161
});
156162
if (
157163
html_tag &&
158-
e.layer.options.mode &&
159-
e.layer.options.mode !== "" &&
160-
!html_tag.classList.contains(e.layer.options.mode)
164+
mode &&
165+
mode !== "" &&
166+
!html_tag.classList.contains(mode)
161167
) {
162-
class_list.add("theme_" + e.layer.options.mode);
168+
class_list.add("theme_" + mode);
163169
labelLayer.updateLayer();
164170
}
165171
});

package-lock.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"@types/d3-selection": "^3.0.11",
3131
"@types/d3-timer": "^3.0.2",
3232
"@types/d3-zoom": "^3.0.8",
33-
"@types/leaflet": "^1.7.1",
33+
"@types/leaflet": "^1.9.4",
3434
"@types/node-polyglot": "^2.4.4",
3535
"@types/rbush": "^4.0.0",
3636
"d3-collection": "^1.0.7",
@@ -41,7 +41,7 @@
4141
"d3-selection": "^3.0.0",
4242
"d3-timer": "^3.0.1",
4343
"d3-zoom": "^3.0.0",
44-
"leaflet": "^1.7.1",
44+
"leaflet": "^1.9.4",
4545
"moment": "^2.30.1",
4646
"navigo": "^7.1.3",
4747
"node-polyglot": "2.5.0",

0 commit comments

Comments
 (0)