geo-activity-playground 0.31.0__py3-none-any.whl → 0.34.1__py3-none-any.whl

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

@@ -73,7 +73,7 @@
             })
             L.tileLayer('/tile/grayscale/{z}/{x}/{y}.png', {
                 maxZoom: 19,
-                attribution: '&copy; <a href=" http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
+                attribution: '{{ map_tile_attribution|safe }}'
             }).addTo(map)
             let explorer_layer_cluster_color = L.geoJSON(explorer_geojson, {
                 style: function (feature) {
@@ -87,58 +87,34 @@
             let explorer_layer_first_age_color = L.geoJSON(explorer_geojson, {
                 style: function (feature) {
                     return {
-                        color: "#440154", fillColor: feature.properties.first_age_color,
-                        weight: 0.5
+                        color: " #440154", fillColor: feature.properties.first_age_color, weight: 0.5
                     }
                 },
                 onEachFeature: onEachFeature
-            })
-            let explorer_layer_last_age_color = L.geoJSON(explorer_geojson, {
-                style: function (feature) {
-                    return {
-                        color: "#440154", fillColor: feature.properties.last_age_color, weight:
-                            0.5
-                    }
-                },
-                onEachFeature: onEachFeature
-            })
-
-            let bbox = {{ center.bbox| safe }}
-            if (bbox) {
-                map.fitBounds(L.geoJSON(bbox).getBounds())
-            }
-
-            let explorer_square_layer = L.geoJSON(square_geojson,
-                {
-                    style: function (feature) {
+            }); let explorer_layer_last_age_color = L.geoJSON(explorer_geojson, {
+                style:
+                    function (feature) {
                         return {
-                            color: "blue", fill: false, weight: 2
+                            color: "#440154", fillColor: feature.properties.last_age_color, weight:
+                                0.5
                         }
-                    }
-                }
-            ).addTo(map)
-
-            active_layer = explorer_layer_cluster_color
-
-            function changeColor(method) {
+                    }, onEachFeature: onEachFeature
+            }); let bbox = {{ center.bbox| safe }}; if (bbox) {
+                map.fitBounds(L.geoJSON(bbox).getBounds())
+            }; let explorer_square_layer = L.geoJSON(square_geojson, {
+                style: function (feature) { return { color: "blue", fill: false, weight: 2 } }
+            }).addTo(map)
+            active_layer = explorer_layer_cluster_color; function changeColor(method) {
                 map.removeLayer(active_layer)
-                if (method == "cluster") {
-                    active_layer = explorer_layer_cluster_color
-                } else if (method == "first") {
+                if (method == "cluster") { active_layer = explorer_layer_cluster_color } else if (method == "first") {
                     active_layer = explorer_layer_first_age_color
                 } else if (method == "last") {
                     active_layer = explorer_layer_last_age_color
-                }
-                map.addLayer(active_layer)
-            }
-
-            function downloadAs(suffix) {
-                bounds = map.getBounds()
-                zoom = "{{ zoom }}"
-                window.location.href =
-                    `/explorer/${zoom}/${bounds.getNorth()}/${bounds.getEast()}/${bounds.getSouth()}/${bounds.getWest()}/${suffix}`
-            }
-        </script>
+                } map.addLayer(active_layer)
+            } function downloadAs(suffix) {
+                bounds = map.getBounds(); zoom = "{{ zoom }}"
+                window.location.href = `/explorer/${zoom}/${bounds.getNorth()}/${bounds.getEast()}/${bounds.getSouth()}/${bounds.getWest()}/${suffix}`
+            } </script>
     </div>
 </div>
 

geo_activity_playground/webui/heatmap/blueprint.py

@@ -6,12 +6,15 @@ from flask import Response
 from ...core.activities import ActivityRepository
 from ...explorer.tile_visits import TileVisitAccessor
 from .heatmap_controller import HeatmapController
+from geo_activity_playground.core.config import Config
 
 
 def make_heatmap_blueprint(
-    repository: ActivityRepository, tile_visit_accessor: TileVisitAccessor
+    repository: ActivityRepository,
+    tile_visit_accessor: TileVisitAccessor,
+    config: Config,
 ) -> Blueprint:
-    heatmap_controller = HeatmapController(repository, tile_visit_accessor)
+    heatmap_controller = HeatmapController(repository, tile_visit_accessor, config)
     blueprint = Blueprint("heatmap", __name__, template_folder="templates")
 
     @blueprint.route("/")

geo_activity_playground/webui/heatmap/heatmap_controller.py

@@ -8,6 +8,7 @@ from PIL import Image
 from PIL import ImageDraw
 
 from geo_activity_playground.core.activities import ActivityRepository
+from geo_activity_playground.core.config import Config
 from geo_activity_playground.core.heatmap import convert_to_grayscale
 from geo_activity_playground.core.heatmap import GeoBounds
 from geo_activity_playground.core.heatmap import get_sensible_zoom_level
@@ -29,10 +30,14 @@ OSM_TILE_SIZE = 256  # OSM tile size in pixel
 
 class HeatmapController:
     def __init__(
-        self, repository: ActivityRepository, tile_visit_accessor: TileVisitAccessor
+        self,
+        repository: ActivityRepository,
+        tile_visit_accessor: TileVisitAccessor,
+        config: Config,
     ) -> None:
         self._repository = repository
         self._tile_visit_accessor = tile_visit_accessor
+        self._config = config
 
         self.tile_histories = self._tile_visit_accessor.tile_state["tile_history"]
         self.tile_evolution_states = self._tile_visit_accessor.tile_state[
@@ -140,11 +145,11 @@ class HeatmapController:
         tile_counts = np.sqrt(tile_counts) / 5
         tile_counts[tile_counts > 1.0] = 1.0
 
-        cmap = pl.get_cmap("hot")
+        cmap = pl.get_cmap(self._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)) / 255
+        map_tile = np.array(get_tile(z, x, y, self._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):
@@ -168,7 +173,12 @@ class HeatmapController:
         background = np.zeros((*pixel_bounds.shape, 3))
         for x in range(tile_bounds.x_tile_min, tile_bounds.x_tile_max):
             for y in range(tile_bounds.y_tile_min, tile_bounds.y_tile_max):
-                tile = np.array(get_tile(tile_bounds.zoom, x, y)) / 255
+                tile = (
+                    np.array(
+                        get_tile(tile_bounds.zoom, x, y, self._config.map_tile_url)
+                    )
+                    / 255
+                )
 
                 i = y - tile_bounds.y_tile_min
                 j = x - tile_bounds.x_tile_min

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

@@ -35,7 +35,7 @@
             });
             L.tileLayer('/heatmap/tile/{z}/{x}/{y}/{{ kinds_str }}.png', {
                 maxZoom: 19,
-                attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
+                attribution: '{{ map_tile_attribution|safe }}'
             }).addTo(map)
 
             let bbox = {{ center.bbox| safe }}

