Skip to content

Commit

Permalink
Some initial error handling for DEM/DTM
Browse files Browse the repository at this point in the history
  • Loading branch information
kbrandwijk committed Jan 21, 2025
1 parent 977e665 commit a90bb64
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
3 changes: 1 addition & 2 deletions maps4fs/generator/dem.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,7 @@ def process(self) -> None:
data = self.dtm_provider.get_numpy()
except Exception as e: # pylint: disable=W0718
self.logger.error("Failed to get DEM data from DTM provider: %s.", e)
self._save_empty_dem(dem_output_resolution)
return
raise e

if len(data.shape) != 2:
self.logger.error("DTM provider returned incorrect data: more than 1 channel.")
Expand Down
3 changes: 3 additions & 0 deletions maps4fs/generator/dtm/denmark.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ class DenmarkProvider(WCSProvider, DTMProvider):
_tile_size = 1000

def get_wcs_parameters(self, tile):
if not self.user_settings.token:
raise ValueError("A token is required for this provider.")

return {
"identifier": "dhm_terraen",
"bbox": (tile[1], tile[0], tile[3], tile[2]),
Expand Down
3 changes: 3 additions & 0 deletions maps4fs/generator/dtm/finland.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ class FinlandProvider(WCSProvider, DTMProvider):
)

def get_wcs_instance_parameters(self):
if not self.user_settings.api_key:
raise ValueError("API Key is required for this provider.")

settings = super().get_wcs_instance_parameters()
settings["auth"] = Authentication(
username=self.user_settings.api_key, password=self.user_settings.api_key
Expand Down
2 changes: 1 addition & 1 deletion webui/generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ def generate_map(self) -> None:
except Exception as e:
self.logger.error("An error occurred while generating the map: %s", repr(e))
self.status_container.error(
f"An error occurred while generating the map: {repr(e)}.", icon="❌"
f"An error occurred while generating the map: {str(e)}.", icon="❌"
)
finally:
if self.public:
Expand Down

0 comments on commit a90bb64

Please sign in to comment.