Skip to content

Commit 010b97b

Browse files
authored
Merge pull request #6848 from meyerlor/fix/6774-timemanager-layername
Fix/Timemanager: Add layername
2 parents e23ed75 + f99c3d7 commit 010b97b

3 files changed

Lines changed: 12 additions & 1 deletion

File tree

CHANGELOG-3.9.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ with some extra keywords: backend, tests, test, translation, funders, important
4949
* Filter - Skip the GeoPackage filtered-extent query when SpatiaLite lacks GeoPackage support, instead of flooding the logs (#6165)
5050
* Filter - No longer show a spurious (NULL) entry in split-value form filters without NULL data (#6166)
5151
* Filter - Numeric form filter now accepts decimal/float values, not only integers (#1356)
52+
* Time manager - Show the controlled layer(s) name in the time manager panel (#6774)
5253

5354
### Tests
5455

assets/src/legacy/timemanager.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,16 @@ var lizTimemanager = function() {
2525
// Count layers
2626
tmLayersNumber = Object.keys(lizMap.config.timemanagerLayers).length;
2727

28+
// Display the layer(s) controlled by the time manager (#6774)
29+
var tmLayerTitles = [];
30+
for (var tmLayerName in lizMap.config.timemanagerLayers) {
31+
var tmLayerConf = lizMap.config.layers[tmLayerName];
32+
tmLayerTitles.push(
33+
(tmLayerConf && tmLayerConf.title) ? tmLayerConf.title : tmLayerName
34+
);
35+
}
36+
$('#tmLayers').text(tmLayerTitles.join(', '));
37+
2838
$('#timemanager-menu button.btn-timemanager-clear').click(function() {
2939
document.getElementById('button-timemanager').click();
3040
});

lizmap/modules/view/templates/map_timemanager.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
</span>
99
</h3>
1010
<div class="menu-content">
11+
<div id="tmLayers" class="dock-subtitle"></div>
1112
<div id="tmSlider"></div>
1213
<div>
1314
<span id="tmCurrentValue"></span><span> - </span><span id="tmNextValue"></span><br/>
1415
<button id="tmPrev" class="btn-print-launch btn btn-sm btn-primary">{@view~map.timemanager.toolbar.prev@}</button>
1516
<button id="tmTogglePlay" class="btn-print-launch btn btn-sm btn-primary">{@view~map.timemanager.toolbar.play@}</button>
1617
<button id="tmNext" class="btn-print-launch btn btn-sm btn-primary">{@view~map.timemanager.toolbar.next@}</button>
1718
</div>
18-
<div id="tmLayers"></div>
1919
</div>
2020
</div>

0 commit comments

Comments
 (0)