Renaming DSM/iDSM

.flake8

@@ -12,13 +12,13 @@ per-file-ignores =
     ./r.dsm.import.be/r.dsm.import.be.py:E501,F821
     ./r.dsm.import.hb/r.dsm.import.hb.py:E501,F821
     ./r.dsm.import.he/r.dsm.import.he.py:E501,F821
-    ./r.dsm.import.hh/r.dsm.import.hh.py:E501,F821
     ./r.dsm.import.ni/r.dsm.import.ni.py:E501,F821
     ./r.dsm.import.sn/r.dsm.import.sn.py:E501,F821
     ./r.dsm.import.th/r.dsm.import.th.py:E501,F821
     ./r.dsm.import/r.dsm.import.py:E501,F821
     ./r.idsm.import/r.idsm.import.py:E501,F821
     ./r.idsm.import.bb/r.idsm.import.bb.py:E501,F821
+    ./r.idsm.import.hh/r.idsm.import.hh.py:E501,F821
     ./r.idsm.import.nw/r.idsm.import.nw.py:E501,F821
     ./r.dtm.import.bb/r.dtm.import.bb.py:E501,F821
     ./r.dtm.import.be/r.dtm.import.be.py:E501,F821

README.md

@@ -20,15 +20,15 @@ The r.dem.import toolset consists of the following modules:
 
 | Federal state | DSM | DTM | nDSM | iDSM | Tile-Index | Data Download | Resolution | Data Source |
 | - | - | - | - | - | - | - | - | - |
-| BB | - | ☑ | via iDSM & DTM | ☑ (TODO: rename r.dsm.bb to r.idsm.bb) | DTM <br> iDSM(DSM)| | DTM: 1m <br> iDSM: 0.2m | |
+| BB | - | ☑ | via iDSM & DTM | ☑ | DTM <br> iDSM| | DTM: 1m <br> iDSM: 0.2m | |
 | BE | ☑ | ☑ | via DSM & DTM | - | DSM <br> DTM | | DSM: 1m <br> DTM: 1m  | |
 | BW | | | | | | | | [Open GeoData Portal](https://opengeodata.lgl-bw.de/#/) |
 | BY | | | | | | | |[Open GeoData](https://geodaten.bayern.de/opengeodata/) |
-| HB | | ☑ | | | DTM | | DTM: 1m | [Geoportal](https://geoportal.bremen.de/geoportal/#) |
+| HB | ☑ | ☑ | via DSM & DTM | - | DTM | | DTM: 1m | [Geoportal](https://geoportal.bremen.de/geoportal/#) |
 | HE | Bug | Bug | | | | | | [Geoportal](/https://www.geoportal.hessen.de/search/) |
-| HH | ☑ | ☑ | via DSM & DTM | - | DSM <br> DTM | | DSM: 1m <br> DTM: 1m | [Geoportal](https://geoportal-hamburg.de/) |
+| HH | - | ☑ | via iDSM & DTM | ☑  | DSM <br> DTM | | DSM: 1m <br> DTM: 1m | [Geoportal](https://geoportal-hamburg.de/) |
 | MV | | | | | | | | [Downloadportal](https://laiv.geodaten-mv.de/afgvk/) |
-| NI | ☑ | ☑ | via DSM & DTM | - | DSM <br> DTM | | DSM: 1m <br> DTM: 1m | [Open GeoData](https://ni-lgln-opengeodata.hub.arcgis.com/) |
+| NI | ☑ | ☑ | via DSM & DTM |  | DSM <br> DTM | | DSM: 1m <br> DTM: 1m | [Open GeoData](https://ni-lgln-opengeodata.hub.arcgis.com/) |
 | NW | - | ☑ | ☑ | ☑ | DTM <br> nDSM <br> iDSM | | DTM: 1m <br> nDSM: 0.5m <br> iDSM: 0.5m |
 | RP | | | | | | | | [Geoportal](https://www.geoportal.rlp.de/) |
 | SH | | | | | | | | [Downloadportal](https://geodaten.schleswig-holstein.de/gaialight-sh/_apps/dladownload/) |

lib_dem/r_dem_import_lib.py

@@ -54,11 +54,9 @@
             "SL",
         ],
         "SUPPORTED": [
-            "BB",
             "BE",
             "HB",
             "HE",
-            "HH",
             "NI",
             "SN",
             "TH",
@@ -67,13 +65,11 @@
     "iDSM": {
         "NOT_YET_SUPPORTED": [
             # either not avaible, or not supported yet
-            "BB",
             "BE",
             "BW",
             "BY",
             "HB",
             "HE",
-            "HH",
             "MV",
             "NI",
             "RP",
@@ -84,6 +80,8 @@
             "TH",
         ],
         "SUPPORTED": [
+            "BB",
+            "HH",
             "NW",
         ],
     },

r.dsm.import.bb/Makefile → r.idsm.import.hh/Makefile

@@ -1,8 +1,8 @@
 MODULE_TOPDIR = ../..
 
-PGM = r.dsm.import.bb
+PGM = r.idsm.import.hh
 
 include $(MODULE_TOPDIR)/include/Make/Script.make
 include $(MODULE_TOPDIR)/include/Make/Python.make
 
-default: script
+default: script

r.dsm.import.hh/r.dsm.import.hh.html → r.idsm.import.hh/r.idsm.import.hh.html

@@ -1,9 +1,9 @@
 <h2>DESCRIPTION</h2>
 
-<em>r.dsm.import.hh</em> downloads digital surface models (DSM, in German DOM)
+<em>r.idsm.import.hh</em> downloads digital surface models (iDSM, in German bDOM)
 for Hamburg (HH) and area of interest.
 
-The data "Digitales Höhenmodell Hamburg" is downloaded from
+The data "Bildbasiertes Digitales Höhenmodell Hamburg" is downloaded from
 <a href="https://daten-hamburg.de/geographie_geologie_geobasisdaten/digitales_hoehenmodell_bdom/">daten-hamburg</a>
 and can be used under the specification of the licence: Freie und Hansestadt Hamburg, Landesbetrieb Geoinformation und Vermessung (LGV),
 <a href="https://www.govdata.de/dl-de/by-2-0">Datenlizenz Deutschland – Namensnennung – Version 2.0</a>,
@@ -14,9 +14,9 @@ <h2>EXAMPLE</h2>
 
 <h3>Hamburg example</h3>
 
-Download and import DSM with native resolution:
+Download and import iDSM with native resolution:
 <div class="code"><pre>
-r.dsm.import.hh aoi=aoi output=dsm -r
+r.idsm.import.hh aoi=aoi output=idsm -r
 </pre></div>