geo_activity_playground/webui/settings/blueprint.py

@@ -15,6 +15,43 @@ from geo_activity_playground.webui.authenticator import needs_authentication
 from geo_activity_playground.webui.settings.controller import SettingsController
 
 
+VEGA_COLOR_SCHEMES_CONTINUOUS = [
+    "lightgreyred",
+    "lightgreyteal",
+    "lightmulti",
+    "lightorange",
+    "lighttealblue",
+    "blues",
+    "tealblues",
+    "teals",
+    "greens",
+    "browns",
+    "oranges",
+    "reds",
+    "purples",
+    "warmgreys",
+    "greys",
+]
+
+MATPLOTLIB_COLOR_SCHEMES_CONTINUOUS = [
+    "afmhot",
+    "bone",
+    "cividis",
+    "copper",
+    "gist_gray",
+    "gist_heat",
+    "gnuplot2",
+    "gray",
+    "Greys_r",
+    "hot",
+    "inferno",
+    "magma",
+    "pink",
+    "plasma",
+    "viridis",
+]
+
+
 def int_or_none(s: str) -> Optional[int]:
     if s:
         try:
@@ -56,44 +93,16 @@ def make_settings_blueprint(
             config_accessor().color_scheme_for_kind = request.form[
                 "color_scheme_for_kind"
             ]
+            config_accessor().color_scheme_for_heatmap = request.form[
+                "color_scheme_for_heatmap"
+            ]
             config_accessor.save()
             flash("Updated color schemes.", category="success")
+
         return render_template(
             "settings/color-schemes.html.j2",
             color_scheme_for_counts=config_accessor().color_scheme_for_counts,
-            color_scheme_for_counts_avail=[
-                "viridis",
-                "magma",
-                "inferno",
-                "plasma",
-                "cividis",
-                "turbo",
-                "bluegreen",
-                "bluepurple",
-                "goldgreen",
-                "goldorange",
-                "goldred",
-                "greenblue",
-                "orangered",
-                "purplebluegreen",
-                "purpleblue",
-                "purplered",
-                "redpurple",
-                "yellowgreenblue",
-                "yellowgreen",
-                "yelloworangebrown",
-                "yelloworangered",
-                "darkblue",
-                "darkgold",
-                "darkgreen",
-                "darkmulti",
-                "darkred",
-                "lightgreyred",
-                "lightgreyteal",
-                "lightmulti",
-                "lightorange",
-                "lighttealblue",
-            ],
+            color_scheme_for_counts_avail=VEGA_COLOR_SCHEMES_CONTINUOUS,
             color_scheme_for_kind=config_accessor().color_scheme_for_kind,
             color_scheme_for_kind_avail=[
                 "accent",
@@ -111,6 +120,8 @@ def make_settings_blueprint(
                 "tableau10",
                 "tableau20",
             ],
+            color_scheme_for_heatmap=config_accessor().color_scheme_for_heatmap,
+            color_scheme_for_heatmap_avail=MATPLOTLIB_COLOR_SCHEMES_CONTINUOUS,
         )
 
     @blueprint.route("/equipment-offsets", methods=["GET", "POST"])

geo_activity_playground/webui/settings/templates/settings/color-schemes.html.j2

@@ -18,8 +18,17 @@
     </div>
 
     <div class="mb-3">
-        <label class="form-label">Color scheme for heatmaps</label>
-        <select class="form-select" aria-label="Color scheme for heatmaps" name="color_scheme_for_counts">
+        <label class="form-label">Color scheme for interactive heatmap</label>
+        <select class="form-select" aria-label="Color scheme for heatmaps" name="color_scheme_for_heatmap">
+            {% for cs in color_scheme_for_heatmap_avail %}
+            <option {% if cs==color_scheme_for_heatmap %} selected {% endif %}>{{ cs }}</option>
+            {% endfor %}
+        </select>
+    </div>
+
+    <div class="mb-3">
+        <label class="form-label">Color scheme for count plots</label>
+        <select class="form-select" aria-label="Color scheme for count plots" name="color_scheme_for_counts">
             {% for cs in color_scheme_for_counts_avail %}
             <option {% if cs==color_scheme_for_counts %} selected {% endif %}>{{ cs }}</option>
             {% endfor %}

geo_activity_playground/webui/settings/templates/settings/privacy-zones.html.j2

@@ -20,7 +20,7 @@
         })
         L.tileLayer('/tile/color/{z}/{x}/{y}.png', {
             maxZoom: 19,
-            attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
+            attribution: '{{ map_tile_attribution|safe }}'
         }).addTo(map)
 
         let geojson_layer = L.geoJSON(geojson).addTo(map)

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

