Skip to content
Snippets Groups Projects
Commit d8c0d68e authored by Rudolf, Michael's avatar Rudolf, Michael
Browse files

Fixed #119 and a problem with dem image generation.

parent eec5302c
No related branches found
No related tags found
No related merge requests found
......@@ -150,6 +150,11 @@ def classify_shape(
res.update(railways(res, sub_set_hull, osm_path, shp_cfg))
# Buildings
if use_online:
res.update(
buildings(res, sub_set_hull, shp_cfg, out_folder=cache_path)
)
else:
res.update(buildings(res, sub_set_hull, shp_cfg, osm_path))
# Water
......@@ -548,21 +553,42 @@ def buildings(
else:
logging.info("Loading building data from HLNUG server")
building_data = u4web.query_hlnug(
"geologie/gk25/MapServer",
"Geologie (Kartiereinheiten)",
"geobasis/alkis_grenzen/MapServer",
"GEBAEUDE",
region=sub_set_hull,
out_folder=out_folder,
suffix=f"{res['group']:05}",
)
if building_data.empty:
logging.debug("Retrying to get geological data.")
logging.debug("Retrying to get building data.")
building_data = u4web.query_hlnug(
"geologie/gk25/MapServer",
"Geologie (Kartiereinheiten)",
"geobasis/alkis_grenzen/MapServer",
"GEBAEUDE",
region=sub_set_hull,
out_folder=out_folder,
suffix=f"{res['group']:05}",
)
if not building_data.empty:
res["buildings"] = building_data
building_data_close = u4web.query_hlnug(
"geobasis/alkis_grenzen/MapServer",
"GEBAEUDE",
region=sub_set_hull,
out_folder=out_folder,
suffix=f"{res['group']:05}_close_",
)
if building_data_close.empty:
logging.debug("Retrying to get building data.")
building_data_close = u4web.query_hlnug(
"geobasis/alkis_grenzen/MapServer",
"GEBAEUDE",
region=sub_set_hull,
out_folder=out_folder,
suffix=f"{res['group']:05}_close_",
)
if not building_data_close.empty:
res["buildings_close"] = True
if len(res["buildings"]) > 0:
res["buildings_area"] = round(res["buildings"].area.sum(), 1)
......
......@@ -106,7 +106,7 @@ def _get_coords(in_path: os.PathLike | list) -> list:
"""
coords = None
if isinstance(in_path, list):
if isinstance(in_path, list) and len(in_path) > 0:
if isinstance(in_path[0], str):
coords, source_index = _file_list_to_coords(in_path)
elif isinstance(in_path[0], tuple):
......
......@@ -241,7 +241,7 @@ def hlnug_description(
# Add buildings
if row["buildings_num"] > 0:
prgph.add_run("Auf der Rutschung ist Bebauung vorhanden. ")
prgph.add_run("Auf der Fläche der Rutschung ist Bebauung vorhanden. ")
elif row["buildings_close"]:
prgph.add_run(
"In in maximal 50\u00a0m Entfernung vom Rand der Rutschung ist "
......
......@@ -340,7 +340,7 @@ def map_worker(
crs,
output_path,
"known_features",
project["paths"]["diff_plan_path"],
dem_path,
contour_path,
plot_buffer=100,
overwrite=overwrite_plots,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment