From b08e34b064728db251b1977c39291cab96d9efc2 Mon Sep 17 00:00:00 2001 From: Jamie Bliss Date: Mon, 23 Feb 2015 21:11:56 +0100 Subject: [PATCH] genPOI: add icon and createInfoWindow support for filters The defaults for "icon" and "createInfoWindow" are read from the POI, but can be overridden by a filter function returning an appripriate dict. --- overviewer_core/aux_files/genPOI.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/overviewer_core/aux_files/genPOI.py b/overviewer_core/aux_files/genPOI.py index c46e143..1b15044 100755 --- a/overviewer_core/aux_files/genPOI.py +++ b/overviewer_core/aux_files/genPOI.py @@ -290,6 +290,13 @@ def create_marker_from_filter_result(poi, result): else: d = dict((v, poi[v]) for v in 'xyz') + # read some Defaults from POI + if "icon" in poi: + d["icon"] = poi['icon'] + if "createInfoWindow" in poi: + d["createInfoWindow"] = poi['createInfoWindow'] + + # Fill in the rest from result if isinstance(result, basestring): d.update(dict(text=result, hovertext=result)) elif type(result) == tuple: @@ -313,10 +320,10 @@ def create_marker_from_filter_result(poi, result): if isinstance(result['color'], basestring): d['strokeColor'] = result['color'] - if "icon" in poi: - d.update({"icon": poi['icon']}) - if "createInfoWindow" in poi: - d.update({"createInfoWindow": poi['createInfoWindow']}) + if "icon" in result: + d["icon"] = result['icon'] + if "createInfoWindow" in result: + d["createInfoWindow"] = result['createInfoWindow'] return d