geo-activity-playground 0.29.1__py3-none-any.whl → 0.29.2__py3-none-any.whl

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/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/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/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/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/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.dist-info → geo_activity_playground-0.29.2.dist-info}/METADATA

@@ -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.dist-info → geo_activity_playground-0.29.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 geo_activity_playground/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/__main__.py,sha256=MBZn9K1m3PofiPNTtpsSTVCyB_Gz95TjVP-nb9v_-JE,3989
 geo_activity_playground/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/core/activities.py,sha256=HcxgLsM2tE48eqZh1t1QBk9O7vxCV9MaL2QRp0loXu0,6509
+geo_activity_playground/core/activities.py,sha256=6IFfTqWGXRVD-DxKho1Nyc9ZV7kvzBWw3ZninXRM0Nk,6578
 geo_activity_playground/core/config.py,sha256=DsjZhiq2BZs94rjd7zgt_KTZIjVfxfntiEQZhgq8NeA,4617
 geo_activity_playground/core/coordinates.py,sha256=tDfr9mlXhK6E_MMIJ0vYWVCoH0Lq8uyuaqUgaa8i0jg,966
 geo_activity_playground/core/enrichment.py,sha256=CwZhW-svgPAYbdx3n9kvKlTgcsiCaeuJfSRCC4JxX6g,7411
@@ -23,7 +23,7 @@ geo_activity_playground/importers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 geo_activity_playground/importers/activity_parsers.py,sha256=XNQs0ziqAcVqIoiLAX5Ndmhb6v__29XdjUPvNvc7oBI,11082
 geo_activity_playground/importers/csv_parser.py,sha256=O1pP5GLhWhnWcy2Lsrr9g17Zspuibpt-GtZ3ZS5eZF4,2143
 geo_activity_playground/importers/directory.py,sha256=IPnr1xk3beznmPVjfWL6AQiEKA4WN5EDIfnzrM0Tzlc,5767
-geo_activity_playground/importers/strava_api.py,sha256=pgWZp-cWOLkvlDE85lTiEKM8BCZYzOlAAdKoa2F7c6o,7780
+geo_activity_playground/importers/strava_api.py,sha256=CLO1tW_delZwVkSLlYteUeX1jsP73ICTuLxTQeUDWTw,7770
 geo_activity_playground/importers/strava_checkout.py,sha256=N-uGTkhBJMC7cPYjRRXHOSLwpK3wc6aaSrY2RQfSitA,9419
 geo_activity_playground/importers/test_csv_parser.py,sha256=LXqva7GuSAfXYE2zZQrg-69lCtfy5MxLSq6BRwL_VyI,1191
 geo_activity_playground/importers/test_directory.py,sha256=ljXokx7q0OgtHvEdHftcQYEmZJUDVv3OOF5opklxdT4,724
@@ -31,11 +31,11 @@ geo_activity_playground/importers/test_strava_api.py,sha256=4vX7wDr1a9aRh8myxNrI
 geo_activity_playground/webui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/activity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/activity/blueprint.py,sha256=upQzZa5sKApj_Fmu6PziFDboi7SBL5Zsi-tNSSNPlEE,1759
-geo_activity_playground/webui/activity/controller.py,sha256=PJIZ7pFqpUyWDrintnnlW6Hxj7DbdPswARozws6TE30,18861
+geo_activity_playground/webui/activity/controller.py,sha256=PQ0uwpIFvcfDHG5TL03kF0jtg7vbtByh3Lrm_90yFNk,18956
 geo_activity_playground/webui/activity/templates/activity/day.html.j2,sha256=r3qKl9uTzOko4R-ZzyYAZt1j61JSevYP4g0Yi06HHPg,2702
 geo_activity_playground/webui/activity/templates/activity/lines.html.j2,sha256=5gB1aDjRgi_RventenRfC10_FtMT4ch_VuWvA9AMlBY,1121
 geo_activity_playground/webui/activity/templates/activity/name.html.j2,sha256=RDLEt6ip8_ngmdLgaC5jg92Dk-F2umGwKkd8cWmvVko,2400
