From d7f6f3ebd50824c876b3eec9a2c5544d2e008736 Mon Sep 17 00:00:00 2001 From: Jens Date: Wed, 1 Jul 2020 19:45:44 +0200 Subject: [PATCH] Make icons in legend OptIn Make them OptIn Add option to docs --- docs/signs.rst | 3 +++ overviewer_core/aux_files/genPOI.py | 3 ++- overviewer_core/data/js_src/util.js | 10 ++++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/docs/signs.rst b/docs/signs.rst index 5e25424..7e2a354 100644 --- a/docs/signs.rst +++ b/docs/signs.rst @@ -215,6 +215,9 @@ The following keys are accepted in the marker dictionary: ``createInfoWindow`` Optional. Specifies whether or not the icon displays an info window on click. Defaults to True +``showIconInLegend`` + Optional. Specifies whether or not the icon is displayed in the legend. Defaults to False + ``checked`` Optional. Specifies whether or not this marker group will be checked(visible) by default when the map loads. Defaults to False diff --git a/overviewer_core/aux_files/genPOI.py b/overviewer_core/aux_files/genPOI.py index d76e517..58889a9 100644 --- a/overviewer_core/aux_files/genPOI.py +++ b/overviewer_core/aux_files/genPOI.py @@ -568,7 +568,8 @@ def main(): displayName=f['name'], icon=f.get('icon', 'signpost_icon.png'), createInfoWindow=f.get('createInfoWindow', True), - checked=f.get('checked', False)) + checked=f.get('checked', False), + showIconInLegend=f.get('showIconInLegend', False)) marker_groups[rname].append(group) # initialize the structure for the markers diff --git a/overviewer_core/data/js_src/util.js b/overviewer_core/data/js_src/util.js index d686e10..7367c3a 100644 --- a/overviewer_core/data/js_src/util.js +++ b/overviewer_core/data/js_src/util.js @@ -424,8 +424,14 @@ overviewer.util = { marker_group.addLayer(layerObj); } // Save marker group - var layer_name_html = marker_entry.displayName + - ''; + var layer_name_html; + if (marker_entry.showIconInLegend) { + layer_name_html = marker_entry.displayName + + ''; + } + else { + layer_name_html = marker_entry.displayName; + } obj.marker_groups[layer_name_html] = marker_group; } }