Skip to content
Permalink
Browse files

genPOI: polyline text improvements

Don't require text for polylines/polygons, and support hovertext
by utilising leaflet's tooltips.
  • Loading branch information
CounterPillow committed Feb 13, 2020
1 parent 2c92b4a commit 1d8279243de99e68b16cbc0d572a57a4e7ce3a1e
Showing with 7 additions and 3 deletions.
  1. +3 −2 overviewer_core/aux_files/genPOI.py
  2. +4 −1 overviewer_core/data/js_src/util.js
@@ -410,13 +410,14 @@ def create_marker_from_filter_result(poi, result):
d.update(dict(text=result[1], hovertext=result[0]))
# Dict support to allow more flexible things in the future as well as polylines on the map.
elif isinstance(result, dict):
d['text'] = result['text']
if 'text' in result:
d['text'] = result['text']

# Use custom hovertext if provided...
if 'hovertext' in result:
d['hovertext'] = str(result['hovertext'])
else: # ...otherwise default to display text.
d['hovertext'] = result['text']
d['hovertext'] = result.get('text', '')

if "icon" in result:
d["icon"] = result['icon']
@@ -404,6 +404,9 @@ overviewer.util = {
fill: db['fill']
};
layerObj = db['isLine'] ? L.polyline(plLatLng, options) : L.polygon(plLatLng, options);
if (db['hovertext']) {
layerObj.bindTooltip(db['hovertext'], {sticky: true});
}
// TODO: add other config options (fill color, fill opacity)
} else {
// Convert coords
@@ -414,7 +417,7 @@ overviewer.util = {
layerObj = new L.marker(latlng, {icon: m_icon, title: db.hovertext});
}
// Add popup to marker
if (marker_entry.createInfoWindow) {
if (marker_entry.createInfoWindow && db.text) {
layerObj.bindPopup(db.text);
}
// Add the polyline or marker to the layer

0 comments on commit 1d82792

Please sign in to comment.
You can’t perform that action at this time.