geo-activity-playground 0.29.1__tar.gz → 0.29.2__tar.gz

{geo_activity_playground-0.29.1 → geo_activity_playground-0.29.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geo-activity-playground
-Version: 0.29.1
+Version: 0.29.2
 Summary: Analysis of geo data activities like rides, runs or hikes.
 License: MIT
 Author: Martin Ueding

{geo_activity_playground-0.29.1 → geo_activity_playground-0.29.2}/geo_activity_playground/core/activities.py

@@ -89,7 +89,10 @@ def build_activity_meta() -> None:
         new_shard = pd.DataFrame(rows)
         new_shard.index = new_shard["id"]
         new_shard.index.name = "index"
-        meta = pd.concat([meta, new_shard])
+        if len(meta):
+            meta = pd.concat([meta, new_shard])
+        else:
+            meta = new_shard
 
     if len(meta):
         assert pd.api.types.is_dtype_equal(meta["start"].dtype, "datetime64[ns]"), (

{geo_activity_playground-0.29.1 → geo_activity_playground-0.29.2}/geo_activity_playground/importers/strava_api.py

@@ -137,7 +137,7 @@ def try_import_strava(config: Config) -> bool:
                     **{
                         "id": activity.id,
                         "commute": activity.commute,
-                        "distance_km": activity.distance.magnitude / 1000,
+                        "distance_km": activity.distance / 1000,
                         "name": activity.name,
                         "kind": str(activity.type),
                         "start": convert_to_datetime_ns(activity.start_date),

{geo_activity_playground-0.29.1 → geo_activity_playground-0.29.2}/geo_activity_playground/webui/activity/controller.py

@@ -72,6 +72,7 @@ class ActivityController:
         }
 
         new_tiles_geojson = {}
+        new_tiles_per_zoom = {}
         for zoom in sorted(self._config.explorer_zoom_levels):
             new_tiles = self._tile_visit_accessor.tile_state["tile_history"][zoom].loc[
                 self._tile_visit_accessor.tile_state["tile_history"][zoom][
@@ -88,6 +89,7 @@ class ActivityController:
                     zoom,
                 )
                 new_tiles_geojson[zoom] = make_grid_file_geojson(points)
+            new_tiles_per_zoom[zoom] = len(new_tiles)
 
         result = {
             "activity": activity,
@@ -100,7 +102,7 @@ class ActivityController:
             "speed_color_bar": make_speed_color_bar(time_series),
             "date": activity["start"].date(),
             "time": activity["start"].time(),
-            "new_tiles": new_tiles,
+            "new_tiles": new_tiles_per_zoom,
             "new_tiles_geojson": new_tiles_geojson,
         }
         if (

{geo_activity_playground-0.29.1 → geo_activity_playground-0.29.2}/geo_activity_playground/webui/activity/templates/activity/show.html.j2

@@ -160,6 +160,7 @@
     {% for zoom, geojson in new_tiles_geojson.items() %}
     <div class="col-md-6">
         <h3>Zoom {{ zoom }}</h3>
+        <p>There are {{ new_tiles[zoom] }} new tiles:</p>
         <div id="map-{{ zoom }}" style="height: 300px; width: 100%;"></div>
         <script>
             let map{{ zoom }} = add_map("{{ zoom }}", {{ geojson | safe }})

{geo_activity_playground-0.29.1 → geo_activity_playground-0.29.2}/geo_activity_playground/webui/settings/templates/settings/metadata-extraction.html.j2

@@ -4,8 +4,7 @@
 
 <h1 class="mb-3">Metadata Extraction</h1>
 
-<p>There are a few metadata fields that can be populated with information from the path of the activity file or by a
-    default value. These are:</p>
+<p>If the current activity metadata is not to your liking, you can adjust how these fields are populated:</p>
 
 <ul>
     <li><tt>kind</tt>: The kind of the activity, like "Ride" or "Run".</li>
@@ -13,8 +12,9 @@
     <li><tt>name</tt>: Name for the activity, like "Ride with Friends".</li>
 </ul>
 
-<p>By default these fields are populated with information from within the activity files. In case one hasn't set these
-    values correctly, it can be nice to override this data.</p>
+<p>By default these fields are extracted from files that contain this data. Otherwise the filename is set as <tt>name</tt>.
+    You can overwrite this by setting up a directory structure with corresponding regular expressions using named capture groups.</p>
+
 
 <form method="POST">
     <div class="row">
@@ -32,19 +32,18 @@
         </div>
 
         <div class="col-md-6">
-            <p>To give an example of what is possible, consider a directory structure where we have
-                <tt>{kind}/{equipment}/{date} {name}.{ext}</tt>. Such an activity could be <tt>Ride/Red
-                    Roadbike/2024-08-10 11-45-00 Ride with Friends.fit</tt>. In order to extract this, we could use the
-                following regular expression:
-            </p>
+            <p>Consider a directory structure <tt>Ride/Red Roadbike/2024-08-10 11-45-00 Ride with Friends.fit</tt> under Activities. 
+                You can extract <tt>kind</tt>: "Ride", <tt>equipment</tt>: "Red Roadbike", <tt>name</tt>: "Ride with Friends" 
+                with the following regular expression:</p>
 
             <div class="code">
                 <pre
                     class="code literal-block">(?P&lt;kind&gt;[^/]+)/(?P&lt;equipment&gt;[^/]+)/[-\d_ .]+(?P&lt;name&gt;[^/\.]+)</pre>
             </div>
 
-            <p>This uses "capture groups". Have a look at the <a href="https://docs.python.org/3/library/re.html">Python
-                    regex documentation</a> if you want to build your own.</p>
+            <p>Have a look at the documentation 
+                <a href="https://martin-ueding.github.io/geo-activity-playground/getting-started/advanced-metadata-extraction">Advanced Metadata Extraction</a> 
+                for explanations and examples.</p>
         </div>
     </div>
 

{geo_activity_playground-0.29.1 → geo_activity_playground-0.29.2}/geo_activity_playground/webui/upload/controller.py

@@ -60,7 +60,7 @@ class UploadController:
             flash("No selected file", "warning")
             return redirect("/upload")
         if file:
-            filename = secure_filename(file.filename)
+            filename = file.filename
             target_path = pathlib.Path(request.form["directory"]) / filename
             assert target_path.suffix in [
                 ".csv",

{geo_activity_playground-0.29.1 → geo_activity_playground-0.29.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "geo-activity-playground"
-version = "0.29.1"
+version = "0.29.2"
 description = "Analysis of geo data activities like rides, runs or hikes."
 authors = ["Martin Ueding <mu@martin-ueding.de>"]
 license = "MIT"