fix europastats

4 files changed, 28 insertions, 20 deletions

diff --git a/GenToken.java b/GenToken.java
index bca41e6..4c43c77 100644
--- a/GenToken.java
+++ b/GenToken.java
@@ -36,7 +36,6 @@ public class GenToken
     Object localObject = new SimpleDateFormat("yyyyMMddHH");
     ((DateFormat)localObject).setTimeZone(TimeZone.getTimeZone("UTC"));
     String text = ((DateFormat)localObject).format(Calendar.getInstance().getTime());
-    System.out.println(text);
     try{
       localObject = Mac.getInstance("HmacSHA256");
       ((Mac)localObject).init(new SecretKeySpec("ZhQCqoZp".getBytes(DEFAULT_CHARSET), "HmacSHA256"));
diff --git a/europastats/attractions.py b/europastats/attractions.py
index 9a6c087..53bbfa4 100644
--- a/europastats/attractions.py
+++ b/europastats/attractions.py
@@ -1,7 +1,15 @@
 #!/usr/bin/env python
 """
-    takes a list of openweathermap ids and a config dict with
-    "openweathermap_apikey"
+    tag fields:
+        status (open closed)
+        type
+        name
+    metrics:
+        statuscode (0-6)
+        waitingtime
+    unused:
+        _ts (timestamp)
+
 """
 from datetime import datetime as dt
 import sys
@@ -24,7 +32,7 @@ status_codes = [
 api_url = "https://api.europapark.de/api-5.4/"
 
 def get_db(id):
-    with open(abspath(join(dirname(__name__),"europastats/data",id+".json")),'rb') as f:
+    with open(abspath(join(dirname(__file__),"data",id+".json")),'rb') as f:
         return json.load(f)
 
 name_mapping = { a["code"]: a for a in get_db("attractions") }
@@ -59,12 +67,13 @@ def get_data(mock=False):
         resp = get_live("waitingtimes")
     for v in resp:
         data = {}
+
         data["status"] = status_codes[v["status"]]
-        data["_name"] = "Attraktion {}".format( name_mapping[v["code"]]["nameGerman"])
-        data["_id"] = "europapark-{}-{}".format(name,v["code"])
+        data["statuscode"] = v["status"]
+        data["name"] = "Attraktion {}".format( name_mapping[v["code"]]["nameGerman"])
+        data["type"] = name
         data["waitingtime"] = v["time"]
         data["_ts"] = now.isoformat(timespec="seconds") + "Z"
-        data["_db"] = name
         yield data
 
 def main():
diff --git a/europastats/weather.py b/europastats/weather.py
index db0879c..3395e4e 100644
--- a/europastats/weather.py
+++ b/europastats/weather.py
@@ -1,5 +1,16 @@
 #!/usr/bin/env python
 """
+    tags fields:
+        name
+        type
+        offset
+    metrics:
+        perspiration
+        maxTemp
+        ...
+    unused:
+        _ts
+
 """
 from datetime import datetime as dt
 from europastats.attractions import get_db, get_live
@@ -23,10 +34,10 @@ def get_data(mock=False):
     offset = 0
     for v in resp:
         data = {
-                "_id": "europapark-weather-{}".format(offset),
                 "_name": "Europapark Wetter {}".format(off[offset]),
+                "offset": offset,
                 "_ts": now.isoformat(timespec="seconds") + "Z",
-                "_db": "weather"
+                "type": "weather"
                 }
         data.update(v)
         yield data
diff --git a/lol.py b/lol.py
deleted file mode 100644
index 38239c1..0000000
--- a/lol.py
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env python3
-from datetime import datetime
-from binascii import hexlify
-import hmac
-import hashlib
-import base64
-secret = "ZhQCqoZp"
-message= datetime.utcnow().strftime("%Y%m%d%H")
-
-dig = hmac.new(secret, msg=message, digestmod=hashlib.sha256).digest()
-print(hexlify(dig).upper())