From 49ffd4ea622df8b534a6df1f5e396eb08fbe7f30 Mon Sep 17 00:00:00 2001 From: Al Date: Wed, 18 Jan 2017 19:32:02 -0500 Subject: [PATCH] [openaddresses] doing config in sorted order, puts the US last, sorts the states, etc. so there's a consistent sense of progress --- scripts/geodata/openaddresses/formatter.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/geodata/openaddresses/formatter.py b/scripts/geodata/openaddresses/formatter.py index b68321b9..659b7c6d 100644 --- a/scripts/geodata/openaddresses/formatter.py +++ b/scripts/geodata/openaddresses/formatter.py @@ -511,7 +511,8 @@ class OpenAddressesFormatter(object): i = 0 - for country_dir, country_config in six.iteritems(openaddresses_config.country_configs): + for country_dir in sorted(openaddresses_config.country_configs.keys()): + country_config = openaddresses_config.country_configs[country_dir] # Clear country cache for each new country self.country_rtree.clear_cache() @@ -542,8 +543,9 @@ class OpenAddressesFormatter(object): if self.debug: break - for subdir, subdir_config in six.iteritems(country_config.get('subdirs', {})): + for subdir in sorted(country_config.get('subdirs', {}).keys()): subdir = safe_decode(subdir) + subdir_config = country_config['subdirs'][subdir] for file_config in subdir_config.get('files', []): filename = file_config['filename']