Merge pull request #83 from jeffdefacto/extra-spaces

Prevent extra spaces from join function

Author: iandees

openaddr/conform.py

@@ -871,8 +871,8 @@ def row_transform_and_convert(source_config, row):
 
 def row_merge(sc, row, key):
     "Merge multiple columns like 'Maple','St' to 'Maple St'"
-    merge_data = [row[field] for field in sc.data_source["conform"][key]]
-    row["oa:{}".format(key)] = ' '.join(merge_data)
+    merge_data = [(row.get(field, '') or '').strip() for field in sc.data_source["conform"][key]]
+    row["oa:{}".format(key)] = ' '.join([part for part in merge_data if part])
     return row
 
 def row_fxn_join(sc, row, key, fxn):

openaddr/tests/__init__.py

@@ -740,9 +740,9 @@ def test_single_pl_l(self):
             self.assertEqual(rows[1]['properties']['number'], u'5')
             self.assertEqual(rows[10]['properties']['number'], u'8')
             self.assertEqual(rows[100]['properties']['number'], u'5a')
-            self.assertEqual(rows[1]['properties']['street'], u'Ulica Dolnych Wa\u0142\xf3w  Gliwice')
-            self.assertEqual(rows[10]['properties']['street'], u'Ulica Dolnych Wa\u0142\xf3w  Gliwice')
-            self.assertEqual(rows[100]['properties']['street'], u'Plac pl. Inwalid\xf3w Wojennych  Gliwice')
+            self.assertEqual(rows[1]['properties']['street'], u'Ulica Dolnych Wa\u0142\xf3w Gliwice')
+            self.assertEqual(rows[10]['properties']['street'], u'Ulica Dolnych Wa\u0142\xf3w Gliwice')
+            self.assertEqual(rows[100]['properties']['street'], u'Plac pl. Inwalid\xf3w Wojennych Gliwice')
             self.assertEqual(rows[1]['properties']['unit'], u'')
             self.assertEqual(rows[10]['properties']['unit'], u'')
             self.assertEqual(rows[100]['properties']['unit'], u'')
@@ -1019,7 +1019,7 @@ def test_single_tx_waco(self):
             self.assertEqual(rows[0]['properties']['region'], u'TX')
             self.assertEqual(rows[0]['properties']['id'], u'')
             self.assertEqual(rows[0]['properties']['number'], u'308')
-            self.assertEqual(rows[0]['properties']['hash'], u'5b2957c31a02e00e')
+            self.assertEqual(rows[0]['properties']['hash'], u'd9db73ddf7ed0e2b')
             self.assertEqual(rows[0]['properties']['city'], u'Mcgregor')
             self.assertEqual(rows[0]['geometry']['coordinates'], [-97.3961768, 31.4432706]),
             self.assertEqual(rows[0]['properties']['street'], u'PULLEN ST')
@@ -1075,7 +1075,7 @@ def test_single_ny_orange(self):
             rows = list(map(json.loads, list(input)))
             self.assertEqual(rows[0]['properties']['id'], u'')
             self.assertEqual(rows[0]['properties']['number'], u'434')
-            self.assertEqual(rows[0]['properties']['hash'], u'd129b77ffa481fea')
+            self.assertEqual(rows[0]['properties']['hash'], u'3baff6b46b2f18bc')
             self.assertEqual(rows[0]['properties']['city'], u'MONROE')
             self.assertEqual(rows[0]['geometry']['coordinates'], [-74.1926686, 41.3187728])
             self.assertEqual(rows[0]['properties']['street'], u'')