aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Schadt <kingdread@gmx.de>2026-11-15 21:34:03 +0100
committerDaniel Schadt <kingdread@gmx.de>2026-11-15 21:34:03 +0100
commita916565c6a7f11bc8d02fc651ab9da690e556a34 (patch)
tree1e33c7bb536c64e009a46c2278d2f7de66f91dc8
parent07bc81f50b8d373e0fb19845efa954704d26c7d3 (diff)
downloadfietsboek-a916565c6a7f11bc8d02fc651ab9da690e556a34.tar.gz
fietsboek-a916565c6a7f11bc8d02fc651ab9da690e556a34.tar.bz2
fietsboek-a916565c6a7f11bc8d02fc651ab9da690e556a34.zip
add Eddington number to profile
-rw-r--r--asset-sources/theme.scss12
-rw-r--r--fietsboek/models/user.py24
-rw-r--r--fietsboek/static/theme.css28
-rw-r--r--fietsboek/static/theme.css.map2
-rw-r--r--fietsboek/templates/profile.jinja23
-rw-r--r--fietsboek/util.py9
-rw-r--r--fietsboek/views/profile.py4
7 files changed, 73 insertions, 9 deletions
diff --git a/asset-sources/theme.scss b/asset-sources/theme.scss
index 82bd8d7..acd41ed 100644
--- a/asset-sources/theme.scss
+++ b/asset-sources/theme.scss
@@ -286,6 +286,18 @@ strong {
font-variant-numeric: tabular-nums;
}
+#eddingtonNumber {
+ font-size: 200%;
+ border: 2px solid #433633;
+ border-radius: 1rem;
+ width: 3em;
+ font-weight: bold;
+ text-align: center;
+ float: right;
+ color: #F7F0F5;
+ background-color: #8C827D;
+}
+
.calendar-title {
text-align: center;
}
diff --git a/fietsboek/models/user.py b/fietsboek/models/user.py
index 551d920..f78b324 100644
--- a/fietsboek/models/user.py
+++ b/fietsboek/models/user.py
@@ -5,6 +5,7 @@ import enum
import hashlib
import secrets
import uuid
+from collections import Counter
from functools import reduce
from typing import TYPE_CHECKING, Optional
@@ -36,7 +37,9 @@ from sqlalchemy.orm.attributes import flag_dirty
from sqlalchemy.orm.session import object_session
from sqlalchemy.sql.expression import CompoundSelect
+from .. import util
from .meta import Base
+from .track import TrackWithMetadata
if TYPE_CHECKING:
from .comment import Comment
@@ -504,6 +507,27 @@ class User(Base):
"""
return reduce(lambda acc, track: acc | track.text_tags(), self.tracks, set())
+ def eddington_number(self) -> int:
+ """Returns the eddington number of this user.
+
+ See https://swinny.net/Cycling/-4687-Calculate-your-Eddington-Number and
+ https://en.wikipedia.org/wiki/Arthur_Eddington#Eddington_number_for_cycling
+
+ Note that by default, this uses the imperial number.
+ """
+ histo = Counter()
+ for track in self.tracks:
+ with_meta = TrackWithMetadata(track)
+ length = int(util.km_to_miles(with_meta.length / 1000))
+ histo.update(range(length + 1))
+
+ miles = 1
+ if histo:
+ for miles in range(max(histo.keys())):
+ if histo[miles] < miles:
+ break
+ return miles - 1
+
Index("idx_users_email", User.email, unique=True)
diff --git a/fietsboek/static/theme.css b/fietsboek/static/theme.css
index f4920e2..5461bb7 100644
--- a/fietsboek/static/theme.css
+++ b/fietsboek/static/theme.css
@@ -80,6 +80,14 @@ strong {
flex-wrap: wrap;
}
+.track-image-preview {
+ position: relative;
+ width: min(317px, 100%);
+ height: 178.3125px;
+ border: 1px solid grey;
+ margin-right: 5px;
+ margin-bottom: 5px;
+}
.track-image-preview .delete-image {
position: absolute;
z-index: 5;
@@ -112,14 +120,6 @@ strong {
left: 50%;
transform: translate(-50%, -50%);
}
-.track-image-preview {
- position: relative;
- width: min(317px, 100%);
- height: 178.3125px;
- border: 1px solid grey;
- margin-right: 5px;
- margin-bottom: 5px;
-}
.track-description img {
max-width: 100%;
@@ -272,6 +272,18 @@ strong {
font-variant-numeric: tabular-nums;
}
+#eddingtonNumber {
+ font-size: 200%;
+ border: 2px solid #433633;
+ border-radius: 1rem;
+ width: 3em;
+ font-weight: bold;
+ text-align: center;
+ float: right;
+ color: #F7F0F5;
+ background-color: #8C827D;
+}
+
.calendar-title {
text-align: center;
}
diff --git a/fietsboek/static/theme.css.map b/fietsboek/static/theme.css.map
index c717ba9..b6b5abb 100644
--- a/fietsboek/static/theme.css.map
+++ b/fietsboek/static/theme.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../../asset-sources/theme.scss"],"names":[],"mappings":"AAAA;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;AAEA;EACE;EACA;EACA;;;AAIJ;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAIA;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;AAlCJ;EAqCE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACI;;;AAGJ;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;AACA;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;;AAIA;EACE;;;AAGJ;AAEA;AAEE;EACE;EACA;EACA,qBACE;EAEF;;AAGF;EACE;EACA;EACA;;;AAIJ;EACE;EACA;EACA;EACA;;;AAEF;AAEA;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;AAIJ;EACE;;AAEF;EACE;;AACA;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;EACA;;AACA;EACE;;AAIJ;EACE;EACA;;;AAKF;EACE;EACA;EAEA;EACA;;;AAIJ;EACE;EACA;;;AAGF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAGF;EACE;;;AAGF;AACA;EACE;;;AAGF;EACE;EACA;;AAEA;EAJF;IAKI,eACE;;;AAIJ;EACE;;AAGF;EACE;;AAEA;EAHF;IAII;;;AAGF;EACE;EACA;;AAIJ;EACE;EACA;;;AAIJ;EACE;;;AAGF;AACA;EACE;EACA;AACA;AAAA;AAAA;EAGA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;AAEA;EACE;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE","file":"theme.css"} \ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../../asset-sources/theme.scss"],"names":[],"mappings":"AAAA;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;AAEA;EACE;EACA;EACA;;;AAIJ;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EAqCE;EACA;EACA;EACA;EACA;EACA;;AAzCA;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAWJ;EACI;;;AAGJ;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;AACA;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;;AAIA;EACE;;;AAGJ;AAEA;AAEE;EACE;EACA;EACA,qBACE;EAEF;;AAGF;EACE;EACA;EACA;;;AAIJ;EACE;EACA;EACA;EACA;;;AAEF;AAEA;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;AAIJ;EACE;;AAEF;EACE;;AACA;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;EACA;;AACA;EACE;;AAIJ;EACE;EACA;;;AAKF;EACE;EACA;EAEA;EACA;;;AAIJ;EACE;EACA;;;AAGF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAGF;EACE;;;AAGF;AACA;EACE;;;AAGF;EACE;EACA;;AAEA;EAJF;IAKI,eACE;;;AAIJ;EACE;;AAGF;EACE;;AAEA;EAHF;IAII;;;AAGF;EACE;EACA;;AAIJ;EACE;EACA;;;AAIJ;EACE;;;AAGF;AACA;EACE;EACA;AACA;AAAA;AAAA;EAGA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;AAEA;EACE;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE","file":"theme.css"} \ No newline at end of file
diff --git a/fietsboek/templates/profile.jinja2 b/fietsboek/templates/profile.jinja2
index 06386ac..8c2dd36 100644
--- a/fietsboek/templates/profile.jinja2
+++ b/fietsboek/templates/profile.jinja2
@@ -2,6 +2,9 @@
{% block content %}
<div class="container">
+ <div id="eddingtonNumber">
+ {{ eddington_number }}
+ </div>
<h1>{{ user.name }}</h1>
<ul class="nav nav-tabs" id="profileTabbar" role="tablist">
diff --git a/fietsboek/util.py b/fietsboek/util.py
index 93ad48c..62cc992 100644
--- a/fietsboek/util.py
+++ b/fietsboek/util.py
@@ -179,6 +179,15 @@ def guess_gpx_timezone(gpx: gpxpy.gpx.GPX) -> datetime.tzinfo:
return datetime.timezone.utc
+def km_to_miles(km: float) -> float:
+ """Converts kilometers to miles.
+
+ :param km: Input kilometers.
+ :return: The miles.
+ """
+ return km * 0.6213712
+
+
def mps_to_kph(mps: float) -> float:
"""Converts meters/second to kilometers/hour.
diff --git a/fietsboek/views/profile.py b/fietsboek/views/profile.py
index 4f9abca..4684d62 100644
--- a/fietsboek/views/profile.py
+++ b/fietsboek/views/profile.py
@@ -82,6 +82,7 @@ def profile_data(request: Request) -> dict:
"heatmap_url": heatmap_url,
"tilehunt_url": tilehunt_url,
"year_contributions": year_contribs,
+ "eddington_number": request.context.eddington_number(),
}
@@ -115,6 +116,7 @@ def profile_graphs(request: Request) -> dict:
"""
return {
"user": request.context,
+ "eddington_number": request.context.eddington_number(),
}
@@ -143,6 +145,7 @@ def profile_calendar(request: Request) -> dict:
data["calendar_prev"], data["calendar_next"] = prev_next_month(date)
data["tab_focus"] = "calendar"
data["day_name"] = util.day_name
+ data["eddington_number"] = request.context.eddington_number()
return data
@@ -171,6 +174,7 @@ def profile_calendar_ym(request: Request) -> dict:
data["calendar_prev"], data["calendar_next"] = prev_next_month(date)
data["tab_focus"] = "calendar"
data["day_name"] = util.day_name
+ data["eddington_number"] = request.context.eddington_number()
return data