From da3240d5f66503fe0534cad7a27aca76b1264a6f Mon Sep 17 00:00:00 2001 From: Al Date: Fri, 16 Dec 2016 06:54:36 -0500 Subject: [PATCH] [openaddresses] making field maps in OpenAddresses config a dictionary rather than a list to make inheritance easier --- scripts/geodata/openaddresses/formatter.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/geodata/openaddresses/formatter.py b/scripts/geodata/openaddresses/formatter.py index fa6ff7f0..510da60d 100644 --- a/scripts/geodata/openaddresses/formatter.py +++ b/scripts/geodata/openaddresses/formatter.py @@ -253,14 +253,14 @@ class OpenAddressesFormatter(object): if not fields: return - fields = {f['field_name']: f['component'] for f in fields} - mapped_values = {f['component']: f['value_map'] for f in fields if hasattr(f.get('value_map'), 'get')} + field_map = {field_name: f['component'] for field_name, f in six.iteritems(fields)} + mapped_values = {f['component']: f['value_map'] for f in six.itervalues(fields) if hasattr(f.get('value_map'), 'get')} f = open(path) reader = unicode_csv_reader(f) headers = reader.next() - header_indices = {i: fields[k] for i, k in enumerate(headers) if k in fields} + header_indices = {i: fields[k] for i, k in enumerate(headers) if k in field_map} latitude_index = headers.index('LAT') longitude_index = headers.index('LON')