Skip to content

Commit

Permalink
integrate suggested changes
Browse files Browse the repository at this point in the history
  • Loading branch information
vbrunn committed Nov 12, 2024
1 parent b114f7f commit c73fed7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions grass-gis-addons/m.import.rvr/m.import.rvr.py
Original file line number Diff line number Diff line change
Expand Up @@ -1470,7 +1470,7 @@ def import_data(data, dataimport_type, output_name, res=None):
elif dataimport_type == "rasterORxyz":
if options[data]:
if os.path.isdir(options[data]):
import_xyz_from_dir(
import_xyz_from_dir(
options[data],
float(options["dtm_resolution"]),
res,
Expand Down Expand Up @@ -1585,7 +1585,7 @@ def main():

# check if needed addons are installed
check_addon("r.import.ndsm_nrw", "/path/to/r.import.ndsm_nrw")
check_addon("r.dtm.import.nw")
check_addon("r.dem.import", "https://github.com/mundialis/r.dem.import")

# check if needed paths to data are set
grass.message(_("Checking input parameters ..."))
Expand Down
6 changes: 3 additions & 3 deletions grass-gis-addons/r.import.dtm_nrw/r.import.dtm_nrw.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# into the current mapset.
#
#
# COPYRIGHT: (C) 2021-2023 by mundialis and the GRASS Development Team
# COPYRIGHT: (C) 2021-2024 by mundialis GmbH & Co. KG and the GRASS Development Team
#
# This program is free software under the GNU General Public
# License (>=v2). Read the file COPYING that comes with GRASS
Expand Down Expand Up @@ -182,7 +182,7 @@ def get_required_tiles():
required_tiles_raw = list(product(required_ew_tiles, required_ns_tiles))
required_tiles = []
for tile in required_tiles_raw:
tilename = "dgm1_32_{}_{}_1_nw_2022.tif.gz".format(tile[0], tile[1])
tilename = "dgm1_32_{}_{}_1_nw.xyz.gz".format(tile[0], tile[1])
required_tiles.append(tilename)
return required_tiles

Expand Down Expand Up @@ -246,7 +246,7 @@ def main():
required_tiles = get_required_tiles()
baseurl = (
"https://www.opengeodata.nrw.de/produkte/geobasis/hm/"
"dgm1_tiff/dgm1_tiff/"
"dgm1_xyz/dgm1_xyz/"
)
# check if tiles exist
dl_urls = []
Expand Down

0 comments on commit c73fed7

Please sign in to comment.