@@ -106,7 +106,7 @@
 
             L.tileLayer('/tile/grayscale/{z}/{x}/{y}.png', {
                 maxZoom: 19,
-                attribution: '&copy; <a href=" http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
+                attribution: '{{ map_tile_attribution|safe }}'
             }).addTo(map)
 
             let explorer_geojson = {{ explored_geojson| safe }}

geo_activity_playground/webui/static/Leaflet.fullscreen.min.js

@@ -0,0 +1 @@
+L.Control.Fullscreen=L.Control.extend({options:{position:"topleft",title:{"false":"View Fullscreen","true":"Exit Fullscreen"}},onAdd:function(map){var container=L.DomUtil.create("div","leaflet-control-fullscreen leaflet-bar leaflet-control");this.link=L.DomUtil.create("a","leaflet-control-fullscreen-button leaflet-bar-part",container);this.link.href="#";this._map=map;this._map.on("fullscreenchange",this._toggleTitle,this);this._toggleTitle();L.DomEvent.on(this.link,"click",this._click,this);return container},_click:function(e){L.DomEvent.stopPropagation(e);L.DomEvent.preventDefault(e);this._map.toggleFullscreen(this.options)},_toggleTitle:function(){this.link.title=this.options.title[this._map.isFullscreen()]}});L.Map.include({isFullscreen:function(){return this._isFullscreen||false},toggleFullscreen:function(options){var container=this.getContainer();if(this.isFullscreen()){if(options&&options.pseudoFullscreen){this._disablePseudoFullscreen(container)}else if(document.exitFullscreen){document.exitFullscreen()}else if(document.mozCancelFullScreen){document.mozCancelFullScreen()}else if(document.webkitCancelFullScreen){document.webkitCancelFullScreen()}else if(document.msExitFullscreen){document.msExitFullscreen()}else{this._disablePseudoFullscreen(container)}}else{if(options&&options.pseudoFullscreen){this._enablePseudoFullscreen(container)}else if(container.requestFullscreen){container.requestFullscreen()}else if(container.mozRequestFullScreen){container.mozRequestFullScreen()}else if(container.webkitRequestFullscreen){container.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT)}else if(container.msRequestFullscreen){container.msRequestFullscreen()}else{this._enablePseudoFullscreen(container)}}},_enablePseudoFullscreen:function(container){L.DomUtil.addClass(container,"leaflet-pseudo-fullscreen");this._setFullscreen(true);this.invalidateSize();this.fire("fullscreenchange")},_disablePseudoFullscreen:function(container){L.DomUtil.removeClass(container,"leaflet-pseudo-fullscreen");this._setFullscreen(false);this.invalidateSize();this.fire("fullscreenchange")},_setFullscreen:function(fullscreen){this._isFullscreen=fullscreen;var container=this.getContainer();if(fullscreen){L.DomUtil.addClass(container,"leaflet-fullscreen-on")}else{L.DomUtil.removeClass(container,"leaflet-fullscreen-on")}},_onFullscreenChange:function(e){var fullscreenElement=document.fullscreenElement||document.mozFullScreenElement||document.webkitFullscreenElement||document.msFullscreenElement;if(fullscreenElement===this.getContainer()&&!this._isFullscreen){this._setFullscreen(true);this.fire("fullscreenchange")}else if(fullscreenElement!==this.getContainer()&&this._isFullscreen){this._setFullscreen(false);this.fire("fullscreenchange")}}});L.Map.mergeOptions({fullscreenControl:false});L.Map.addInitHook(function(){if(this.options.fullscreenControl){this.fullscreenControl=new L.Control.Fullscreen(this.options.fullscreenControl);this.addControl(this.fullscreenControl)}var fullscreenchange;if("onfullscreenchange"in document){fullscreenchange="fullscreenchange"}else if("onmozfullscreenchange"in document){fullscreenchange="mozfullscreenchange"}else if("onwebkitfullscreenchange"in document){fullscreenchange="webkitfullscreenchange"}else if("onmsfullscreenchange"in document){fullscreenchange="MSFullscreenChange"}if(fullscreenchange){var onFullscreenChange=L.bind(this._onFullscreenChange,this);this.whenReady(function(){L.DomEvent.on(document,fullscreenchange,onFullscreenChange)});this.on("unload",function(){L.DomEvent.off(document,fullscreenchange,onFullscreenChange)})}});L.control.fullscreen=function(options){return new L.Control.Fullscreen(options)};

