Skip to content

Prevent extra spaces from join function #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iandees merged 2 commits into from
Dec 10, 2025
Merged

Prevent extra spaces from join function #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06f374d
Prevent extra spaces in joined outputs
jeffdefacto Dec 9, 2025
ae7064e
Update tests to account for change
jeffdefacto Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions openaddr/conform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
10 changes: 5 additions & 5 deletions openaddr/tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'')
Expand Down Expand Up @@ -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')
Expand Down Expand Up @@ -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'')
Expand Down