[fix] recursive merge for entries that are empty dictionaries

scripts/geodata/address_formatting/formatter.py

@@ -266,8 +266,9 @@ class AddressFormatter(object):
     def insertion_distribution(self, insertions):
         values = []
         probs = []
+
         for k, v in six.iteritems(insertions):
-            if k == 'conditional':
+            if k == 'conditional' or not v:
                 continue
 
             allow_between_house_number_and_road = v.get('allow_between_house_number_and_road', False)

scripts/geodata/configs/utils.py

@@ -4,7 +4,7 @@ from collections import Mapping
 
 def recursive_merge(a, b):
     for k, v in six.iteritems(b):
-        if isinstance(v, Mapping):
+        if isinstance(v, Mapping) and v:
             existing = a.get(k, v)
             merged = recursive_merge(existing, v)
             a[k] = merged