${items}
@@ -833,6 +861,110 @@
`;
}
+ /** Prefer explicit map_destination; else Maps URL dest; else "Visit X" / venue. */
+ function resolveMapDestination(item, venueName) {
+ if (item && item.map_destination) return String(item.map_destination).trim();
+ if (item && item.walking_map_url) {
+ try {
+ var u = new URL(item.walking_map_url);
+ var dest = u.searchParams.get("destination");
+ if (dest) return decodeURIComponent(dest.replace(/\+/g, " "));
+ } catch (e) { /* ignore */ }
+ }
+ var action = (item && item.action) ? String(item.action) : "";
+ var visit = action.match(/^Visit\s+(.+?)(?:\s+—|$)/i);
+ if (visit) {
+ var place = visit[1].split(" — ")[0].trim();
+ if (venueName && place.toLowerCase().indexOf(venueName.toLowerCase()) === -1) {
+ return place + ", " + venueName;
+ }
+ return place;
+ }
+ if (venueName && /arrive at/i.test(action)) return venueName;
+ return "";
+ }
+
+ function buildWalkingMapsUrl(origin, destination) {
+ var url = "https://www.google.com/maps/dir/?api=1&destination=" +
+ encodeURIComponent(destination) + "&travelmode=walking";
+ if (origin) {
+ url += "&origin=" + encodeURIComponent(origin);
+ }
+ return url;
+ }
+
+ function openWalkingMapFromHere(destination) {
+ if (!destination) {
+ showToast(t("schedule.mapNoDestination"), "error");
+ return;
+ }
+ function openWithOrigin(origin) {
+ window.open(buildWalkingMapsUrl(origin, destination), "_blank", "noopener,noreferrer");
+ }
+ if (!navigator.geolocation) {
+ openWithOrigin(null);
+ showToast(t("schedule.mapOpenedNoGeo"), "info");
+ return;
+ }
+ showToast(t("schedule.locating"), "info");
+ navigator.geolocation.getCurrentPosition(
+ function (pos) {
+ openWithOrigin(pos.coords.latitude + "," + pos.coords.longitude);
+ showToast(t("schedule.mapOpened"), "success");
+ },
+ function () {
+ openWithOrigin(null);
+ showToast(t("schedule.mapOpenedNoGeo"), "info");
+ },
+ { enableHighAccuracy: true, timeout: 10000, maximumAge: 60000 }
+ );
+ }
+
+ /** Expand/collapse stops and map-from-here — shared by plan detail + inline result. */
+ function handleScheduleUiClick(e) {
+ var mapBtn = e.target.closest(".map-from-here-btn");
+ if (mapBtn) {
+ e.preventDefault();
+ e.stopPropagation();
+ openWalkingMapFromHere(mapBtn.getAttribute("data-destination") || "");
+ return;
+ }
+
+ var header = e.target.closest(".timeline-item-header");
+ if (!header) return;
+ // Ignore clicks that bubbled from controls inside the expanded body
+ if (e.target.closest(".timeline-item-body")) return;
+
+ var item = header.closest(".timeline-item");
+ if (!item) return;
+ var body = item.querySelector(".timeline-item-body");
+ if (!body) return;
+
+ var willOpen = body.hasAttribute("hidden");
+ // Accordion: close other open stops in the same timeline
+ var timeline = item.closest(".timeline");
+ if (timeline && willOpen) {
+ timeline.querySelectorAll(".timeline-item.is-expanded").forEach(function (el) {
+ if (el === item) return;
+ el.classList.remove("is-expanded");
+ var h = el.querySelector(".timeline-item-header");
+ var b = el.querySelector(".timeline-item-body");
+ if (h) h.setAttribute("aria-expanded", "false");
+ if (b) b.setAttribute("hidden", "");
+ });
+ }
+
+ if (willOpen) {
+ body.removeAttribute("hidden");
+ item.classList.add("is-expanded");
+ header.setAttribute("aria-expanded", "true");
+ } else {
+ body.setAttribute("hidden", "");
+ item.classList.remove("is-expanded");
+ header.setAttribute("aria-expanded", "false");
+ }
+ }
+
function renderRoute(plan) {
if (!Array.isArray(plan.route) || plan.route.length === 0) {
return "";
@@ -1044,6 +1176,7 @@
{ key: "restaurant", label: "Restaurant" },
{ key: "reminder_min", label: "Reminder Before (min)", type: "select", options: ["", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60"] },
{ key: "walking_map_url", label: "Walking Map URL" },
+ { key: "map_destination", label: "Map Destination (for walk-from-here)" },
{ key: "meal_timing_note", label: "Meal Timing Note" },
{ key: "backup_plan", label: "Backup Plan" },
];
@@ -1413,10 +1546,11 @@
// Plan detail content delegation for schedule editing & delete
$planDetailContent.addEventListener("click", (e) => {
+ handleScheduleUiClick(e);
+
const editBtn = e.target.closest(".edit-schedule-btn");
const removeBtn = e.target.closest(".remove-schedule-btn");
const addBtn = e.target.closest("#btn-add-schedule-item");
- const deleteBtn = e.target.closest("#btn-delete-plan");
if (editBtn && currentPlanId) {
const idx = parseInt(editBtn.dataset.index, 10);
@@ -1436,6 +1570,11 @@
}
});
+ // Inline new-trip result: expand + map actions
+ $resultNewTrip.addEventListener("click", function (e) {
+ handleScheduleUiClick(e);
+ });
+
// Reminder dropdown change (plan detail)
$planDetailContent.addEventListener("change", function (e) {
var sel = e.target.closest(".reminder-inline");
diff --git a/static/js/i18n.js b/static/js/i18n.js
index efc4a0e..f2c010c 100644
--- a/static/js/i18n.js
+++ b/static/js/i18n.js
@@ -110,6 +110,14 @@
"schedule.reminderNone": "\uD83D\uDD14 None",
"schedule.reminderMin": "\uD83D\uDD14 {min} min",
"schedule.walkToHere": "\uD83D\uDEE3 Walk to here",
+ "schedule.walkFromPrev": "\uD83D\uDEB6 From previous stop",
+ "schedule.mapFromHere": "\uD83D\uDCCD Map from my location",
+ "schedule.mapFromHereHint": "Open walking directions from where you are now",
+ "schedule.tapToExpand": "Tap a stop for walking directions",
+ "schedule.locating": "Getting your location\u2026",
+ "schedule.mapOpened": "Opening walking directions",
+ "schedule.mapOpenedNoGeo": "Opening map (location unavailable \u2014 Maps may still use your position)",
+ "schedule.mapNoDestination": "This stop has no map destination yet.",
"schedule.noItems": "No schedule items.",
// Edit/Add Modal
@@ -311,6 +319,14 @@
"schedule.reminderNone": "\uD83D\uDD14 Ninguno",
"schedule.reminderMin": "\uD83D\uDD14 {min} min",
"schedule.walkToHere": "\uD83D\uDEE3 Caminar hasta aquí",
+ "schedule.walkFromPrev": "\uD83D\uDEB6 Desde la parada anterior",
+ "schedule.mapFromHere": "\uD83D\uDCCD Mapa desde mi ubicación",
+ "schedule.mapFromHereHint": "Abrir indicaciones a pie desde donde estás",
+ "schedule.tapToExpand": "Toca una parada para ver indicaciones a pie",
+ "schedule.locating": "Obteniendo tu ubicación\u2026",
+ "schedule.mapOpened": "Abriendo indicaciones a pie",
+ "schedule.mapOpenedNoGeo": "Abriendo mapa (ubicación no disponible \u2014 Maps puede usar tu posición)",
+ "schedule.mapNoDestination": "Esta parada aún no tiene destino en el mapa.",
"schedule.noItems": "Sin elementos en el horario.",
// Edit/Add Modal
diff --git a/test_waypoint_maps.py b/test_waypoint_maps.py
new file mode 100644
index 0000000..30da8b6
--- /dev/null
+++ b/test_waypoint_maps.py
@@ -0,0 +1,28 @@
+"""Tests for in-venue walking map destination helpers."""
+
+from app.engine.planner import (
+ _attraction_short_name,
+ _map_destination,
+ _venue_label,
+ _walking_directions_url,
+)
+
+
+def test_venue_label_includes_location_when_distinct():
+ assert _venue_label({"venue": "Busch Gardens", "location": "Tampa"}) == "Busch Gardens Tampa"
+ assert _venue_label({"venue": "Busch Gardens Tampa", "location": "Tampa"}) == "Busch Gardens Tampa"
+
+
+def test_map_destination_qualifies_attraction():
+ assert _map_destination("Kumba", "Busch Gardens Tampa") == "Kumba, Busch Gardens Tampa"
+
+
+def test_walking_directions_url_includes_venue_and_walking_mode():
+ url = _walking_directions_url("Congo River Rapids", "Kumba", "Busch Gardens Tampa")
+ assert "travelmode=walking" in url
+ assert "origin=" in url and "destination=" in url
+ assert "Busch" in url or "Busch%20" in url or "Busch+" in url
+
+
+def test_attraction_short_name_strips_tip_suffix():
+ assert _attraction_short_name("Kumba — tip: ride early") == "Kumba"