fixed point layer display

sitn · Jan 23, 2020 · ac27ad6 · ac27ad6
1 parent 937354a
commit ac27ad6
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/crdppf/lib/content.py b/crdppf/lib/content.py
@@ -131,7 +131,10 @@ def add_layer(layer, featureid, featureinfo, translations, appconfig, topicdata)
         groupedresult = {}
         for code in codegenres:
             for result in results:
-                measure = int(result['properties']['intersectionMeasure'].replace(' : ', '').replace(' - ', '').replace('[m2]', '').replace('[m]', ''))
+                if result['properties']['intersectionMeasure'] == ' ':
+                    measure = None
+                else:
+                    measure = int(result['properties']['intersectionMeasure'].replace(' : ', '').replace(' - ', '').replace('[m2]', '').replace('[m]', ''))
                 if result['properties']['codegenre'] == code:
                     if code in groupedresult:
                         groupedresult[code]["intersectionMeasure"] += measure
@@ -476,6 +479,13 @@ def get_content(id, request):
                                         "area_pct": round((float(
                                             feature['intersectionMeasure'])*100)/propertyarea, 1)
                                     })
+                                elif feature['geomType'] == 'point':
+                                    topicdata[str(topic.topicid)]["restrictions"].append({
+                                        "codegenre": legenddir+feature['codegenre']+".png",
+                                        "teneur": feature['teneur'],
+                                        "area": '',
+                                        "area_pct": -1
+                                    })
                                 else:
                                     topicdata[str(topic.topicid)]["restrictions"].append({
                                         "codegenre": legenddir+feature['codegenre']+".png",