geo-activity-playground 1.3.1__py3-none-any.whl → 1.4.0__py3-none-any.whl

geo_activity_playground/__main__.py

@@ -4,6 +4,7 @@ import pathlib
 
 import coloredlogs
 
+from .core.photos import main_inspect_photo
 from .explorer.video import explorer_video_main
 from .heatmap_video import main_heatmap_video
 from .importers.strava_checkout import convert_strava_checkout
@@ -73,6 +74,13 @@ def main() -> None:
     subparser.add_argument("--video-height", type=int, default=1080)
     subparser.set_defaults(func=main_heatmap_video)
 
+    subparser = subparsers.add_parser(
+        "inspect-photo",
+        help="Extract EXIF data from the image to see how it would be imported",
+    )
+    subparser.add_argument("path", type=pathlib.Path)
+    subparser.set_defaults(func=main_inspect_photo)
+
     options = parser.parse_args()
     coloredlogs.install(
         fmt="%(asctime)s %(name)s %(levelname)s %(message)s",

geo_activity_playground/core/copernicus_dem.py

@@ -13,7 +13,7 @@ from scipy.interpolate import RegularGridInterpolator
 from .paths import USER_CACHE_DIR
 
 
-def s3_path(lat: int, lon: int) -> pathlib.Path:
+def _s3_path(lat: int, lon: int) -> pathlib.Path:
     lat_str = f"N{(lat):02d}" if lat >= 0 else f"S{(-lat):02d}"
     lon_str = f"E{(lon):03d}" if lon >= 0 else f"W{(-lon):03d}"
     result = (
@@ -26,7 +26,7 @@ def s3_path(lat: int, lon: int) -> pathlib.Path:
     return result
 
 
-def ensure_copernicus_file(p: pathlib.Path) -> None:
+def _ensure_copernicus_file(p: pathlib.Path) -> None:
     if p.exists():
         return
     s3 = boto3.client(
@@ -39,10 +39,12 @@ def ensure_copernicus_file(p: pathlib.Path) -> None:
 
 
 @functools.lru_cache(9)
-def get_elevation_arrays(p: pathlib.Path) -> Optional[np.ndarray]:
-    ensure_copernicus_file(p)
+def _get_elevation_arrays(p: pathlib.Path) -> Optional[np.ndarray]:
+
+    _ensure_copernicus_file(p)
     if not p.exists():
         return None
+
     gt = geotiff.GeoTiff(p)
     a = np.array(gt.read())
     lon_array, lat_array = gt.get_coord_arrays()
@@ -50,8 +52,8 @@ def get_elevation_arrays(p: pathlib.Path) -> Optional[np.ndarray]:
 
 
 @functools.lru_cache(1)
-def get_interpolator(lat: int, lon: int) -> Optional[RegularGridInterpolator]:
-    arrays = get_elevation_arrays(s3_path(lat, lon))
+def _get_interpolator(lat: int, lon: int) -> Optional[RegularGridInterpolator]:
+    arrays = _get_elevation_arrays(_s3_path(lat, lon))
     # If we don't have data for the current center, we cannot do anything.
     if arrays is None:
         return None
@@ -88,7 +90,7 @@ def get_interpolator(lat: int, lon: int) -> Optional[RegularGridInterpolator]:
 
 
 def get_elevation(lat: float, lon: float) -> float:
-    interpolator = get_interpolator(math.floor(lat), math.floor(lon))
+    interpolator = _get_interpolator(math.floor(lat), math.floor(lon))
     if interpolator is not None:
         return float(interpolator((lat, lon)))
     else:

geo_activity_playground/core/enrichment.py

@@ -9,7 +9,6 @@ import pandas as pd
 
 from .config import Config
 from .coordinates import get_distance
-from .copernicus_dem import get_elevation
 from .datamodel import Activity
 from .datamodel import DB
 from .missing_values import some
@@ -109,6 +108,8 @@ def enrichment_compute_tile_xy(
 def enrichment_copernicus_elevation(
     activity: Activity, time_series: pd.DataFrame, config: Config
 ) -> bool:
+    from .copernicus_dem import get_elevation
+
     if "copernicus_elevation" not in time_series.columns:
         time_series["copernicus_elevation"] = [
             get_elevation(lat, lon)
@@ -247,7 +248,7 @@ enrichments: list[Callable[[Activity, pd.DataFrame, Config], bool]] = [
     enrichment_normalize_time,
     enrichment_rename_altitude,
     enrichment_compute_tile_xy,
-    enrichment_copernicus_elevation,
+    # enrichment_copernicus_elevation,
     enrichment_elevation_gain,
     enrichment_add_calories,
     enrichment_distance,

geo_activity_playground/core/photos.py

@@ -0,0 +1,39 @@
+import argparse
+import datetime
+import pathlib
+import pprint
+import zoneinfo
+
+import dateutil.parser
+import exifread
+
+
+def ratio_to_decimal(numbers: list[exifread.utils.Ratio]) -> float:
+    deg, min, sec = numbers.values
+    return deg.decimal() + min.decimal() / 60 + sec.decimal() / 3600
+
+
+def get_metadata_from_image(path: pathlib.Path) -> dict:
+    with open(path, "rb") as f:
+        tags = exifread.process_file(f)
+    metadata = {}
+    try:
+        metadata["latitude"] = ratio_to_decimal(tags["GPS GPSLatitude"])
+        metadata["longitude"] = ratio_to_decimal(tags["GPS GPSLongitude"])
+    except KeyError:
+        pass
+    try:
+        metadata["time"] = dateutil.parser.parse(
+            str(tags["EXIF DateTimeOriginal"])
+            + str(tags.get("EXIF OffsetTime", "+00:00"))
+        ).astimezone(zoneinfo.ZoneInfo("UTC"))
+    except KeyError:
+        pass
+
+    return metadata
+
+
+def main_inspect_photo(options: argparse.Namespace) -> None:
+    path: pathlib.Path = options.path
+    metadata = get_metadata_from_image(path)
+    pprint.pprint(metadata)

geo_activity_playground/core/raster_map.py

@@ -283,3 +283,9 @@ class PastelImageTransform(ImageTransform):
         averaged_tile = np.sum(image * [0.2126, 0.7152, 0.0722], axis=2)
         grayscale_tile = np.dstack((averaged_tile, averaged_tile, averaged_tile))
         return self._factor * grayscale_tile + (1 - self._factor) * image
+
+
+class InverseGrayscaleImageTransform(ImageTransform):
+    def transform_image(self, image: np.ndarray) -> np.ndarray:
+        image = np.sum(image * [0.2126, 0.7152, 0.0722], axis=2)  # to grayscale
+        return 1 - np.dstack((image, image, image))  # to rgb

geo_activity_playground/explorer/tile_visits.py

@@ -13,6 +13,8 @@ from tqdm import tqdm
 
 from ..core.activities import ActivityRepository
 from ..core.config import Config
+from ..core.datamodel import Activity
+from ..core.datamodel import DB
 from ..core.paths import atomic_open
 from ..core.tasks import try_load_pickle
 from ..core.tasks import work_tracker_path
@@ -20,10 +22,41 @@ from ..core.tasks import WorkTracker
 from ..core.tiles import adjacent_to
 from ..core.tiles import interpolate_missing_tile
 
+# import sqlalchemy as sa
+
+# from sqlalchemy import Column
+# from sqlalchemy import ForeignKey
+# from sqlalchemy import String
+# from sqlalchemy import Table
+# from sqlalchemy.orm import DeclarativeBase
+# from sqlalchemy.orm import Mapped
+# from sqlalchemy.orm import mapped_column
+# from sqlalchemy.orm import relationship
 
 logger = logging.getLogger(__name__)
 
 
+# class VisitedTile(DB.Model):
+#     __tablename__ = "visited_tiles"
+
+#     zoom: Mapped[int] = mapped_column(primary_key=True)
+#     x: Mapped[int] = mapped_column(primary_key=True)
+#     y: Mapped[int] = mapped_column(primary_key=True)
+
+#     first_activity_id: Mapped[int] = mapped_column(
+#         ForeignKey("Activity.id", name="first_activity_id"), nullable=True
+#     )
+#     first_activity: Mapped[Activity] = relationship(back_populates="activities")
+#     first_visit: Mapped[Optional[datetime.datetime]] = mapped_column(
+#         sa.DateTime, nullable=True
+#     )
+
+#     __table_args__ =  (
+#         sa.PrimaryKeyConstraint(zoom, x, y),
+#         {},
+#     )
+
+
 class TileInfo(TypedDict):
     activity_ids: set[int]
     first_time: datetime.datetime
@@ -58,7 +91,6 @@ class TileState(TypedDict):
     tile_visits: dict[int, dict[tuple[int, int], TileInfo]]
     tile_history: dict[int, pd.DataFrame]
     activities_per_tile: dict[int, dict[tuple[int, int], set[int]]]
-    processed_activities: set[int]
     evolution_state: dict[int, TileEvolutionState]
     version: int
 
@@ -99,7 +131,6 @@ def make_tile_state() -> TileState:
         "tile_visits": collections.defaultdict(make_defaultdict_dict),
         "tile_history": collections.defaultdict(pd.DataFrame),
         "activities_per_tile": collections.defaultdict(make_defaultdict_set),
-        "processed_activities": set(),
         "evolution_state": collections.defaultdict(TileEvolutionState),
         "version": TILE_STATE_VERSION,
     }
@@ -122,6 +153,9 @@ def _consistency_check(
 
     for zoom, tile_visits in tile_visit_accessor.tile_state["tile_visits"].items():
         for tile, meta in tile_visits.items():
+            if not pd.isna(meta["first_time"]) and meta["first_time"].tzinfo is None:
+                logger.info("Tile visits are stored without time zone.")
+                return False
             if meta["first_id"] not in present_activity_ids:
                 logger.info(f"Activity {meta['first_id']} have been deleted.")
                 return False
@@ -143,10 +177,35 @@ def compute_tile_visits_new(
         work_tracker.reset()
 
     for activity_id in tqdm(
-        work_tracker.filter(repository.get_activity_ids()), desc="Tile visits", delay=2
+        work_tracker.filter(repository.get_activity_ids()), desc="Tile visits", delay=1
     ):
         _process_activity(repository, tile_visit_accessor.tile_state, activity_id)
         work_tracker.mark_done(activity_id)
+
+    for zoom in reversed(range(20)):
+        tile_state = tile_visit_accessor.tile_state
+        if not (
+            tile_state["tile_history"][zoom]["time"].diff().dropna()
+            >= datetime.timedelta(seconds=0)
+        ).all():
+            logger.warning(
+                f"The order of the tile history at {zoom=} is not chronological, resetting."
+            )
+            new_tile_history_soa: dict[str, list] = {
+                "activity_id": [],
+                "time": [],
+                "tile_x": [],
+                "tile_y": [],
+            }
+            for tile, visit in tile_state["tile_visits"][zoom].items():
+                new_tile_history_soa["activity_id"].append(visit["first_id"])
+                new_tile_history_soa["time"].append(visit["first_time"])
+                new_tile_history_soa["tile_x"].append(tile[0])
+                new_tile_history_soa["tile_y"].append(tile[1])
+            tile_state["tile_history"][zoom] = pd.DataFrame(new_tile_history_soa)
+            tile_state["tile_history"][zoom].sort_values("time", inplace=True)
+            # Reset the evolution state.
+            tile_state["evolution_state"] = collections.defaultdict(TileEvolutionState)
     tile_visit_accessor.save()
     work_tracker.close()
 
@@ -258,7 +317,7 @@ def _compute_cluster_evolution(
     for index, row in tqdm(
         tiles.iloc[s.cluster_start :].iterrows(),
         desc=f"Cluster evolution for {zoom=}",
-        delay=2,
+        delay=1,
     ):
         new_clusters = False
         # Current tile.
@@ -337,7 +396,7 @@ def _compute_square_history(
     for index, row in tqdm(
         tiles.iloc[s.square_start :].iterrows(),
         desc=f"Square evolution for {zoom=}",
-        delay=2,
+        delay=1,
     ):
         tile = (row["tile_x"], row["tile_y"])
         x, y = tile

geo_activity_playground/importers/strava_checkout.py

@@ -3,6 +3,7 @@ import logging
 import pathlib
 import shutil
 import sys
+import traceback
 import urllib.parse
 import zoneinfo
 from typing import Optional
@@ -22,6 +23,7 @@ from ..core.tasks import get_state
 from ..core.tasks import set_state
 from ..core.tasks import work_tracker_path
 from ..core.tasks import WorkTracker
+from .activity_parsers import ActivityParseError
 from .activity_parsers import read_activity
 from .csv_parser import parse_csv
 
@@ -182,12 +184,12 @@ def import_from_strava_checkout(config: Config) -> None:
     ]
 
     for activity_id in tqdm(activities_ids_to_parse, desc="Import from Strava export"):
-        work_tracker.mark_done(activity_id)
         index = all_activity_ids.index(activity_id)
         row = {column: table[column][index] for column in header}
 
         # Some manually recorded activities have no file name. Pandas reads that as a float. We skip those.
         if not row["Filename"]:
+            work_tracker.mark_done(activity_id)
             continue
 
         start_datetime = dateutil.parser.parse(
@@ -196,7 +198,14 @@ def import_from_strava_checkout(config: Config) -> None:
 
         activity_file = checkout_path / row["Filename"]
 
-        activity, time_series = read_activity(activity_file)
+        try:
+            activity, time_series = read_activity(activity_file)
+        except ActivityParseError as e:
+            logger.error(f"Error while parsing `{activity_file}`:")
+            traceback.print_exc()
+            continue
+
+        work_tracker.mark_done(activity_id)
 
         if not len(time_series):
             continue

geo_activity_playground/webui/app.py

@@ -6,6 +6,7 @@ import os
 import pathlib
 import secrets
 import shutil
+import sys
 import threading
 import urllib.parse
 import uuid
@@ -32,6 +33,7 @@ from ..core.heart_rate import HeartRateZoneComputer
 from ..core.paths import TIME_SERIES_DIR
 from ..core.raster_map import GrayscaleImageTransform
 from ..core.raster_map import IdentityImageTransform
+from ..core.raster_map import InverseGrayscaleImageTransform
 from ..core.raster_map import PastelImageTransform
 from ..core.raster_map import TileGetter
 from ..explorer.tile_visits import TileVisitAccessor
@@ -85,6 +87,7 @@ def importer_thread(
 ) -> None:
     with app.app_context():
         scan_for_activities(repository, tile_visit_accessor, config)
+    logger.info("Importer thread is done.")
 
 
 def web_ui_main(
@@ -182,6 +185,7 @@ def web_ui_main(
         "color": IdentityImageTransform(),
         "grayscale": GrayscaleImageTransform(),
         "pastel": PastelImageTransform(),
+        "inverse_grayscale": InverseGrayscaleImageTransform(),
     }
     flasher = FlaskFlasher()
     heart_rate_zone_computer = HeartRateZoneComputer(config)
@@ -265,6 +269,9 @@ def web_ui_main(
         variables["photo_count"] = DB.session.scalar(
             sqlalchemy.select(sqlalchemy.func.count()).select_from(Photo)
         )
+        variables["python_version"] = (
+            f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}"
+        )
         return variables
 
     app.run(host=host, port=port)

geo_activity_playground/webui/blueprints/activity_blueprint.py

@@ -177,7 +177,7 @@ def make_activity_blueprint(
             )
         ) is not None:
             context["heart_zones_plot"] = heart_rate_zone_plot(heart_zones)
-        if "copernicus_elevation" in time_series.columns:
+        if "elevation" in time_series.columns:
             context["elevation_time_plot"] = elevation_time_plot(time_series)
         if "elevation_gain_cum" in time_series.columns:
             context["elevation_gain_cum_plot"] = elevation_gain_cum_plot(time_series)
@@ -508,7 +508,7 @@ def elevation_time_plot(time_series: pd.DataFrame) -> str:
         .encode(
             alt.X("time", title="Time"),
             alt.Y(
-                "copernicus_elevation",
+                "elevation",
                 scale=alt.Scale(zero=False),
                 title="Elevation / m",
             ),

geo_activity_playground/webui/blueprints/explorer_blueprint.py

@@ -26,6 +26,7 @@ from ...core.coordinates import Bounds
 from ...core.datamodel import Activity
 from ...core.datamodel import DB
 from ...core.raster_map import ImageTransform
+from ...core.raster_map import OSM_TILE_SIZE
 from ...core.raster_map import TileGetter
 from ...core.tiles import compute_tile
 from ...core.tiles import get_tile_upper_left_lat_lon
@@ -71,13 +72,14 @@ class MaxClusterColorStrategy(ColorStrategy):
         self, tile_xy: tuple[int, int], grayscale: np.ndarray
     ) -> np.ndarray:
         if tile_xy in self.max_cluster_members:
-            return blend_color(grayscale, np.array([[[55, 126, 184]]]) / 256, 0.3)
+            color = np.array([[[55, 126, 184, 70]]]) / 256
         elif tile_xy in self.evolution_state.memberships:
-            return blend_color(grayscale, np.array([[[77, 175, 74]]]) / 256, 0.3)
+            color = np.array([[[77, 175, 74, 70]]]) / 256
         elif tile_xy in self.tile_visits:
-            return blend_color(grayscale, 0.0, 0.3)
+            color = np.array([[[0, 0, 0, 70]]]) / 256
         else:
-            return grayscale
+            color = np.array([[[0, 0, 0, 0]]]) / 256
+        return np.broadcast_to(color, grayscale.shape)
 
 
 class ColorfulClusterColorStrategy(ColorStrategy):
@@ -98,11 +100,12 @@ class ColorfulClusterColorStrategy(ColorStrategy):
             m = hashlib.sha256()
             m.update(str(cluster_id).encode())
             d = int(m.hexdigest(), base=16) / (256.0**m.digest_size)
-            return blend_color(grayscale, np.array([[self._cmap(d)[:3]]]), 0.3)
+            color = np.array([[self._cmap(d)[:3] + (0.5,)]])
         elif tile_xy in self.tile_visits:
-            return blend_color(grayscale, 0.0, 0.3)
+            color = np.array([[[0, 0, 0, 70]]]) / 256
         else:
-            return grayscale
+            color = np.array([[[0, 0, 0, 0]]]) / 256
+        return np.broadcast_to(color, grayscale.shape)
 
 
 class VisitTimeColorStrategy(ColorStrategy):
@@ -120,11 +123,15 @@ class VisitTimeColorStrategy(ColorStrategy):
             relevant_time = (
                 tile_info["first_time"] if self.use_first else tile_info["last_time"]
             )
-            last_age_days = (today - relevant_time.date()).days
-            color = cmap(max(1 - last_age_days / (2 * 365), 0.0))
-            return blend_color(grayscale, np.array([[color[:3]]]), 0.3)
+            if pd.isna(relevant_time):
+                color = np.array([[[0, 0, 0, 70]]]) / 256
+            else:
+                last_age_days = (today - relevant_time.date()).days
+                color = cmap(max(1 - last_age_days / (2 * 365), 0.0))
+                color = np.array([[color[:3] + (0.5,)]])
         else:
-            return grayscale
+            color = np.array([[[0, 0, 0, 0]]]) / 256
+        return np.broadcast_to(color, grayscale.shape)
 
 
 class NumVisitsColorStrategy(ColorStrategy):
@@ -138,9 +145,10 @@ class NumVisitsColorStrategy(ColorStrategy):
             cmap = matplotlib.colormaps["viridis"]
             tile_info = self.tile_visits[tile_xy]
             color = cmap(min(len(tile_info["activity_ids"]) / 50, 1.0))
-            return blend_color(grayscale, np.array([[color[:3]]]), 0.3)
+            color = np.array([[color[:3] + (0.5,)]])
         else:
-            return grayscale
+            color = np.array([[[0, 0, 0, 0]]]) / 256
+        return np.broadcast_to(color, grayscale.shape)
 
 
 def make_explorer_blueprint(
@@ -159,7 +167,7 @@ def make_explorer_blueprint(
             config_accessor().explorer_zoom_levels.append(zoom)
             config_accessor().explorer_zoom_levels.sort()
             config_accessor.save()
-            compute_tile_evolution(tile_visit_accessor, config_accessor())
+            compute_tile_evolution(tile_visit_accessor.tile_state, config_accessor())
             flash(f"Enabled {zoom=} for explorer tiles.", category="success")
         else:
             flash(f"{zoom=} is not valid, must be between 0 and 19.", category="danger")
@@ -264,10 +272,11 @@ def make_explorer_blueprint(
         tile_visits = tile_visit_accessor.tile_state["tile_visits"][zoom]
         evolution_state = tile_visit_accessor.tile_state["evolution_state"][zoom]
 
-        map_tile = np.array(tile_getter.get_tile(z, x, y)) / 255
-        grayscale = image_transforms["grayscale"].transform_image(map_tile)
+        # map_tile = np.array(tile_getter.get_tile(z, x, y)) / 255
+        # grayscale = image_transforms["grayscale"].transform_image(map_tile)
+        grayscale = np.zeros((OSM_TILE_SIZE, OSM_TILE_SIZE, 4), dtype=np.float32)
         square_line_width = 3
-        square_color = np.array([[[228, 26, 28]]]) / 256
+        square_color = np.array([[[228, 26, 28, 255]]]) / 256
 
         color_strategy_name = request.args.get("color_strategy", "colorful_cluster")
         if color_strategy_name == "default":
@@ -311,9 +320,7 @@ def make_explorer_blueprint(
                         <= tile_y
                         < evolution_state.square_y + evolution_state.max_square_size
                     ):
-                        result[:, 0:square_line_width] = blend_color(
-                            result[:, 0:square_line_width], square_color, 0.5
-                        )
+                        result[:, 0:square_line_width] = square_color
                     if (
                         y % factor == 0
                         and tile_y == evolution_state.square_y
@@ -321,10 +328,7 @@ def make_explorer_blueprint(
                         <= tile_x
                         < evolution_state.square_x + evolution_state.max_square_size
                     ):
-                        result[0:square_line_width, :] = blend_color(
-                            result[0:square_line_width, :], square_color, 0.5
-                        )
-
+                        result[0:square_line_width, :] = square_color
                     if (
                         (x + 1) % factor == 0
                         and (x + 1) // factor
@@ -333,9 +337,7 @@ def make_explorer_blueprint(
                         <= tile_y
                         < evolution_state.square_y + evolution_state.max_square_size
                     ):
-                        result[:, -square_line_width:] = blend_color(
-                            result[:, -square_line_width:], square_color, 0.5
-                        )
+                        result[:, -square_line_width:] = square_color
                     if (
                         (y + 1) % factor == 0
                         and (y + 1) // factor
@@ -344,9 +346,7 @@ def make_explorer_blueprint(
                         <= tile_x
                         < evolution_state.square_x + evolution_state.max_square_size
                     ):
-                        result[-square_line_width:, :] = blend_color(
-                            result[-square_line_width:, :], square_color, 0.5
-                        )
+                        result[-square_line_width:, :] = square_color
         else:
             result = grayscale
             factor = 2 ** (zoom - z)
@@ -381,14 +381,7 @@ def make_explorer_blueprint(
                                 result[
                                     yo * width : (yo + 1) * width,
                                     xo * width : xo * width + square_line_width,
-                                ] = blend_color(
-                                    result[
-                                        yo * width : (yo + 1) * width,
-                                        xo * width : xo * width + square_line_width,
-                                    ],
-                                    square_color,
-                                    0.5,
-                                )
+                                ] = square_color
                             if (
                                 tile_y == evolution_state.square_y
                                 and evolution_state.square_x
@@ -399,14 +392,7 @@ def make_explorer_blueprint(
                                 result[
                                     yo * width : yo * width + square_line_width,
                                     xo * width : (xo + 1) * width,
-                                ] = blend_color(
-                                    result[
-                                        yo * width : yo * width + square_line_width,
-                                        xo * width : (xo + 1) * width,
-                                    ],
-                                    square_color,
-                                    0.5,
-                                )
+                                ] = square_color
 
                             if (
                                 tile_x + 1
@@ -421,15 +407,7 @@ def make_explorer_blueprint(
                                     yo * width : (yo + 1) * width,
                                     (xo + 1) * width
                                     - square_line_width : (xo + 1) * width,
-                                ] = blend_color(
-                                    result[
-                                        yo * width : (yo + 1) * width,
-                                        (xo + 1) * width
-                                        - square_line_width : (xo + 1) * width,
-                                    ],
-                                    square_color,
-                                    0.5,
-                                )
+                                ] = square_color
 
                             if (
                                 tile_y + 1
@@ -444,15 +422,7 @@ def make_explorer_blueprint(
                                     (yo + 1) * width
                                     - square_line_width : (yo + 1) * width,
                                     xo * width : (xo + 1) * width,
-                                ] = blend_color(
-                                    result[
-                                        (yo + 1) * width
-                                        - square_line_width : (yo + 1) * width,
-                                        xo * width : (xo + 1) * width,
-                                    ],
-                                    square_color,
-                                    0.5,
-                                )
+                                ] = square_color
                     if width >= 64:
                         result[yo * width, :, :] = 0.5
                         result[:, xo * width, :] = 0.5

geo_activity_playground/webui/blueprints/hall_of_fame_blueprint.py

@@ -1,4 +1,5 @@
 import collections
+import logging
 
 import pandas as pd
 from flask import Blueprint
@@ -12,6 +13,9 @@ from ..search_util import search_query_from_form
 from ..search_util import SearchQueryHistory
 
 
+logger = logging.getLogger(__name__)
+
+
 def make_hall_of_fame_blueprint(
     repository: ActivityRepository,
     search_query_history: SearchQueryHistory,
@@ -73,7 +77,14 @@ def _nominate_activities_inner(
 
     for variable, title, format_str in ratings:
         if variable in meta.columns and not pd.isna(meta[variable]).all():
-            i = meta[variable].idxmax()
-            value = meta.loc[i, variable]
-            format_applied = format_str.format(value)
-            nominations[i].append(f"{title}{title_suffix}: {format_applied}")
+            try:
+                i = meta[variable].idxmax()
+            except ValueError as e:
+                print(meta[variable].tolist())
+                print(f"{meta[variable].dtype=}")
+                logger.error(f"Trying to work with {variable=}.")
+                logger.error(f"We got a ValueError: {e}")
+            else:
+                value = meta.loc[i, variable]
+                format_applied = format_str.format(value)
+                nominations[i].append(f"{title}{title_suffix}: {format_applied}")

geo_activity_playground/webui/blueprints/heatmap_blueprint.py

@@ -221,13 +221,6 @@ def _render_tile_image(
 
     cmap = pl.get_cmap(config.color_scheme_for_heatmap)
     data_color = cmap(tile_counts)
-    data_color[data_color == cmap(0.0)] = 0.0  # remove background color
-
-    map_tile = np.array(get_tile(z, x, y, config.map_tile_url)) / 255
-    map_tile = convert_to_grayscale(map_tile)
-    map_tile = 1.0 - map_tile  # invert colors
-    for c in range(3):
-        map_tile[:, :, c] = (1.0 - data_color[:, :, c]) * map_tile[
-            :, :, c
-        ] + data_color[:, :, c]
-    return map_tile
+    data_color[tile_counts > 0, 3] = 0.8
+    data_color[tile_counts == 0, 3] = 0.0
+    return data_color

geo_activity_playground/webui/blueprints/photo_blueprint.py

@@ -2,8 +2,6 @@ import datetime
 import pathlib
 import uuid
 
-import dateutil.parser
-import exifread
 import geojson
 import sqlalchemy
 from flask import Blueprint
@@ -21,36 +19,13 @@ from ...core.datamodel import Activity
 from ...core.datamodel import DB
 from ...core.datamodel import Photo
 from ...core.paths import PHOTOS_DIR
+from ...core.photos import get_metadata_from_image
 from ..authenticator import Authenticator
 from ..authenticator import needs_authentication
 from ..flasher import Flasher
 from ..flasher import FlashTypes
 
 
-def ratio_to_decimal(numbers: list[exifread.utils.Ratio]) -> float:
-    deg, min, sec = numbers.values
-    return deg.decimal() + min.decimal() / 60 + sec.decimal() / 3600
-
-
-def get_metadata_from_image(path: pathlib.Path) -> dict:
-    with open(path, "rb") as f:
-        tags = exifread.process_file(f)
-    metadata = {}
-    try:
-        metadata["latitude"] = ratio_to_decimal(tags["GPS GPSLatitude"])
-        metadata["longitude"] = ratio_to_decimal(tags["GPS GPSLongitude"])
-    except KeyError:
-        pass
-    try:
-        metadata["time"] = datetime.datetime.strptime(
-            str(tags["EXIF DateTimeOriginal"]), "%Y:%m:%d %H:%M:%S"
-        )
-    except KeyError:
-        pass
-
-    return metadata
-
-
 def make_photo_blueprint(
     config_accessor: ConfigAccessor, authenticator: Authenticator, flasher: Flasher
 ) -> Blueprint:

geo_activity_playground/webui/static/server-side-explorer.js

@@ -1,23 +1,59 @@
+let map = L.map('explorer-map', {
+    fullscreenControl: true,
+    center: [center_latitude, center_longitude],
+    zoom: 12
+});
 
-let tile_layer = null
+let base_maps = {
+    "Grayscale": L.tileLayer("/tile/grayscale/{z}/{x}/{y}.png", {
+        maxZoom: 19,
+        attribution: map_tile_attribution
+    }),
+    "Pastel": L.tileLayer("/tile/pastel/{z}/{x}/{y}.png", {
+        maxZoom: 19,
+        attribution: map_tile_attribution
+    }),
+    "Color": L.tileLayer("/tile/color/{z}/{x}/{y}.png", {
+        maxZoom: 19,
+        attribution: map_tile_attribution
+    }),
+    "Inverse Grayscale": L.tileLayer("/tile/inverse_grayscale/{z}/{x}/{y}.png", {
+        maxZoom: 19,
+        attribution: map_tile_attribution
+    }),
+}
 
-function changeColor(method) {
-    if (tile_layer) {
-        map.removeLayer(tile_layer)
-    }
-    tile_layer = L.tileLayer(`/explorer/${zoom}/tile/{z}/{x}/{y}.png?color_strategy=${method}`, {
+let overlay_maps = {
+    "Colorful Cluster": L.tileLayer(`/explorer/${zoom}/tile/{z}/{x}/{y}.png?color_strategy=colorful_cluster`, {
         maxZoom: 19,
         attribution: map_tile_attribution
-    }).addTo(map)
+    }),
+    "Max Cluster": L.tileLayer(`/explorer/${zoom}/tile/{z}/{x}/{y}.png?color_strategy=max_cluster`, {
+        maxZoom: 19,
+        attribution: map_tile_attribution
+    }),
+    "First Visit": L.tileLayer(`/explorer/${zoom}/tile/{z}/{x}/{y}.png?color_strategy=first`, {
+        maxZoom: 19,
+        attribution: map_tile_attribution
+    }),
+    "Last Visit": L.tileLayer(`/explorer/${zoom}/tile/{z}/{x}/{y}.png?color_strategy=last`, {
+        maxZoom: 19,
+        attribution: map_tile_attribution
+    }),
+    "Number of Visits": L.tileLayer(`/explorer/${zoom}/tile/{z}/{x}/{y}.png?color_strategy=visits`, {
+        maxZoom: 19,
+        attribution: map_tile_attribution
+    }),
+    "Heatmap": L.tileLayer("/heatmap/tile/{z}/{x}/{y}.png", {
+        maxZoom: 19,
+        attribution: map_tile_attribution
+    }),
 }
 
-let map = L.map('explorer-map', {
-    fullscreenControl: true,
-    center: [center_latitude, center_longitude],
-    zoom: 12
-});
+base_maps['Grayscale'].addTo(map)
+overlay_maps["Colorful Cluster"].addTo(map)
 
-changeColor('default')
+var layerControl = L.control.layers(base_maps, overlay_maps).addTo(map);
 
 if (bbox) {
     map.fitBounds(L.geoJSON(bbox).getBounds())

geo_activity_playground/webui/templates/explorer/server-side.html.j2

@@ -24,14 +24,6 @@
     </div>
 </div>
 
-<div class="btn-group mb-3" role="group">
-    <button type="button" class="btn btn-primary" onclick="changeColor('colorful_cluster')">Colorful Cluster</button>
-    <button type="button" class="btn btn-primary" onclick="changeColor('max_cluster')">Max Cluster</button>
-    <button type="button" class="btn btn-primary" onclick="changeColor('first')">First Visit</button>
-    <button type="button" class="btn btn-primary" onclick="changeColor('last')">Last Visit</button>
-    <button type="button" class="btn btn-primary" onclick="changeColor('visits')">Number of Visits</button>
-</div>
-
 <div class="row mb-3">
     <div class="col">
         <div id="explorer-map" class="mb-1" style="height: 800px;"></div>

geo_activity_playground/webui/templates/heatmap/index.html.j2

@@ -18,6 +18,12 @@
                 center: [{{ center.latitude }}, {{ center.longitude }}],
             zoom: 12
             });
+
+            L.tileLayer("/tile/inverse_grayscale/{z}/{x}/{y}.png", {
+                maxZoom: 19,
+                attribution: '{{ map_tile_attribution|safe }}'
+            }).addTo(map)
+
             L.tileLayer('/heatmap/tile/{z}/{x}/{y}.png?{{ extra_args|safe }}', {
                 maxZoom: 19,
                 attribution: '{{ map_tile_attribution|safe }}'

geo_activity_playground/webui/templates/page.html.j2

@@ -204,9 +204,12 @@
 
         <div class="row border-top py-3 my-4">
             <ul class="nav col-4">
-                <li class="nav-item px-2 nav-link"><a
+                <li class="nav-item"><a
                         href="https://github.com/martin-ueding/geo-activity-playground/blob/main/docs/changelog.md"
                         class="nav-link px-2 text-muted" target="_blank">Version {{ version }}</a></li>
+
+                <li class="nav-item"><span class="nav-link px-2 text-muted">Python {{ python_version
+                        }}</span></li>
             </ul>
             <ul class="nav col-8 justify-content-end">
                 <li class="nav-item"><a href="https://github.com/martin-ueding/geo-activity-playground"

{geo_activity_playground-1.3.1.dist-info → geo_activity_playground-1.4.0.dist-info}/METADATA

@@ -1,13 +1,14 @@
 Metadata-Version: 2.1
 Name: geo-activity-playground
-Version: 1.3.1
+Version: 1.4.0
 Summary: Analysis of geo data activities like rides, runs or hikes.
 License: MIT
 Author: Martin Ueding
 Author-email: mu@martin-ueding.de
-Requires-Python: >=3.11,<3.14
+Requires-Python: >=3.10,<3.14
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
@@ -15,7 +16,6 @@ Requires-Dist: Pillow (>=11.0.0,<12.0.0)
 Requires-Dist: alembic (>=1.15.2,<2.0.0)
 Requires-Dist: altair (>=5.5.0,<6.0.0)
 Requires-Dist: appdirs (>=1.4.4,<2.0.0)
-Requires-Dist: boto3 (>=1.38.45,<2.0.0)
 Requires-Dist: charset-normalizer (>=3.3.2,<4.0.0)
 Requires-Dist: coloredlogs (>=15.0.1,<16.0.0)
 Requires-Dist: exifread (>=3.2.0,<4.0.0)
@@ -24,24 +24,19 @@ Requires-Dist: flask (>=3.0.0,<4.0.0)
 Requires-Dist: flask-alembic (>=3.1.1,<4.0.0)
 Requires-Dist: flask-sqlalchemy (>=3.1.1,<4.0.0)
 Requires-Dist: geojson (>=3.0.1,<4.0.0)
-Requires-Dist: geotiff (>=0.2.10,<0.3.0)
 Requires-Dist: gpxpy (>=1.5.0,<2.0.0)
-Requires-Dist: imagecodecs (>=2025.3.30,<2026.0.0)
 Requires-Dist: jinja2 (>=3.1.2,<4.0.0)
 Requires-Dist: matplotlib (>=3.10.1,<4.0.0)
-Requires-Dist: numcodecs (<0.15.0)
 Requires-Dist: numpy (>=2.2.3,<3.0.0)
 Requires-Dist: openpyxl (>=3.1.5,<4.0.0)
 Requires-Dist: pandas (>=2.2.3,<3.0.0)
 Requires-Dist: pyarrow (>=19.0.1,<20.0.0)
 Requires-Dist: python-dateutil (>=2.8.2,<3.0.0)
 Requires-Dist: requests (>=2.28.1,<3.0.0)
-Requires-Dist: scipy (>=1.16.0,<2.0.0)
 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: tifffile (==2025.5.10)
 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.3.1.dist-info → geo_activity_playground-1.4.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 geo_activity_playground/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/__main__.py,sha256=eL7NlKydYrzi4ikTvvKmlwkEFxx0V6CXOHOhRtazmd8,2907
+geo_activity_playground/__main__.py,sha256=y49XBk0PmAiunx2pZvxLjng1C-AMgAB-f_DljtTCb34,3209
 geo_activity_playground/alembic/README,sha256=MVlc9TYmr57RbhXET6QxgyCcwWP7w-vLkEsirENqiIQ,38
 geo_activity_playground/alembic/env.py,sha256=46oMzwSROaAsYuYWTd46txFdRLD3adm_SCn01A_ex8Q,2081
 geo_activity_playground/alembic/script.py.mako,sha256=g1k4U3D8y4PPYRzW3DH7GEu6yN4EiAr62GgCu6cRpBo,524
@@ -20,17 +20,18 @@ geo_activity_playground/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 geo_activity_playground/core/activities.py,sha256=apP_-Rg1ub3lh7RARMGXf2BOmJTiahxqpX_soEnYF3E,4681
 geo_activity_playground/core/config.py,sha256=mmdMQ5iCLNGnAlriT1ETEVS-gM6Aq_9sg22QECHj4n8,5358
 geo_activity_playground/core/coordinates.py,sha256=rW_OmMRpTUyIsQwrT6mgT9Y6uPGuwqTo5XDDMS7mGuo,1140
-geo_activity_playground/core/copernicus_dem.py,sha256=U6pvUAymLCX4CpbQKvUoXRj8LYdlaQTKtEVlrlHH3kw,2934
+geo_activity_playground/core/copernicus_dem.py,sha256=t6Bc9fsyGyx1awdePXvlN-Zc-tiT2eGSJ80SV5B1Z9A,2944
 geo_activity_playground/core/datamodel.py,sha256=3LdTm7lqykeLM6KYviW9WamgnS61nGNl-NHSEQdwTXY,15765
-geo_activity_playground/core/enrichment.py,sha256=TPA0PsWhz2D3R3PL-8WGr8TJIWvtfPoUIbya7X910qA,8701
+geo_activity_playground/core/enrichment.py,sha256=pw9VEyDAtdNbjQ1HOPYyXCXT8SLL5i3Cp6KWjKK7puM,8708
 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/privacy_zones.py,sha256=4TumHsVUN1uW6RG3ArqTXDykPVipF98DCxVBe7YNdO8,512
-geo_activity_playground/core/raster_map.py,sha256=Cq8dNLdxVQg3Agzn2bmXVu0-8kZf56QrSe-LKNn3jaU,7994
+geo_activity_playground/core/raster_map.py,sha256=y7maiC_bmUwXsULC_XCZ1m8nGgU2jFe47QFB7TpC_V4,8257
 geo_activity_playground/core/similarity.py,sha256=L2de3DPRdDeDY5AxZwLDcH7FjHWRWklr41VNU06q9kQ,3117
 geo_activity_playground/core/summary_stats.py,sha256=v5FtWnE1imDF5axI6asVN55wCrlD73oZ6lvqzxsTN2c,1006
 geo_activity_playground/core/tasks.py,sha256=-_9cxekoHSWzCW4XblNeqrwi2tTqr5AE7_-p8fdqhwc,2886
@@ -47,7 +48,7 @@ geo_activity_playground/core/tiles.py,sha256=LBn2V6WAvMxZeXSIQ8ruZL71iyvOXoFZMz7
 geo_activity_playground/core/time_conversion.py,sha256=F-vQ-MdbTOqPTAELplDjT5m7kdaf1RsqBXELfsR5eOU,1329
 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=WK_H5fdy3S69BT4zZGP0R92qq5MlNRJMp25BrMj6O2Q,13884
+geo_activity_playground/explorer/tile_visits.py,sha256=NUzC4jNb_vQExAIALrO2H1MiNs5JJKsOQKGietAcATE,16271
 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
@@ -55,26 +56,26 @@ geo_activity_playground/importers/activity_parsers.py,sha256=zWgLkHHd8rjWnKs-COB
 geo_activity_playground/importers/csv_parser.py,sha256=O1pP5GLhWhnWcy2Lsrr9g17Zspuibpt-GtZ3ZS5eZF4,2143
 geo_activity_playground/importers/directory.py,sha256=ucnB5sPBvXzLdaza2v8GVU75ArfGG4E7d5OXrCgoFq4,3562
 geo_activity_playground/importers/strava_api.py,sha256=Fiqlc-VeuzsvgDcWt71JoPMri221cMjkeL4SH80gC5s,8426
-geo_activity_playground/importers/strava_checkout.py,sha256=6RJoGRN3OdEXODeB8yzhT1OJglBGgsaZdNath1rzooA,8937
+geo_activity_playground/importers/strava_checkout.py,sha256=Pugtv0nbgfuVzBDC5e5Tfv1jShUYmMcDbpCQp2ULXow,9232
 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
 geo_activity_playground/webui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/webui/app.py,sha256=4dCfzxPk7KJTAwEXyw3NPiQQz-udvgECqeL8CtOj0Es,10334
+geo_activity_playground/webui/app.py,sha256=qsnwE20S-tWBbD_MgkIS8HVsRh6TO6mrwW_gWYHk0Bo,10653
 geo_activity_playground/webui/authenticator.py,sha256=dhREYOu_TCD_nzFNuSlHIbf5K6TmwKdXtr1wxD8fBcc,1491
 geo_activity_playground/webui/blueprints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/webui/blueprints/activity_blueprint.py,sha256=kfI7GrQUm36GuSNWv8vYQEmT7bshDFrLkWchqesa_9k,26793
+geo_activity_playground/webui/blueprints/activity_blueprint.py,sha256=tFy0GpOBhIP8xlmYc9PF4kAng-0MosXMJudVupGz2Yw,26771
 geo_activity_playground/webui/blueprints/auth_blueprint.py,sha256=iCm3hZphQKR9qFgytOrfnSmr-Og1gHuQ1Djiv2o_bkE,1031
 geo_activity_playground/webui/blueprints/bubble_chart_blueprint.py,sha256=8R1rUVoyofGhUgesPunys1HoLPYinvhA46BBnMvEn9Q,2880
 geo_activity_playground/webui/blueprints/calendar_blueprint.py,sha256=SmOu5AfNNoWcJJNduEfPtaPRvr4EZLYAeIDLUK9P1LY,2939
 geo_activity_playground/webui/blueprints/eddington_blueprints.py,sha256=Ya5GJxfVESwmRlgMTYe9g75g8JHHTAAvYFmSD-3Uz4Q,8987
 geo_activity_playground/webui/blueprints/entry_views.py,sha256=SDCzpUSb1FAb84tM0SnmrZQvtaTlO-Rqdj94hyIMDSc,2936
 geo_activity_playground/webui/blueprints/equipment_blueprint.py,sha256=8L_7NZGErvu4jyigi2gg7HN_gegZRdsSFahUH7Dz6Lw,5727
-geo_activity_playground/webui/blueprints/explorer_blueprint.py,sha256=wlInaRbh1Wp-Va9mqcaHsVelBUQsqHusoTvkiynoU2E,22985
+geo_activity_playground/webui/blueprints/explorer_blueprint.py,sha256=l-rMutpEcde1PaVETQ2gxtY6hgXZz6MHvb1eStxZTsQ,21497
 geo_activity_playground/webui/blueprints/export_blueprint.py,sha256=C9yFH5gEJs2YtWE-EhcGDEyGwwaLgC1umybgIRi6duE,1036
-geo_activity_playground/webui/blueprints/hall_of_fame_blueprint.py,sha256=zNYKw7ps9Yx9995Zsj4psAlOLnt4tFi2Hwp74-kjmzw,2806
-geo_activity_playground/webui/blueprints/heatmap_blueprint.py,sha256=qPwvcZLZgAH1g8FQAzjIc5LxKp2bkc7YbZwkjxVJVWc,8730
-geo_activity_playground/webui/blueprints/photo_blueprint.py,sha256=ZBh7Gt5vEzeW8JDK3t-3RcLTT40mbOqRkttkicgcIRM,7885
+geo_activity_playground/webui/blueprints/hall_of_fame_blueprint.py,sha256=bOJ6ejDS6rw8-GEGo1Lihn5DS6j0t9e8CbcbRi44Pts,3168
+geo_activity_playground/webui/blueprints/heatmap_blueprint.py,sha256=5LlYKMeOMIE7c3xGRZ52ld4Jxtdc3GNcb6lvt3v7NVA,8435
+geo_activity_playground/webui/blueprints/photo_blueprint.py,sha256=eK3JSvOAsiTVDy5wardtqTDGIZ79jmwuXpdIPBI-GjU,7186
 geo_activity_playground/webui/blueprints/plot_builder_blueprint.py,sha256=nGtYblRTJ0rasJvl_L35cs1Iry4LONPy_9TY4ytXB-Q,3838
 geo_activity_playground/webui/blueprints/search_blueprint.py,sha256=Sv_KL1Cdai26y51qVfI-5jZLhtElREsEar1dbR_VAC4,2275
 geo_activity_playground/webui/blueprints/settings_blueprint.py,sha256=cwes3QmRrC_HMP1g-Yc-x2BJycF4jF3StJl75v9acWo,20377
@@ -113,11 +114,13 @@ geo_activity_playground/webui/static/leaflet/MarkerCluster.Default.css,sha256=LW
 geo_activity_playground/webui/static/leaflet/MarkerCluster.css,sha256=-bdWuWOXMFkX0v9Cvr3OWClPiYefDQz9GGZP_7xZxdc,886
 geo_activity_playground/webui/static/leaflet/fullscreen.png,sha256=yDtz-dhjuAoo6q9xc00-_XNTrGwEWrN80pOneFdol4g,299
 geo_activity_playground/webui/static/leaflet/fullscreen@2x.png,sha256=HVi2guZO6sekf2NggilbzjUTvJDweXpSMBS81fhtnX0,420
+geo_activity_playground/webui/static/leaflet/images/layers-2x.png,sha256=Bm2sqFDY_77wB68AsG6sABVyje4nnFHzy2xxbffELt8,1259
+geo_activity_playground/webui/static/leaflet/images/layers.png,sha256=Hbvp0CjikvNvy6j4s6KNXokydU_CIVuaxp5M3s9RB8Y,696
 geo_activity_playground/webui/static/leaflet/leaflet.css,sha256=p4NxAoJBhIIN-hmNHrzRCf9tD_miZyoHS5obTRR9BMY,14806
 geo_activity_playground/webui/static/leaflet/leaflet.fullscreen.css,sha256=YTbhDGEH5amI_JfotPMN7IByFpsN9e4tCBnv5oNdvHU,994
 geo_activity_playground/webui/static/leaflet/leaflet.js,sha256=20nQCchB9co0qIjJZRGuk2_Z9VM-kNiyxNV1lvTlZBo,147552
 geo_activity_playground/webui/static/leaflet/leaflet.markercluster.js,sha256=WL6HHfYfbFEkZOFdsJQeY7lJG_E5airjvqbznghUzRw,33724
-geo_activity_playground/webui/static/server-side-explorer.js,sha256=5_I1OnHjKE4j9KFS7LP6LTpLPMW0buanlNfI-_xhrGo,1845
+geo_activity_playground/webui/static/server-side-explorer.js,sha256=dmGTTCZ9OchOc18SJM6qE_EgG-6LEZhckpVIsBvCkv8,3262
 geo_activity_playground/webui/static/table-sort.min.js,sha256=sFeDrgkXTePr2ciJU9_mLh-Z8qtYhPIQMgOZtj0LwBY,8506
 geo_activity_playground/webui/static/vega/vega-embed@6.js,sha256=EtAqz74-xZ75o33UgiouBOKWG1u7Zxu-Zh0iIXFbmdo,60630
 geo_activity_playground/webui/static/vega/vega-lite@4.js,sha256=roXmcY9bUF91uB9V-eSEUHEgfwoXe6B1xoDPuIe5ou8,267999
@@ -136,12 +139,12 @@ geo_activity_playground/webui/templates/eddington/distance.html.j2,sha256=9cLlIr
 geo_activity_playground/webui/templates/eddington/elevation_gain.html.j2,sha256=h2mI1Uc1-P7rN_SeCVP_uadpQqX09ZpBG3Z6N8QWNLw,4723
 geo_activity_playground/webui/templates/elevation_eddington/index.html.j2,sha256=WjquRFWaMzIZrvByhRIuhJbSCUW2HTfMck6THQHZI-I,4743
 geo_activity_playground/webui/templates/equipment/index.html.j2,sha256=6pzSCJACMXA1fKgsO_KrCTvpumAKlelzj5f9dReey14,1742
-geo_activity_playground/webui/templates/explorer/server-side.html.j2,sha256=ynejXeUjb-ZwkvPtbD20R8R1KLUIFsyM5VJgwW7vzM8,3133
+geo_activity_playground/webui/templates/explorer/server-side.html.j2,sha256=CrTFVghloFJcN25H18FZ6KQY7QgIqvyCauFzgYG_yCo,2547
 geo_activity_playground/webui/templates/export/index.html.j2,sha256=vxqpAm9KnT405Qz7q0_td-HZ4mCjcPR4Lp6EnIEWisg,1652
 geo_activity_playground/webui/templates/hall_of_fame/index.html.j2,sha256=P15fVPjXf0Wf6K_hd_lCMuw6-Q8_qfNqsBOWNpMfoXw,1804
-geo_activity_playground/webui/templates/heatmap/index.html.j2,sha256=uM-l4gmDKw6307ZH_zb8zroMTKBuOkrR0Bu4fTEJE0s,1231
+geo_activity_playground/webui/templates/heatmap/index.html.j2,sha256=Q99v4LP5EnuvDYKayL52qujWaIroLsD89ly2cM2YvTI,1420
 geo_activity_playground/webui/templates/home.html.j2,sha256=L6U44p05IagWERPxJ99cUMZzZCyhmA5IV7PL-QaO_mg,2258
-geo_activity_playground/webui/templates/page.html.j2,sha256=X3dXpmcV4486St3BLHIBbhZYcb6X_dYBOBSZi_M3Aio,12188
+geo_activity_playground/webui/templates/page.html.j2,sha256=4vtvq7cV5YIXIUsjG44grHMqnjKWUlVy0eBwqW8UIzg,12315
 geo_activity_playground/webui/templates/photo/map.html.j2,sha256=MWhqt5Q8ExiRhgxndcEnwngOj1qw0E0u4hKuiuY24Gg,1437
 geo_activity_playground/webui/templates/photo/new.html.j2,sha256=0BO4ZJgJQM1Hlp9SHylEOfthpQlywDc-xFs8K_Spptc,392
 geo_activity_playground/webui/templates/plot-macros.html.j2,sha256=lzsu8c8fcsVjgpdcmpwCa1e6EPALZtCS9RbvQ-DAtAs,2861
@@ -171,8 +174,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.3.1.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
-geo_activity_playground-1.3.1.dist-info/METADATA,sha256=2H0luCrinp9PleOQHmimHifLY4cqlUuhAOFlHKmdgAc,2083
-geo_activity_playground-1.3.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-geo_activity_playground-1.3.1.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
-geo_activity_playground-1.3.1.dist-info/RECORD,,
+geo_activity_playground-1.4.0.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
+geo_activity_playground-1.4.0.dist-info/METADATA,sha256=emNPjWxE-mMtKn0osd1sWZ7QeK_kFYavMpMtftmjhGs,1890
+geo_activity_playground-1.4.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+geo_activity_playground-1.4.0.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
+geo_activity_playground-1.4.0.dist-info/RECORD,,