aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fietsboek/actions.py5
-rw-r--r--fietsboek/data.py2
-rw-r--r--fietsboek/models/track.py2
-rw-r--r--fietsboek/transformers/breaks.py5
-rw-r--r--fietsboek/transformers/elevation.py1
-rw-r--r--fietsboek/util.py3
-rw-r--r--fietsboek/views/browse.py3
-rw-r--r--fietsboek/views/detail.py2
-rw-r--r--fietsboek/views/edit.py2
-rw-r--r--fietsboek/views/profile.py2
-rw-r--r--fietsboek/views/upload.py1
11 files changed, 7 insertions, 21 deletions
diff --git a/fietsboek/actions.py b/fietsboek/actions.py
index ea19f63..b4bced3 100644
--- a/fietsboek/actions.py
+++ b/fietsboek/actions.py
@@ -12,14 +12,12 @@ import logging
import re
from typing import Optional
-import brotli
-import gpxpy
from pyramid.i18n import TranslationString as _
from pyramid.request import Request
from sqlalchemy import select
from sqlalchemy.orm.session import Session
-from . import convert, email, geo, models, trackmap
+from . import convert, email, models, trackmap
from . import transformers as mod_transformers
from . import util
from .config import TileLayerConfig
@@ -96,7 +94,6 @@ def add_track(
LOGGER.debug("Saving backup to %s", manager.backup_path())
manager.compress_backup(gpx_data)
- gpx = gpxpy.parse(track.gpx_xml())
for transformer in transformers:
LOGGER.debug("Running %s with %r", transformer, transformer.parameters)
transformer.execute(path)
diff --git a/fietsboek/data.py b/fietsboek/data.py
index c7fa7f4..6b690d8 100644
--- a/fietsboek/data.py
+++ b/fietsboek/data.py
@@ -7,7 +7,6 @@ the database itself. This module makes access to such data objects easier.
# We don't have onexc yet in all supported versions, so let's ignore the
# deprecation for now and stick with onerror:
# pylint: disable=deprecated-argument
-import datetime
import logging
import random
import shutil
@@ -17,7 +16,6 @@ from pathlib import Path
from typing import BinaryIO, Literal, Optional
import brotli
-import gpxpy
from filelock import FileLock
from . import util
diff --git a/fietsboek/models/track.py b/fietsboek/models/track.py
index 33bbe3e..0162f39 100644
--- a/fietsboek/models/track.py
+++ b/fietsboek/models/track.py
@@ -18,7 +18,7 @@ import gzip
import json
import logging
from itertools import chain
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING, Optional
import gpxpy
import sqlalchemy.types
diff --git a/fietsboek/transformers/breaks.py b/fietsboek/transformers/breaks.py
index e8af6de..f1279a0 100644
--- a/fietsboek/transformers/breaks.py
+++ b/fietsboek/transformers/breaks.py
@@ -2,7 +2,6 @@
import datetime
-from gpxpy.gpx import GPX, GPXTrack
from pyramid.i18n import TranslationString
from . import Parameters, Transformer
@@ -66,7 +65,9 @@ class RemoveBreaks(Transformer):
current_length += last_point.distance(current_point) or 0.0
last_point = current_point
- delta_t = datetime.timedelta(seconds=last_point.time_offset - point.time_offset or 0.0)
+ delta_t = datetime.timedelta(
+ seconds=last_point.time_offset - point.time_offset or 0.0
+ )
if not delta_t or current_length / delta_t.total_seconds() > STOPPED_SPEED_LIMIT:
break
count += 1
diff --git a/fietsboek/transformers/elevation.py b/fietsboek/transformers/elevation.py
index d5ecd1b..25b4a50 100644
--- a/fietsboek/transformers/elevation.py
+++ b/fietsboek/transformers/elevation.py
@@ -3,7 +3,6 @@
from collections.abc import Callable, Iterable
from itertools import islice, zip_longest
-from gpxpy.gpx import GPX, GPXTrackPoint
from pyramid.i18n import TranslationString
from . import Parameters, Transformer
diff --git a/fietsboek/util.py b/fietsboek/util.py
index 27c333d..156b7d4 100644
--- a/fietsboek/util.py
+++ b/fietsboek/util.py
@@ -8,7 +8,7 @@ import re
import secrets
import unicodedata
from pathlib import Path
-from typing import Optional, TypeVar, Union
+from typing import Optional, TypeVar
import babel
import gpxpy
@@ -491,7 +491,6 @@ __all__ = [
"round_timedelta_to_multiple",
"round_to_seconds",
"guess_gpx_timezone",
- "tour_metadata",
"mps_to_kph",
"human_size",
"month_name",
diff --git a/fietsboek/views/browse.py b/fietsboek/views/browse.py
index a9e9d2e..a01c015 100644
--- a/fietsboek/views/browse.py
+++ b/fietsboek/views/browse.py
@@ -428,7 +428,6 @@ def apply_order(query: Select, track: AliasedTrack, order: ResultOrder) -> Selec
def paginate(
dbsession: Session,
- data_manager: DataManager,
query: Select,
filters: Filter,
start: int,
@@ -440,7 +439,6 @@ def paginate(
elements if the filters end up throwing tracks out.
:param dbsession: The current database session.
- :param data_manager: The current data manager.
:param query: The (filtered and ordered) query.
:param filters: The filters to apply after retrieving elements from the
database.
@@ -498,7 +496,6 @@ def browse(request: Request) -> Response:
tracks = list(
paginate(
request.dbsession,
- request.data_manager,
query,
filters,
(page - 1) * TRACKS_PER_PAGE,
diff --git a/fietsboek/views/detail.py b/fietsboek/views/detail.py
index 5fa3beb..8ca7836 100644
--- a/fietsboek/views/detail.py
+++ b/fietsboek/views/detail.py
@@ -7,11 +7,9 @@ import logging
from html.parser import HTMLParser
import brotli
-import gpxpy
from markupsafe import Markup
from pyramid.httpexceptions import (
HTTPFound,
- HTTPInternalServerError,
HTTPNotAcceptable,
HTTPNotFound,
)
diff --git a/fietsboek/views/edit.py b/fietsboek/views/edit.py
index 09c47f5..4e7b1f5 100644
--- a/fietsboek/views/edit.py
+++ b/fietsboek/views/edit.py
@@ -4,7 +4,6 @@ import datetime
import logging
from collections import namedtuple
-import gpxpy
from pyramid.httpexceptions import HTTPBadRequest, HTTPFound
from pyramid.i18n import TranslationString as _
from pyramid.view import view_config
@@ -96,7 +95,6 @@ def do_edit(request):
new_track = convert.smart_convert(gpx_bytes)
if new_track is None:
request.session.flash(request.localizer.translate(_("flash.invalid_file")))
- LOGGER.info("Could not parse updated gpx: %s", exc)
return HTTPFound(request.route_url("edit", track_id=track.id))
data.compress_backup(gpx_bytes)
track.set_path(new_track.path())
diff --git a/fietsboek/views/profile.py b/fietsboek/views/profile.py
index 2e18c19..544373b 100644
--- a/fietsboek/views/profile.py
+++ b/fietsboek/views/profile.py
@@ -223,7 +223,7 @@ def calendar_rows(
query = user.all_tracks_query()
query = select(aliased(models.Track, query)).where(query.c.type == TrackType.ORGANIC)
tracks = [
- TrackWithMetadata(track, data_manager) for track in dbsession.execute(query).scalars()
+ TrackWithMetadata(track) for track in dbsession.execute(query).scalars()
]
# Step 2: Build the calendar
diff --git a/fietsboek/views/upload.py b/fietsboek/views/upload.py
index 84eb95f..5c86b29 100644
--- a/fietsboek/views/upload.py
+++ b/fietsboek/views/upload.py
@@ -3,7 +3,6 @@
import datetime
import logging
-import gpxpy
from pyramid.httpexceptions import HTTPBadRequest, HTTPFound
from pyramid.i18n import TranslationString as _
from pyramid.response import Response
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-15 06:44:21 +0000