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.

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

Prioritize using longitude and latitude columns in building files when present. #291

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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: 7 additions & 5 deletions src/skai/buildings.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,23 @@ def _read_buildings_csv(path: str) -> gpd.GeoDataFrame:
"""
with tf.io.gfile.GFile(path, 'r') as csv_file:
df = pd.read_csv(csv_file)
if 'geometry' in df.columns:
if 'longitude' in df.columns and 'latitude' in df.columns:
geometries = gpd.points_from_xy(df['longitude'], df['latitude'])
df.drop(columns=['longitude', 'latitude'], inplace=True)
elif 'geometry' in df.columns:
logging.info('Parsing %d WKT strings. This could take a while.', len(df))
geometries = gpd.GeoSeries.from_wkt(df['geometry'])
df.drop(columns=['geometry'], inplace=True)
elif 'wkt' in df.columns:
logging.info('Parsing %d WKT strings. This could take a while.', len(df))
geometries = gpd.GeoSeries.from_wkt(df['wkt'])
df.drop(columns=['wkt'], inplace=True)
elif 'longitude' in df.columns and 'latitude' in df.columns:
geometries = gpd.points_from_xy(df['longitude'], df['latitude'])
df.drop(columns=['longitude', 'latitude'], inplace=True)
else:
raise ValueError(f'No geometry information found in file "{path}"')

return gpd.GeoDataFrame(df, geometry=geometries, crs=4326)
geometries = geometries.normalize()
gdf = gpd.GeoDataFrame(df, geometry=geometries, crs=4326)
return gdf.drop_duplicates()


def convert_buildings_file(
Expand Down
Loading