Skip to content

Output geopoint instead of latitude/longitude columns #7

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

Open
RMenini wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Output geopoint instead of latitude/longitude columns #7

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
12 changes: 5 additions & 7 deletions python-lib/dataframe_forward_geocoding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,14 @@ def add_forward_geocode_columns(cache, config, current_df, geocode_function):
"""
columns = current_df.columns.tolist()
# Adding columns to the schema
columns_to_append = [config[c] for c in ['latitude', 'longitude'] if not config[c] in columns]
if columns_to_append:
if 'geopoint' not in columns:
index = columns.index(config['address_column'])
current_df = current_df.reindex(columns=columns[:index + 1] + columns_to_append + columns[index + 1:],
current_df = current_df.reindex(columns=columns[:index + 1] + ['geopoint'] + columns[index + 1:],
copy=False)
# Normal, 1 by 1 geocoding when batch is not enabled/available
if not config['batch_enabled']:
current_df[config['latitude']], current_df[config['longitude']] = \
zip(*current_df.apply(perform_forward_geocode, axis=1, args=(config, geocode_function, cache)))
lat_long_tuple = current_df.apply(perform_forward_geocode, axis=1, args=(config, geocode_function, cache))
current_df['geopoint'] = ['POINT({} {})'.format(long, lat) for lat, long in lat_long_tuple]

# Batch creation and geocoding otherwise
else:
Expand All @@ -46,8 +45,7 @@ def add_forward_geocode_columns(cache, config, current_df, geocode_function):
else:
res = [row[config[c]] for c in ['latitude', 'longitude']]

current_df.loc[i, config['latitude']] = res[0]
current_df.loc[i, config['longitude']] = res[1]
current_df.loc[i, 'geopoint'] = 'POINT({} {})'.format(res[1], res[0]) # Create a geopoint from lat and long
except (KeyError, IndexError):
batch.append((i, address))

Expand Down