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

[fix] refactor to use ComponentDependencies class

Browse Source
This commit is contained in:
Al
2016-11-15 17:07:10 -05:00
parent 68ab69cdc3
commit 15b66f541c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/geodata/addresses/components.py
View File

@@ -1316,7 +1316,7 @@ class AddressComponents(object):
def drop_invalid_components(self, address_components, country): def drop_invalid_components(self, address_components, country):
if not address_components: if not address_components:
return return
component_bitset = self.component_bitset(address_components) component_bitset = ComponentDependencies.component_bitset(address_components)
deps = self.component_dependencies.get(country, self.component_dependencies[None]) deps = self.component_dependencies.get(country, self.component_dependencies[None])
dep_order = deps.dependency_order dep_order = deps.dependency_order
@@ -1326,7 +1326,7 @@ class AddressComponents(object):
continue continue
if c in deps and not component_bitset & deps[c]: if c in deps and not component_bitset & deps[c]:
address_components.pop(c) address_components.pop(c)
component_bitset ^= self.component_bit_values[c] component_bitset ^= ComponentDependencies.component_bit_values[c]
def po_box_address(self, address_components, language, country=None): def po_box_address(self, address_components, language, country=None):
po_box_config = self.config['po_box'] po_box_config = self.config['po_box']