From 457ca3072ef0d19791022870282bc10cae2961e5 Mon Sep 17 00:00:00 2001 From: Anton Linus Date: Fri, 9 Oct 2020 10:53:09 +0200 Subject: [PATCH] some css experiments (unsuccesfull haha) --- 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 | 4 +- website/datetime.txt | 2 +- website/index.php | 12 +- website/main.css | 61 +++++---- website/map.html | 224 ++++++++++++++++---------------- 15 files changed, 165 insertions(+), 158 deletions(-) diff --git a/website/Scooters/scooter1.json b/website/Scooters/scooter1.json index 2213e11..b70d134 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-08T16:45:11Z","lastStateChange":"2020-10-07T15:09:13Z","batteryLevel":59,"lat":52.504926,"lng":13.358061,"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-09T08:00:29Z","lastStateChange":"2020-10-07T15:09:13Z","batteryLevel":51,"lat":52.504926,"lng":13.358061,"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 821df43..076797b 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-08T16:43:04Z","lastStateChange":"2020-10-08T13:20:54Z","batteryLevel":52,"lat":52.513734,"lng":13.477419,"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-09T08:08:19Z","lastStateChange":"2020-10-08T13:20:54Z","batteryLevel":43,"lat":52.526517,"lng":13.47936,"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 ce01924..3f3d980 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-08T16:49:40Z","lastStateChange":"2020-10-06T21:00:11Z","batteryLevel":91,"lat":52.461132,"lng":13.321118,"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-09T08:04:46Z","lastStateChange":"2020-10-06T21:00:11Z","batteryLevel":85,"lat":52.461211,"lng":13.321236,"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 ee9aac3..419d7bb 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-08T16:42:16Z","lastStateChange":"2020-10-06T13:26:05Z","batteryLevel":52,"lat":52.487742,"lng":13.42546,"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-09T08:07:31Z","lastStateChange":"2020-10-06T13:26:05Z","batteryLevel":26,"lat":52.513729,"lng":13.417783,"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 f273475..73577f4 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-08T16:43:21Z","lastStateChange":"2020-10-08T10:32:34Z","batteryLevel":100,"lat":52.475104,"lng":13.419081,"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-09T08:08:36Z","lastStateChange":"2020-10-08T10:32:34Z","batteryLevel":66,"lat":52.493582,"lng":13.448384,"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 b323d63..912ccd3 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-08T16:46:36Z","lastStateChange":"2020-10-06T19:18:09Z","batteryLevel":87,"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-09T08:01:55Z","lastStateChange":"2020-10-06T19:18:09Z","batteryLevel":82,"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 0acb262..403f9fd 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-08T16:50:20Z","lastStateChange":"2020-10-08T07:16:24Z","batteryLevel":89,"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-09T08:05:38Z","lastStateChange":"2020-10-08T07:16:24Z","batteryLevel":85,"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 15bc595..a6602c9 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-08T16:49:21Z","lastStateChange":"2020-10-08T00:13:27Z","batteryLevel":97,"lat":52.512428,"lng":13.316365,"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":"ACTIVE","lastLocationUpdate":"2020-10-09T08:00:48Z","lastStateChange":"2020-10-08T00:13:27Z","batteryLevel":92,"lat":52.512555,"lng":13.316421,"maxSpeed":20,"zoneId":"BERLIN","code":283303,"iotVendor":"okai","licencePlate":"147MZT","isRentable":true,"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 e11d58a..a91ea29 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-08T16:48:57Z","lastStateChange":"2020-10-08T10:00:12Z","batteryLevel":75,"lat":52.501228,"lng":13.346171,"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-09T08:08:23Z","lastStateChange":"2020-10-08T10:00:12Z","batteryLevel":70,"lat":52.501228,"lng":13.346171,"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 1d2e3fc..e889b87 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-08T16:43:45Z","lastStateChange":"2020-10-05T10:49:36Z","batteryLevel":78,"lat":52.516198,"lng":13.294055,"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-09T08:07:24Z","lastStateChange":"2020-10-05T10:49:36Z","batteryLevel":71,"lat":52.511607,"lng":13.29455,"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 13cadb5..c6e4dd0 100644 --- a/website/Speedshow_Map.py +++ b/website/Speedshow_Map.py @@ -33,9 +33,9 @@ def application(): #create markers for scooter print('creating marker for scooter nr.' + str(scooter_counter) + '/10') folium.Marker([lat,lng], - popup='ARTIST_NAME + ARTWORK_TITLE', + popup='ARTWORK_TITLE
short descriptive one liner about the work', tooltip='ARTIST_NAME_HERE', - icon=folium.Icon(icon='cloud')).add_to(m) + icon=folium.Icon(color='purple', icon='remove')).add_to(m) print('created. moving on...') scooter_counter = scooter_counter+1 diff --git a/website/datetime.txt b/website/datetime.txt index 05a3418..5c21a4d 100644 --- a/website/datetime.txt +++ b/website/datetime.txt @@ -1 +1 @@ -2020-10-08 18:52:12.650105 \ No newline at end of file +2020-10-09 10:10:26.040536 \ No newline at end of file diff --git a/website/index.php b/website/index.php index d955684..aa7aae6 100644 --- a/website/index.php +++ b/website/index.php @@ -8,15 +8,17 @@ -

OPENCOIL

-

roaming (low-)speedshow

+
+

OPENCOIL

+

roaming (low-)speedshow

+

26. October - 1. November

+

the map was last updated

+
- -

26. October - 1. November

-

the map was last updated

+ \ No newline at end of file diff --git a/website/main.css b/website/main.css index 73b04b4..d031788 100644 --- a/website/main.css +++ b/website/main.css @@ -1,52 +1,57 @@ body { - display: flex; - flex-flow: row wrap; - justify-content: space-between; - align-content: space-between; height: 100%; width: 100%; margin: 0; } iframe { - position: fixed; + position: absolute; height: 100%; width: 100%; border: none; } -h1 { - order: 1; +.texts { + position: absolute; + display: flex; + flex-flow: row wrap; + pointer-events: none; z-index: 1000; + text-align: right; width: 100%; - font-family: monospace; - font-size: 40px; - color: aquamarine; + height: 100%; } -h2 { - order: 2; - z-index: 1000; +h1, h2, h3, p { + position: absolute; width: 100%; - font-family: monospace; - font-size: 20px; - color: aquamarine; + pointer-events: none; + font-family: Courier; + color: purple; + margin: 0; +} + +h1 { + padding-top: 2%; + font-size: 8rem; + align-self: flex-start; + +} + +h2 { + padding-top: 15%; + font-size: 2rem; + align-self: flex-start; } h3 { - order: 3; - align-self: flex-end; - z-index: 1000; - width: 100%; - font-family: monospace; - font-size: 15px; - color: aquamarine; + padding-top: 18%; + font-size: 2rem; + align-self: flex-start; } p { - order: 4; - z-index: 1000; - font-family: monospace; - font-size: 15px; - color: red; + font-size: 1rem; + align-self: flex-end; + padding-bottom: 2.5%; } diff --git a/website/map.html b/website/map.html index c1214e7..d928be3 100644 --- a/website/map.html +++ b/website/map.html @@ -23,7 +23,7 @@