From 0f4af5f63ca555edf8119a1d480b524cb832d6f7 Mon Sep 17 00:00:00 2001 From: Anton Linus Date: Wed, 7 Oct 2020 19:45:50 +0200 Subject: [PATCH] removed zoom controls from map added better mobile scaling (not working imo) --- website/Scooters/scooter1.json | 2 +- website/Scooters/scooter10.json | 2 +- website/Scooters/scooter2.json | 2 +- website/Scooters/scooter3.json | 2 +- website/Scooters/scooter4.json | 2 +- website/Scooters/scooter5.json | 2 +- website/Scooters/scooter6.json | 2 +- website/Scooters/scooter7.json | 2 +- website/Scooters/scooter8.json | 2 +- website/Scooters/scooter9.json | 2 +- website/Speedshow_Map.py | 7 +- website/datetime.txt | 2 +- website/main.css | 1 + website/map.html | 198 ++++++++++++++++---------------- 14 files changed, 117 insertions(+), 111 deletions(-) diff --git a/website/Scooters/scooter1.json b/website/Scooters/scooter1.json index 4a931bb..c19646c 100644 --- a/website/Scooters/scooter1.json +++ b/website/Scooters/scooter1.json @@ -1 +1 @@ -{"data":{"type":"vehicle","id":"fbd739d6-554f-4eaf-bd9c-afe3d501c94b","attributes":{"state":"ACTIVE","lastLocationUpdate":"2020-10-07T16:54:28Z","lastStateChange":"2020-10-07T15:09:13Z","batteryLevel":70,"lat":52.505015,"lng":13.358382,"maxSpeed":20,"zoneId":"BERLIN","code":272581,"iotVendor":"okai","licencePlate":"115MZJ","isRentable":true,"vehicleType":"escooter","hasHelmetBox":true,"hasHelmet":true}}} \ No newline at end of file +{"data":{"type":"vehicle","id":"fbd739d6-554f-4eaf-bd9c-afe3d501c94b","attributes":{"state":"ACTIVE","lastLocationUpdate":"2020-10-07T17:42:16Z","lastStateChange":"2020-10-07T15:09:13Z","batteryLevel":70,"lat":52.505015,"lng":13.358382,"maxSpeed":20,"zoneId":"BERLIN","code":272581,"iotVendor":"okai","licencePlate":"115MZJ","isRentable":true,"vehicleType":"escooter","hasHelmetBox":true,"hasHelmet":true}}} \ No newline at end of file diff --git a/website/Scooters/scooter10.json b/website/Scooters/scooter10.json index 9c69365..cc56df2 100644 --- a/website/Scooters/scooter10.json +++ b/website/Scooters/scooter10.json @@ -1 +1 @@ -{"data":{"type":"vehicle","id":"8732f342-df2f-475f-b0f6-c0032743a944","attributes":{"state":"ACTIVE","lastLocationUpdate":"2020-10-07T17:00:21Z","lastStateChange":"2020-10-05T22:40:24Z","batteryLevel":63,"lat":52.523263,"lng":13.485609,"maxSpeed":20,"zoneId":"BERLIN","code":285124,"iotVendor":"okai","licencePlate":"502MZT","isRentable":true,"vehicleType":"escooter","hasHelmetBox":true,"hasHelmet":false}}} \ No newline at end of file +{"data":{"type":"vehicle","id":"8732f342-df2f-475f-b0f6-c0032743a944","attributes":{"state":"ACTIVE","lastLocationUpdate":"2020-10-07T17:40:09Z","lastStateChange":"2020-10-05T22:40:24Z","batteryLevel":63,"lat":52.523244,"lng":13.485684,"maxSpeed":20,"zoneId":"BERLIN","code":285124,"iotVendor":"okai","licencePlate":"502MZT","isRentable":true,"vehicleType":"escooter","hasHelmetBox":true,"hasHelmet":false}}} \ No newline at end of file diff --git a/website/Scooters/scooter2.json b/website/Scooters/scooter2.json index 7a949f8..0e1e843 100644 --- a/website/Scooters/scooter2.json +++ b/website/Scooters/scooter2.json @@ -1 +1 @@ -{"data":{"type":"vehicle","id":"530b66c9-e5f9-47ac-ba31-2e357dc4c735","attributes":{"state":"ACTIVE","lastLocationUpdate":"2020-10-07T16:59:13Z","lastStateChange":"2020-10-06T21:00:11Z","batteryLevel":97,"lat":52.461337,"lng":13.32099,"maxSpeed":20,"zoneId":"BERLIN","code":285232,"iotVendor":"okai","licencePlate":"291MZT","isRentable":true,"vehicleType":"escooter","hasHelmetBox":true,"hasHelmet":false}}} \ No newline at end of file +{"data":{"type":"vehicle","id":"530b66c9-e5f9-47ac-ba31-2e357dc4c735","attributes":{"state":"ACTIVE","lastLocationUpdate":"2020-10-07T17:41:22Z","lastStateChange":"2020-10-06T21:00:11Z","batteryLevel":97,"lat":52.461337,"lng":13.32099,"maxSpeed":20,"zoneId":"BERLIN","code":285232,"iotVendor":"okai","licencePlate":"291MZT","isRentable":true,"vehicleType":"escooter","hasHelmetBox":true,"hasHelmet":false}}} \ No newline at end of file diff --git a/website/Scooters/scooter3.json b/website/Scooters/scooter3.json index b9c10c4..ebc3f56 100644 --- a/website/Scooters/scooter3.json +++ b/website/Scooters/scooter3.json @@ -1 +1 @@ -{"data":{"type":"vehicle","id":"aa9cedf8-ab8e-4651-8b43-93079179f26a","attributes":{"state":"ACTIVE","lastLocationUpdate":"2020-10-07T16:54:06Z","lastStateChange":"2020-10-06T13:26:05Z","batteryLevel":95,"lat":52.521088,"lng":13.353991,"maxSpeed":20,"zoneId":"BERLIN","code":284748,"iotVendor":"okai","licencePlate":"893MZT","isRentable":true,"vehicleType":"escooter","hasHelmetBox":true,"hasHelmet":false}}} \ No newline at end of file +{"data":{"type":"vehicle","id":"aa9cedf8-ab8e-4651-8b43-93079179f26a","attributes":{"state":"ACTIVE","lastLocationUpdate":"2020-10-07T17:43:51Z","lastStateChange":"2020-10-06T13:26:05Z","batteryLevel":95,"lat":52.521088,"lng":13.353991,"maxSpeed":20,"zoneId":"BERLIN","code":284748,"iotVendor":"okai","licencePlate":"893MZT","isRentable":true,"vehicleType":"escooter","hasHelmetBox":true,"hasHelmet":false}}} \ No newline at end of file diff --git a/website/Scooters/scooter4.json b/website/Scooters/scooter4.json index a6a8aa1..d0d3d61 100644 --- a/website/Scooters/scooter4.json +++ b/website/Scooters/scooter4.json @@ -1 +1 @@ -{"data":{"type":"vehicle","id":"9df16c74-4a88-4f21-acf5-12ba401ca15a","attributes":{"state":"ACTIVE","lastLocationUpdate":"2020-10-07T16:58:06Z","lastStateChange":"2020-10-07T06:37:12Z","batteryLevel":93,"lat":52.478558,"lng":13.419809,"maxSpeed":20,"zoneId":"BERLIN","code":279035,"iotVendor":"okai","licencePlate":"838MZJ","isRentable":true,"vehicleType":"escooter","hasHelmetBox":true,"hasHelmet":false}}} \ No newline at end of file +{"data":{"type":"vehicle","id":"9df16c74-4a88-4f21-acf5-12ba401ca15a","attributes":{"state":"ACTIVE","lastLocationUpdate":"2020-10-07T17:37:53Z","lastStateChange":"2020-10-07T06:37:12Z","batteryLevel":93,"lat":52.478558,"lng":13.419809,"maxSpeed":20,"zoneId":"BERLIN","code":279035,"iotVendor":"okai","licencePlate":"838MZJ","isRentable":true,"vehicleType":"escooter","hasHelmetBox":true,"hasHelmet":false}}} \ No newline at end of file diff --git a/website/Scooters/scooter5.json b/website/Scooters/scooter5.json index 4e691e0..ef700e1 100644 --- a/website/Scooters/scooter5.json +++ b/website/Scooters/scooter5.json @@ -1 +1 @@ -{"data":{"type":"vehicle","id":"4763ce60-5b2e-44cf-919e-fffbff26a15e","attributes":{"state":"ACTIVE","lastLocationUpdate":"2020-10-07T16:54:34Z","lastStateChange":"2020-10-06T19:18:09Z","batteryLevel":94,"lat":52.54126,"lng":13.368985,"maxSpeed":20,"zoneId":"BERLIN","code":284002,"iotVendor":"okai","licencePlate":"078MZT","isRentable":true,"vehicleType":"escooter","hasHelmetBox":true,"hasHelmet":false}}} \ No newline at end of file +{"data":{"type":"vehicle","id":"4763ce60-5b2e-44cf-919e-fffbff26a15e","attributes":{"state":"ACTIVE","lastLocationUpdate":"2020-10-07T17:43:42Z","lastStateChange":"2020-10-06T19:18:09Z","batteryLevel":94,"lat":52.54126,"lng":13.368985,"maxSpeed":20,"zoneId":"BERLIN","code":284002,"iotVendor":"okai","licencePlate":"078MZT","isRentable":true,"vehicleType":"escooter","hasHelmetBox":true,"hasHelmet":false}}} \ No newline at end of file diff --git a/website/Scooters/scooter6.json b/website/Scooters/scooter6.json index 92e1498..47c904a 100644 --- a/website/Scooters/scooter6.json +++ b/website/Scooters/scooter6.json @@ -1 +1 @@ -{"data":{"type":"vehicle","id":"ca884ba2-b0a6-4f3f-b727-fcc33d10182c","attributes":{"state":"ACTIVE","lastLocationUpdate":"2020-10-07T16:57:19Z","lastStateChange":"2020-10-06T20:38:14Z","batteryLevel":96,"lat":52.525817,"lng":13.404346,"maxSpeed":20,"zoneId":"BERLIN","code":279601,"iotVendor":"okai","licencePlate":"359MZW","isRentable":true,"vehicleType":"escooter","hasHelmetBox":true,"hasHelmet":false}}} \ No newline at end of file +{"data":{"type":"vehicle","id":"ca884ba2-b0a6-4f3f-b727-fcc33d10182c","attributes":{"state":"ACTIVE","lastLocationUpdate":"2020-10-07T17:37:07Z","lastStateChange":"2020-10-06T20:38:14Z","batteryLevel":95,"lat":52.525817,"lng":13.404346,"maxSpeed":20,"zoneId":"BERLIN","code":279601,"iotVendor":"okai","licencePlate":"359MZW","isRentable":true,"vehicleType":"escooter","hasHelmetBox":true,"hasHelmet":false}}} \ No newline at end of file diff --git a/website/Scooters/scooter7.json b/website/Scooters/scooter7.json index 664f425..610e292 100644 --- a/website/Scooters/scooter7.json +++ b/website/Scooters/scooter7.json @@ -1 +1 @@ -{"data":{"type":"vehicle","id":"78e9b9f1-0cf1-4415-9301-e2fe01d39bce","attributes":{"state":"ACTIVE","lastLocationUpdate":"2020-10-07T16:58:53Z","lastStateChange":"2020-10-07T12:50:46Z","batteryLevel":38,"lat":52.507907,"lng":13.306222,"maxSpeed":20,"zoneId":"BERLIN","code":283303,"iotVendor":"okai","licencePlate":"147MZT","isRentable":true,"vehicleType":"escooter","hasHelmetBox":true,"hasHelmet":false}}} \ No newline at end of file +{"data":{"type":"vehicle","id":"78e9b9f1-0cf1-4415-9301-e2fe01d39bce","attributes":{"state":"INACTIVE","lastLocationUpdate":"2020-10-07T17:38:41Z","lastStateChange":"2020-10-07T17:21:56Z","batteryLevel":9,"lat":52.512429,"lng":13.316471,"maxSpeed":20,"zoneId":"BERLIN","code":283303,"iotVendor":"okai","licencePlate":"147MZT","isRentable":false,"vehicleType":"escooter","hasHelmetBox":true,"hasHelmet":false}}} \ No newline at end of file diff --git a/website/Scooters/scooter8.json b/website/Scooters/scooter8.json index 2467b2d..9efe34d 100644 --- a/website/Scooters/scooter8.json +++ b/website/Scooters/scooter8.json @@ -1 +1 @@ -{"data":{"type":"vehicle","id":"0b939caf-80e9-4d6b-8454-4a7f8eaf088c","attributes":{"state":"ACTIVE","lastLocationUpdate":"2020-10-07T17:01:18Z","lastStateChange":"2020-10-05T19:25:58Z","batteryLevel":84,"lat":52.502256,"lng":13.346028,"maxSpeed":20,"zoneId":"BERLIN","code":284530,"iotVendor":"okai","licencePlate":"963MZT","isRentable":true,"vehicleType":"escooter","hasHelmetBox":true,"hasHelmet":false}}} \ No newline at end of file +{"data":{"type":"vehicle","id":"0b939caf-80e9-4d6b-8454-4a7f8eaf088c","attributes":{"state":"ACTIVE","lastLocationUpdate":"2020-10-07T17:41:06Z","lastStateChange":"2020-10-05T19:25:58Z","batteryLevel":83,"lat":52.502256,"lng":13.346028,"maxSpeed":20,"zoneId":"BERLIN","code":284530,"iotVendor":"okai","licencePlate":"963MZT","isRentable":true,"vehicleType":"escooter","hasHelmetBox":true,"hasHelmet":false}}} \ No newline at end of file diff --git a/website/Scooters/scooter9.json b/website/Scooters/scooter9.json index 84a9193..97779dc 100644 --- a/website/Scooters/scooter9.json +++ b/website/Scooters/scooter9.json @@ -1 +1 @@ -{"data":{"type":"vehicle","id":"0f7fa267-4bc1-439a-8fd0-43b98b9ffba7","attributes":{"state":"ACTIVE","lastLocationUpdate":"2020-10-07T17:01:03Z","lastStateChange":"2020-10-05T10:49:36Z","batteryLevel":87,"lat":52.516038,"lng":13.294029,"maxSpeed":20,"zoneId":"BERLIN","code":275306,"iotVendor":"okai","licencePlate":"799MZJ","isRentable":true,"vehicleType":"escooter","hasHelmetBox":true,"hasHelmet":false}}} \ No newline at end of file +{"data":{"type":"vehicle","id":"0f7fa267-4bc1-439a-8fd0-43b98b9ffba7","attributes":{"state":"ACTIVE","lastLocationUpdate":"2020-10-07T17:40:51Z","lastStateChange":"2020-10-05T10:49:36Z","batteryLevel":87,"lat":52.516038,"lng":13.294029,"maxSpeed":20,"zoneId":"BERLIN","code":275306,"iotVendor":"okai","licencePlate":"799MZJ","isRentable":true,"vehicleType":"escooter","hasHelmetBox":true,"hasHelmet":false}}} \ No newline at end of file diff --git a/website/Speedshow_Map.py b/website/Speedshow_Map.py index 1b90af4..506db5c 100644 --- a/website/Speedshow_Map.py +++ b/website/Speedshow_Map.py @@ -6,7 +6,7 @@ from datetime import datetime from glob import glob #create map object -m = folium.Map(location=[52.516190, 13.377693], tiles='Stamen Toner',zoom_start=13) +m = folium.Map(location=[52.516190, 13.377693], tiles='Stamen Toner',zoom_start=13, zoom_control=False) #make api request (writes api responses to json) @@ -40,6 +40,11 @@ for file in glob('Scooters/*.json'): #generate map.html m.save('map.html') +#adding mobile support +m.get_root().header.add_child(folium.Element( + '' +)) #saving timestamp print('generating timestamp') with open('datetime.txt', 'w') as timestamp: diff --git a/website/datetime.txt b/website/datetime.txt index 6db0971..a612f67 100644 --- a/website/datetime.txt +++ b/website/datetime.txt @@ -1 +1 @@ -2020-10-07 19:02:05.429713 \ No newline at end of file +2020-10-07 19:44:16.700230 \ No newline at end of file diff --git a/website/main.css b/website/main.css index f29f045..73b04b4 100644 --- a/website/main.css +++ b/website/main.css @@ -5,6 +5,7 @@ body { align-content: space-between; height: 100%; width: 100%; + margin: 0; } iframe { diff --git a/website/map.html b/website/map.html index 621976e..2738704 100644 --- a/website/map.html +++ b/website/map.html @@ -23,7 +23,7 @@