Expand __properties__ logic to clarify

tilezen · Jul 31, 2017 · da19aa0 · da19aa0
1 parent 6217295
commit da19aa0
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/tilequeue/process.py b/tilequeue/process.py
@@ -475,7 +475,11 @@ def convert_source_data_to_feature_layers(rows, layer_data, bounds, zoom):
         boundaries_geometry = row.pop('__boundaries_geometry__', None)
         assert geometry or boundaries_geometry
 
-        common_props = row.pop('__properties__', None) or {}
+        common_props = row.pop('__properties__', None)
+        if common_props is None:
+            # if __properties__ exists but is null in the query, we
+            # want to normalize that to an empty dict too
+            common_props = {}
 
         row_props_by_layer = dict(
             boundaries=row.pop('__boundaries_properties__', None),