Skip to content

Commit

Permalink
- Bump to version 2.0.4.5
Browse files Browse the repository at this point in the history
  • Loading branch information
afabiani committed Jul 1, 2020
1 parent da54f54 commit 7d112ea
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions mapstore2_adapter/plugins/geonode.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,23 +412,23 @@ def get_overlays(self, viewer, request=None):
layer['getFeatureInfo']['propertyNames']:
fields = layer['getFeatureInfo']['fields']
propertyNames = layer['getFeatureInfo']['propertyNames']
displayTypes = layer['getFeatureInfo']['displayTypes']
displayTypes = layer['getFeatureInfo']['displayTypes'] if 'displayTypes' in layer['getFeatureInfo'] else dict()
featureInfo = {'format': 'TEMPLATE'}

_template = '<div>'
for _field in fields:
_label = propertyNames[_field] if propertyNames[_field] else _field
_template += '<div class="row">'

if displayTypes[_field] == 'type_href':
if _field in displayTypes and displayTypes[_field] == 'type_href':
_template += '<div class="col-xs-6" style="font-weight: bold; word-wrap: break-word;">%s:</div> \
<div class="col-xs-6" style="word-wrap: break-word;"><a href="${properties.%s}" target="_new">${properties.%s}</a></div>' % \
(_label, _field, _field)
elif displayTypes[_field] == 'type_image':
elif _field in displayTypes and displayTypes[_field] == 'type_image':
_template += '<div class="col-xs-12" align="center" style="font-weight: bold; word-wrap: break-word;"> \
<a href="${properties.%s}" target="_new"><img width="100%%" height="auto" src="${properties.%s}" title="%s" alt="%s"/></a></div>' % \
(_field, _field, _label, _label)
elif 'type_video' in displayTypes[_field]:
elif _field in displayTypes and 'type_video' in displayTypes[_field]:
if 'youtube' in displayTypes[_field]:
_template += '<div class="col-xs-12" align="center" style="font-weight: bold; word-wrap: break-word;"> \
<iframe src="${properties.%s}" width="100%%" height="360" frameborder="0" allowfullscreen></iframe></div>' % \
Expand All @@ -438,11 +438,11 @@ def get_overlays(self, viewer, request=None):
_template += '<div class="col-xs-12" align="center" style="font-weight: bold; word-wrap: break-word;"> \
<video width="100%%" height="360" controls><source src="${properties.%s}" type="%s">Your browser does not support the video tag.</video></div>' % \
(_field, _type)
elif displayTypes[_field] == 'type_audio':
elif _field in displayTypes and displayTypes[_field] == 'type_audio':
_template += '<div class="col-xs-12" align="center" style="font-weight: bold; word-wrap: break-word;"> \
<audio controls><source src="${properties.%s}" type="audio/mpeg">Your browser does not support the audio element.</audio></div>' % \
(_field)
elif displayTypes[_field] == 'type_iframe':
elif _field in displayTypes and displayTypes[_field] == 'type_iframe':
_template += '<div class="col-xs-12" align="center" style="font-weight: bold; word-wrap: break-word;"> \
<iframe src="/proxy/?url=${properties.%s}" width="100%%" height="360" frameborder="0" allowfullscreen></iframe></div>' % \
(_field)
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = django-mapstore-adapter
version = 2.0.4.4
version = 2.0.4.5
description = Django MapStore2 Adapter
author = Alessio Fabiani
author_email = [email protected]
Expand Down

0 comments on commit 7d112ea

Please sign in to comment.