From 315372ff4d55cec4a846923b4e95bc604d3f75e9 Mon Sep 17 00:00:00 2001 From: Daniel Schadt Date: Wed, 29 Jun 2022 01:31:18 +0200 Subject: first uploads are working! --- fietsboek/locale/en/LC_MESSAGES/messages.mo | Bin 846 -> 2536 bytes fietsboek/locale/en/LC_MESSAGES/messages.po | 167 +- fietsboek/locale/fietslog.pot | 167 +- fietsboek/models/__init__.py | 1 + fietsboek/models/track.py | 134 + fietsboek/models/user.py | 10 + fietsboek/routes.py | 8 + fietsboek/static/GM_Utils/GPX2GM.css | 55 + fietsboek/static/GM_Utils/GPX2GM.js | 2868 ++++ fietsboek/static/GM_Utils/GPX2GM_Defs.js | 545 + fietsboek/static/GM_Utils/Icons/Grau256x256.png | Bin 0 -> 147 bytes fietsboek/static/GM_Utils/Icons/Loading_icon.gif | Bin 0 -> 7209 bytes .../static/GM_Utils/Icons/Loading_icon_V1.gif | Bin 0 -> 17490 bytes .../static/GM_Utils/Icons/Loading_icon_V2.gif | Bin 0 -> 1775 bytes fietsboek/static/GM_Utils/Icons/airport.png | Bin 0 -> 877 bytes fietsboek/static/GM_Utils/Icons/bar.png | Bin 0 -> 698 bytes fietsboek/static/GM_Utils/Icons/boat.png | Bin 0 -> 873 bytes fietsboek/static/GM_Utils/Icons/bridge.png | Bin 0 -> 624 bytes fietsboek/static/GM_Utils/Icons/castle.png | Bin 0 -> 715 bytes fietsboek/static/GM_Utils/Icons/church2.png | Bin 0 -> 648 bytes fietsboek/static/GM_Utils/Icons/circle_green.svg | 11 + fietsboek/static/GM_Utils/Icons/circle_red.svg | 11 + fietsboek/static/GM_Utils/Icons/cluster.png | Bin 0 -> 1138 bytes fietsboek/static/GM_Utils/Icons/cluster.svg | 17 + .../GM_Utils/Icons/current_location - Kopie.svg | 37 + .../static/GM_Utils/Icons/current_location.svg | 37 + fietsboek/static/GM_Utils/Icons/cycling.png | Bin 0 -> 1270 bytes fietsboek/static/GM_Utils/Icons/finish.png | Bin 0 -> 780 bytes fietsboek/static/GM_Utils/Icons/flag.png | Bin 0 -> 482 bytes fietsboek/static/GM_Utils/Icons/fullscreen_m.svg | 1 + fietsboek/static/GM_Utils/Icons/fullscreen_p.svg | 1 + fietsboek/static/GM_Utils/Icons/harbor.png | Bin 0 -> 710 bytes fietsboek/static/GM_Utils/Icons/hiking.png | Bin 0 -> 1325 bytes fietsboek/static/GM_Utils/Icons/hotel.png | Bin 0 -> 309 bytes fietsboek/static/GM_Utils/Icons/hotel2.png | Bin 0 -> 892 bytes fietsboek/static/GM_Utils/Icons/kreis.png | Bin 0 -> 3311 bytes fietsboek/static/GM_Utils/Icons/library.png | Bin 0 -> 650 bytes fietsboek/static/GM_Utils/Icons/lupe_m.png | Bin 0 -> 204 bytes fietsboek/static/GM_Utils/Icons/lupe_m_32.png | Bin 0 -> 392 bytes fietsboek/static/GM_Utils/Icons/lupe_p.png | Bin 0 -> 200 bytes fietsboek/static/GM_Utils/Icons/lupe_p_32.png | Bin 0 -> 405 bytes fietsboek/static/GM_Utils/Icons/marker-icon_bw.png | Bin 0 -> 645 bytes .../static/GM_Utils/Icons/marker-icon_bw_41x25.png | Bin 0 -> 495 bytes .../static/GM_Utils/Icons/marker-icon_bw_small.png | Bin 0 -> 345 bytes fietsboek/static/GM_Utils/Icons/marker.gif | Bin 0 -> 77 bytes fietsboek/static/GM_Utils/Icons/marker.svg | 18 + fietsboek/static/GM_Utils/Icons/museum.png | Bin 0 -> 849 bytes fietsboek/static/GM_Utils/Icons/panorama.png | Bin 0 -> 1390 bytes fietsboek/static/GM_Utils/Icons/park.png | Bin 0 -> 1100 bytes fietsboek/static/GM_Utils/Icons/peak.png | Bin 0 -> 545 bytes fietsboek/static/GM_Utils/Icons/photo.png | Bin 0 -> 720 bytes fietsboek/static/GM_Utils/Icons/pin_red.png | Bin 0 -> 642 bytes fietsboek/static/GM_Utils/Icons/pin_red_shadow.png | Bin 0 -> 650 bytes fietsboek/static/GM_Utils/Icons/restaurant.png | Bin 0 -> 1003 bytes fietsboek/static/GM_Utils/Icons/scenic.png | Bin 0 -> 394 bytes fietsboek/static/GM_Utils/Icons/shadow.png | Bin 0 -> 770 bytes fietsboek/static/GM_Utils/Icons/shadow50.png | Bin 0 -> 570 bytes fietsboek/static/GM_Utils/Icons/shoppingmall.png | Bin 0 -> 643 bytes fietsboek/static/GM_Utils/Icons/square_green.svg | 11 + fietsboek/static/GM_Utils/Icons/square_red.svg | 11 + fietsboek/static/GM_Utils/Icons/start.png | Bin 0 -> 449 bytes .../GM_Utils/Icons/streckenmarker - Kopie.svg | 17 + fietsboek/static/GM_Utils/Icons/streckenmarker.svg | 17 + fietsboek/static/GM_Utils/Icons/subway.png | Bin 0 -> 795 bytes fietsboek/static/GM_Utils/Icons/tent.png | Bin 0 -> 642 bytes fietsboek/static/GM_Utils/Icons/train.png | Bin 0 -> 947 bytes fietsboek/static/GM_Utils/Icons/video.png | Bin 0 -> 1290 bytes fietsboek/static/GM_Utils/Icons/villa.png | Bin 0 -> 626 bytes fietsboek/static/GM_Utils/Icons/whereami.svg | 16 + fietsboek/static/GM_Utils/Icons/whereami_V1.svg | 14 + fietsboek/static/GM_Utils/gmutils.js | 952 ++ fietsboek/static/GM_Utils/gra_canvas.js | 114 + fietsboek/static/GM_Utils/gra_svg.js | 174 + .../static/GM_Utils/leaflet/images/layers-2x.png | Bin 0 -> 1259 bytes .../static/GM_Utils/leaflet/images/layers.png | Bin 0 -> 696 bytes .../GM_Utils/leaflet/images/marker-icon-2x.png | Bin 0 -> 2464 bytes .../static/GM_Utils/leaflet/images/marker-icon.png | Bin 0 -> 1466 bytes .../GM_Utils/leaflet/images/marker-shadow.png | Bin 0 -> 618 bytes .../static/GM_Utils/leaflet/leaflet-src.esm.js | 13986 ++++++++++++++++++ .../static/GM_Utils/leaflet/leaflet-src.esm.js.map | 1 + fietsboek/static/GM_Utils/leaflet/leaflet-src.js | 14080 +++++++++++++++++++ .../static/GM_Utils/leaflet/leaflet-src.js.map | 1 + fietsboek/static/GM_Utils/leaflet/leaflet.css | 640 + fietsboek/static/GM_Utils/leaflet/leaflet.js | 5 + fietsboek/static/GM_Utils/leaflet/leaflet.js.map | 1 + fietsboek/static/GM_Utils/osmutils.js | 985 ++ fietsboek/static/GM_Utils/plot.js | 592 + fietsboek/static/GM_Utils/shimg.js | 70 + fietsboek/static/fietsboek.js | 37 + fietsboek/static/theme.css | 26 + fietsboek/summaries.py | 62 + fietsboek/templates/details.jinja2 | 52 + fietsboek/templates/edit.jinja2 | 17 + fietsboek/templates/edit_form.jinja2 | 31 + fietsboek/templates/finish_upload.jinja2 | 17 + fietsboek/templates/home.jinja2 | 27 + fietsboek/templates/layout.jinja2 | 6 +- fietsboek/templates/upload.jinja2 | 14 + fietsboek/util.py | 80 + fietsboek/views/default.py | 23 +- fietsboek/views/detail.py | 24 + fietsboek/views/edit.py | 32 + fietsboek/views/upload.py | 92 + setup.py | 3 + 104 files changed, 36308 insertions(+), 10 deletions(-) create mode 100644 fietsboek/models/track.py create mode 100644 fietsboek/static/GM_Utils/GPX2GM.css create mode 100644 fietsboek/static/GM_Utils/GPX2GM.js create mode 100644 fietsboek/static/GM_Utils/GPX2GM_Defs.js create mode 100644 fietsboek/static/GM_Utils/Icons/Grau256x256.png create mode 100644 fietsboek/static/GM_Utils/Icons/Loading_icon.gif create mode 100644 fietsboek/static/GM_Utils/Icons/Loading_icon_V1.gif create mode 100644 fietsboek/static/GM_Utils/Icons/Loading_icon_V2.gif create mode 100644 fietsboek/static/GM_Utils/Icons/airport.png create mode 100644 fietsboek/static/GM_Utils/Icons/bar.png create mode 100644 fietsboek/static/GM_Utils/Icons/boat.png create mode 100644 fietsboek/static/GM_Utils/Icons/bridge.png create mode 100644 fietsboek/static/GM_Utils/Icons/castle.png create mode 100644 fietsboek/static/GM_Utils/Icons/church2.png create mode 100644 fietsboek/static/GM_Utils/Icons/circle_green.svg create mode 100644 fietsboek/static/GM_Utils/Icons/circle_red.svg create mode 100644 fietsboek/static/GM_Utils/Icons/cluster.png create mode 100644 fietsboek/static/GM_Utils/Icons/cluster.svg create mode 100644 fietsboek/static/GM_Utils/Icons/current_location - Kopie.svg create mode 100644 fietsboek/static/GM_Utils/Icons/current_location.svg create mode 100644 fietsboek/static/GM_Utils/Icons/cycling.png create mode 100644 fietsboek/static/GM_Utils/Icons/finish.png create mode 100644 fietsboek/static/GM_Utils/Icons/flag.png create mode 100644 fietsboek/static/GM_Utils/Icons/fullscreen_m.svg create mode 100644 fietsboek/static/GM_Utils/Icons/fullscreen_p.svg create mode 100644 fietsboek/static/GM_Utils/Icons/harbor.png create mode 100644 fietsboek/static/GM_Utils/Icons/hiking.png create mode 100644 fietsboek/static/GM_Utils/Icons/hotel.png create mode 100644 fietsboek/static/GM_Utils/Icons/hotel2.png create mode 100644 fietsboek/static/GM_Utils/Icons/kreis.png create mode 100644 fietsboek/static/GM_Utils/Icons/library.png create mode 100644 fietsboek/static/GM_Utils/Icons/lupe_m.png create mode 100644 fietsboek/static/GM_Utils/Icons/lupe_m_32.png create mode 100644 fietsboek/static/GM_Utils/Icons/lupe_p.png create mode 100644 fietsboek/static/GM_Utils/Icons/lupe_p_32.png create mode 100644 fietsboek/static/GM_Utils/Icons/marker-icon_bw.png create mode 100644 fietsboek/static/GM_Utils/Icons/marker-icon_bw_41x25.png create mode 100644 fietsboek/static/GM_Utils/Icons/marker-icon_bw_small.png create mode 100644 fietsboek/static/GM_Utils/Icons/marker.gif create mode 100644 fietsboek/static/GM_Utils/Icons/marker.svg create mode 100644 fietsboek/static/GM_Utils/Icons/museum.png create mode 100644 fietsboek/static/GM_Utils/Icons/panorama.png create mode 100644 fietsboek/static/GM_Utils/Icons/park.png create mode 100644 fietsboek/static/GM_Utils/Icons/peak.png create mode 100644 fietsboek/static/GM_Utils/Icons/photo.png create mode 100644 fietsboek/static/GM_Utils/Icons/pin_red.png create mode 100644 fietsboek/static/GM_Utils/Icons/pin_red_shadow.png create mode 100644 fietsboek/static/GM_Utils/Icons/restaurant.png create mode 100644 fietsboek/static/GM_Utils/Icons/scenic.png create mode 100644 fietsboek/static/GM_Utils/Icons/shadow.png create mode 100644 fietsboek/static/GM_Utils/Icons/shadow50.png create mode 100644 fietsboek/static/GM_Utils/Icons/shoppingmall.png create mode 100644 fietsboek/static/GM_Utils/Icons/square_green.svg create mode 100644 fietsboek/static/GM_Utils/Icons/square_red.svg create mode 100644 fietsboek/static/GM_Utils/Icons/start.png create mode 100644 fietsboek/static/GM_Utils/Icons/streckenmarker - Kopie.svg create mode 100644 fietsboek/static/GM_Utils/Icons/streckenmarker.svg create mode 100644 fietsboek/static/GM_Utils/Icons/subway.png create mode 100644 fietsboek/static/GM_Utils/Icons/tent.png create mode 100644 fietsboek/static/GM_Utils/Icons/train.png create mode 100644 fietsboek/static/GM_Utils/Icons/video.png create mode 100644 fietsboek/static/GM_Utils/Icons/villa.png create mode 100644 fietsboek/static/GM_Utils/Icons/whereami.svg create mode 100644 fietsboek/static/GM_Utils/Icons/whereami_V1.svg create mode 100644 fietsboek/static/GM_Utils/gmutils.js create mode 100644 fietsboek/static/GM_Utils/gra_canvas.js create mode 100644 fietsboek/static/GM_Utils/gra_svg.js create mode 100644 fietsboek/static/GM_Utils/leaflet/images/layers-2x.png create mode 100644 fietsboek/static/GM_Utils/leaflet/images/layers.png create mode 100644 fietsboek/static/GM_Utils/leaflet/images/marker-icon-2x.png create mode 100644 fietsboek/static/GM_Utils/leaflet/images/marker-icon.png create mode 100644 fietsboek/static/GM_Utils/leaflet/images/marker-shadow.png create mode 100644 fietsboek/static/GM_Utils/leaflet/leaflet-src.esm.js create mode 100644 fietsboek/static/GM_Utils/leaflet/leaflet-src.esm.js.map create mode 100644 fietsboek/static/GM_Utils/leaflet/leaflet-src.js create mode 100644 fietsboek/static/GM_Utils/leaflet/leaflet-src.js.map create mode 100644 fietsboek/static/GM_Utils/leaflet/leaflet.css create mode 100644 fietsboek/static/GM_Utils/leaflet/leaflet.js create mode 100644 fietsboek/static/GM_Utils/leaflet/leaflet.js.map create mode 100644 fietsboek/static/GM_Utils/osmutils.js create mode 100644 fietsboek/static/GM_Utils/plot.js create mode 100644 fietsboek/static/GM_Utils/shimg.js create mode 100644 fietsboek/static/fietsboek.js create mode 100644 fietsboek/summaries.py create mode 100644 fietsboek/templates/details.jinja2 create mode 100644 fietsboek/templates/edit.jinja2 create mode 100644 fietsboek/templates/edit_form.jinja2 create mode 100644 fietsboek/templates/finish_upload.jinja2 create mode 100644 fietsboek/templates/home.jinja2 create mode 100644 fietsboek/templates/upload.jinja2 create mode 100644 fietsboek/util.py create mode 100644 fietsboek/views/detail.py create mode 100644 fietsboek/views/edit.py create mode 100644 fietsboek/views/upload.py diff --git a/fietsboek/locale/en/LC_MESSAGES/messages.mo b/fietsboek/locale/en/LC_MESSAGES/messages.mo index 4d9ce39..8e5c45e 100644 Binary files a/fietsboek/locale/en/LC_MESSAGES/messages.mo and b/fietsboek/locale/en/LC_MESSAGES/messages.mo differ diff --git a/fietsboek/locale/en/LC_MESSAGES/messages.po b/fietsboek/locale/en/LC_MESSAGES/messages.po index 822a4f0..b061d0d 100644 --- a/fietsboek/locale/en/LC_MESSAGES/messages.po +++ b/fietsboek/locale/en/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2022-06-28 14:02+0200\n" +"POT-Creation-Date: 2022-06-29 01:22+0200\n" "PO-Revision-Date: 2022-06-28 13:11+0200\n" "Last-Translator: \n" "Language: en\n" @@ -18,6 +18,149 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.10.3\n" +#: fietsboek/util.py:66 +msgid "month.january" +msgstr "January" + +#: fietsboek/util.py:67 +msgid "month.february" +msgstr "February" + +#: fietsboek/util.py:68 +msgid "month.march" +msgstr "March" + +#: fietsboek/util.py:69 +msgid "month.april" +msgstr "April" + +#: fietsboek/util.py:70 +msgid "month.may" +msgstr "May" + +#: fietsboek/util.py:71 +msgid "month.june" +msgstr "June" + +#: fietsboek/util.py:72 +msgid "month.july" +msgstr "July" + +#: fietsboek/util.py:73 +msgid "month.august" +msgstr "August" + +#: fietsboek/util.py:74 +msgid "month.september" +msgstr "September" + +#: fietsboek/util.py:75 +msgid "month.october" +msgstr "October" + +#: fietsboek/util.py:76 +msgid "month.november" +msgstr "November" + +#: fietsboek/util.py:77 +msgid "month.december" +msgstr "December" + +#: fietsboek/templates/details.jinja2:5 +msgid "page.details.title" +msgstr "Track Details" + +#: fietsboek/templates/details.jinja2:5 +msgid "page.details.edit" +msgstr "Edit" + +#: fietsboek/templates/details.jinja2:15 +msgid "page.details.tags" +msgstr "Tagged as" + +#: fietsboek/templates/details.jinja2:19 fietsboek/templates/edit.jinja2:9 +#: fietsboek/templates/finish_upload.jinja2:9 +msgid "page.noscript" +msgstr "JavaScript is disabled, please enable JavaScript" + +#: fietsboek/templates/details.jinja2:24 +msgid "page.details.download" +msgstr "Download tour" + +#: fietsboek/templates/details.jinja2:29 +msgid "page.details.date" +msgstr "Date" + +#: fietsboek/templates/details.jinja2:33 +msgid "page.details.length" +msgstr "Length" + +#: fietsboek/templates/details.jinja2:37 +msgid "page.details.uphill" +msgstr "Uphill" + +#: fietsboek/templates/details.jinja2:41 +msgid "page.details.downhill" +msgstr "Downhill" + +#: fietsboek/templates/details.jinja2:50 +msgid "page.details.comments" +msgstr "Comments" + +#: fietsboek/templates/edit.jinja2:7 +msgid "page.edit.title" +msgstr "Edit Track" + +#: fietsboek/templates/edit.jinja2:13 +msgid "page.edit.form.submit" +msgstr "Save" + +#: fietsboek/templates/edit.jinja2:14 +msgid "page.edit.form.cancel" +msgstr "Cancel" + +#: fietsboek/templates/edit_form.jinja2:3 +msgid "page.track.form.title" +msgstr "Title" + +#: fietsboek/templates/edit_form.jinja2:7 +msgid "page.track.form.date" +msgstr "Date" + +#: fietsboek/templates/edit_form.jinja2:11 +msgid "page.track.form.tags" +msgstr "Tags" + +#: fietsboek/templates/edit_form.jinja2:22 +msgid "page.track.form.add_tag" +msgstr "Add Tag" + +#: fietsboek/templates/edit_form.jinja2:28 +msgid "page.track.form.description" +msgstr "Description" + +#: fietsboek/templates/finish_upload.jinja2:7 +#: fietsboek/templates/upload.jinja2:5 +msgid "page.upload.title" +msgstr "Upload" + +#: fietsboek/templates/finish_upload.jinja2:13 +#: fietsboek/templates/upload.jinja2:11 +msgid "page.upload.form.submit" +msgstr "Upload" + +#: fietsboek/templates/finish_upload.jinja2:14 +msgid "page.upload.form.cancel" +msgstr "Cancel" + +#: fietsboek/templates/home.jinja2:5 +msgid "page.home.title" +msgstr "Home" + +#: fietsboek/templates/home.jinja2:23 +msgid "page.home.total" +msgstr "Total" + #: fietsboek/templates/layout.jinja2:34 msgid "page.navbar.login" msgstr "Login" @@ -26,6 +169,10 @@ msgstr "Login" msgid "page.navbar.logout" msgstr "Logout" +#: fietsboek/templates/layout.jinja2:37 +msgid "page.navbar.upload" +msgstr "Upload" + #: fietsboek/templates/login.jinja2:5 msgid "page.login.title" msgstr "Login" @@ -42,15 +189,27 @@ msgstr "Password" msgid "page.login.submit" msgstr "Login" -#: fietsboek/views/default.py:25 +#: fietsboek/templates/upload.jinja2:8 +msgid "page.upload.form.gpx" +msgstr "GPX file" + +#: fietsboek/views/default.py:44 msgid "flash.invalid_credentials" msgstr "Invalid login credentials" -#: fietsboek/views/default.py:28 +#: fietsboek/views/default.py:47 msgid "flash.logged_in" msgstr "You are now logged in" -#: fietsboek/views/default.py:35 +#: fietsboek/views/default.py:54 msgid "flash.logged_out" msgstr "You have been logged out" +#: fietsboek/views/upload.py:80 +msgid "flash.upload_success" +msgstr "Upload successful" + +#: fietsboek/views/upload.py:91 +msgid "flash.upload_cancelled" +msgstr "Upload cancelled" + diff --git a/fietsboek/locale/fietslog.pot b/fietsboek/locale/fietslog.pot index 07b8b2c..4a4cd92 100644 --- a/fietsboek/locale/fietslog.pot +++ b/fietsboek/locale/fietslog.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2022-06-28 14:02+0200\n" +"POT-Creation-Date: 2022-06-29 01:22+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,149 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.10.3\n" +#: fietsboek/util.py:66 +msgid "month.january" +msgstr "" + +#: fietsboek/util.py:67 +msgid "month.february" +msgstr "" + +#: fietsboek/util.py:68 +msgid "month.march" +msgstr "" + +#: fietsboek/util.py:69 +msgid "month.april" +msgstr "" + +#: fietsboek/util.py:70 +msgid "month.may" +msgstr "" + +#: fietsboek/util.py:71 +msgid "month.june" +msgstr "" + +#: fietsboek/util.py:72 +msgid "month.july" +msgstr "" + +#: fietsboek/util.py:73 +msgid "month.august" +msgstr "" + +#: fietsboek/util.py:74 +msgid "month.september" +msgstr "" + +#: fietsboek/util.py:75 +msgid "month.october" +msgstr "" + +#: fietsboek/util.py:76 +msgid "month.november" +msgstr "" + +#: fietsboek/util.py:77 +msgid "month.december" +msgstr "" + +#: fietsboek/templates/details.jinja2:5 +msgid "page.details.title" +msgstr "" + +#: fietsboek/templates/details.jinja2:5 +msgid "page.details.edit" +msgstr "" + +#: fietsboek/templates/details.jinja2:15 +msgid "page.details.tags" +msgstr "" + +#: fietsboek/templates/details.jinja2:19 fietsboek/templates/edit.jinja2:9 +#: fietsboek/templates/finish_upload.jinja2:9 +msgid "page.noscript" +msgstr "" + +#: fietsboek/templates/details.jinja2:24 +msgid "page.details.download" +msgstr "" + +#: fietsboek/templates/details.jinja2:29 +msgid "page.details.date" +msgstr "" + +#: fietsboek/templates/details.jinja2:33 +msgid "page.details.length" +msgstr "" + +#: fietsboek/templates/details.jinja2:37 +msgid "page.details.uphill" +msgstr "" + +#: fietsboek/templates/details.jinja2:41 +msgid "page.details.downhill" +msgstr "" + +#: fietsboek/templates/details.jinja2:50 +msgid "page.details.comments" +msgstr "" + +#: fietsboek/templates/edit.jinja2:7 +msgid "page.edit.title" +msgstr "" + +#: fietsboek/templates/edit.jinja2:13 +msgid "page.edit.form.submit" +msgstr "" + +#: fietsboek/templates/edit.jinja2:14 +msgid "page.edit.form.cancel" +msgstr "" + +#: fietsboek/templates/edit_form.jinja2:3 +msgid "page.track.form.title" +msgstr "" + +#: fietsboek/templates/edit_form.jinja2:7 +msgid "page.track.form.date" +msgstr "" + +#: fietsboek/templates/edit_form.jinja2:11 +msgid "page.track.form.tags" +msgstr "" + +#: fietsboek/templates/edit_form.jinja2:22 +msgid "page.track.form.add_tag" +msgstr "" + +#: fietsboek/templates/edit_form.jinja2:28 +msgid "page.track.form.description" +msgstr "" + +#: fietsboek/templates/finish_upload.jinja2:7 +#: fietsboek/templates/upload.jinja2:5 +msgid "page.upload.title" +msgstr "" + +#: fietsboek/templates/finish_upload.jinja2:13 +#: fietsboek/templates/upload.jinja2:11 +msgid "page.upload.form.submit" +msgstr "" + +#: fietsboek/templates/finish_upload.jinja2:14 +msgid "page.upload.form.cancel" +msgstr "" + +#: fietsboek/templates/home.jinja2:5 +msgid "page.home.title" +msgstr "" + +#: fietsboek/templates/home.jinja2:23 +msgid "page.home.total" +msgstr "" + #: fietsboek/templates/layout.jinja2:34 msgid "page.navbar.login" msgstr "" @@ -25,6 +168,10 @@ msgstr "" msgid "page.navbar.logout" msgstr "" +#: fietsboek/templates/layout.jinja2:37 +msgid "page.navbar.upload" +msgstr "" + #: fietsboek/templates/login.jinja2:5 msgid "page.login.title" msgstr "" @@ -41,15 +188,27 @@ msgstr "" msgid "page.login.submit" msgstr "" -#: fietsboek/views/default.py:25 +#: fietsboek/templates/upload.jinja2:8 +msgid "page.upload.form.gpx" +msgstr "" + +#: fietsboek/views/default.py:44 msgid "flash.invalid_credentials" msgstr "" -#: fietsboek/views/default.py:28 +#: fietsboek/views/default.py:47 msgid "flash.logged_in" msgstr "" -#: fietsboek/views/default.py:35 +#: fietsboek/views/default.py:54 msgid "flash.logged_out" msgstr "" +#: fietsboek/views/upload.py:80 +msgid "flash.upload_success" +msgstr "" + +#: fietsboek/views/upload.py:91 +msgid "flash.upload_cancelled" +msgstr "" + diff --git a/fietsboek/models/__init__.py b/fietsboek/models/__init__.py index 2c0336a..4d8942c 100644 --- a/fietsboek/models/__init__.py +++ b/fietsboek/models/__init__.py @@ -6,6 +6,7 @@ import zope.sqlalchemy # Import or define all models here to ensure they are attached to the # ``Base.metadata`` prior to any initialization routines. from .user import User # flake8: noqa +from .track import Track, TrackCache, Upload # flake8: noqa # Run ``configure_mappers`` after defining all of the models to ensure # all relationships can be setup. diff --git a/fietsboek/models/track.py b/fietsboek/models/track.py new file mode 100644 index 0000000..001d4b9 --- /dev/null +++ b/fietsboek/models/track.py @@ -0,0 +1,134 @@ +from sqlalchemy import ( + Column, + Integer, + Text, + LargeBinary, + DateTime, + ForeignKey, + Float, + Enum, + Table, + Boolean, +) +from sqlalchemy.orm import relationship +from sqlalchemy.types import TypeDecorator + +import enum +import gzip + +from .meta import Base +from .. import util + + +class TagBag(TypeDecorator): + """A custom type that represents a set of tags.""" + impl = Text + + def process_bind_param(self, value, dialect): + tags = list(set(v.lower() for v in value)) + tags.sort() + return ' '.join(tags) + + def process_result_value(self, value, dialect): + tags = set(value.split(' ')) + return tags + + +class Visibility(enum.Enum): + PRIVATE = enum.auto() + LINK_ONLY = enum.auto() + PUBLIC = enum.auto() + + +track_people_assoc = Table( + "track_people_assoc", + Base.metadata, + Column("track_id", ForeignKey("tracks.id"), primary_key=True), + Column("user_id", ForeignKey("users.id"), primary_key=True), +) + + +class Track(Base): + __tablename__ = 'tracks' + id = Column(Integer, primary_key=True) + owner_id = Column(Integer, ForeignKey('users.id')) + title = Column(Text) + description = Column(Text) + date = Column(DateTime) + gpx = Column(LargeBinary) + visibility = Column(Enum(Visibility)) + tags = Column(TagBag) + + owner = relationship('User', back_populates='tracks') + cache = relationship('TrackCache', back_populates='track', uselist=False) + tagged_people = relationship('User', secondary=track_people_assoc, back_populates='tagged_tracks') + + # GPX files are XML files with a lot of repeated property names. Really, it + # is quite inefficient to store a whole ton of GPS points in big XML + # structs. Therefore, we add transparent gzip compression to reduce the + # file size by quite a bit: + # 6.7M 20210902_111541.gpx + # 792K 20210902_111541.gpx.gz + @property + def gpx_data(self): + return gzip.decompress(self.gpx) + + @gpx_data.setter + def gpx_data(self, value): + self.gpx = gzip.compress(value) + + def ensure_cache(self): + if self.cache is not None: + return + self.cache = TrackCache(track=self) + meta = util.tour_metadata(self.gpx_data) + self.cache.length = meta["length"] + self.cache.uphill = meta["uphill"] + self.cache.downhill = meta["downhill"] + + @property + def length(self): + if self.cache is None: + return util.tour_metadata(self.gpx_data)["length"] + return self.cache.length + + @property + def downhill(self): + if self.cache is None: + return util.tour_metadata(self.gpx_data)["downhill"] + return self.cache.downhill + + @property + def uphill(self): + if self.cache is None: + return util.tour_metadata(self.gpx_data)["uphill"] + return self.cache.uphill + + +class TrackCache(Base): + __tablename__ = 'track_cache' + id = Column(Integer, primary_key=True) + track_id = Column(Integer, ForeignKey('tracks.id'), unique=True) + length = Column(Float) + uphill = Column(Float) + downhill = Column(Float) + + track = relationship('Track', back_populates='cache') + + +class Upload(Base): + __tablename__ = 'uploads' + id = Column(Integer, primary_key=True) + uploaded_at = Column(DateTime) + owner_id = Column(Integer, ForeignKey('users.id')) + gpx = Column(LargeBinary) + + owner = relationship('User', back_populates='uploads') + + @property + def gpx_data(self): + return gzip.decompress(self.gpx) + + @gpx_data.setter + def gpx_data(self, value): + self.gpx = gzip.compress(value) diff --git a/fietsboek/models/user.py b/fietsboek/models/user.py index 74a76df..52bb6db 100644 --- a/fietsboek/models/user.py +++ b/fietsboek/models/user.py @@ -5,6 +5,7 @@ from sqlalchemy import ( Text, LargeBinary, ) +from sqlalchemy.orm import relationship from .meta import Base @@ -41,6 +42,10 @@ class User(Base): salt = Column(LargeBinary) email = Column(Text) + tracks = relationship('Track', back_populates='owner') + tagged_tracks = relationship('Track', secondary='track_people_assoc', back_populates='tagged_people') + uploads = relationship('Upload', back_populates='owner') + def set_password(self, new_password): """Sets a new password for the user. @@ -70,6 +75,11 @@ class User(Base): except InvalidKey: raise PasswordMismatch from None + @property + def all_tracks(self): + yield from self.tracks + yield from self.tagged_tracks + Index('idx_users_name', User.name, unique=True) Index('idx_users_email', User.email, unique=True) diff --git a/fietsboek/routes.py b/fietsboek/routes.py index 119ae92..9f57adc 100644 --- a/fietsboek/routes.py +++ b/fietsboek/routes.py @@ -1,4 +1,12 @@ def includeme(config): config.add_static_view('static', 'static', cache_max_age=3600) + config.add_route('home', '/') config.add_route('login', '/login') config.add_route('logout', '/logout') + config.add_route('upload', '/upload') + config.add_route('preview', '/preview/{id}.gpx') + config.add_route('finish-upload', '/upload/{id}') + config.add_route('cancel-upload', '/cancel/{id}') + config.add_route('details', '/track/{id}') + config.add_route('edit', '/edit/{id}') + config.add_route('gpx', '/gpx/{id}.gpx') diff --git a/fietsboek/static/GM_Utils/GPX2GM.css b/fietsboek/static/GM_Utils/GPX2GM.css new file mode 100644 index 0000000..f422bde --- /dev/null +++ b/fietsboek/static/GM_Utils/GPX2GM.css @@ -0,0 +1,55 @@ +/* GPX2GM.css + Lizenz CC BY-NC-SA 4.0 + Jürgen Berkemeier + www.j-berkemeier.de + 25. 7. 2020 */ + +.JBinfofenster { position:absolute; z-index:1000; margin-top:10px; margin-left:10px; border:1px solid #aaa; border-radius:3px; + box-shadow:1px 1px 5px #aaa; background-color:white; padding:0.5em; font-size:0.8em; line-height:1.2em; + max-width:50%; color: black } +.JBinfofenster strong { font-size:1.2em } + +.JBinfofenster_gm { color: black !important } +.JBinfofenster_gm strong { white-space:nowrap } +.leaflet-popup-content { overflow: auto } + +.JBmaphead { position: absolute; margin:0;padding:0;font-size:16px;line-height:24px;z-index:510;max-width:100% } +.JBmaphead * { margin:0;padding:0; } +.JBmaphead div { display:inline-block; } +.JBmaphead button { border: none; background-color: transparent; font: inherit; color: inherit; text-align: inherit; padding: 0; cursor: pointer; } + +.visually-hidden { position: absolute !important; clip: rect(1px, 1px, 1px, 1px) !important; padding: 0 !important; border: 0 !important; height: 1px !important; width: 1px !important; overflow: hidden !important; white-space: nowrap !important; } + +.JBcheckbox ol { position: absolute; } +.JBcheckbox li { list-style-type: none; white-space:nowrap; background-color: white; } +.JBcheckbox input { margin-right:3px; margin-left:3px; } +.JBcheckbox li input:hover ~ label, .JBcheckbox li label:hover, .JBcheckbox li button:hover, +.JBcheckbox li input:focus ~ label, .JBcheckbox li button:focus { outline: 1px dotted red; background-color: lightgray; } +.JBcheckbox [aria-pressed="false"]::after { content: " ▼" } +.JBcheckbox ol[aria-expanded="false"] { display: none } +.JBcheckbox [aria-pressed="true"]::after { content: " ▲" } +.JBcheckbox ol[aria-expanded="true"] { overflow-y:auto } +.JBcheckbox ol[aria-expanded="true"] li { padding-right: 1.5em } + +.JBinfodiv { border:3px solid black; background-color:white; padding:30px; font-size:1.2em; line-height:3em; text-align:center; + position:relative; z-index:1000; left:20%; top:-80%; width:60%; height:60%} +.JBinfodiv img { position:absolute; top:50%; left:50%; transform: translateX(-50%) translateY(-50%); } + +.JBmapdiv_map { width:100%; height:100%; color: black } +.JBmapdiv_map img { max-width: none } +.JBmapdiv { font-size:16px; position:relative } +.JBmapdiv img { image-orientation:from-image } + +.JBfull { background-color:#eee; + -webkit-transition: left 1s, top 1s, height 1s, width 1s; + transition: left 1s, top 1s, height 1s, width 1s; + z-index: 2001} + +.JBprofildiv { } + +div.JBcluster-icon { } +div.JBcluster-icon > div { display: flex; align-items: center; justify-content: center; font-weight: bold } +div.JBdirection-marker { width: auto !important; height: auto !important; } +div.JBdirection-marker > div { display: flex; align-items: center; justify-content: center; font-size: 2em; } + +div.leaflet-top { z-index: 500 !important } diff --git a/fietsboek/static/GM_Utils/GPX2GM.js b/fietsboek/static/GM_Utils/GPX2GM.js new file mode 100644 index 0000000..b3f4655 --- /dev/null +++ b/fietsboek/static/GM_Utils/GPX2GM.js @@ -0,0 +1,2868 @@ +// GPX2GM.js +// Darstellung von GPS-Daten aus einer GPX-Datei in Openstreetmap oder Google Maps +// Lizenz CC BY-NC-SA 4.0 +// Jürgen Berkemeier +// www.j-berkemeier.de +// Version 6.16 vom 11. 2. 2022 + +"use strict"; + +window.JB = window.JB || {}; +window.JB.GPX2GM = window.JB.GPX2GM || {}; +JB.GPX2GM.ver = "6.16"; +JB.GPX2GM.dat = "8. 2. 2022"; +JB.GPX2GM.fname = "GPX2GM.js"; +JB.GPX2GM.globalMapParameter = {}; + +if(typeof(GPXVIEW_Debuginfo)=="undefined") + JB.debuginfo = (location.search.toLowerCase().search("debuginfo")!=-1) + && (location.search.toLowerCase().search("debuginfo=false")==-1) ; +else + JB.debuginfo = GPXVIEW_Debuginfo; +if(JB.debuginfo) JB.gpxview_Start = Date.now(); + +(function() { + JB.GPX2GM.Path = ""; + JB.GPX2GM.autoload = false; + var scr = document.getElementsByTagName("script"); + for(var i=scr.length-1;i>=0;i--) if(scr[i].src && scr[i].src.length) { + var path = scr[i].src; + var pos = path.search(JB.GPX2GM.fname); + if(pos!=-1) { + JB.GPX2GM.autoload = !(path.search("autoload=false")>pos); + JB.GPX2GM.Path = path.substring(0,pos); + break; + } + } +})(); + +window.requestAnimationFrame = window.requestAnimationFrame || function(callback) { window.setTimeout(callback,1) }; + +(function() { + // CustomEvent-Polyfill für IE<=11 + if ( typeof window.CustomEvent != "function" ) { + function CustomEvent ( event, params ) { + params = params || { bubbles: false, cancelable: false, detail: null }; + const evt = document.createEvent( 'CustomEvent' ); + evt.initCustomEvent( event, params.bubbles, params.cancelable, params.detail ); + return evt; + } + window.CustomEvent = CustomEvent; + } +})(); + +JB.Scripte = { GPX2GM_Defs:0, maplib:0, gra:0, plot:0, maputils:0 }; + +JB.makeMap = function (ID) { + + JB.Debug_Info(ID,"makeMap gestartet",false); + + var dieses = this; + var gpxdaten; + this.gpxdaten = gpxdaten; + var id = ID; + this.id = id; + var markers=[],trackpolylines=[],routepolylines=[]; + var file,maptype; + var Map; + var newfile; + var div = document.getElementById(id); + + initEvents(this); + + this.parameters = {}; + for(var par in JB.GPX2GM.parameters) this.parameters[par] = JB.GPX2GM.parameters[par]; + JB.Debug_Info(ID,"Parameter: " + JSON.stringify(div.dataset),false); + for(var par in div.dataset) { + if(par in this.parameters) { + if(div.dataset[par] == "false") this.parameters[par] = false; + else if(div.dataset[par] == "true") this.parameters[par] = true; + else this.parameters[par] = div.dataset[par]; + } + else { + JB.Debug_Info(ID,"Unbekannter Parameter: " + par,true); + } + } + if(JB.debuginfo) { + var t = ""; + for(var o in this.parameters) t += "
  " + o + ": " + this.parameters[o]; + JB.Debug_Info(ID,"Lokale Steuervariablen: "+t+"