-geo_activity_playground/webui/activity/templates/activity/show.html.j2,sha256=W77M1S7RQOGY3Vg9LRT5mFnefuMWUKKU1Vd-ZKxUoKg,6552
+geo_activity_playground/webui/activity/templates/activity/show.html.j2,sha256=q0O1zHrfjD9lr6smuqmPYcy21-2hzNQFIPubptiRcSM,6610
 geo_activity_playground/webui/app.py,sha256=foON49jw8klBJ3GF70DDjgz-_KRDPFvC31_mScaqDXk,4255
 geo_activity_playground/webui/auth/blueprint.py,sha256=Lx-ZvMnfHLC1CMre1xPQI3k_pCtQoZvgRhtmafULzoE,812
 geo_activity_playground/webui/auth/templates/auth/index.html.j2,sha256=ILQ5HvTEYc3OrtOAIFt1VrqWorVD70V9DC342znmP70,579
@@ -73,7 +73,7 @@ geo_activity_playground/webui/settings/templates/settings/equipment-offsets.html
 geo_activity_playground/webui/settings/templates/settings/heart-rate.html.j2,sha256=UPT3MegRgSeff36lhCo0l3ZwhqNSIg5gM6h2s32GkCY,4255
 geo_activity_playground/webui/settings/templates/settings/index.html.j2,sha256=-ZSlR6htaeMMOf4ISUSzWPu5BUhYODuAmcWPN0ZoBno,4443
 geo_activity_playground/webui/settings/templates/settings/kinds-without-achievements.html.j2,sha256=IdUfXon1Pu8zX3NirKb28ypshLHOvZRpz2T4bJrzrak,1067
-geo_activity_playground/webui/settings/templates/settings/metadata-extraction.html.j2,sha256=Ppa8O-zRJznbeCsF4YQj37_HM9nOW8fyTi66jvWvHmA,2285
+geo_activity_playground/webui/settings/templates/settings/metadata-extraction.html.j2,sha256=EUHZ-MWnSPAkiad0CHSj9UUkRUQwItTbKYJcZz9TVi0,2314
 geo_activity_playground/webui/settings/templates/settings/privacy-zones.html.j2,sha256=7BxFvCaVJOEqbImyK5vxCmhh-NGSFaRa9ARhqjZeYJ0,3093
 geo_activity_playground/webui/settings/templates/settings/sharepic.html.j2,sha256=qZkfEpd4CtKKMaSSVadqvNEgMRYLV-0X-pw5-nJvukk,678
 geo_activity_playground/webui/settings/templates/settings/strava.html.j2,sha256=FrXgT-m1PgvsQWo9kMKpk8QenKeifSDBCZFqKgsHRxQ,1827
@@ -104,11 +104,11 @@ geo_activity_playground/webui/tile/blueprint.py,sha256=cK0o2Z3BrLycgF9zw0F8s9qF-
 geo_activity_playground/webui/tile/controller.py,sha256=PISh4vKs27b-LxFfTARtr5RAwHFresA1Kw1MDcERSRU,1221
 geo_activity_playground/webui/upload/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/upload/blueprint.py,sha256=xX9scEmleN_dL03jfhWRh5yI1WsFyhxUFiS_Ul2HWy4,1428
-geo_activity_playground/webui/upload/controller.py,sha256=disRtrlvPiqsIFt9UaAokgtRtXCvosg7bXkAnN_qaxk,4102
+geo_activity_playground/webui/upload/controller.py,sha256=AUcDotTw-h30XgY5Te0kAqRfL7xXqK74iVO13g20pD0,4085
 geo_activity_playground/webui/upload/templates/upload/index.html.j2,sha256=I1Ix8tDS3YBdi-HdaNfjkzYXVVCjfUTe5PFTnap1ydc,775
 geo_activity_playground/webui/upload/templates/upload/reload.html.j2,sha256=YZWX5eDeNyqKJdQAywDBcU8DZBm22rRBbZqFjrFrCvQ,556
-geo_activity_playground-0.29.1.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
-geo_activity_playground-0.29.1.dist-info/METADATA,sha256=O9NvI6x-QQvVw7XklVLmq2pkz2UFTTg9PnLwAK6KhWY,1612
-geo_activity_playground-0.29.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-geo_activity_playground-0.29.1.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
-geo_activity_playground-0.29.1.dist-info/RECORD,,
+geo_activity_playground-0.29.2.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
+geo_activity_playground-0.29.2.dist-info/METADATA,sha256=GNn0dY6lLwtyLfJ9PDljs1QeZi8Xaro-_ElwOZtv0zQ,1612
+geo_activity_playground-0.29.2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+geo_activity_playground-0.29.2.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
+geo_activity_playground-0.29.2.dist-info/RECORD,,