geo_activity_playground/webui/static/MarkerCluster.Default.css

@@ -0,0 +1,60 @@
+.marker-cluster-small {
+	background-color: rgba(181, 226, 140, 0.6);
+	}
+.marker-cluster-small div {
+	background-color: rgba(110, 204, 57, 0.6);
+	}
+
+.marker-cluster-medium {
+	background-color: rgba(241, 211, 87, 0.6);
+	}
+.marker-cluster-medium div {
+	background-color: rgba(240, 194, 12, 0.6);
+	}
+
+.marker-cluster-large {
+	background-color: rgba(253, 156, 115, 0.6);
+	}
+.marker-cluster-large div {
+	background-color: rgba(241, 128, 23, 0.6);
+	}
+
+	/* IE 6-8 fallback colors */
+.leaflet-oldie .marker-cluster-small {
+	background-color: rgb(181, 226, 140);
+	}
+.leaflet-oldie .marker-cluster-small div {
+	background-color: rgb(110, 204, 57);
+	}
+
+.leaflet-oldie .marker-cluster-medium {
+	background-color: rgb(241, 211, 87);
+	}
+.leaflet-oldie .marker-cluster-medium div {
+	background-color: rgb(240, 194, 12);
+	}
+
+.leaflet-oldie .marker-cluster-large {
+	background-color: rgb(253, 156, 115);
+	}
+.leaflet-oldie .marker-cluster-large div {
+	background-color: rgb(241, 128, 23);
+}
+
+.marker-cluster {
+	background-clip: padding-box;
+	border-radius: 20px;
+	}
+.marker-cluster div {
+	width: 30px;
+	height: 30px;
+	margin-left: 5px;
+	margin-top: 5px;
+
+	text-align: center;
+	border-radius: 15px;
+	font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif;
+	}
+.marker-cluster span {
+	line-height: 30px;
+	}

geo_activity_playground/webui/static/MarkerCluster.css

@@ -0,0 +1,14 @@
+.leaflet-cluster-anim .leaflet-marker-icon, .leaflet-cluster-anim .leaflet-marker-shadow {
+	-webkit-transition: -webkit-transform 0.3s ease-out, opacity 0.3s ease-in;
+	-moz-transition: -moz-transform 0.3s ease-out, opacity 0.3s ease-in;
+	-o-transition: -o-transform 0.3s ease-out, opacity 0.3s ease-in;
+	transition: transform 0.3s ease-out, opacity 0.3s ease-in;
+}
+
+.leaflet-cluster-spider-leg {
+	/* stroke-dashoffset (duration and function) should match with leaflet-marker-icon transform in order to track it exactly */
+	-webkit-transition: -webkit-stroke-dashoffset 0.3s ease-out, -webkit-stroke-opacity 0.3s ease-in;
+	-moz-transition: -moz-stroke-dashoffset 0.3s ease-out, -moz-stroke-opacity 0.3s ease-in;
+	-o-transition: -o-stroke-dashoffset 0.3s ease-out, -o-stroke-opacity 0.3s ease-in;
+	transition: stroke-dashoffset 0.3s ease-out, stroke-opacity 0.3s ease-in;
+}