Skip to content

Commit b0e0606

Browse files
committed
fix(btns): display issues for layerManager and compare
1 parent c598a35 commit b0e0606

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

src/css/map-buttons.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@
4848
top: calc(76px + var(--safe-area-inset-top));
4949
}
5050

51+
#layerManagerBtn.highest {
52+
top: calc(10px + var(--safe-area-inset-top));
53+
}
54+
5155
#layerManagerBtn.active {
5256
background-image: url("assets/map-buttons/layers-w.svg");
5357
background-color: var(--dark-green);
@@ -417,6 +421,7 @@
417421
background-color: unset;
418422
position: absolute;
419423
bottom: 66px;
424+
transition: opacity 0.5s,
420425
}
421426

422427
.maplibregl-ctrl-bottom-right > .maplibregl-ctrl:has(.maplibregl-ctrl-shrink) {

src/js/event-listeners.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ function addListeners() {
268268
DOM.$bottomButtons.classList.remove("opacity0");
269269
DOM.$routeDrawEdit.classList.remove("opacity0");
270270
DOM.$filterPoiBtn.classList.remove("opacity0");
271+
DOM.$layerManagerBtn.classList.remove("opacity0");
271272
if (DOM.$fullScreenBtn) {
272273
DOM.$fullScreenBtn.classList.remove("opacity0");
273274
}
@@ -276,6 +277,7 @@ function addListeners() {
276277
DOM.$bottomButtons.classList.add("opacity0");
277278
DOM.$routeDrawEdit.classList.add("opacity0");
278279
DOM.$filterPoiBtn.classList.add("opacity0");
280+
DOM.$layerManagerBtn.classList.add("opacity0");
279281
if (DOM.$fullScreenBtn) {
280282
DOM.$fullScreenBtn.classList.add("opacity0");
281283
}

src/js/nav.js

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ class MenuNavigation {
140140
case "offlineMaps":
141141
DOM.$search.classList.add("d-none");
142142
DOM.$filterPoiBtn.classList.add("d-none");
143+
DOM.$layerManagerBtn.classList.add("d-none");
143144
DOM.$fullScreenBtn.classList.add("d-none");
144145
DOM.$backTopLeftBtn.classList.remove("d-none");
145146
DOM.$bottomButtons.classList.add("d-none");
@@ -180,6 +181,7 @@ class MenuNavigation {
180181
Globals.backButtonState = "landmark-" + previousBackState;
181182
DOM.$search.classList.add("d-none");
182183
DOM.$filterPoiBtn.classList.add("d-none");
184+
DOM.$layerManagerBtn.classList.add("highest");
183185
DOM.$fullScreenBtn.classList.add("d-none");
184186
DOM.$backTopLeftBtn.classList.remove("d-none");
185187
Globals.interactivityIndicator.hardDisable();
@@ -192,6 +194,7 @@ class MenuNavigation {
192194
Globals.backButtonState = "signalementOSM-" + previousBackState;
193195
DOM.$positionWindow.classList.add("d-none");
194196
DOM.$filterPoiBtn.classList.add("d-none");
197+
DOM.$layerManagerBtn.classList.add("highest");
195198
DOM.$fullScreenBtn.classList.add("d-none");
196199
Globals.interactivityIndicator.hardDisable();
197200
break;
@@ -266,13 +269,15 @@ class MenuNavigation {
266269
DOM.$bottomButtons.classList.add("compare");
267270
DOM.$bottomButtons.classList.add("compareWidth");
268271
DOM.$bottomButtons.querySelector(".maplibregl-ctrl-bottom-left").classList.add("d-none");
272+
DOM.$bottomButtons.querySelector(".maplibregl-ctrl-bottom-right").classList.add("d-none");
269273
Globals.compare.show();
270274
Globals.interactivityIndicator.hardDisable();
271275
Globals.currentScrollIndex = 0;
272276
break;
273277
case "routeDrawSave":
274278
DOM.$routeDrawWindow.classList.add("d-none");
275279
DOM.$filterPoiBtn.classList.add("d-none");
280+
DOM.$layerManagerBtn.classList.add("highest");
276281
DOM.$fullScreenBtn.classList.add("d-none");
277282
Globals.routeDraw.dom.changeMode.classList.add("d-none");
278283
DOM.$routeDrawEdit.classList.add("d-none");
@@ -299,10 +304,9 @@ class MenuNavigation {
299304
Globals.backButtonState = "poi-" + previousBackState;
300305
Globals.routeDraw.deactivate();
301306
DOM.$search.classList.add("d-none");
302-
DOM.$filterPoiBtn.classList.add("higher");
307+
DOM.$layerManagerBtn.classList.add("highest");
303308
DOM.$backTopLeftBtn.classList.remove("d-none");
304309
DOM.$filterPoiBtn.classList.add("d-none");
305-
DOM.$fullScreenBtn.classList.add("d-none");
306310
Globals.currentScrollIndex = 2;
307311
break;
308312
case "layerManager":
@@ -341,7 +345,7 @@ class MenuNavigation {
341345
Globals.backButtonState = "isochrone-" + previousBackState;
342346
DOM.$search.classList.add("d-none");
343347
DOM.$filterPoiBtn.classList.add("d-none");
344-
DOM.$fullScreenBtn.classList.add("highest");
348+
DOM.$layerManagerBtn.classList.add("highest");
345349
DOM.$backTopLeftBtn.classList.remove("d-none");
346350
Globals.interactivityIndicator.hardDisable();
347351
Globals.currentScrollIndex = 1;
@@ -441,6 +445,7 @@ class MenuNavigation {
441445
case "offlineMaps":
442446
DOM.$search.classList.remove("d-none");
443447
DOM.$filterPoiBtn.classList.remove("d-none");
448+
DOM.$layerManagerBtn.classList.remove("d-none");
444449
DOM.$fullScreenBtn.classList.remove("d-none");
445450
DOM.$backTopLeftBtn.classList.add("d-none");
446451
DOM.$bottomButtons.classList.remove("d-none");
@@ -475,6 +480,7 @@ class MenuNavigation {
475480
case "landmark":
476481
DOM.$search.classList.remove("d-none");
477482
DOM.$filterPoiBtn.classList.remove("d-none");
483+
DOM.$layerManagerBtn.classList.remove("highest");
478484
DOM.$fullScreenBtn.classList.remove("d-none");
479485
DOM.$backTopLeftBtn.classList.add("d-none");
480486
Globals.landmark.clear();
@@ -484,6 +490,7 @@ class MenuNavigation {
484490
case "signalementOSM":
485491
DOM.$positionWindow.classList.remove("d-none");
486492
DOM.$filterPoiBtn.classList.remove("d-none");
493+
DOM.$layerManagerBtn.classList.remove("highest");
487494
DOM.$fullScreenBtn.classList.remove("d-none");
488495
Globals.interactivityIndicator.enable();
489496
Globals.signalement.clear();
@@ -547,6 +554,7 @@ class MenuNavigation {
547554
DOM.$bottomButtons.classList.remove("compare");
548555
DOM.$bottomButtons.classList.add("compareWidth");
549556
DOM.$bottomButtons.querySelector(".maplibregl-ctrl-bottom-left").classList.remove("d-none");
557+
DOM.$bottomButtons.querySelector(".maplibregl-ctrl-bottom-right").classList.remove("d-none");
550558
Globals.compare.hide();
551559
Globals.interactivityIndicator.enable();
552560
break;
@@ -555,6 +563,7 @@ class MenuNavigation {
555563
// Disparition de la croix
556564
DOM.$tabClose.classList.add("d-none");
557565
DOM.$filterPoiBtn.classList.remove("d-none");
566+
DOM.$layerManagerBtn.classList.remove("highest");
558567
DOM.$fullScreenBtn.classList.remove("d-none");
559568
DOM["$routeDrawWindow"].classList.remove("d-none");
560569
Globals.routeDraw.dom.changeMode.classList.remove("d-none");
@@ -581,10 +590,9 @@ class MenuNavigation {
581590
case "poi":
582591
DOM.$search.classList.remove("d-none");
583592
DOM.$filterPoiBtn.classList.remove("higher");
584-
DOM.$layerManagerBtn.classList.remove("higher");
585593
DOM.$backTopLeftBtn.classList.add("d-none");
586594
DOM.$filterPoiBtn.classList.remove("d-none");
587-
DOM.$fullScreenBtn.classList.remove("d-none");
595+
DOM.$layerManagerBtn.classList.remove("highest");
588596
break;
589597
case "layerManager":
590598
DOM.$search.classList.remove("d-none");
@@ -608,7 +616,7 @@ class MenuNavigation {
608616
// FIXME mettre en place une méthode sur la classe Searchs
609617
DOM.$search.classList.remove("d-none");
610618
DOM.$filterPoiBtn.classList.remove("d-none");
611-
DOM.$fullScreenBtn.classList.remove("highest");
619+
DOM.$layerManagerBtn.classList.remove("highest");
612620
DOM.$backTopLeftBtn.classList.add("d-none");
613621
Globals.isochrone.clear();
614622
Globals.isochrone.clearForm();

0 commit comments

Comments
 (0)