Use getattr for tolerant accessing IGeoJSONProperties attributes. Als…

…o use extraClasses for marker icons
collective · Apr 20, 2019 · 8c3d65b · 8c3d65b
1 parent 1075781
commit 8c3d65b
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/collective/collectionfilter/baseviews.py b/src/collective/collectionfilter/baseviews.py
@@ -197,21 +197,26 @@ def data_geojson(self):
 
                 props = IGeoJSONProperties(it.getObject())
 
-                features.append({
+                feature = {
                     'type': 'Feature',
                     'id': it.UID,
-                    'properties': {
-                        'popup': props.popup,
-                        'color': props.color,
-                    },
+                    'properties': {},
                     'geometry': {
                         'type': 'Point',
                         'coordinates': [
                             it.longitude,
                             it.latitude,
                         ]
                     }
-                })
+                }
+                if getattr(props, 'popup', None):
+                    feature['properties']['popup'] = props.popup
+                if getattr(props, 'color', None):
+                    feature['properties']['color'] = props.color
+                if getattr(props, 'extraClasses', None):
+                    feature['properties']['extraClasses'] = props.extraClasses
+
+                features.append(feature)
 
             if not features:
                 return