",false); + } + + var hscale=[],sscale=[],vscale=[],hrscale=[],cadscale=[],atempscale=[]; + if(typeof(JB.Scaling)!="undefined") { + if(typeof(JB.Scaling.hmin)!="undefined" && typeof(JB.Scaling.hmax)!="undefined") + hscale = [{x:.0001,h:JB.Scaling.hmin} ,{x:.0002,h:JB.Scaling.hmax}] ; + if(typeof(JB.Scaling.smin)!="undefined" && typeof(JB.Scaling.smax)!="undefined") + sscale = [{x:.0001,s:JB.Scaling.smin} ,{x:.0002,s:JB.Scaling.smax}] ; + if(typeof(JB.Scaling.vmin)!="undefined" && typeof(JB.Scaling.vmax)!="undefined") + vscale = [{x:.0001,v:JB.Scaling.vmin} ,{x:.0002,v:JB.Scaling.vmax}] ; + if(typeof(JB.Scaling.hrmin)!="undefined" && typeof(JB.Scaling.hrmax)!="undefined") + hrscale = [{x:.0001,hr:JB.Scaling.hrmin} ,{x:.0002,hr:JB.Scaling.hrmax}] ; + if(typeof(JB.Scaling.cadmin)!="undefined" && typeof(JB.Scaling.cadmax)!="undefined") + cadscale = [{x:.0001,cad:JB.Scaling.cadmin} ,{x:.0002,cad:JB.Scaling.cadmax}] ; + if(typeof(JB.Scaling.atempmin)!="undefined" && typeof(JB.Scaling.atempmax)!="undefined") + atempscale = [{x:.0001,atemp:JB.Scaling.atempmin} ,{x:.0002,atemp:JB.Scaling.atempmax}] ; + } + + var doc_lang = JB.GPX2GM.parameters.doclang.toLowerCase(); + if(doc_lang == "auto" && document.documentElement.hasAttribute("lang")) doc_lang = document.documentElement.getAttribute("lang"); + for(var lang in JB.GPX2GM.strings) { if(doc_lang.search(lang)>-1) { JB.GPX2GM.parameters.doclang = doc_lang = lang; break; } } + if(JB.GPX2GM.parameters.doclang == "auto") JB.GPX2GM.parameters.doclang = doc_lang = "de"; + var strings = JB.GPX2GM.strings[doc_lang]; + var unit = this.parameters.unit.toLowerCase(); + if(unit == "airwater" || unit == "air" || unit == "water") { + var units = JB.GPX2GM.units[unit]; + if(typeof(Wfaktor)=="undefined") this.parameters.wfaktor = 1/1.852; + if(typeof(Hfaktor)=="undefined") this.parameters.hfaktor = 1/0.3048; + if(typeof(Sfaktor)=="undefined") this.parameters.sfaktor = 0.3048 / 1.852; + } + else if(unit == "enus" || unit == "en" || unit == "us") { + var units = JB.GPX2GM.units.enus; + if(typeof(Wfaktor)=="undefined") this.parameters.wfaktor = 1/1.609344; + if(typeof(Hfaktor)=="undefined") this.parameters.hfaktor = 1/0.3048; + if(typeof(Sfaktor)=="undefined") this.parameters.sfaktor = 0.3048 / 1.609344; + } + else + var units = JB.GPX2GM.units.si; + if(unit == "us") { + if(typeof(Tfaktor)=="undefined") this.parameters.tfaktor = 9/5; + if(typeof(Toffset)=="undefined") this.parameters.toffset = 32; + } + JB.Debug_Info(ID,"Sprache: "+doc_lang+" Einheiten: "+this.parameters.unit,false); + + if(typeof(JB.GPX2GM.callback)=="function") + JB.GPX2GM.callback({id:id,type:"Map_div_v"}); + fireEvent(this,this.events.Map_div_v); + + JB.GPX2GM.globalMapParameter[id] = {keydownhandler: null}; + JB.GPX2GM.globalMapParameter[id] = {closeActivehandler: null}; + JB.GPX2GM.globalMapParameter.activeMapId = id; + + div.tabIndex = 0; + div.addEventListener("focusin",function(e) { JB.GPX2GM.globalMapParameter.activeMapId = this.id; },false); + div.addEventListener("mouseover",function(e) { JB.GPX2GM.globalMapParameter.activeMapId = this.id; },false); + JB.addClass("JBmapdiv",div); + + var MapHead = document.createElement("div"); + MapHead.id = "map_head"+id; + JB.addClass("JBmaphead",MapHead); + MapHead.setAttribute("role","menu"); // oder menubar? + MapHead.appendChild(document.createTextNode(": ")); + var mapdiv = document.createElement("div"); + this.mapdiv = mapdiv; + mapdiv.id = "map_"+id; + mapdiv.style.height = "100%"; + while(div.hasChildNodes()) div.removeChild(div.firstChild); + if(!this.parameters.legende) MapHead.style.display = "none"; + var odiv = document.createElement("div"); + odiv.style.width = odiv.style.height = "100%"; + odiv.appendChild(MapHead); + odiv.appendChild(mapdiv); + div.appendChild(odiv); + if (this.parameters.trcolmod.length) { + try { mapdiv.style.width = "calc(100% - 90px)"; } catch(e) {} + odiv.style.position = "relative"; + var FB; + var fb_onresize; + } + if(typeof(JB.GPX2GM.callback)=="function") + JB.GPX2GM.callback({id:id,type:"Map_div_n"}); + fireEvent(this,this.events.Map_div_n); + JB.Debug_Info(ID,"Mapdiv angelegt "+mapdiv.offsetWidth+"*"+mapdiv.offsetHeight,false); + + this.parameters.profilflag = false; + var profil = { + hp:{x:"x",y:"h"},hpt:{x:"t",y:"h"}, + wpt:{x:"t",y:"x"}, + sp:{x:"x",y:"s"},spt:{x:"t",y:"s"}, + vp:{x:"x",y:"v"},vpt:{x:"t",y:"v"}, + hrp:{x:"x",y:"hr"},hrpt:{x:"t",y:"hr"}, + cadp:{x:"x",y:"cad"},cadpt:{x:"t",y:"cad"}, + atempp:{x:"x",y:"atemp"},atemppt:{x:"t",y:"atemp"} + }; + if(this.parameters.shtrtabs_p) + profil.hpt.x = profil.spt.x = profil.vpt.x = profil.hrpt.x = profil.cadpt.x = profil.atemppt.x = profil.wpt.x = "tabs"; + profil.hpt.ytext = profil.hp.ytext = strings.alt+strings.in+units.alt; + profil.spt.ytext = profil.sp.ytext = strings.grade+strings.in+strings.grade_unit; + profil.vpt.ytext = profil.vp.ytext = strings.speed+strings.in+units.speed; + profil.hrpt.ytext = profil.hrp.ytext = strings.hr+strings.in+strings.hr_unit; + profil.cadpt.ytext = profil.cadp.ytext = strings.cad+strings.in+strings.cad_unit; + profil.atemppt.ytext = profil.atempp.ytext = strings.temp+strings.in+units.temp; + profil.wpt.ytext = strings.way+strings.in+units.way; + profil.hp.xtext = profil.vp.xtext = profil.sp.xtext = profil.hrp.xtext = profil.cadp.xtext = profil.atempp.xtext = strings.way+strings.in+units.way; + profil.hpt.xtext = profil.vpt.xtext = profil.spt.xtext = profil.hrpt.xtext = profil.cadpt.xtext = profil.atemppt.xtext = profil.wpt.xtext = strings.time; //+strings.in+strings.time_unit; + profil.hpt.scale = profil.hp.scale = hscale; + profil.spt.scale = profil.sp.scale = sscale; + profil.vpt.scale = profil.vp.scale = vscale; + profil.hrpt.scale = profil.hrp.scale = hrscale; + profil.cadpt.scale = profil.cadp.scale = cadscale; + profil.atemppt.scale = profil.atempp.scale = atempscale; + profil.setflags = function(tr,ct) { + if(ct==-1) { + profil.hp.pflag = profil.sp.pflag = tr.hflag; + profil.hpt.pflag = profil.spt.pflag = tr.hflag && tr.tflag; + profil.vpt.pflag = profil.vp.pflag = tr.tflag; + profil.hrpt.pflag = profil.hrp.pflag = tr.hrflag; + profil.hrpt.pflag &= tr.tflag; + profil.cadpt.pflag = profil.cadp.pflag = tr.cadflag; + profil.cadpt.pflag &= tr.tflag; + profil.atemppt.pflag = profil.atempp.pflag = tr.atempflag; + profil.atemppt.pflag &= tr.tflag; + profil.wpt.pflag = tr.tflag; + } + else { + profil.hp.pflag = profil.sp.pflag = ct==1?tr.hflag:tr.hflagall; + profil.hpt.pflag = profil.spt.pflag = ct==1?tr.hflagall&&tr.tflag:tr.hflagall&&tr.tflagall; + profil.vpt.pflag = profil.vp.pflag = ct==1?tr.tflag:tr.tflagall; + profil.hrpt.pflag = profil.hrp.pflag = ct==1?tr.hrflag:tr.hrflagall; + profil.hrpt.pflag &= ct==1?tr.tflag:tr.tflagall; + profil.cadpt.pflag = profil.cadp.pflag = ct==1?tr.cadflag:tr.cadflagall; + profil.cadpt.pflag &= ct==1?tr.tflag:tr.tflagall; + profil.atemppt.pflag = profil.atempp.pflag = ct==1?tr.atempflag:tr.atempflagall; + profil.atemppt.pflag &= ct==1?tr.tflag:tr.tflagall; + profil.wpt.pflag = ct==1?tr.tflag:tr.tflagall; + } + } + + for(var p in profil) { + profil[p].id = ID+"_"+p; + profil[p].ele = document.getElementById(profil[p].id); + if(profil[p].ele) { + JB.addClass("JBprofildiv",profil[p].ele); + this.parameters.profilflag = true; + JB.Debug_Info(id,"Profil, ID: "+profil[p].id+" gefunden",false); + } + } + + if(this.parameters.profilflag || this.parameters.trcolmod.length) { + if(JB.Scripte.gra==0) { + JB.Scripte.gra = 1; +// JB.LoadScript(JB.GPX2GM.Path+'gra_canvas.js', function(){ JB.Scripte.gra = 2; }); + JB.LoadScript(JB.GPX2GM.Path+'gra_svg.js', function(){ JB.Scripte.gra = 2; }); + JB.Scripte.plot = 1; + JB.LoadScript(JB.GPX2GM.Path+"plot.js", function(){ JB.Scripte.plot = 2; }); + JB.Debug_Info(ID,"Grafikscripte werden geladen",false); + } + } + + function initEvents(mapObject) { + mapObject.events = {}; + mapObject.events.eventElement = document.getElementById(mapObject.id); + mapObject.events.Map_div_v = new CustomEvent("Map_div_v", { detail: mapObject } ); + mapObject.events.Map_div_n = new CustomEvent("Map_div_n", { detail: mapObject } ); + mapObject.events.Map_v = new CustomEvent("Map_v", { detail: mapObject } ); + mapObject.events.Map_n = new CustomEvent("Map_n", { detail: mapObject } ); + mapObject.events.Show = new CustomEvent("Show", { detail: mapObject } ); + mapObject.events.Wegpunkte_v = new CustomEvent("Wegpunkte_v", { detail: mapObject } ); + mapObject.events.Wegpunkte_n = new CustomEvent("Wegpunkte_n", { detail: mapObject } ); + mapObject.events.Routen_v = new CustomEvent("Routen_v", { detail: mapObject } ); + mapObject.events.Routen_n = new CustomEvent("Routen_n", { detail: mapObject } ); + mapObject.events.Tracks_v = new CustomEvent("Tracks_v", { detail: mapObject } ); + mapObject.events.Tracks_n = new CustomEvent("Tracks_n", { detail: mapObject } ); + mapObject.events.Profile_v = new CustomEvent("Profile_v", { detail: mapObject } ); + mapObject.events.Profile_n = new CustomEvent("Profile_n", { detail: mapObject } ); + mapObject.events.created_Marker_Text = new CustomEvent("created_Marker_Text", { detail: mapObject } ); + mapObject.events.created_Marker_Bild = new CustomEvent("created_Marker_Bild", { detail: mapObject } ); + mapObject.events.created_Marker_Link = new CustomEvent("created_Marker_Link", { detail: mapObject } ); + mapObject.events.created_Route = new CustomEvent("created_Route", { detail: mapObject } ); + mapObject.events.created_Track = new CustomEvent("created_Track", { detail: mapObject } ); + mapObject.events.click_Marker_Text = new CustomEvent("click_Marker_Text", { detail: mapObject, cancelable:true } ); + mapObject.events.click_Marker_Bild = new CustomEvent("click_Marker_Bild", { detail: mapObject, cancelable:true } ); + mapObject.events.click_Marker_Link = new CustomEvent("click_Marker_Link", { detail: mapObject, cancelable:true } ); + mapObject.events.click_Route = new CustomEvent("click_Route", { detail: mapObject, cancelable:true } ); + mapObject.events.click_Track = new CustomEvent("click_Track", { detail: mapObject, cancelable:true } ); + } // initEvents + + function fireEvent(mapObject,event,eventparameter) { + mapObject.events.eventparameter = eventparameter; + let notCanceled = mapObject.events.eventElement.dispatchEvent(event); + return notCanceled; + } // fireEvent + this.fireEvent = fireEvent; + + this.ShowGPX = function(fn,mpt) { + var filenames = []; + file = []; + for(var i=0;i 0 ? strings.wait : "
"; + div.appendChild(infodiv); + JB.Debug_Info(id,"Info da",false); + JB.Debug_Info(id,"Lade "+filenames.join(","),false); + JB.lpgpx.call(this,file,id,function(daten) { + newfile = true; + gpxdaten = daten; + // JB.Wait(id,["maputils"],(function() {JB.getTimezone.call(dieses,gpxdaten,{trackinfo:trackinfo,wpinfo:wpinfo})})); + gpxdaten = pict2WP.call(this,gpxdaten); + gpxdaten = div2WP.call(this,gpxdaten); + if(this.parameters.tracksort) gpxdaten = sort_tracks.call(this,gpxdaten); + if(this.parameters.wpcluster) gpxdaten = wp_dist.call(this,gpxdaten); + this.gpxdaten = gpxdaten; + setMapHead.call(this); + if (this.parameters.legende) { + JB.onresize(odiv, function(w,h) { + var t = MapHead.offsetHeight; + mapdiv.style.top = t +"px"; + mapdiv.style.height = (h-t) + "px"; + },true) + } + show.call(this); + div.removeChild(infodiv); + JB.Debug_Info(id,"Info weg",false); + }); + } // ShowGPX + + this.Rescale = function() { + var daten; + if(arguments.length == 0) daten = gpxdaten; + else if(arguments.length == 1) daten = arguments[0]; + else if(arguments.length == 3) daten = JB.bounds(arguments[0],arguments[1],arguments[2]); + // daten = JB.bounds(center_lat, center_lon, radius); + JB.Debug_Info(id,"Rescale: lat: "+daten.latmin+"..."+daten.latmax+", lon: "+daten.lonmin+"..."+daten.lonmax,false); + Map.rescale(daten); + } // Rescale + + this.GetMap = function() { + return Map; + } // GetMap + + this.removeElements = function() { + var i; + for(i=0;ib.fnr) return 1; + else return(a.t0-b.t0); + }); + var x0,t0; + for(var k=1;kdaten.latmax) daten.latmax=bounds.latmax; + if(bounds.lonmindaten.lonmax) daten.lonmax=bounds.lonmax; + } + else + JB.Debug_Info(id,"Fehler bei Bounds in Pict-Div",false); + } + var im = pict.querySelectorAll("img, a"); + JB.Debug_Info(id,im.length +" Bilder zum Geotaggen gefunden",false); + for(var i=0;idaten.latmax) daten.latmax=wp.lat; + if(wp.londaten.lonmax) daten.lonmax=wp.lon; + } + if(wp.latdaten.wegpunkte.latmax) daten.wegpunkte.latmax=wp.lat; + if(wp.londaten.wegpunkte.lonmax) daten.wegpunkte.lonmax=wp.lon; + if(im[i].alt) wp.cmt = im[i].alt; + else if (im[i].innerHTML) wp.cmt = im[i].innerHTML; + else wp.cmt = ""; + wp.desc = ""; //wp.cmt; + wp.link = im[i].getAttribute("data-link")?im[i].getAttribute("data-link"):"" ; + wp.sym = "default"; + wp.time = 0; + if(im[i].src) wp.name = im[i].src; + else if(im[i].href) wp.name = im[i].href; + else wp.name = ""; + daten.wegpunkte.wegpunkt.push(wp); + } + } + } + } + daten.wegpunkte.anzahl = daten.wegpunkte.wegpunkt.length; + } + return daten; + } // pict2WP + + function div2WP(daten) { + var divs = document.getElementById(ID+"_wp"); + if(divs) { + var geodata = divs.getAttribute("data-geo"); + if(geodata) { + var bounds = {},t,e=false; + geodata = geodata.split(","); + if(geodata.length==3) { + for(var i=0;i<3;i++) { + t = geodata[i].split(":"); + if(t.length == 2) bounds[t[0]] = parseFloat(t[1]); + else e = true; + } + } + if(!e) { + JB.Debug_Info(id,"Im Wegpunktbereich Bounds gefunden.",false); + var bounds = JB.bounds(bounds.centerlat,bounds.centerlon,bounds.radius); + if(bounds.latmindaten.latmax) daten.latmax=bounds.latmax; + if(bounds.lonmindaten.lonmax) daten.lonmax=bounds.lonmax; + } + else + JB.Debug_Info(id,"Fehler bei Bounds in WP-Div",false); + } + var dv = divs.querySelectorAll("div"); + JB.Debug_Info(id,dv.length +" Divs zum Geotaggen gefunden",false); + for(var i=0;idaten.latmax) daten.latmax=wp.lat; + if(wp.londaten.lonmax) daten.lonmax=wp.lon; + } + if(wp.latdaten.wegpunkte.latmax) daten.wegpunkte.latmax=wp.lat; + if(wp.londaten.wegpunkte.lonmax) daten.wegpunkte.lonmax=wp.lon; + wp.cmt = dv[i].innerHTML?dv[i].innerHTML:""; + wp.desc = ""; // wp.cmt; + wp.link = dv[i].getAttribute("data-link")?dv[i].getAttribute("data-link"):"" ; + wp.sym = dv[i].getAttribute("data-icon")?dv[i].getAttribute("data-icon"):"default" ; + wp.time = 0; + wp.name = dv[i].getAttribute("data-name")?dv[i].getAttribute("data-name"):""; + daten.wegpunkte.wegpunkt.push(wp); + } + } + } + } + daten.wegpunkte.anzahl = daten.wegpunkte.wegpunkt.length; + } + return daten; + } // div2WP + + var chkwpt,chktrk,chkrt; + function setMapHead() { + JB.Debug_Info(id,"setMapHead",false); + var dieses = this; + var str = "
"; + if(div.title) { + str += div.title + " "; + } + else { + if(this.parameters.legende_fnm) { + var shdate = this.parameters.legende_fnm_lm === true || this.parameters.legende_fnm_lm ==="d" || this.parameters.legende_fnm_lm === "dt"; + var shtime = this.parameters.legende_fnm_lm ==="t" || this.parameters.legende_fnm_lm === "dt"; + str += "" + for(var i=0;i1) { + gpxelement = strings.wpts; + var texte = [strings.all]; + for(var i=0;i 1) zoomFunc[0] = function() { dieses.Rescale(gpxdaten.wegpunkte) }; + for(var i=0;i1) { + gpxelement = strings.trks; + if(this.parameters.legende_rr) { + var rrflag=true; + for(var i=0;i1) { + gpxelement = strings.rtes; + texte[0] = "Alle"; + infotext = " ("+Number(gpxdaten.routen.laenge.toPrecision(10).toString(10))+units.way+") "; + for(var i=0;i0 && typeof(JB.GPX2GM.callback)=="function") + JB.GPX2GM.callback({id:id,type:"Wegpunkte_v",gpxdaten:gpxdaten,profil:profil,Map:Map}); + fireEvent(this,this.events.Wegpunkte_v); + if(this.parameters.wpcluster && gpxdaten.wegpunkte.anzahl>1) { + var clusters = wpcluster(); + mrk = showClusters.call(this,clusters); + markers = markers.concat(mrk); + } + for(var i=0;i0 && typeof(JB.GPX2GM.callback)=="function") + JB.GPX2GM.callback({id:id,type:"Wegpunkte_n",gpxdaten:gpxdaten,profil:profil,Map:Map,markers:markers}); + fireEvent(this,this.events.Wegpunkte_n,{markers:markers}); + } // showWpts + + function showWpt(waypoint) { + var icon; + const emoji_test = /\p{Extended_Pictographic}/ug; + var sym = waypoint.sym ; console.log(sym,sym.length); + if(JB.icons[sym]) + icon = JB.icons[sym]; + else if(JB.icons[sym.toLowerCase()]) + icon = JB.icons[sym.toLowerCase()]; + else if(emoji_test.test(sym) || sym.length <= 3) + icon = waypoint.sym; + else if(this.parameters.defaulticon !== "" && ( this.parameters.defaulticon.length <= 3 || emoji_test.test(this.parameters.defaulticon) ) ) + icon = this.parameters.defaulticon; + else if(this.parameters.defaulticon !== "" && this.parameters.defaulticon.length > 3) + icon = JB.icons[this.parameters.defaulticon.toLowerCase()] ? JB.icons[this.parameters.defaulticon.toLowerCase()] : null; + else + icon = null; + JB.Debug_Info(id,"Symbol: "+sym,false); console.log("Symbol: "+icon); + var imgsrc=""; + if (JB.checkImageName(waypoint.name)) imgsrc = waypoint.name; + else if (JB.checkImageName(waypoint.link)) imgsrc = waypoint.link; + wpinfo.call(this,waypoint); + var mrk; + if(imgsrc.length) { + if(this.parameters.bildwegpunkticon != "") sym = this.parameters.bildwegpunkticon; + mrk = Map.Marker_Bild(waypoint,JB.icons[sym]?JB.icons[sym]:JB.icons.Bild,this.parameters.bildpfad+imgsrc); + } + else if (waypoint.link && waypoint.link.length) + mrk = Map.Marker_Link(waypoint,icon,waypoint.name,waypoint.link,this.parameters.popup_Pars); + else if (waypoint.name.length || waypoint.cmt.length || waypoint.desc.length) + mrk = Map.Marker_Text(waypoint,icon,waypoint.name); + else + mrk = Map.Marker(waypoint,icon); + return mrk; + } // showWpt + + function showClusters(clusters) { + var zoomstatus = Map.getZoom(); + var mrks=[],mrk; + for(var i=0;imindist) break; + wppointer[i] = [i,ct]; + } + wppointer.sort(function(a,b) {return a[1]-b[1];}); + var clusternr=-1; + for(var i=0;i1) clusters.push(cluster); + else if(cluster.members.length==1) wps[cluster.members[0]].cluster = -1; + } + } + for(var i=0;i-1) { + wps[i].cluster = wps[wp.dist[j][0]].cluster; + clusters[wps[i].cluster].members.push(i); + break; + } + } + } + } + } + for(var i=0;i0 && typeof(JB.GPX2GM.callback)=="function") + JB.GPX2GM.callback({id:id,type:"Routen_v",gpxdaten:gpxdaten,profil:profil,Map:Map}); + fireEvent(this,this.events.Routen_v); + for(var i=0;i0 && typeof(JB.GPX2GM.callback)=="function") + JB.GPX2GM.callback({id:id,type:"Routen_n",gpxdaten:gpxdaten,profil:profil,Map:Map,polylines:routepolylines}); + if(routepolylines.length) fireEvent(this,this.events.Routen_n,{polylines:routepolylines}); + } // showRoutes + + function showTracks() { + var colmod=this.parameters.trcolmod,colmodflag=false,min=1e10,max=-1e10,minmax={}; + JB.Debug_Info(id,"showTracks",false); + for(var i=0;i0 && typeof(JB.GPX2GM.callback)=="function") + JB.GPX2GM.callback({id:id,type:"Tracks_v",gpxdaten:gpxdaten,profil:profil,Map:Map}); + fireEvent(this,this.events.Tracks_v); + if( (colmod=="h" && gpxdaten.tracks.hflag) || (colmod=="v" && gpxdaten.tracks.tflag) || (colmod=="hr" && gpxdaten.tracks.hrflag) + || (colmod=="cad" && gpxdaten.tracks.cadflag) || (colmod=="atemp" && gpxdaten.tracks.atempflag) ) { + colmodflag = true; + var coltab = JB.farbtafel(1000); + for(var i=0;i0) min = -max; + else max = -min; + } + } + if(colmodflag) { + if(max0 && typeof(JB.GPX2GM.callback)=="function") + JB.GPX2GM.callback({id:id,type:"Tracks_n",gpxdaten:gpxdaten,profil:profil,Map:Map,polylines:trackpolylines}); + if(trackpolylines.length>0) fireEvent(this,this.events.Tracks_n,{polylines:trackpolylines}); + } // showTracks + + function streckenmarker(delta,daten) { + delta = Number(delta); + var markerpos = delta, di, dim, marker, markers = [], dx, lat, lon; + if(delta > daten[daten.length-1].x) return markers; + if(delta < daten[daten.length-1].x/100) return markers; + di = daten[0]; + for(var i=1;i markerpos) { + dx = (markerpos - dim.x) / (di.x - dim.x); + lat = dim.lat + dx * (di.lat - dim.lat); + lon = dim.lon + dx * (di.lon - dim.lon); + marker = Map.setDistanceMarker({lat:lat,lon:lon},JB.icons.Streckenmarker,markerpos,markerpos); + markers = markers.concat(marker); + markerpos += delta; + dim = di; + } + } + return markers; + } // streckenmarker + + function track_click_fkt(map,daten,point) { + var d, entf=[]; + for(var i=0;i"; + if(this.parameters.shtrx) + info += "
"+strings.way+": "+Number(tracki.laenge.toPrecision(10).toString(10))+" "+units.way; + if(this.parameters.shtrtges && tracki.tges>0) + info += "
"+strings.duration+": "+JB.Zeitstring(tracki.tges*3600); + if(this.parameters.shtrtgeswob && tracki.tgeswob>0) + info += "
"+strings.duration+" "+strings.inmo+": "+JB.Zeitstring(tracki.tgeswob*3600); + if(this.parameters.shtrs && typeof(tracki.rauf)!="undefined" ) + info += "
"+strings.altdiff+": +"+tracki.rauf+" "+units.alt+" / -"+tracki.runter+" "+units.alt+""; + if(this.parameters.shtrt && tracki.t0>0) + info += "
"+strings.tstart+": " + JB.sec2string.call(this,tracki.t0*3600,this.parameters.tdiff*3600+tracki.tzoff) + ""; + if(this.parameters.shtrvmitt && tracki.vmitt>0) + info += "
"+strings.avspeed+" = " + tracki.vmitt + " "+units.speed+""; + if(this.parameters.shtrvmittwob && tracki.vmittwob>0) + info += "
"+strings.avspeed+" = " + tracki.vmittwob + " "+units.speed+" "+strings.inmo+""; + if(this.parameters.shtrvmittpace && tracki.vmitt>0) + info += "
"+strings.pace+" = " + (60/tracki.vmitt).toFixed(1) + " "+units.pace+""; + if(this.parameters.shtrvmittpacewob && tracki.vmittwob>0) + info += "
"+strings.pace+" = " + (60/tracki.vmittwob).toFixed(1) + " "+units.pace+" "+strings.inmo+""; + if(this.parameters.shtrcmt) info += "
"+tracki.cmt; + if(this.parameters.shtrdesc) info += "
"+tracki.desc; + tracki.info = info; + } // trackinfo + + function routinfo(routei) { + var info = ""+routei.name+""; + if(this.parameters.shtrx) + info += "
"+strings.way+" "+Number(routei.laenge.toPrecision(10).toString(10))+" "+units.way; + if(this.parameters.shrtcmt) info += "
"+routei.cmt; + if(this.parameters.shrtdesc) info += "
"+routei.desc; + routei.info = info; + } // routinfo + + function wpinfo(wp) { + var imgsrc=""; + if (JB.checkImageName(wp.name)) imgsrc = wp.name; + else if (JB.checkImageName(wp.link)) imgsrc = wp.link; + var info = ((this.parameters.shwpname&&!imgsrc.length)?""+wp.name+"
":"") + + (this.parameters.shwpcmt?wp.cmt:"") + + (this.parameters.shwpcmt&&this.parameters.shwpdesc?"
":"") + + (this.parameters.shwpdesc?wp.desc:""); + if(this.parameters.shwptime && wp.time>0) info += "
(" + + JB.sec2string.call(this,wp.time,this.parameters.tdiff) +")"; + wp.info = info; + } // wpinfo + + function getminmax(daten,o,minmax) { + var min=1e10,max=-1e10; + if(typeof(minmax)!="undefined") { min = minmax.min; max = minmax.max; } + for(var j=0;jmax) max = wert; + } + return {min:min,max:max}; + } // getminmax + + function showProfiles() { + JB.Debug_Info(id,"showProfiles",false); + if(profil) profil.setflags(gpxdaten.tracks,-1); + if(typeof(JB.GPX2GM.callback)=="function") + JB.GPX2GM.callback({id:id,type:"Profile_v",gpxdaten:gpxdaten,profil:profil,Map:Map}); + fireEvent(this,this.events.Profile_v,{profil:profil}); + for(var p in profil) { + if(profil[p].ele && !profil[p].diag) { + profil[p].diag = new JB.plot(profil[p].id,profil[p].x,profil[p].y); + if (profil[p].ele.className && profil[p].ele.className.search(/(^|\s)no_x(\s|$)/i)!=-1) profil[p].xtext = ""; + JB.Debug_Info(id,"Profil: "+profil[p].id+" Diagramm angelegt",false); + profil[p].diag.framecol = this.parameters.plotframecol; + profil[p].diag.gridcol = this.parameters.plotgridcol; + profil[p].diag.labelcol = this.parameters.plotlabelcol; + profil[p].diag.markercol = this.parameters.plotmarkercol; + profil[p].diag.fillopac = this.parameters.profilfillopac; + profil[p].diag.tkorr = this.parameters.tkorr; + if(p.search("pt")>-1) { + if(this.parameters.shtrtabs_p) profil[p].diag.xscaletime = "absolute"; + else profil[p].diag.xscaletime = "relative"; + } + } + } + for(var p in profil) { + var pr = profil[p]; + if(pr.ele /*&& pr.pflag*/) pr.diag.clear(); + } + if(!(chktrk && chktrk.status[0])) return; + if(!gpxdaten) return; + for(var i=0;i1 && chktrk.status[gpxdaten.tracks.anzahl==1?0:i+1]) { + for(var p in profil) { + pr = profil[p]; + if(pr.ele) { + if(pr.scale && pr.scale.length==2) { + pr.scale[0][pr.x] = daten[0][pr.x]; + pr.scale[1][pr.x] = daten[daten.length-1][pr.x]; + pr.diag.scale(pr.scale); + if(!JB.Scaling.hardscaling) pr.diag.scale(daten); + } + else { + pr.diag.scale(daten); + } + } + } + } + } + profil.setflags(gpxdaten.tracks,-1); + for(var p in profil) { + var pr = profil[p]; + if(pr.ele) { + pr.diag.frame(50,35,pr.xtext,pr.ytext); + } + } + for(var i=0;i1) { + profil.setflags(tracki,-1); + for(var p in profil) { + var pr = profil[p]; + if(pr.ele && pr.pflag) { + pr.diag.plot(tracki.daten,tracki.farbe); + } + } + } + } + var ct=0,cf=0; + if(chktrk.status.length==1) { + if(chktrk.status[0]) cf = ct = 1; + } + else { + var fa={}; + for(var i=1;i-1) ; +} // checkImageName + +JB.CheckBoxGroup = function(mapoject,id,Texte,gpxelement,Label,Farbe,def_stat,clickFunc,clickFunc2) { + var dieses = this; + var nbx = Texte.length; + this.status = []; for(var i=0;i