Merge pull request #22 from ArtesiaWater/dev

update setup.py
ArtesiaWater · Mar 27, 2020 · f6bd793 · f6bd793
2 parents d5e9be9 + d465a5b
commit f6bd793
Show file tree

Hide file tree

Showing 11 changed files with 2,548 additions and 178 deletions.
diff --git a/examples/Untitled.ipynb b/examples/Untitled.ipynb
diff --git a/examples/voorbeeld_observations_pastastore.ipynb b/examples/voorbeeld_observations_pastastore.ipynb
diff --git a/data/knmi_meteostation.json → observations/data/knmi_meteostation.json b/data/knmi_meteostation.json → observations/data/knmi_meteostation.json
@@ -17,6 +17,7 @@
     "323": 51.5333333333,
     "330": 51.9833333333,
     "340": 51.45,
+	"344": 51.58,
     "348": 51.9666666667,
     "350": 51.5666666667,
     "356": 51.85,
@@ -51,6 +52,7 @@
     "323": 3.9,
     "330": 4.1,
     "340": 4.35,
+	"344": 4.27,
     "348": 4.9166666667,
     "350": 4.9333333333,
     "356": 5.15,
@@ -85,6 +87,7 @@
     "323": "Wilhelminadorp",
     "330": "Hoek van Holland",
     "340": "Woensdrecht",
+	"344": "Rotterdam",
     "348": "Cabauw",
     "350": "Gilze-Rijen",
     "356": "Herwijnen",
@@ -119,6 +122,7 @@
     "323": 51796.9894138229,
     "330": 66556.6593424747,
     "340": 82881.4038130033,
+	"344": 77564.0000000000,
     "348": 122637.5500428702,
     "350": 123504.8944820797,
     "356": 138628.3530043226,
@@ -153,6 +157,7 @@
     "323": 394768.744780688,
     "330": 444557.6206735963,
     "340": 384958.5108108983,
+	"344": 399602.0000000000,
     "348": 442024.5360290739,
     "350": 397521.3127536682,
     "356": 428968.0220408023,

diff --git a/data/knmi_neerslagstation.json → observations/data/knmi_neerslagstation.json b/data/knmi_neerslagstation.json → observations/data/knmi_neerslagstation.json
diff --git a/observations/io/io_dino.py b/observations/io/io_dino.py
@@ -1388,7 +1388,7 @@ class of the observations, so far only GroundwaterObs is supported
             print('reading -> {}'.format(index))
 
         if cache:
-            cache_dir = os.path.join(tempfile.gettempdir(), 'pbdata')
+            cache_dir = os.path.join(tempfile.gettempdir(), 'dino')
             if not os.path.isdir(cache_dir):
                 os.mkdir(cache_dir)
             fname = os.path.join(