whereto-bike 0.0.6 → 0.0.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "whereto-bike",
   "type": "module",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Open-source cycling platform — the CMS for cycling",
   "license": "AGPL-3.0",
   "repository": {

package/packages/create-bike-blog/templates/github/workflows/ci.yml.tpl

@@ -44,7 +44,7 @@ jobs:
         uses: actions/cache@v5
         with:
           path: .astro
-          key: astro-${{ hashFiles('blog/**') }}
+          key: astro-${{ github.run_id }}
           restore-keys: astro-
 
       - name: Resolve VIDEO_PREFIX from wrangler config

package/packages/create-bike-blog/templates/github/workflows/deploy.yml.tpl

@@ -56,7 +56,7 @@ jobs:
         uses: actions/cache@v5
         with:
           path: .astro
-          key: astro-${{ hashFiles('blog/**') }}
+          key: astro-${{ github.run_id }}
           restore-keys: astro-
 
       - name: Restore dist cache

package/packages/create-bike-blog/templates/scripts/setup.js

@@ -65,7 +65,7 @@ function run(cmd, opts = {}) {
 
 function commandExists(cmd) {
   try {
-    safeExec(`which ${cmd}`, { stdio: 'pipe' });
+    safeExec(`command -v ${cmd}`, { stdio: 'pipe', shell: true });
     return true;
   } catch {
     return false;

package/src/components/WikiHome.astro

@@ -11,7 +11,7 @@ const config = getCityConfig();
 const { published, filterTags, routeTagsMap } = await loadHomepageData();
 ---
 
-<p class="site-identity-line">{t('home.identity', locale, { display_name: config.display_name })}</p>
+<p class="site-identity-line">{t('home.identity', locale, { name: config.name })}</p>
 <TagFilter tags={filterTags} />
 <ul class="routes-grid">
   {published.map((route, i) => {

package/src/components/admin/RideEditor.tsx

@@ -13,6 +13,7 @@ import type { StravaImportResult } from './StravaActivityBrowser';
 import { useEditorState } from './useEditorState';
 import { useFormValidation } from './useFormValidation';
 import { useDragDrop } from '../../lib/hooks';
+import { paths } from '../../lib/paths';
 import { useUnsavedGuard } from '../../lib/hooks/use-unsaved-guard';
 import { slugify } from '../../lib/slug';
 import SlugEditor from './SlugEditor';
@@ -118,8 +119,8 @@ export default function RideEditor({ initialData, cdnUrl, videosCdnUrl, videoPre
         );
         if (!res.ok || cancelled) return;
         const data = await res.json();
-        const code = data?.address?.country_code;
-        if (code && !cancelled) setCountry(code.toUpperCase());
+        const countryName = data?.address?.country;
+        if (countryName && !cancelled) setCountry(countryName);
       } catch { /* Nominatim failures are non-critical */ }
     })();
 
@@ -424,7 +425,7 @@ export default function RideEditor({ initialData, cdnUrl, videosCdnUrl, videoPre
           <EditorActions
             error={error} githubUrl={githubUrl} saved={saved} saving={saving}
             onSave={handleSave} contentType="ride"
-            viewLink={initialData.tour_slug ? `/tours/${initialData.tour_slug}/${initialData.slug}` : `/rides/${initialData.slug}`}
+            viewLink={paths.ride(initialData.slug, initialData.tour_slug)}
             showLicenseNotice={false}
           />
         </div>

package/src/i18n/en.json

@@ -7,7 +7,7 @@
   "footer.community": "Built by people who ride here",
   "footer.powered_by": "made with whereto.bike",
   "home.welcome": "New to biking? Experienced rider? Find your new favourite ride and explore nature!",
-  "home.identity": "Community-maintained cycling routes for {display_name}. Built by people who ride here.",
+  "home.identity": "Community-maintained cycling routes for {name}. Built by people who ride here.",
   "home.suggest_route": "Know a route that's missing? You can add it — share a ride you love with other cyclists.",
   "filter.choose_tag": "choose a tag to filter:",
   "route.elevation_gain": "Elevation Gain",

package/src/i18n/es.json

@@ -7,7 +7,7 @@
   "footer.community": "Creado por personas que pedalean aquí",
   "footer.powered_by": "hecho con whereto.bike",
   "home.welcome": "¿Nuevo en el ciclismo? ¿Ciclista experimentado? ¡Encuentra tu nuevo recorrido favorito y explora la naturaleza!",
-  "home.identity": "Rutas ciclistas mantenidas por la comunidad para {display_name}. Creado por personas que pedalean aquí.",
+  "home.identity": "Rutas ciclistas mantenidas por la comunidad para {name}. Creado por personas que pedalean aquí.",
   "home.suggest_route": "¿Conoces una ruta que falta? Agrégala — comparte un recorrido que te guste con otros ciclistas.",
   "filter.choose_tag": "elige una etiqueta para filtrar:",
   "route.elevation_gain": "Desnivel positivo",

package/src/integrations/admin-routes.ts

@@ -49,8 +49,11 @@ const routes = [
   { pattern: '/api/auth/strava/callback', entrypoint: view('api/auth/strava-callback.ts') },
   // Content-type admin pages and API endpoints (from registry)
   ...contentTypeRoutes,
-  // Admin index — serves the primary content type's list page per instance type
-  { pattern: '/admin', entrypoint: view(adminIndexView()) },
+  // Admin index — serves the primary content type's list page per instance type.
+  // Skipped when a content type already claims /admin via adminListRoute (e.g. routes on wiki).
+  ...(!contentTypeRoutes.some(r => r.pattern === '/admin')
+    ? [{ pattern: '/admin', entrypoint: view(adminIndexView()) }]
+    : []),
   // Non-content-type admin pages
   { pattern: '/admin/history', entrypoint: view('admin/history.astro') },
   { pattern: '/admin/users', entrypoint: view('admin/users.astro') },

package/src/lib/content/content-types.server.ts

@@ -48,6 +48,7 @@ export const contentTypes: ContentTypeConfig[] = [
     label: 'Routes',
     featureGate: 'hasRoutes',
     ops: routeOps,
+    adminListRoute: { pattern: '/admin', entrypoint: 'admin/index.astro' },
     adminDetailRoutes: [
       { pattern: '/admin/routes/new', entrypoint: 'admin/route-new.astro' },
       { pattern: '/admin/routes/[slug]', entrypoint: 'admin/route-detail.astro' },

package/src/lib/csp.ts

@@ -10,7 +10,7 @@ function originFrom(raw: string | undefined, fallback: string): string {
 
 export function cspOrigins() {
   const config = getCityConfig();
-  const cdn = originFrom(process.env.R2_PUBLIC_URL || config.cdn_url, config.cdn_url);
+  const cdn = originFrom(config.cdn_url, config.cdn_url);
   const videos = originFrom(config.videos_cdn_url, config.videos_cdn_url);
 
   return { cdn, videos };

package/src/loaders/admin-rides.ts

@@ -23,6 +23,7 @@ import {
   rideDateToIso,
   nameFromFilename,
   extractDateFromPath,
+  adjustTourYears,
   buildSlug,
 } from './rides';
 import { readRideFile } from './ride-file-reader';
@@ -73,8 +74,8 @@ export interface RideStats {
   by_year: Record<string, { rides: number; distance_km: number; elevation_m: number }>;
   by_country: Record<string, { rides: number; distance_km: number }>;
   records: {
-    longest_ride?: { slug: string; name: string; distance_km: number };
-    most_elevation?: { slug: string; name: string; elevation_m: number };
+    longest_ride?: { slug: string; name: string; distance_km: number; tour_slug?: string };
+    most_elevation?: { slug: string; name: string; elevation_m: number; tour_slug?: string };
     longest_tour?: { slug: string; name: string; distance_km: number; days: number };
   };
 }
@@ -122,6 +123,20 @@ export async function loadAdminRideData(): Promise<AdminRideData> {
     }
   }
 
+  // Adjust years for multi-year tours (e.g. Dec 2022 → Jan 2023)
+  const adjustedDates = new Map<string, { year: number; month: number; day: number }>();
+  for (const tour of tours) {
+    const tourDates: { gpxPath: string; date: { year: number; month: number; day: number } }[] = [];
+    for (const ridePath of tour.ridePaths) {
+      const date = extractDateFromPath(ridePath);
+      if (date) tourDates.push({ gpxPath: ridePath, date });
+    }
+    adjustTourYears(tourDates.map(td => td.date));
+    for (const td of tourDates) {
+      adjustedDates.set(td.gpxPath, td.date);
+    }
+  }
+
   // Load tour-level metadata
   const tourMeta = new Map<string, { name: string; description?: string; renderedDescription?: string; country?: string }>();
   for (const tour of tours) {
@@ -165,7 +180,7 @@ export async function loadAdminRideData(): Promise<AdminRideData> {
     const digest = computeFileDigest([gpxAbsPath, sidecarPath, mediaYmlPath]);
 
     // Compute slug early for cache key
-    const date = extractDateFromPath(gpxRelPath);
+    const date = adjustedDates.get(gpxRelPath) || extractDateFromPath(gpxRelPath);
     if (!date) continue;
     const gpxFilename = path.basename(gpxRelPath);
     const slug = buildSlug(date, gpxFilename, !!tourInfo);
@@ -188,7 +203,7 @@ export async function loadAdminRideData(): Promise<AdminRideData> {
     const parsed = readRideFile(ridesDir, gpxRelPath, tourInfo?.slug);
     if (!parsed) continue;
 
-    const isoDate = rideDateToIso(parsed.date);
+    const isoDate = rideDateToIso(date);
 
     // Compute content hash from raw file contents
     const contentHash = computeRideContentHash(
@@ -401,8 +416,8 @@ function buildStats(
     by_year: byYear,
     by_country: byCountry,
     records: {
-      longest_ride: longestRide ? { slug: longestRide.slug, name: longestRide.name, distance_km: longestRide.distance_km } : undefined,
-      most_elevation: mostElevation ? { slug: mostElevation.slug, name: mostElevation.name, elevation_m: mostElevation.elevation_m } : undefined,
+      longest_ride: longestRide ? { slug: longestRide.slug, name: longestRide.name, distance_km: longestRide.distance_km, tour_slug: longestRide.tour_slug } : undefined,
+      most_elevation: mostElevation ? { slug: mostElevation.slug, name: mostElevation.name, elevation_m: mostElevation.elevation_m, tour_slug: mostElevation.tour_slug } : undefined,
       longest_tour: longestTour ? { slug: longestTour.slug, name: longestTour.name, distance_km: longestTour.total_distance_km, days: longestTour.days } : undefined,
     },
   };

package/src/loaders/rides.ts

@@ -187,6 +187,49 @@ export function buildSlug(date: RideDate, gpxFilename: string, isTour?: boolean)
   return `${yyyy}-${mm}-${dd}-${slug}`;
 }
 
+/**
+ * Adjust years for rides in a multi-year tour.
+ *
+ * When a tour directory lives under a single YYYY/ folder but spans a year
+ * boundary (e.g. December 2022 → January 2023), all rides initially get the
+ * directory year. This function detects the year rollover by finding the
+ * largest internal gap between sorted months. If months [1,2,3,10,11,12] are
+ * present, the gap between 3 and 10 (7 months) indicates the tour runs
+ * Oct→Mar across a year boundary — months 1–3 become year + 1.
+ *
+ * Only considers non-circular gaps (between consecutive sorted months).
+ * The wrap-around gap from the highest to lowest month is ignored — it's
+ * always large for any clustered set of months and would cause false positives.
+ */
+export function adjustTourYears(dates: RideDate[]): void {
+  if (dates.length < 2) return;
+
+  const months = [...new Set(dates.map(d => d.month))].sort((a, b) => a - b);
+  if (months.length < 2) return;
+
+  // Find the largest gap between consecutive sorted months (non-circular).
+  // A gap > 6 means the months split into two clusters across a year boundary.
+  let maxGap = 0;
+  let gapAfterMonth = 0;
+  for (let i = 1; i < months.length; i++) {
+    const gap = months[i] - months[i - 1];
+    if (gap > maxGap) {
+      maxGap = gap;
+      gapAfterMonth = months[i - 1];
+    }
+  }
+
+  if (maxGap <= 6) return;
+
+  // Months at or before gapAfterMonth are the "early" cluster (next year).
+  // Months after gapAfterMonth are the "late" cluster (directory year).
+  for (const date of dates) {
+    if (date.month <= gapAfterMonth) {
+      date.year += 1;
+    }
+  }
+}
+
 /** Build an ISO date string from a RideDate. */
 export function rideDateToIso(date: RideDate): string {
   const mm = String(date.month).padStart(2, '0');
@@ -253,6 +296,21 @@ export function rideLoader(): Loader {
         }
       }
 
+      // Adjust years for multi-year tours (e.g. Dec 2022 → Jan 2023)
+      const adjustedDates = new Map<string, RideDate>();
+      for (const tour of tours) {
+        const tourDates: { gpxPath: string; date: RideDate }[] = [];
+        for (const ridePath of tour.ridePaths) {
+          const date = extractDateFromPath(ridePath);
+          if (date) tourDates.push({ gpxPath: ridePath, date });
+        }
+        const dates = tourDates.map(td => td.date);
+        adjustTourYears(dates);
+        for (const td of tourDates) {
+          adjustedDates.set(td.gpxPath, td.date);
+        }
+      }
+
       // Load privacy zone config once (if configured for this city)
       const privacyZone = getCityConfig().privacy_zone;
 
@@ -265,7 +323,7 @@ export function rideLoader(): Loader {
         const mediaYmlDigestPath = gpxAbsPath.replace(/\.gpx$/i, '-media.yml');
 
         // Incremental caching — need date+slug before checking digest
-        const date = extractDateFromPath(gpxRelPath);
+        const date = adjustedDates.get(gpxRelPath) || extractDateFromPath(gpxRelPath);
         if (!date) {
           logger.warn(`Could not extract date from path: ${gpxRelPath}`);
           continue;

package/src/views/admin/ride-detail.astro

@@ -10,6 +10,7 @@ import { CITY, VIDEO_PREFIX } from '../../lib/config/config';
 import { getCityConfig, isBlogInstance } from '../../lib/config/city-config';
 import { loadDetailPageData } from '../../lib/content/load-admin-content.server';
 import { rideDetailFromCache } from '../../lib/models/ride-model';
+import { paths } from '@/lib/paths';
 import { t } from '@/i18n';
 import tours from 'virtual:bike-app/tours';
 import { db } from '@/lib/get-db';
@@ -91,7 +92,7 @@ try {
   title={title}
   backLink="/admin/rides"
   backLabel="Back to rides"
-  viewLink={slug ? (rideData.tour_slug ? `/tours/${rideData.tour_slug}/${slug}` : `/rides/${slug}`) : undefined}
+  viewLink={slug ? paths.ride(slug, rideData.tour_slug) : undefined}
   hideTitle
   user={Astro.locals.user}
   currentTab="routes"

package/src/views/routes/routes-index.json.ts

@@ -7,7 +7,9 @@ import { routeShape } from '../../lib/route-insights';
 import { difficultyLabel, scoreRoute } from '../../lib/difficulty';
 import { paths, routeSlug } from '../../lib/paths';
 import { defaultLocale } from '../../lib/i18n/locale-utils';
-import { loadBuildPlan, filterByBuildPlan } from '../../lib/content/build-plan.server';
+// NOTE: This is a single-output endpoint (not parameterized), so it must NOT
+// use filterByBuildPlan — doing so would produce a partial index in incremental
+// mode, overwriting the full one from the previous build.
 
 export const prerender = true;
 
@@ -21,7 +23,7 @@ export const GET: APIRoute = async ({ currentLocale }) => {
   const config = getCityConfig();
   const locale = currentLocale || defaultLocale();
   const allRoutes = await getCollection('routes');
-  const published = filterByBuildPlan(allRoutes.filter(isPublished), loadBuildPlan(), 'route');
+  const published = allRoutes.filter(isPublished);
 
   const allScores = published
     .map(r => scoreRoute(r))

package/src/views/stats.astro

@@ -3,6 +3,7 @@ export const prerender = true;
 import Base from '@/layouts/Base.astro';
 import stats from 'virtual:bike-app/ride-stats';
 import { getCityConfig } from '@/lib/config/city-config';
+import { paths } from '@/lib/paths';
 import { t } from '@/i18n';
 
 const config = getCityConfig();
@@ -55,7 +56,7 @@ const countryKeys = Object.keys(stats.by_country).sort((a, b) =>
         {stats.records.longest_ride && (
           <div class="stats-record-card">
             <span class="stats-record-card--label">{t('stats.longest_ride', locale)}</span>
-            <a href={`/rides/${stats.records.longest_ride.slug}`} class="stats-record-card--value">
+            <a href={paths.ride(stats.records.longest_ride.slug, stats.records.longest_ride.tour_slug)} class="stats-record-card--value">
               {stats.records.longest_ride.name}
             </a>
             <span class="stats-record-card--detail">{stats.records.longest_ride.distance_km} km</span>
@@ -64,7 +65,7 @@ const countryKeys = Object.keys(stats.by_country).sort((a, b) =>
         {stats.records.most_elevation && (
           <div class="stats-record-card">
             <span class="stats-record-card--label">{t('stats.most_elevation', locale)}</span>
-            <a href={`/rides/${stats.records.most_elevation.slug}`} class="stats-record-card--value">
+            <a href={paths.ride(stats.records.most_elevation.slug, stats.records.most_elevation.tour_slug)} class="stats-record-card--value">
               {stats.records.most_elevation.name}
             </a>
             <span class="stats-record-card--detail">{stats.records.most_elevation.elevation_m.toLocaleString()} m</span>

package/src/virtual-modules.d.ts

@@ -294,8 +294,8 @@ interface _RideStats {
   by_year: Record<string, { rides: number; distance_km: number; elevation_m: number }>;
   by_country: Record<string, { rides: number; distance_km: number }>;
   records: {
-    longest_ride?: { slug: string; name: string; distance_km: number };
-    most_elevation?: { slug: string; name: string; elevation_m: number };
+    longest_ride?: { slug: string; name: string; distance_km: number; tour_slug?: string };
+    most_elevation?: { slug: string; name: string; elevation_m: number; tour_slug?: string };
     longest_tour?: { slug: string; name: string; distance_km: number; days: number };
   };
 }

package/sync.js

@@ -11,6 +11,7 @@
  *   - scripts/setup.js   — interactive setup helper
  *   - astro.config.mjs   — Astro config
  *   - tsconfig.json      — TypeScript config
+ *   - package.json       — scripts only (merged, preserving name/deps)
  */
 
 import fs from 'node:fs';
@@ -101,6 +102,22 @@ for (const rel of sourceFiles) {
   }
 }
 
+// --- Sync package.json scripts from template ---
+const templatePkgPath = path.join(templateRoot, 'package.json.tpl');
+if (fs.existsSync(templatePkgPath)) {
+  const templatePkg = JSON.parse(renderTemplate(fs.readFileSync(templatePkgPath, 'utf-8'), vars));
+  const blogPkgPath = path.join(cwd, 'package.json');
+  const blogPkg = JSON.parse(fs.readFileSync(blogPkgPath, 'utf-8'));
+
+  const before = JSON.stringify(blogPkg.scripts);
+  blogPkg.scripts = { ...blogPkg.scripts, ...templatePkg.scripts };
+  if (JSON.stringify(blogPkg.scripts) !== before) {
+    fs.writeFileSync(blogPkgPath, JSON.stringify(blogPkg, null, 2) + '\n');
+    console.log('  updated package.json (scripts)');
+    updated++;
+  }
+}
+
 // --- Summary ---
 if (updated === 0) {
   console.log('  Everything is up to date.');