tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] recursive merge for entries that are empty dictionaries

Browse Source
This commit is contained in:
Al
2016-11-16 02:14:28 -05:00
parent b03494a736
commit 3617b3a10c
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/geodata/address_formatting/formatter.py
View File

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

2
scripts/geodata/configs/utils.py
View File

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