Skip to content
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

add 'geocoded_address' to cleanedplace #972

Merged
merged 1 commit into from
Jul 23, 2024
Merged

add 'geocoded_address' to cleanedplace #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions emission/analysis/intake/cleaning/clean_and_resample.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ def get_filtered_place(raw_place):
reverse_geocoded_json = eco.Geocoder.get_json_reverse(filtered_place_data.location.coordinates[1],
filtered_place_data.location.coordinates[0])
if reverse_geocoded_json is not None:
filtered_place_data['geocoded_address'] = reverse_geocoded_json['address']
filtered_place_data.display_name = format_result(reverse_geocoded_json)
except KeyError as e:
logging.info("nominatim result does not have an address, skipping")
Expand Down
1 change: 1 addition & 0 deletions emission/core/wrapper/cleanedplace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class Cleanedplace(ecwp.Place):
props = ecwp.Place.props
props.update(
{"raw_places": ecwb.WrapperBase.Access.WORM, # raw places that were combined to from this cleaned place
"geocoded_address": ecwb.WrapperBase.Access.WORM, # the 'address' field of the OSM reverse geocoding result
"display_name": ecwb.WrapperBase.Access.WORM # The human readable name for this place
})

Expand Down
10 changes: 7 additions & 3 deletions emission/individual_tests/TestNominatim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,13 @@ def test_geofabrik_and_nominatim(self):
def test_get_filtered_place(self):
fake_place_raw = self.fake_place
fake_place_data = clean.get_filtered_place(fake_place_raw).__getattr__("data")
actual_result = fake_place_data.__getattr__("display_name")
expected_result = "Dorrance Street, Providence"
self.assertEqual(expected_result, actual_result)
actual_display_name = fake_place_data.__getattr__("display_name")
expected_display_name = "Dorrance Street, Providence"
self.assertEqual(expected_display_name, actual_display_name)
actual_geocoded_address = fake_place_data["geocoded_address"]
expected_geocoded_address = {'road': 'Dorrance Street', 'city': 'Providence', 'postcode': '02903'}
for k in expected_geocoded_address:
self.assertEqual(expected_geocoded_address[k], actual_geocoded_address[k])

#Testing make_url_geo, which creates a query URL from the input string.
def test_make_url_geo(self):
Expand Down
Loading