Make the map center static when map reloads

This commit is contained in:
didier committed 2025-01-19 10:54:04 -05:00
1 parent cab7eada1f
commit 79488d75e8
4 files changed
+91 -11

No files matched your search

+11 -6
View File
@@ -5,16 +5,20 @@ using YongeStreet.Services;
namespace YongeStreet.Controllers;
public record CityModel(string City, IList<CityRoadLengthStats> CityRoadLengthStats, DateOnly Date);
public record MapLocation(double? lon, double? lat, int? zoom);
public record CityModel(
string City,
IList<CityRoadLengthStats> CityRoadLengthStats,
DateOnly Date,
MapLocation mapLocation);
public record IndexModel(List<CityOverview> Cities);
public record TmpModel(IList<string> Cities);
public class HomeController : Controller
{
private readonly ILogger<HomeController> _logger;
private readonly DataService _dataService;
private readonly ILogger<HomeController> _logger;
public HomeController(ILogger<HomeController> logger, DataService dataService)
{
@@ -22,11 +26,12 @@ public class HomeController : Controller
_dataService = dataService;
}
public IActionResult City(string city, string date)
public IActionResult City(string city, string date, double? lon, double? lat, int? zoom)
{
var cityRoadLengthStats = _dataService.GetCityRoadLengthStats(city);
var parsedDate = Util.ParseDateOnly(date) ?? new DateOnly(2025, 1, 1);
return View(new CityModel(city, cityRoadLengthStats, parsedDate ));
var mapLocation = new MapLocation(lon, lat, zoom);
return View(new CityModel(city, cityRoadLengthStats, parsedDate, mapLocation));
}
public IActionResult Index()
+6 -2
View File
@@ -13,7 +13,10 @@
style=""
id="leaflet-map"
data-city="@Model.City"
data-date="@Model.Date.ToString("yyyy-MM-dd")">
data-date="@Model.Date.ToString("yyyy-MM-dd")"
data-initial-zoom="@Model.mapLocation.zoom"
data-initial-lon="@Model.mapLocation.lon"
data-initial-lat="@Model.mapLocation.lat">
</div>
<table class="uk-table uk-table-striped">
@@ -35,7 +38,8 @@
@Html.ActionLink(stats.Date.ToString("yyyy-MM-dd"),
"City",
"Home",
new { City = Model.City, Date = stats.Date.ToString("yyyy-MM-dd"), })
new { City = Model.City, Date = stats.Date.ToString("yyyy-MM-dd"), },
htmlAttributes: new {@class = "map-link"})
}
else
+3 -1
View File
@@ -22,7 +22,9 @@
<hr/>
<footer>
source: <a href="https://gitlab.com/all-dressed-programming/yongestreet">https://gitlab.com/all-dressed-programming/yongestreet</a>
source: <a href="https://gitlab.com/all-dressed-programming/yongestreet" target="_blank">
https://gitlab.com/all-dressed-programming/yongestreet
</a>
</footer>
</div>
+71 -2
View File
@@ -13,7 +13,28 @@ function findBaryCenter(points) {
return [lat / points.length, lon / points.length]
}
function getCenter(data) {
function elementSpecifyMapCenter(elm) {
return !!elm.getAttribute('data-initial-lon') && elm.getAttribute('data-initial-lat');
}
function getMapCenterFromElement(elm) {
const lon = parseFloat(elm.getAttribute('data-initial-lon'))
const lat = parseFloat(elm.getAttribute('data-initial-lat'))
return [lat, lon];
}
function elementSpecifyMapZoom(elm) {
return !!elm.getAttribute('data-initial-zoom');
}
function getMapZoomFromElement(elm) {
return parseFloat(elm.getAttribute('data-initial-zoom'))
}
function getCenter(data, elm) {
if(elementSpecifyMapCenter(elm)){
return getMapCenterFromElement(elm)
}
if (!data) {
return centerOfTheWorld;
}
@@ -49,11 +70,59 @@ function getUrl(city, date) {
return `/api/roads?${new URLSearchParams(params).toString()}`
}
function recenterURLPointsToMaps(url, center, zoom) {
url.searchParams.set('lat', center.lat);
url.searchParams.set('lon', center.lng);
url.searchParams.set('zoom', zoom);
return url;
}
function recenterLinkThatPointsToMaps(elm, center, zoom) {
const href = elm.getAttribute("href");
try {
const url = new URL(href, window.document.location.origin)
const newUrl = recenterURLPointsToMaps(url, center, zoom);
elm.setAttribute("href", newUrl.toString());
} catch (e) {
console.error(`Could not recenter ${elm} with href ${href}.`)
}
}
function recenterLinksThatPointsToMaps(center, zoom) {
const elms = document.getElementsByClassName("map-link");
for (const elm of elms) {
recenterLinkThatPointsToMaps(elm, center, zoom);
}
}
function onMapChange(e) {
const center = e.target.getCenter();
const zoom = e.target.getZoom();
recenterLinksThatPointsToMaps(center, zoom);
}
function hookEvents(map){
const events = ['zoomend', 'moveend', 'load'];
events.forEach((event) => map.on(event, onMapChange));
}
function getZoom(elm){
return elementSpecifyMapCenter(elm) ? getMapZoomFromElement(elm): 13;
}
async function renderLeafletMap(city, date) {
const resp = await fetch(getUrl(city, date));
const roads = await resp.json();
const elm = document.getElementById("leaflet-map")
const map = leaflet.map("leaflet-map").setView(getCenter(roads), 13);
const map = leaflet.map(elm);
hookEvents(map)
map.setView(getCenter(roads, elm), getZoom(elm));
leaflet
.tileLayer("https://tile.openstreetmap.org/{z}/{x}/{y}.png", {maxZoom: 19})