Name of public_transport_stop was split.

[philipp/winterrodeln/wrpylib.git] / wrpylib / wrdem.py

diff --git a/wrpylib/wrdem.py b/wrpylib/wrdem.py
index 9184247d412beed292c5f8cdd220ec366f7650ae..ce0163fbf4a9420d6382110775f62b247ce24cb2 100644 (file)
--- a/wrpylib/wrdem.py
+++ b/wrpylib/wrdem.py
@@ -1,10 +1,9 @@
 import json
 import math
 from abc import abstractmethod
-from collections import namedtuple
 from typing import Optional, Tuple
 
-import fiona.crs
+import fiona.crs  # pip install Fiona
 import fiona.transform
 import owslib.crs
 import owslib.wms
@@ -140,12 +139,16 @@ class DemBasemap(DemRasterBase):
 
 class DemSwitzerland(DemRasterBase):
     def __init__(self):
-        filename = '/home/philipp/daten/GeoData/dem/schweiz_200m/data/DHM200.xyz'
-        filename = '/home/philipp/daten/GeoData/dem/schweiz_200m/data/DHM200.asc'
-        # https://www.swisstopo.admin.ch/de/swisstopo/kostenlose-geobasisdaten.html
+        filename = 'zip:///home/philipp/daten/GeoData/dem/schweiz_200m/dem_schweiz_200m.zip!data/DHM200.asc'
         super().__init__(filename, crs='EPSG:21781')
 
 
+class DemBavaria(DemRasterBase):
+    def __init__(self):
+        filename = 'zip:///home/philipp/daten/GeoData/dem/bayern_50m/dgm50_epsg25832.tif.zip!dgm50_epsg25832.tif'
+        super().__init__(filename)
+
+
 class DemWmsBase(DemBase):
     def __init__(self, url: str, wms_version: str, layer_name: str):
         self.url = url
@@ -180,7 +183,12 @@ class DemSouthTyrol(DemWmsBase):
 
 class MultiDem:
     def __init__(self):
-        self.dems = [DemBasemap(), DemSouthTyrol(), DemSwitzerland()]
+        self.dems = [
+            DemBasemap(),
+            DemSouthTyrol(),
+            # DemBavaria(),  # too coarse - we should have a 25 m grid or denser - this is 50 m
+            # DemSwitzerland(), # too coarse - we should have a 25 m grid or denser - this is 200 m
+        ]
 
     def close(self):
         for dem in self.dems: