geo-activity-playground 1.5.2__py3-none-any.whl → 1.6.0__py3-none-any.whl

geo_activity_playground/core/enrichment.py

@@ -13,7 +13,7 @@ from .datamodel import Activity
 from .datamodel import DB
 from .missing_values import some
 from .tiles import compute_tile_float
-from .time_conversion import get_country_timezone
+from .time_conversion import get_timezone
 
 logger = logging.getLogger(__name__)
 
@@ -26,9 +26,7 @@ def enrichment_set_timezone(
     ), f"You cannot import an activity without points. {activity=}"
     latitude, longitude = time_series[["latitude", "longitude"]].iloc[0].to_list()
     if activity.iana_timezone is None or activity.start_country is None:
-        country, tz_str = get_country_timezone(latitude, longitude)
-        activity.iana_timezone = tz_str
-        activity.start_country = country
+        activity.iana_timezone = get_timezone(latitude, longitude)
         return True
     else:
         return False

geo_activity_playground/core/photos.py

@@ -23,10 +23,14 @@ def get_metadata_from_image(path: pathlib.Path) -> dict:
     except KeyError:
         pass
     try:
-        metadata["time"] = dateutil.parser.parse(
-            str(tags["EXIF DateTimeOriginal"])
-            + str(tags.get("EXIF OffsetTime", "+00:00"))
+        date_time_original = str(tags["EXIF DateTimeOriginal"]) + str(
+            tags.get("EXIF OffsetTime", "+00:00")
+        ).replace(":", "")
+        print(f"Extracted date: {date_time_original}")
+        metadata["time"] = datetime.datetime.strptime(
+            date_time_original, "%Y:%m:%d %H:%M:%S%z"
         ).astimezone(zoneinfo.ZoneInfo("UTC"))
+
     except KeyError:
         pass
 

geo_activity_playground/core/test_time_zone_from_location.py

@@ -1,7 +1,13 @@
 from .time_conversion import get_country_timezone
+from .time_conversion import get_timezone
 
 
 def test_time_zone_from_location() -> None:
     country, iana_timezone = get_country_timezone(50, 7)
     assert country == "Germany"
     assert iana_timezone == "Europe/Berlin"
+
+
+def test_timezone_finder() -> None:
+    iana_timezone = get_timezone(50, 7)
+    assert iana_timezone == "Europe/Berlin"

geo_activity_playground/core/time_conversion.py

@@ -2,8 +2,10 @@ import datetime
 import json
 import logging
 import zoneinfo
+from typing import Optional
 
 import requests
+import timezonefinder
 
 from .paths import USER_CACHE_DIR
 
@@ -40,3 +42,8 @@ def get_country_timezone(latitude: float, longitude: float) -> tuple[str, str]:
         with open(cache_file, "w") as f:
             json.dump(data, f)
     return data["location"], data["iana_timezone"]
+
+
+def get_timezone(latitude: float, longitude: float) -> Optional[str]:
+    tf = timezonefinder.TimezoneFinder()  # reuse
+    return tf.timezone_at(lng=longitude, lat=latitude)

geo_activity_playground/explorer/tile_visits.py

@@ -4,6 +4,7 @@ import itertools
 import logging
 import pathlib
 import pickle
+import zoneinfo
 from typing import Iterator
 from typing import Optional
 from typing import TypedDict
@@ -272,6 +273,10 @@ def _process_activity(
 def _tiles_from_points(
     time_series: pd.DataFrame, zoom: int
 ) -> Iterator[tuple[datetime.datetime, int, int]]:
+    # Some people haven't localized their time series yet. This breaks the tile history part. Just assume that it is UTC, should be good enough for tiles.
+    if time_series["time"].dt.tz is None:
+        time_series = time_series.copy()
+        time_series["time"].dt.tz_localize(zoneinfo.ZoneInfo("UTC"))
     xf = time_series["x"] * 2**zoom
     yf = time_series["y"] * 2**zoom
     for t1, x1, y1, x2, y2, s1, s2 in zip(

geo_activity_playground/importers/activity_parsers.py

@@ -138,10 +138,9 @@ def read_fit_activity(path: pathlib.Path, open) -> tuple[Activity, pd.DataFrame]
                             try:
                                 row["speed"] = values["enhanced_speed"] * factor
                             except TypeError as e:
-                                # https://github.com/martin-ueding/geo-activity-playground/issues/301
-                                raise ActivityParseError(
+                                logger.warning(
                                     f'Cannot work with {values["enhanced_speed"]!r}, {factor!r}'
-                                ) from e
+                                )
                         if "grade" in fields:
                             row["grade"] = values["grade"]
                         if "temperature" in fields:

geo_activity_playground/importers/directory.py

@@ -4,6 +4,7 @@ import re
 import traceback
 
 import sqlalchemy
+from tqdm import tqdm
 
 from ..core.activities import ActivityRepository
 from ..core.config import Config
@@ -37,8 +38,22 @@ def import_from_directory(
         and not path.stem.startswith(".")
         and not path.suffix in config.ignore_suffixes
     ]
+    activity_paths.sort()
 
-    for i, activity_path in enumerate(activity_paths):
+    paths_to_import = [
+        activity_path
+        for activity_path in tqdm(
+            activity_paths, desc="Scanning for new files", delay=1
+        )
+        if DB.session.scalar(
+            sqlalchemy.select(Activity).filter(Activity.path == str(activity_path))
+        )
+        is None
+    ]
+
+    for i, activity_path in enumerate(
+        tqdm(paths_to_import, desc="Importing activity files", delay=0)
+    ):
         with DB.session.no_autoflush:
             activity = DB.session.scalar(
                 sqlalchemy.select(Activity).filter(Activity.path == str(activity_path))

geo_activity_playground/importers/strava_checkout.py

@@ -198,6 +198,8 @@ def import_from_strava_checkout(config: Config) -> None:
 
         activity_file = checkout_path / row["Filename"]
 
+        logger.info(f"Importing '{activity_file}' …")
+
         try:
             activity, time_series = read_activity(activity_file)
         except ActivityParseError as e:

geo_activity_playground/webui/static/activity-trim.js

@@ -0,0 +1,39 @@
+var map = L.map('activity-map', {
+    fullscreenControl: true
+});
+L.tileLayer('/tile/pastel/{z}/{x}/{y}.png', {
+    maxZoom: 19,
+    attribution: map_tile_attribution
+}).addTo(map);
+
+let copy_to_input = function (value, input) {
+    document.getElementById(input).value = value;
+}
+
+let layer = L.geoJSON(color_line_geojson, {
+    pointToLayer: function (feature, lat_lon) {
+        let p = feature.properties
+
+        let marker = null
+        if (p.markerType == "circle") {
+            marker = L.circleMarker(lat_lon, p.markerStyle)
+        } else {
+            marker = L.marker(lat_lon)
+        }
+
+        let text = ''
+        if (p.name) {
+            text += `<button class="btn btn-primary" onclick="copy_to_input(${p.name}, 'begin')">Use as Begin</button>`
+            text += ' '
+            text += `<button class="btn btn-primary" onclick="copy_to_input(${p.name}+1, 'end')">Use as End</button>`
+        }
+        if (text) {
+            marker = marker.bindPopup(text)
+        }
+
+        return marker
+    }
+})
+
+layer.addTo(map)
+map.fitBounds(layer.getBounds());

geo_activity_playground/webui/templates/activity/trim.html.j2

@@ -9,47 +9,12 @@
 
 <a href="{{ url_for('.show', id=activity['id']) }}" class="btn btn-primary btn-small">Back</a>
 
-
 <div id="activity-map" style="height: 600px;" class="mb-3"></div>
 <script>
-    var map = L.map('activity-map', {
-        fullscreenControl: true
-    });
-    L.tileLayer('/tile/pastel/{z}/{x}/{y}.png', {
-        maxZoom: 19,
-        attribution: '{{ map_tile_attribution|safe }}'
-    }).addTo(map);
-
-
-    let layer = L.geoJSON({{ color_line_geojson| safe }}, {
-        pointToLayer: function (feature, lat_lon) {
-            let p = feature.properties
-
-            let marker = null
-            if (p.markerType == "circle") {
-                marker = L.circleMarker(lat_lon, p.markerStyle)
-            } else {
-                marker = L.marker(lat_lon)
-            }
-
-            let text = ''
-            if (p.name) {
-                text += `<p><b>${p.name}</b></p>`
-            }
-            if (p.description) {
-                text += p.description
-            }
-            if (text) {
-                marker = marker.bindPopup(text)
-            }
-
-            return marker
-        }
-    })
-
-    layer.addTo(map)
-    map.fitBounds(layer.getBounds());
+    var map_tile_attribution = '{{ map_tile_attribution }}';
+    var color_line_geojson = {{ color_line_geojson | safe }};
 </script>
+<script src="/static/activity-trim.js"></script>
 
 <form method="POST">
     <div class="mb-3">

{geo_activity_playground-1.5.2.dist-info → geo_activity_playground-1.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geo-activity-playground
-Version: 1.5.2
+Version: 1.6.0
 Summary: Analysis of geo data activities like rides, runs or hikes.
 License: MIT
 Author: Martin Ueding
@@ -37,6 +37,7 @@ Requires-Dist: shapely (>=2.0.5,<3.0.0)
 Requires-Dist: sqlalchemy (>=2.0.40,<3.0.0)
 Requires-Dist: stravalib (>=2.0,<3.0)
 Requires-Dist: tcxreader (>=0.4.5,<0.5.0)
+Requires-Dist: timezonefinder (>=6.5.9,<7.0.0)
 Requires-Dist: tomli (>=2.0.1,<3.0.0) ; python_version < "3.11"
 Requires-Dist: tqdm (>=4.64.0,<5.0.0)
 Requires-Dist: vegafusion-python-embed (>=1.4.3,<2.0.0)

{geo_activity_playground-1.5.2.dist-info → geo_activity_playground-1.6.0.dist-info}/RECORD

@@ -22,14 +22,14 @@ geo_activity_playground/core/config.py,sha256=mmdMQ5iCLNGnAlriT1ETEVS-gM6Aq_9sg2
 geo_activity_playground/core/coordinates.py,sha256=rW_OmMRpTUyIsQwrT6mgT9Y6uPGuwqTo5XDDMS7mGuo,1140
 geo_activity_playground/core/copernicus_dem.py,sha256=t6Bc9fsyGyx1awdePXvlN-Zc-tiT2eGSJ80SV5B1Z9A,2944
 geo_activity_playground/core/datamodel.py,sha256=PRqxKlExXxRXkHYIJeNsRr1DZQmdzAwa3PLyivJoix8,15983
-geo_activity_playground/core/enrichment.py,sha256=pw9VEyDAtdNbjQ1HOPYyXCXT8SLL5i3Cp6KWjKK7puM,8708
+geo_activity_playground/core/enrichment.py,sha256=b27E_KK30xjq8MuGFZyIpKzz8fO2LwLVaGGTP0mb5N0,8618
 geo_activity_playground/core/export.py,sha256=ayOmhWL72263oP9NLIZRYCg_Db0GLUFhgNIL_MCrV-E,4435
 geo_activity_playground/core/heart_rate.py,sha256=-S3WAhS7AOywrw_Lk5jfuo_fu6zvZQ1VtjwEKSycWpU,1542
 geo_activity_playground/core/meta_search.py,sha256=nyvCuR7v0pd6KjA8W5Kr71bBafRdE_ol7uSFRJs4eAM,6662
 geo_activity_playground/core/missing_values.py,sha256=HjonaLV0PFMICnuMrbdUNnK9uy_8PBh_RxI5GuEMQK0,250
 geo_activity_playground/core/parametric_plot.py,sha256=8CKB8dey7EmZtQnl6IOgBhpxkw0UCpQPWeiBw5PqW8k,5737
 geo_activity_playground/core/paths.py,sha256=qQ4ujaIHmsxTGEWzf-76XS8FclEI2RC5COTUeuLEbDI,2938
-geo_activity_playground/core/photos.py,sha256=pUnEfVesEKESlew6_KkYAF582ejLupnWTqs_RcvnRsA,1070
+geo_activity_playground/core/photos.py,sha256=pHdVUpgKfbyrTddZL_mgmsXQJ3k_IHKf70jtcIjjcCA,1229
 geo_activity_playground/core/privacy_zones.py,sha256=4TumHsVUN1uW6RG3ArqTXDykPVipF98DCxVBe7YNdO8,512
 geo_activity_playground/core/raster_map.py,sha256=y7maiC_bmUwXsULC_XCZ1m8nGgU2jFe47QFB7TpC_V4,8257
 geo_activity_playground/core/similarity.py,sha256=L2de3DPRdDeDY5AxZwLDcH7FjHWRWklr41VNU06q9kQ,3117
@@ -41,22 +41,22 @@ geo_activity_playground/core/test_missing_values.py,sha256=7yvg6dUu7p8PR_rxUxgFa
 geo_activity_playground/core/test_pandas_timezone.py,sha256=-MDiLoLG5tDMqkI0iKno24kFn9X3tslh9ZpoDYLWNJU,771
 geo_activity_playground/core/test_summary_stats.py,sha256=qH_45mPRFD2H-Rr0Ku-RYc67vhC7qKxbPr7J2F36uV8,3081
 geo_activity_playground/core/test_tiles.py,sha256=zce1FxNfsSpOQt66jMehdQRVoNdl-oiFydx6iVBHZXM,764
-geo_activity_playground/core/test_time_zone_from_location.py,sha256=PKxDysm8D0FJjyuc4Kzrv65UxzP-ogUtFHQZ7mGKZQw,229
+geo_activity_playground/core/test_time_zone_from_location.py,sha256=frL5QHV7-Tuwo2Igx2kIEyTPbW2t3lusCc4Sl5xWlz0,393
 geo_activity_playground/core/test_time_zone_import.py,sha256=1CAJyGTHYPoxabBNVRfLhaRNbvvWcAYjJyDR-qvbRjg,3349
 geo_activity_playground/core/test_timezone_sqlalchemy.py,sha256=OXjdowGXM-DsM4-Mpab8c3j3AtdW_yXp2NgI-B_cbvA,1172
 geo_activity_playground/core/tiles.py,sha256=LBn2V6WAvMxZeXSIQ8ruZL71iyvOXoFZMz7PZgNUf7M,2189
-geo_activity_playground/core/time_conversion.py,sha256=F-vQ-MdbTOqPTAELplDjT5m7kdaf1RsqBXELfsR5eOU,1329
+geo_activity_playground/core/time_conversion.py,sha256=f5CByqyWSthCplrbXZThSFbt3eY-t1g-2H5lkfBlgc0,1556
 geo_activity_playground/explorer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/explorer/grid_file.py,sha256=YNL_c4O1-kxaajATJwj4ZLywCL5Hpj9qy2h-F7rk8Yg,3260
-geo_activity_playground/explorer/tile_visits.py,sha256=NUzC4jNb_vQExAIALrO2H1MiNs5JJKsOQKGietAcATE,16271
+geo_activity_playground/explorer/tile_visits.py,sha256=7B8c9xf7jJFVjXD3SNEgoQb707dHFa4JN0hUdn5z-xQ,16594
 geo_activity_playground/explorer/video.py,sha256=7j6Qv3HG6On7Tn7xh7Olwrx_fbQnfzS7CeRg3TEApHg,4397
 geo_activity_playground/heatmap_video.py,sha256=I8i1uVvbbPUXVtvLAROaLy58nQoUPnuMCZkERWNkQjg,3318
 geo_activity_playground/importers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/importers/activity_parsers.py,sha256=kL0PcS5eIjRokphQqkWs3ETNj-xdFkYLP7kdQW8y23o,11430
+geo_activity_playground/importers/activity_parsers.py,sha256=MJIsBi2SH5y8Q5D-w9djB4ZFnKxCsoNx5qpynqrubhw,11311
 geo_activity_playground/importers/csv_parser.py,sha256=O1pP5GLhWhnWcy2Lsrr9g17Zspuibpt-GtZ3ZS5eZF4,2143
-geo_activity_playground/importers/directory.py,sha256=ucnB5sPBvXzLdaza2v8GVU75ArfGG4E7d5OXrCgoFq4,3562
+geo_activity_playground/importers/directory.py,sha256=sHcLIi0DOPEATt4wiE_vp00h89fO940wUQyJZUzzpnw,3978
 geo_activity_playground/importers/strava_api.py,sha256=Fiqlc-VeuzsvgDcWt71JoPMri221cMjkeL4SH80gC5s,8426
-geo_activity_playground/importers/strava_checkout.py,sha256=Pugtv0nbgfuVzBDC5e5Tfv1jShUYmMcDbpCQp2ULXow,9232
+geo_activity_playground/importers/strava_checkout.py,sha256=joJI_uic9fYtu7E5Odh6GUq_LyiLqQ72Ucy_Mbjr-X0,9289
 geo_activity_playground/importers/test_csv_parser.py,sha256=nOTVTdlzIY0TDcbWp7xNyNaIO6Mkeu55hVziVl22QE4,1092
 geo_activity_playground/importers/test_directory.py,sha256=_fn_-y98ZyElbG0BRxAmGFdtGobUShPU86SdEOpuv-A,691
 geo_activity_playground/importers/test_strava_api.py,sha256=7b8bl5Rh2BctCmvTPEhCadxtUOq3mfzuadD6F5XxRio,398
@@ -88,6 +88,7 @@ geo_activity_playground/webui/columns.py,sha256=FP0YfX-WFQk1JEXhrywv3NUEVq-x7Hv0
 geo_activity_playground/webui/flasher.py,sha256=Covc1D9cO_jjokRWnvyiXCc2tfp3aZ8XkNqFdA1AXtk,500
 geo_activity_playground/webui/plot_util.py,sha256=5Uesjj-xcMskQX2z9viDZYHSxLGrH2a5dHA1ogsJW9U,261
 geo_activity_playground/webui/search_util.py,sha256=gH2cOM1FTAozZUlSQ4C1dR1xlV-8e82pD1PPi_pPBNY,2647
+geo_activity_playground/webui/static/activity-trim.js,sha256=TVU32IGVweK9KfcMIXbtEo8IeQ36mS--_D8gjBXqBz0,1076
 geo_activity_playground/webui/static/bootstrap/bootstrap-dark-mode.js,sha256=XfyhxIFgjDc6aEj0kYgKpG5zjS5gvyhWCJmNfUG4HJY,2622
 geo_activity_playground/webui/static/bootstrap/bootstrap.bundle.min.js,sha256=gvZPYrsDwbwYJLD5yeBfcNujPhRoGOY831wwbIzz3t0,80663
 geo_activity_playground/webui/static/bootstrap/bootstrap.min.css,sha256=MBffSnbbXwHCuZtgPYiwMQbfE7z-GOZ7fBPCNB06Z98,232948
@@ -130,7 +131,7 @@ geo_activity_playground/webui/templates/activity/edit.html.j2,sha256=r979JPqaZi_
 geo_activity_playground/webui/templates/activity/lines.html.j2,sha256=_ZDg1ruW-9UMJfOudy1-uY_-IcSSaagq7tPCih5Bb8g,1079
 geo_activity_playground/webui/templates/activity/name.html.j2,sha256=RYbNGzPexa4gRUWRjw-C9nWvp5lI7agAZZCS3Du7nAs,2661
 geo_activity_playground/webui/templates/activity/show.html.j2,sha256=gE4RraLi-h63KvHO4oXLDWPcXN1FB6wqMxVKB75Zn0k,10974
-geo_activity_playground/webui/templates/activity/trim.html.j2,sha256=3oAXQab6QqWjGBC9KCvWNOVn8uRmxoDLj3hx_O63TXc,1836
+geo_activity_playground/webui/templates/activity/trim.html.j2,sha256=4ALQ6ZruhGfK4gAyCzVFl4jEHC-3w9iWjmigsunCe7s,1022
 geo_activity_playground/webui/templates/auth/index.html.j2,sha256=wzA0uxpiT1ktDadgnjvFXc9iUGMFm9GhjDkavl3S1h4,646
 geo_activity_playground/webui/templates/bubble_chart/index.html.j2,sha256=yd7lWjtxxVmJZqCiXb0Y1gMEOQ7LQYJXEdpE7JB1OZY,1616
 geo_activity_playground/webui/templates/calendar/index.html.j2,sha256=8dV9yeDwfv0Mm81mhiPHN5r3hdPUWl1Yye03x0Rqbo8,1601
@@ -174,8 +175,8 @@ geo_activity_playground/webui/templates/summary/vega-chart.html.j2,sha256=mw8Hti
 geo_activity_playground/webui/templates/time_zone_fixer/index.html.j2,sha256=s9r6BJMXmd7kLSyjkvH4xLi6e01S5bpGRcMgMMJyCAE,1760
 geo_activity_playground/webui/templates/upload/index.html.j2,sha256=I1Ix8tDS3YBdi-HdaNfjkzYXVVCjfUTe5PFTnap1ydc,775
 geo_activity_playground/webui/templates/upload/reload.html.j2,sha256=YZWX5eDeNyqKJdQAywDBcU8DZBm22rRBbZqFjrFrCvQ,556
-geo_activity_playground-1.5.2.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
-geo_activity_playground-1.5.2.dist-info/METADATA,sha256=smMUq_xNvcfzZpxkimkxsJG7OkBD52yEARb7M8Qqc74,1890
-geo_activity_playground-1.5.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-geo_activity_playground-1.5.2.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
-geo_activity_playground-1.5.2.dist-info/RECORD,,
+geo_activity_playground-1.6.0.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
+geo_activity_playground-1.6.0.dist-info/METADATA,sha256=gj1svTD4GNI5A8Y8-ZXacM2oDOdvtY7Gk8SM3aENH2A,1937
+geo_activity_playground-1.6.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+geo_activity_playground-1.6.0.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
+geo_activity_playground-1.6.0.dist-info/RECORD,,