From 4ce50723a7c673b37e09b1ba251250c5824212e2 Mon Sep 17 00:00:00 2001
From: sanj <67624670+iodrift@users.noreply.github.com>
Date: Fri, 15 Nov 2024 13:09:24 -0800
Subject: [PATCH] Auto-update: Fri Nov 15 13:09:24 PST 2024
---
sijapi/routers/gis.py | 39 ++++++++++++++++-----------------------
1 file changed, 16 insertions(+), 23 deletions(-)
diff --git a/sijapi/routers/gis.py b/sijapi/routers/gis.py
index b60c2e8..bcd2e7d 100644
--- a/sijapi/routers/gis.py
+++ b/sijapi/routers/gis.py
@@ -9,6 +9,8 @@ import random
from pathlib import Path
import traceback
import matplotlib.pyplot as plt
+import contextily as ctx
+import numpy as np
from datetime import datetime, timezone
from typing import Union, List
import folium
@@ -122,6 +124,7 @@ async def get_last_location() -> Optional[Location]:
return None
+
async def generate_and_save_heatmap(
start_date: Union[str, int, datetime],
end_date: Optional[Union[str, int, datetime]] = None,
@@ -136,11 +139,7 @@ Generate a heatmap for the given date range and save it as a PNG file.
:return: The path where the PNG file was saved
"""
try:
- import matplotlib.pyplot as plt
- import contextily as ctx
- import numpy as np
- from matplotlib.colors import LinearSegmentedColormap
-
+
start_date = await dt(start_date)
if end_date:
end_date = await dt(end_date)
@@ -160,39 +159,33 @@ Generate a heatmap for the given date range and save it as a PNG file.
buffer = max(lat_range, lon_range) * 0.05
# Enforce minimum zoom
- MIN_RANGE = 0.05 # roughly 3-4 miles
+ MIN_RANGE = 0.05
lat_range = max(lat_range, MIN_RANGE)
lon_range = max(lon_range, MIN_RANGE)
- bounds = [
- min(lons) - buffer,
- max(lons) + buffer,
- min(lats) - buffer,
- max(lats) + buffer
- ]
-
# Create figure with fixed size
- fig, ax = plt.subplots(figsize=(6.4, 3.6), dpi=100) # 640x360 pixels
+ fig, ax = plt.subplots(figsize=(6.4, 3.6), dpi=100)
- # Add dark basemap
- ctx.add_basemap(
- ax,
- crs='EPSG:4326',
- source=ctx.providers.CartoDB.DarkMatter,
- zoom='auto',
- bbox=bounds
- )
+ # Set map extent
+ ax.set_xlim(min(lons) - buffer, max(lons) + buffer)
+ ax.set_ylim(min(lats) - buffer, max(lats) + buffer)
# Create heatmap overlay
heatmap = ax.hexbin(
lons, lats,
- extent=bounds,
gridsize=25,
cmap='hot',
alpha=0.6,
zorder=2
)
+ # Add dark basemap
+ ctx.add_basemap(
+ ax,
+ source=ctx.providers.CartoDB.DarkMatter,
+ zoom='auto'
+ )
+
# Remove axes and margins
ax.set_axis_off()
plt.subplots_adjust(left=0, right=1, top=1, bottom=0)