How each mode works
id="dataViewRoutesModes"
class="data-routes-toolbar hidden mt-2 mb-3"
>
int:
OUT_GARAGES.write_text(
json.dumps(
{
- "name": f"{ELLIS_MANAGER} garages",
+ "name": f"{ELLIS_OWNER} garages",
"modes": ["drive"],
"note": note_g,
"items": garages,
@@ -343,7 +343,7 @@ def main() -> int:
OUT_LOTS.write_text(
json.dumps(
{
- "name": f"{ELLIS_MANAGER} lots",
+ "name": f"{ELLIS_OWNER} lots",
"modes": ["drive"],
"note": note_l,
"items": lots,
diff --git a/src/bootstrap.mjs b/src/bootstrap.mjs
index 94a6fb7..0275854 100644
--- a/src/bootstrap.mjs
+++ b/src/bootstrap.mjs
@@ -818,12 +818,32 @@ function dataDestinationsHiddenOnlyIconSvg() {
);
}
-function dataViewBackLinkHtml() {
- return `
`;
+const DATA_VIEW_TAB_IDS = ["destinations", "parking", "routes"];
+
+const DATA_VIEW_TAB_LABELS = {
+ destinations: "Destinations",
+ parking: "Parking",
+ routes: "Routes",
+};
+
+const DATA_VIEW_DEFAULT_TAB = "destinations";
+
+/** Map `#/data/
` to a tab id, or null for JSON detail paths. */
+function dataViewTabFromPath(path) {
+ if (DATA_VIEW_TAB_IDS.includes(path)) return path;
+ if (path.startsWith("parking/")) return "parking";
+ return null;
}
-function dataViewBackLinkInlineHtml() {
- return `←`;
+function renderDataViewTabs(activeTab) {
+ const tabsEl = document.getElementById("dataViewTabs");
+ if (!tabsEl) return;
+ tabsEl.classList.remove("hidden");
+ tabsEl.innerHTML = DATA_VIEW_TAB_IDS.map((id) => {
+ const selected = id === activeTab;
+ const label = DATA_VIEW_TAB_LABELS[id] || id;
+ return `${escapeHtml(label)}`;
+ }).join("");
}
function dataViewToggleButtonHtml(className, mode, label) {
@@ -1005,19 +1025,19 @@ function updateDataViewMap(points, options) {
rows.push(
`| Address | ${escapeHtml(parkingAddress)} |
|---|
`,
);
- const parkingManager =
+ const parkingOwner =
p.parkingItem &&
- typeof p.parkingItem.manager === "string" &&
- p.parkingItem.manager.trim() !== ""
- ? p.parkingItem.manager.trim()
+ typeof p.parkingItem.owner === "string" &&
+ p.parkingItem.owner.trim() !== ""
+ ? p.parkingItem.owner.trim()
: "";
- if (parkingManager) {
- const managerTd =
- ovf?.manager === true
- ? `${escapeHtml(parkingManager)}`
- : escapeHtml(parkingManager);
+ if (parkingOwner) {
+ const ownerTd =
+ ovf?.owner === true
+ ? `${escapeHtml(parkingOwner)}`
+ : escapeHtml(parkingOwner);
rows.push(
- `| Manager | ${managerTd} |
|---|
`,
+ `| Owner | ${ownerTd} |
|---|
`,
);
}
const pricingRows = getDataViewParkingPricingRows(
@@ -1368,19 +1388,23 @@ function getDataRoutePath() {
function renderDataView() {
const appView = document.getElementById("appView");
const dataView = document.getElementById("dataView");
- const dataViewIndex = document.getElementById("dataViewIndex");
const dataViewDetail = document.getElementById("dataViewDetail");
const dataViewDetailTitle = document.getElementById("dataViewDetailTitle");
const dataViewContent = document.getElementById("dataViewContent");
if (!appView || !dataView || !appData) return;
- const path = getDataRoutePath();
+ let path = getDataRoutePath();
if (path === null) return;
if (path === "strategies" || path.startsWith("strategies/")) {
- window.location.hash = "#/data";
- return;
+ history.replaceState(null, "", `#/data/${DATA_VIEW_DEFAULT_TAB}`);
+ path = DATA_VIEW_DEFAULT_TAB;
+ }
+
+ if (path === "") {
+ history.replaceState(null, "", `#/data/${DATA_VIEW_DEFAULT_TAB}`);
+ path = DATA_VIEW_DEFAULT_TAB;
}
hideModesView();
@@ -1390,29 +1414,18 @@ function renderDataView() {
dataView.classList.remove("hidden");
document.querySelector("main")?.classList.add("data-view-active");
- const isIndex = path === "";
- const hideDetail = isIndex || path === "destinations" || path === "routes";
- dataViewIndex.classList.toggle("hidden", !isIndex);
+ const activeTab = dataViewTabFromPath(path);
+ const hideDetail =
+ path === "destinations" || path === "routes" || path === "parking";
dataViewDetail.classList.toggle("hidden", hideDetail);
document.getElementById("dataViewParkingModes")?.classList.add("hidden");
document.getElementById("dataViewDestinationsBar")?.classList.add("hidden");
document.getElementById("dataViewRoutesModes")?.classList.add("hidden");
document.getElementById("dataViewMap")?.classList.add("hidden");
+ document.getElementById("dataViewTabs")?.classList.add("hidden");
- if (path === "") {
- // Index: list datasets with links
- const geoLinks = [
- { href: "#/data/destinations", label: "destinations" },
- { href: "#/data/parking", label: "parking" },
- { href: "#/data/routes", label: "routes" },
- ];
- dataViewIndex.innerHTML = geoLinks
- .map(
- (l) =>
- `${l.label}`,
- )
- .join("");
- return;
+ if (activeTab) {
+ renderDataViewTabs(activeTab);
}
if (path === "destinations") {
@@ -1420,18 +1433,18 @@ function renderDataView() {
? appData.destinations
: [];
const params = parseFragment();
- const viewRaw = params.view ? String(params.view).trim().toLowerCase() : "";
- const destViewMode =
- viewRaw === "hidden"
- ? "hidden"
- : viewRaw === "visible"
- ? "visible"
- : "all";
-
- function buildDataDestinationsHash(opts) {
+ const viewParam = params.view ? String(params.view).trim() : "";
+ const selectedViews =
+ viewParam === ""
+ ? []
+ : viewParam
+ .split(",")
+ .map((v) => v.trim().toLowerCase())
+ .filter((v) => v === "visible" || v === "hidden");
+
+ function buildDataDestinationsHash(selected) {
const q = [];
- if (opts.view === "visible") q.push("view=visible");
- if (opts.view === "hidden") q.push("view=hidden");
+ if (selected.length > 0) q.push("view=" + selected.join(","));
return "#/data/destinations" + (q.length > 0 ? "?" + q.join("&") : "");
}
@@ -1440,18 +1453,14 @@ function renderDataView() {
);
if (dataViewDestinationsBar) {
dataViewDestinationsBar.classList.remove("hidden");
- const visiblePressed = destViewMode === "visible";
- const hiddenPressed = destViewMode === "hidden";
+ const visiblePressed = selectedViews.includes("visible");
+ const hiddenPressed = selectedViews.includes("hidden");
dataViewDestinationsBar.innerHTML = `
`;
@@ -1464,21 +1473,47 @@ function renderDataView() {
setDataViewToggleButtonActive(btnVisible, visiblePressed);
setDataViewToggleButtonActive(btnHidden, hiddenPressed);
btnVisible?.addEventListener("click", () => {
- const next = destViewMode === "visible" ? "all" : "visible";
- window.location.hash = buildDataDestinationsHash({ view: next });
+ const current = parseFragment();
+ const viewRaw = current.view ? String(current.view).trim() : "";
+ const currentViews =
+ viewRaw === ""
+ ? []
+ : viewRaw
+ .split(",")
+ .map((v) => v.trim().toLowerCase())
+ .filter((v) => v === "visible" || v === "hidden");
+ const idx = currentViews.indexOf("visible");
+ const nextViews =
+ idx >= 0
+ ? currentViews.filter((_, i) => i !== idx)
+ : [...currentViews, "visible"];
+ window.location.hash = buildDataDestinationsHash(nextViews);
});
btnHidden?.addEventListener("click", () => {
- const next = destViewMode === "hidden" ? "all" : "hidden";
- window.location.hash = buildDataDestinationsHash({ view: next });
+ const current = parseFragment();
+ const viewRaw = current.view ? String(current.view).trim() : "";
+ const currentViews =
+ viewRaw === ""
+ ? []
+ : viewRaw
+ .split(",")
+ .map((v) => v.trim().toLowerCase())
+ .filter((v) => v === "visible" || v === "hidden");
+ const idx = currentViews.indexOf("hidden");
+ const nextViews =
+ idx >= 0
+ ? currentViews.filter((_, i) => i !== idx)
+ : [...currentViews, "hidden"];
+ window.location.hash = buildDataDestinationsHash(nextViews);
});
}
const destinationPoints = destinations
.filter((d) => {
- if (destViewMode === "hidden")
- return isDestinationHiddenFromPublicMaps(d);
- if (destViewMode === "visible")
- return !isDestinationHiddenFromPublicMaps(d);
- return true;
+ if (selectedViews.length === 0) return true;
+ const hidden = isDestinationHiddenFromPublicMaps(d);
+ if (selectedViews.includes("visible") && !hidden) return true;
+ if (selectedViews.includes("hidden") && hidden) return true;
+ return false;
})
.filter(
(d) =>
@@ -1493,7 +1528,6 @@ function renderDataView() {
destinationHiddenFromPublicMaps: isDestinationHiddenFromPublicMaps(d),
}));
updateDataViewMap(destinationPoints);
- dataViewIndex.classList.add("hidden");
dataViewDetail.classList.add("hidden");
return;
}
@@ -1529,19 +1563,18 @@ function renderDataView() {
).join("");
dataViewRoutesModes.innerHTML = `