Activities, Trails, Wanderer + Strava Integration, UI Refresh, Devops Improvments, and more (#785)
* Implement code changes to enhance functionality and improve performance * Update nl.json Fix Dutch translations. * feat(security): add Trivy security scans for Docker images and source code * feat(security): restructure Trivy scans for improved clarity and organization * fix(dependencies): update Django version to 5.2.2 * style(workflows): standardize quotes and fix typo in frontend-test.yml * feat(workflows): add job names for clarity in backend and frontend test workflows * refactor(workflows): remove path filters from pull_request and push triggers in backend and frontend workflows * feat(workflows): add paths to push and pull_request triggers for backend and frontend workflows * refactor(workflows): simplify trigger paths for backend and frontend workflows fix(dependencies): add overrides for esbuild in frontend package.json * fix(package): add missing pnpm overrides for esbuild in package.json * fix(workflows): add missing severity parameter for Trivy filesystem scan * fix(workflows): add missing severity parameter for Docker image scans in Trivy workflow * fix(workflows): remove MEDIUM severity from Trivy scans in security workflow * added-fix-image-deletion (#681) * added-fix-image-deletion * feat(commands): add image cleanup command to find and delete unused files * fix(models): ensure associated AdventureImages are deleted and files cleaned up on Adventure deletion * fix(models): ensure associated Attachment files are deleted and their filesystem cleaned up on Adventure deletion --------- Co-authored-by: ferdousahmed <taninme@gmail.com> Co-authored-by: Sean Morley * Rename Adventures to Locations (#696) * Refactor user_id to user in adventures and related models, views, and components - Updated all instances of user_id to user in the adventures app, including models, serializers, views, and frontend components. - Adjusted queries and filters to reflect the new user field naming convention. - Ensured consistency across the codebase for user identification in adventures, collections, notes, and transportation entities. - Modified frontend components to align with the updated data structure, ensuring proper access control and rendering based on user ownership. * Refactor adventure-related views and components to use "Location" terminology - Updated GlobalSearchView to replace AdventureSerializer with LocationSerializer. - Modified IcsCalendarGeneratorViewSet to use LocationSerializer instead of AdventureSerializer. - Created new LocationImageViewSet for managing location images, including primary image toggling and image deletion. - Introduced LocationViewSet for managing locations with enhanced filtering, sorting, and sharing capabilities. - Updated ReverseGeocodeViewSet to utilize LocationSerializer. - Added ActivityTypesView to retrieve distinct activity types from locations. - Refactored user views to replace AdventureSerializer with LocationSerializer. - Updated frontend components to reflect changes from "adventure" to "location", including AdventureCard, AdventureLink, AdventureModal, and others. - Adjusted API endpoints in frontend routes to align with new location-based structure. - Ensured all references to adventures are replaced with locations across the codebase. * refactor: rename adventures to locations across the application - Updated localization files to replace adventure-related terms with location-related terms. - Refactored TypeScript types and variables from Adventure to Location in various routes and components. - Adjusted UI elements and labels to reflect the change from adventures to locations. - Ensured all references to adventures in the codebase are consistent with the new location terminology. * Refactor code structure for improved readability and maintainability * feat: Implement location details page with server-side loading and deletion functionality - Added +page.server.ts to handle server-side loading of additional location info. - Created +page.svelte for displaying location details, including images, visits, and maps. - Integrated GPX file handling and rendering on the map. - Updated map route to link to locations instead of adventures. - Refactored profile and search routes to use LocationCard instead of AdventureCard. * docs: Update terminology from "Adventure" to "Location" and enhance project overview * docs: Clarify collection examples in usage documentation * feat: Enable credentials for GPX file fetch and add CORS_ALLOW_CREDENTIALS setting * Refactor adventure references to locations across the backend and frontend - Updated CategoryViewSet to reflect location context instead of adventures. - Modified ChecklistViewSet to include locations in retrieval logic. - Changed GlobalSearchView to search for locations instead of adventures. - Adjusted IcsCalendarGeneratorViewSet to handle locations instead of adventures. - Refactored LocationImageViewSet to remove unused import. - Updated LocationViewSet to clarify public access for locations. - Changed LodgingViewSet to reference locations instead of adventures. - Modified NoteViewSet to prevent listing all locations. - Updated RecommendationsViewSet to handle locations in parsing and response. - Adjusted ReverseGeocodeViewSet to search through user locations. - Updated StatsViewSet to count locations instead of adventures. - Changed TagsView to reflect activity types for locations. - Updated TransportationViewSet to reference locations instead of adventures. - Added new translations for search results related to locations in multiple languages. - Updated dashboard and profile pages to reflect location counts instead of adventure counts. - Adjusted search routes to handle locations instead of adventures. * Update banner image * style: Update stats component background and border for improved visibility * refactor: Rename AdventureCard and AdventureModal to LocationCard and LocationModal for consistency * Import and Export Functionality (#698) * feat(backup): add BackupViewSet for data export and import functionality * Fixed frontend returning corrupt binary data * feat(import): enhance import functionality with confirmation check and improved city/region/country handling * Potential fix for code scanning alert no. 29: Information exposure through an exception Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * Refactor response handling to use arrayBuffer instead of bytes * Refactor image cleanup command to use LocationImage model and update import/export view to include backup and restore functionality * Update backup export versioning and improve data restore warning message * Enhance image navigation and localization support in modal components * Refactor location handling in Immich integration components for consistency * Enhance backup and restore functionality with improved localization and error handling * Improve accessibility by adding 'for' attribute to backup file input label --------- Co-authored-by: Christian Zäske <blitzdose@gmail.com> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * refactor(serializers): rename Location to Adventure and update related fields * refactor(serializers): rename Adventure to Location and update related fields * chore(requirements): update pillow version to 11.3.0 * Add PT-BR translations (#739) * Fixed frontend returning corrupt binary data * fix(adventure): enhance collection ownership validation in AdventureSerializer (#723) * Add PT-BR translations Add translation for Brazilian Portuguese to the project; Signed-off-by: Lucas Zampieri <lzampier@redhat.com> --------- Signed-off-by: Lucas Zampieri <lzampier@redhat.com> Co-authored-by: Sean Morley <98704938+seanmorley15@users.noreply.github.com> Co-authored-by: Christian Zäske <blitzdose@gmail.com> * fix: update date formatting for adventure items to include timezone * Image/attachment overhaul, activities, trails and integrations with Strava and Wanderer (#726) * refactor(models, views, serializers): rename LocationImage and Attachment to ContentImage and ContentAttachment, update related references * feat: Enhance collection sharing and location management features - Implemented unsharing functionality in CollectionViewSet, including removal of user-owned locations from collections. - Refactored ContentImageViewSet to support multiple content types and improved permission checks for image uploads. - Added user ownership checks in LocationViewSet for delete operations. - Enhanced collection management in the frontend to display both owned and shared collections separately. - Updated Immich integration to handle access control based on location visibility and user permissions. - Improved UI components to show creator information and manage collection links more effectively. - Added loading states and error handling in collection fetching logic. * feat: enhance transportation card and modal with image handling - Added CardCarousel component to TransportationCard for image display. - Implemented privacy indicator with Eye and EyeOff icons. - Introduced image upload functionality in TransportationModal, allowing users to upload multiple images. - Added image management features: remove image and set primary image. - Updated Transportation and Location types to include images as ContentImage array. - Enhanced UI for image upload and display in modal, including selected images preview and current images management. * feat: update CardCarousel component to handle images, name, and icon props across various cards * feat: add Discord link to AboutModal and update appVersion in config * feat: add LocationQuickStart and LocationVisits components for enhanced location selection and visit management - Implemented LocationQuickStart.svelte for searching and selecting locations on a map with reverse geocoding. - Created LocationVisits.svelte to manage visit dates and notes for locations, including timezone handling and validation. - Updated types to remove location property from Attachment type. - Modified locations page to integrate NewLocationModal for creating and editing locations, syncing updates with adventures. * feat: update button styles and add back and close functionality in location components * Collection invite system * feat: update CollectionSerializer to include 'shared_with' as a read-only field; update app version; add new background images and localization strings for invites * feat: add Strava integration with OAuth flow and activity management - Implemented IntegrationView for listing integrations including Immich, Google Maps, and Strava. - Created StravaIntegrationView for handling OAuth authorization and token exchange. - Added functionality to refresh Strava access tokens when needed. - Implemented endpoints to fetch user activities from Strava and extract essential information. - Added Strava logo asset and integrated it into the frontend settings page. - Updated settings page to display Strava integration status. - Enhanced location management to include trails with create, edit, and delete functionalities. - Updated types and localization files to support new features. * feat: enhance Strava integration with user-specific settings and management options; update localization strings * feat: update Strava integration settings and add Wanderer logo; enhance user experience with active section management * Add StravaActivity and Activity types to types.ts - Introduced StravaActivity type to represent detailed activity data from Strava. - Added Activity type to encapsulate user activities, including optional trail and GPX file information. - Updated Location type to include an array of activities associated with each visit. * feat: streamline location and activity management; enhance Strava import functionality and add activity handling in server actions * feat: add ActivityCard component and update LocationVisits to use it; modify Activity type to reference trail as string * feat: add geojson support to ActivitySerializer and ActivityCard; enhance location page with activity summaries and GPS tracks * feat: add trails property to recommendation object in collection page * feat: add Wanderer integration with authentication and management features * feat: implement Wanderer integration with trail management and UI components; enhance settings for reauthentication * feat: add measurement system field to CustomUser model and update related serializers, migrations, and UI components * feat: add measurement system support across ActivityCard, StravaActivityCard, NewLocationModal, LocationVisits, and related utility functions * feat: enhance Wanderer integration with trail data fetching and UI updates; add measurement system support * feat: add TrailCard component for displaying trail details with measurement system support * feat: add wanderer link support in TrailSerializer and TrailCard; update measurement system handling in location page * feat: integrate memcached for caching in Wanderer services; update Docker, settings, and supervisord configurations * feat: add activity statistics to user profile; include distance, moving time, elevation, and total activities * feat: enhance import/export functionality to include trails and activities; update UI components and localization * feat: integrate NewLocationModal across various components; update location handling and state management * Refactor Location and Visit types: Replace visits structure in Location with Visit type and add location, created_at, and updated_at fields to Visit * feat: enhance permissions and validation in activity, trail, and visit views; add unique constraint to CollectionInvite model * feat: sync visits when updating adventures in collection page * feat: add geojson support for attachments and refactor GPX handling in location page * chore: remove unused dependencies from pnpm-lock.yaml * feat: add Strava and Wanderer integration documentation and configuration options * Add support for Japanese and Arabic languages in localization * Add new localization strings for Russian, Swedish, and Chinese languages - Updated translations in ru.json, sv.json, and zh.json to include new phrases related to collections, activities, and integrations. - Added strings for leaving collections, loading collections, and quick start instructions. - Included new sections for invites and Strava integration with relevant messages. - Enhanced Google Maps integration descriptions for clarity. * Add localization support for activity-related features and update UI labels - Added new Russian, Swedish, and Chinese translations for activity statistics, achievements, and related terms. - Updated UI components to use localized strings for activity statistics, distance, moving time, and other relevant fields. - Enhanced user experience by ensuring all relevant buttons and labels are translated and accessible. * fix: update appVersion to reflect the latest development version * feat: add getActivityColor function and integrate activity color coding in map and location pages * feat: add support for showing activities and visited cities on the map * feat: update map page to display counts for visited cities and activities * fix: remove debug print statement from IsOwnerOrSharedWithFullAccess permission class * feat: add MapStyleSelector component and integrate basemap selection in map page * feat: enhance basemap functions with 3D terrain support and update XYZ style handling * feat: add management command to recalculate elevation data from GPX files and update activity view to handle elevation data extraction * feat: update MapStyleSelector component and enhance basemap options for improved user experience * feat: refactor activity model and admin to use sport_type, update serializers and components for improved activity handling * feat: update Activity model string representation to use sport_type instead of type * feat: update activity handling to use sport_type for color determination in map and location components * feat: Add attachments support to Transportation and Lodging types - Updated Transportation and Lodging types to include attachments array. - Enhanced localization files for multiple languages to include new strings related to attachments, lodging, and transportation. - Added error and success messages for attachment removal and upload information. - Included new prompts for creating and updating lodging and transportation details across various languages. * feat: Enhance activity statistics and breakdown by category in user profile * feat: Add SPORT_CATEGORIES for better organization of sports types and update StatsViewSet to use it * feat: Enhance CategoryDropdown for mobile responsiveness and add category creation functionality * feat: Update inspirational quote in adventure log * feat: Localize navigation labels in Navbar and add translation to en.json * feat: Update navigation elements to use anchor tags for better accessibility and add new fields to signup form * Translate login button text to support internationalization * feat: Refactor location visit status logic and add utility function for visited locations count * chore: Upgrade GitHub Actions and remove unused timezone import * fix: Update Docker image tags in GitHub Actions workflow for consistency * fix: Update Docker image build process to use BuildKit cache for improved performance * chore: Remove unused imports from stats_view.py for cleaner code * Increase background image opacity on login and signup pages for improved visibility * fix: Add postgresql-client to runtime dependencies in Dockerfile * fix: Update workflow files to include permissions for GitHub Actions * fix: Update esbuild version to ^0.25.9 in package.json and pnpm-lock.yaml for compatibility * chore: improve Chinese translation (#796) * fix: update adventure log quote and remove unused activity type field * fix: optimize import process by using get_or_create for visited cities and regions * fix: update README to reflect changes from adventures to locations and enhance feature descriptions * fix: update documentation to reflect changes from adventures to locations and enhance feature descriptions * Update google_maps_integration.md (#743) * Update google_maps_integration.md Explain APIs needed for AdventureLogs versions. Fixes #731 and #727 * Fix a typo google_maps_integration.md --------- Co-authored-by: Sean Morley <98704938+seanmorley15@users.noreply.github.com> * fix: update appVersion to reflect the main branch version * fix: update image source for satellite map in documentation * Update frontend/src/lib/components/NewLocationModal.svelte Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Add localization updates for multiple languages - Japanese (ja.json): Added new activity-related phrases and checklist terms. - Korean (ko.json): Included activity breakdown and checklist enhancements. - Dutch (nl.json): Updated activity descriptions and added checklist functionalities. - Norwegian (no.json): Enhanced activity and checklist terminology. - Polish (pl.json): Added new phrases for activities and checklist management. - Brazilian Portuguese (pt-br.json): Updated activity-related terms and checklist features. - Russian (ru.json): Included new phrases for activities and checklist management. - Swedish (sv.json): Enhanced activity descriptions and checklist functionalities. - Chinese (zh.json): Added new activity-related phrases and checklist terms. * fix: enhance image upload handling to support immich_id * Add "not_enabled" message for Strava integration in multiple languages - Updated Spanish, French, Italian, Japanese, Korean, Dutch, Norwegian, Polish, Brazilian Portuguese, Russian, Swedish, and Chinese locale files to include a new message indicating that Strava integration is not enabled in the current instance. --------- Signed-off-by: Lucas Zampieri <lzampier@redhat.com> Co-authored-by: Ycer0n <37674033+Ycer0n@users.noreply.github.com> Co-authored-by: taninme <5262715+taninme@users.noreply.github.com> Co-authored-by: ferdousahmed <taninme@gmail.com> Co-authored-by: Christian Zäske <blitzdose@gmail.com> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Co-authored-by: Lucas Zampieri <lcasmz54@gmail.com> Co-authored-by: pplulee <pplulee@live.cn> Co-authored-by: Cathelijne Hornstra <github@hornstra.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
Sean Morley
@@ -4,7 +4,7 @@ import randomBackgrounds from './json/backgrounds.json';
|
||||
// @ts-ignore
|
||||
import { DateTime } from 'luxon';
|
||||
import type {
|
||||
Adventure,
|
||||
Location,
|
||||
Background,
|
||||
Checklist,
|
||||
Collection,
|
||||
@@ -34,26 +34,6 @@ export function checkLink(link: string) {
|
||||
}
|
||||
}
|
||||
|
||||
export async function exportData() {
|
||||
let res = await fetch('/api/adventures/all');
|
||||
let adventures = (await res.json()) as Adventure[];
|
||||
|
||||
res = await fetch('/api/collections/all');
|
||||
let collections = (await res.json()) as Collection[];
|
||||
|
||||
res = await fetch('/api/visitedregion');
|
||||
let visitedRegions = await res.json();
|
||||
|
||||
const data = {
|
||||
adventures,
|
||||
collections,
|
||||
visitedRegions
|
||||
};
|
||||
|
||||
const blob = new Blob([JSON.stringify(data)], { type: 'application/json' });
|
||||
return URL.createObjectURL(blob);
|
||||
}
|
||||
|
||||
export function isValidUrl(url: string) {
|
||||
try {
|
||||
new URL(url);
|
||||
@@ -63,22 +43,22 @@ export function isValidUrl(url: string) {
|
||||
}
|
||||
}
|
||||
|
||||
export function groupAdventuresByDate(
|
||||
adventures: Adventure[],
|
||||
export function groupLocationsByDate(
|
||||
locations: Location[],
|
||||
startDate: Date,
|
||||
numberOfDays: number
|
||||
): Record<string, Adventure[]> {
|
||||
const groupedAdventures: Record<string, Adventure[]> = {};
|
||||
): Record<string, Location[]> {
|
||||
const groupedLocations: Record<string, Location[]> = {};
|
||||
|
||||
// Initialize all days in the range using DateTime
|
||||
for (let i = 0; i < numberOfDays; i++) {
|
||||
const currentDate = DateTime.fromJSDate(startDate).plus({ days: i });
|
||||
const dateString = currentDate.toISODate(); // 'YYYY-MM-DD'
|
||||
groupedAdventures[dateString] = [];
|
||||
groupedLocations[dateString] = [];
|
||||
}
|
||||
|
||||
adventures.forEach((adventure) => {
|
||||
adventure.visits.forEach((visit) => {
|
||||
locations.forEach((location) => {
|
||||
location.visits.forEach((visit: { start_date: string; end_date: string; timezone: any }) => {
|
||||
if (visit.start_date) {
|
||||
// Check if it's all-day: start has 00:00:00 AND (no end OR end also has 00:00:00)
|
||||
const startHasZeros = isAllDay(visit.start_date);
|
||||
@@ -115,10 +95,10 @@ export function groupAdventuresByDate(
|
||||
const currentDate = DateTime.fromJSDate(startDate).plus({ days: i });
|
||||
const currentDateStr = currentDate.toISODate();
|
||||
|
||||
// Include the current day if it falls within the adventure date range
|
||||
// Include the current day if it falls within the location date range
|
||||
if (currentDateStr >= startDateStr && currentDateStr <= endDateStr) {
|
||||
if (groupedAdventures[currentDateStr]) {
|
||||
groupedAdventures[currentDateStr].push(adventure);
|
||||
if (groupedLocations[currentDateStr]) {
|
||||
groupedLocations[currentDateStr].push(location);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -126,7 +106,7 @@ export function groupAdventuresByDate(
|
||||
});
|
||||
});
|
||||
|
||||
return groupedAdventures;
|
||||
return groupedLocations;
|
||||
}
|
||||
|
||||
function getLocalDateString(date: Date): string {
|
||||
@@ -426,15 +406,6 @@ export let TRANSPORTATION_TYPES_ICONS = {
|
||||
other: '❓'
|
||||
};
|
||||
|
||||
export function getAdventureTypeLabel(type: string) {
|
||||
// return the emoji ADVENTURE_TYPE_ICONS label for the given type if not found return ? emoji
|
||||
if (type in ADVENTURE_TYPE_ICONS) {
|
||||
return ADVENTURE_TYPE_ICONS[type as keyof typeof ADVENTURE_TYPE_ICONS];
|
||||
} else {
|
||||
return '❓';
|
||||
}
|
||||
}
|
||||
|
||||
export function getRandomBackground() {
|
||||
const today = new Date();
|
||||
|
||||
@@ -646,9 +617,513 @@ export function getIsDarkMode() {
|
||||
return false;
|
||||
}
|
||||
|
||||
export function getBasemapUrl() {
|
||||
if (getIsDarkMode()) {
|
||||
return 'https://basemaps.cartocdn.com/gl/dark-matter-gl-style/style.json';
|
||||
// Enhanced basemap functions with 3D terrain support
|
||||
export function getBasemapUrl(type = 'default'): any {
|
||||
switch (type) {
|
||||
// 3D Terrain Maps with elevation data
|
||||
case 'terrain-3d':
|
||||
return {
|
||||
version: 8,
|
||||
name: '3D Terrain',
|
||||
sources: {
|
||||
'raster-tiles': {
|
||||
type: 'raster',
|
||||
tiles: ['https://basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}{r}.png'],
|
||||
tileSize: 256,
|
||||
attribution: '© OpenStreetMap contributors, © CARTO'
|
||||
},
|
||||
terrain: {
|
||||
type: 'raster-dem',
|
||||
tiles: ['https://s3.amazonaws.com/elevation-tiles-prod/terrarium/{z}/{x}/{y}.png'],
|
||||
encoding: 'terrarium',
|
||||
tileSize: 256,
|
||||
maxzoom: 15
|
||||
}
|
||||
},
|
||||
layers: [
|
||||
{
|
||||
id: 'background',
|
||||
type: 'background',
|
||||
paint: {
|
||||
'background-color': '#b8dee6'
|
||||
}
|
||||
},
|
||||
{
|
||||
id: 'raster-layer',
|
||||
type: 'raster',
|
||||
source: 'raster-tiles'
|
||||
}
|
||||
],
|
||||
terrain: {
|
||||
source: 'terrain',
|
||||
exaggeration: 1.5
|
||||
}
|
||||
};
|
||||
|
||||
case 'satellite-terrain-3d':
|
||||
return {
|
||||
version: 8,
|
||||
name: 'Satellite 3D Terrain',
|
||||
sources: {
|
||||
satellite: {
|
||||
type: 'raster',
|
||||
tiles: [
|
||||
'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}'
|
||||
],
|
||||
tileSize: 256,
|
||||
attribution: '© Esri, Maxar, Earthstar Geographics, USGS'
|
||||
},
|
||||
terrain: {
|
||||
type: 'raster-dem',
|
||||
tiles: ['https://s3.amazonaws.com/elevation-tiles-prod/terrarium/{z}/{x}/{y}.png'],
|
||||
encoding: 'terrarium',
|
||||
tileSize: 256,
|
||||
maxzoom: 15
|
||||
}
|
||||
},
|
||||
layers: [
|
||||
{
|
||||
id: 'background',
|
||||
type: 'background',
|
||||
paint: {
|
||||
'background-color': '#000'
|
||||
}
|
||||
},
|
||||
{
|
||||
id: 'satellite-layer',
|
||||
type: 'raster',
|
||||
source: 'satellite'
|
||||
}
|
||||
],
|
||||
terrain: {
|
||||
source: 'terrain',
|
||||
exaggeration: 2.0
|
||||
}
|
||||
};
|
||||
|
||||
case 'topo-terrain-3d':
|
||||
return {
|
||||
version: 8,
|
||||
name: 'Topographic 3D Terrain',
|
||||
sources: {
|
||||
topo: {
|
||||
type: 'raster',
|
||||
tiles: [
|
||||
'https://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/tile/{z}/{y}/{x}'
|
||||
],
|
||||
tileSize: 256,
|
||||
attribution: '© Esri, HERE, Garmin, USGS, FAO, NOAA'
|
||||
},
|
||||
terrain: {
|
||||
type: 'raster-dem',
|
||||
tiles: ['https://s3.amazonaws.com/elevation-tiles-prod/terrarium/{z}/{x}/{y}.png'],
|
||||
encoding: 'terrarium',
|
||||
tileSize: 256,
|
||||
maxzoom: 15
|
||||
}
|
||||
},
|
||||
layers: [
|
||||
{
|
||||
id: 'background',
|
||||
type: 'background',
|
||||
paint: {
|
||||
'background-color': '#f5f5dc'
|
||||
}
|
||||
},
|
||||
{
|
||||
id: 'topo-layer',
|
||||
type: 'raster',
|
||||
source: 'topo'
|
||||
}
|
||||
],
|
||||
terrain: {
|
||||
source: 'terrain',
|
||||
exaggeration: 1.8
|
||||
}
|
||||
};
|
||||
|
||||
// Alternative free terrain source using MapTiler (no key required for basic use)
|
||||
case 'maptiler-terrain-3d':
|
||||
return {
|
||||
version: 8,
|
||||
name: 'MapTiler 3D Terrain',
|
||||
sources: {
|
||||
maptiler: {
|
||||
type: 'raster',
|
||||
tiles: [
|
||||
'https://api.maptiler.com/maps/outdoor/256/{z}/{x}/{y}.png?key=get_your_own_OpIi9ZULNHzrESv6T2vL'
|
||||
],
|
||||
tileSize: 256,
|
||||
attribution: '© MapTiler © OpenStreetMap contributors'
|
||||
},
|
||||
'terrain-rgb': {
|
||||
type: 'raster-dem',
|
||||
tiles: [
|
||||
'https://api.maptiler.com/tiles/terrain-rgb/{z}/{x}/{y}.png?key=get_your_own_OpIi9ZULNHzrESv6T2vL'
|
||||
],
|
||||
encoding: 'mapbox',
|
||||
tileSize: 256,
|
||||
maxzoom: 12
|
||||
}
|
||||
},
|
||||
layers: [
|
||||
{
|
||||
id: 'background',
|
||||
type: 'background',
|
||||
paint: {
|
||||
'background-color': '#e8f4f8'
|
||||
}
|
||||
},
|
||||
{
|
||||
id: 'maptiler-layer',
|
||||
type: 'raster',
|
||||
source: 'maptiler'
|
||||
}
|
||||
],
|
||||
terrain: {
|
||||
source: 'terrain-rgb',
|
||||
exaggeration: 1.5
|
||||
}
|
||||
};
|
||||
|
||||
// Existing non-3D maps...
|
||||
case 'satellite':
|
||||
return getXYZStyle(
|
||||
'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
|
||||
'© Esri, Maxar, Earthstar Geographics, USGS'
|
||||
);
|
||||
|
||||
case 'satellite-labels':
|
||||
return getXYZStyle(
|
||||
'https://server.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places/MapServer/tile/{z}/{y}/{x}',
|
||||
'© Esri',
|
||||
'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}'
|
||||
);
|
||||
|
||||
case 'elevation':
|
||||
return getXYZStyle(
|
||||
'https://server.arcgisonline.com/ArcGIS/rest/services/Elevation/World_Hillshade/MapServer/tile/{z}/{y}/{x}',
|
||||
'© Esri, USGS, NOAA'
|
||||
);
|
||||
|
||||
case 'usgs-topo':
|
||||
return getXYZStyle(
|
||||
'https://basemap.nationalmap.gov/arcgis/rest/services/USGSTopo/MapServer/tile/{z}/{y}/{x}',
|
||||
'© USGS'
|
||||
);
|
||||
|
||||
case 'esri-topo':
|
||||
return getXYZStyle(
|
||||
'https://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/tile/{z}/{y}/{x}',
|
||||
'© Esri, HERE, Garmin, USGS, FAO, NOAA'
|
||||
);
|
||||
|
||||
case 'osm-standard':
|
||||
return getXYZStyle(
|
||||
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
|
||||
'© OpenStreetMap contributors'
|
||||
);
|
||||
|
||||
case 'osm-humanitarian':
|
||||
return getXYZStyle(
|
||||
'https://tile-{s}.openstreetmap.fr/hot/{z}/{x}/{y}.png',
|
||||
'© OpenStreetMap contributors, Humanitarian OSM Team'
|
||||
);
|
||||
|
||||
case 'osm-france':
|
||||
return getXYZStyle(
|
||||
'https://tile-{s}.openstreetmap.fr/osmfr/{z}/{x}/{y}.png',
|
||||
'© OpenStreetMap France'
|
||||
);
|
||||
|
||||
case 'carto-light':
|
||||
return getXYZStyle(
|
||||
'https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png',
|
||||
'© OpenStreetMap contributors, © CartoDB'
|
||||
);
|
||||
|
||||
case 'carto-dark':
|
||||
return getXYZStyle(
|
||||
'https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_all/{z}/{x}/{y}.png',
|
||||
'© OpenStreetMap contributors, © CartoDB'
|
||||
);
|
||||
|
||||
case 'carto-positron':
|
||||
return getXYZStyle(
|
||||
'https://basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}{r}.png',
|
||||
'© OpenStreetMap contributors, © CARTO'
|
||||
);
|
||||
|
||||
case 'carto-positron-labels':
|
||||
return getXYZStyle(
|
||||
'https://basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}{r}.png',
|
||||
'© OpenStreetMap contributors, © CARTO',
|
||||
'https://basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}{r}.png'
|
||||
);
|
||||
|
||||
case 'carto-voyager':
|
||||
return getXYZStyle(
|
||||
'https://basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}{r}.png',
|
||||
'© OpenStreetMap contributors, © CARTO'
|
||||
);
|
||||
|
||||
case 'wikimedia':
|
||||
return getXYZStyle(
|
||||
'https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png',
|
||||
'© OpenStreetMap contributors, Wikimedia Maps'
|
||||
);
|
||||
|
||||
case 'usgs-imagery':
|
||||
return getXYZStyle(
|
||||
'https://basemap.nationalmap.gov/arcgis/rest/services/USGSImageryOnly/MapServer/tile/{z}/{y}/{x}',
|
||||
'© USGS'
|
||||
);
|
||||
|
||||
case 'usgs-imagery-topo':
|
||||
return getXYZStyle(
|
||||
'https://basemap.nationalmap.gov/arcgis/rest/services/USGSImageryTopo/MapServer/tile/{z}/{y}/{x}',
|
||||
'© USGS'
|
||||
);
|
||||
|
||||
case 'esri-streets':
|
||||
return getXYZStyle(
|
||||
'https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/{z}/{y}/{x}',
|
||||
'© Esri, HERE, Garmin, USGS, EPA'
|
||||
);
|
||||
|
||||
case 'esri-national-geographic':
|
||||
return getXYZStyle(
|
||||
'https://server.arcgisonline.com/ArcGIS/rest/services/NatGeo_World_Map/MapServer/tile/{z}/{y}/{x}',
|
||||
'© Esri, National Geographic, Garmin, HERE, UNEP-WCMC'
|
||||
);
|
||||
|
||||
case 'esri-oceans':
|
||||
return getXYZStyle(
|
||||
'https://server.arcgisonline.com/ArcGIS/rest/services/Ocean/World_Ocean_Base/MapServer/tile/{z}/{y}/{x}',
|
||||
'© Esri, GEBCO, NOAA, National Geographic, Garmin, HERE'
|
||||
);
|
||||
|
||||
case 'esri-gray':
|
||||
return getXYZStyle(
|
||||
'https://server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}',
|
||||
'© Esri, HERE, Garmin, USGS, EPA'
|
||||
);
|
||||
|
||||
case 'opentopomap':
|
||||
return getXYZStyle(
|
||||
[
|
||||
'https://a.tile.opentopomap.org/{z}/{x}/{y}.png',
|
||||
'https://b.tile.opentopomap.org/{z}/{x}/{y}.png',
|
||||
'https://c.tile.opentopomap.org/{z}/{x}/{y}.png'
|
||||
],
|
||||
'© OpenTopoMap (CC-BY-SA), © OpenStreetMap contributors'
|
||||
);
|
||||
|
||||
default:
|
||||
return getIsDarkMode()
|
||||
? 'https://basemaps.cartocdn.com/gl/dark-matter-gl-style/style.json'
|
||||
: 'https://basemaps.cartocdn.com/gl/voyager-gl-style/style.json';
|
||||
}
|
||||
return 'https://basemaps.cartocdn.com/gl/voyager-gl-style/style.json';
|
||||
}
|
||||
|
||||
// Helper function for XYZ tile styles (updated to handle arrays and remove {s} placeholders)
|
||||
function getXYZStyle(tileUrl: string | string[], attribution: string, baseUrl?: string) {
|
||||
// Convert single URL to array and expand any remaining {s} placeholders
|
||||
let tiles: string[];
|
||||
if (Array.isArray(tileUrl)) {
|
||||
tiles = tileUrl;
|
||||
} else {
|
||||
if (tileUrl.includes('{s}')) {
|
||||
// Fallback: expand {s} to common subdomains
|
||||
const subdomains = ['a', 'b', 'c'];
|
||||
tiles = subdomains.map((s) => tileUrl.replace('{s}', s));
|
||||
} else {
|
||||
tiles = [tileUrl];
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
version: 8,
|
||||
sources: {
|
||||
'raster-tiles': {
|
||||
type: 'raster',
|
||||
tiles: tiles,
|
||||
tileSize: 256,
|
||||
attribution: attribution
|
||||
},
|
||||
...(baseUrl && {
|
||||
'base-tiles': {
|
||||
type: 'raster',
|
||||
tiles: [baseUrl],
|
||||
tileSize: 256
|
||||
}
|
||||
})
|
||||
},
|
||||
layers: [
|
||||
...(baseUrl
|
||||
? [
|
||||
{
|
||||
id: 'base-layer',
|
||||
type: 'raster' as const,
|
||||
source: 'base-tiles'
|
||||
}
|
||||
]
|
||||
: []),
|
||||
{
|
||||
id: 'raster-layer',
|
||||
type: 'raster' as const,
|
||||
source: 'raster-tiles'
|
||||
}
|
||||
]
|
||||
};
|
||||
}
|
||||
|
||||
// Enhanced basemap options array
|
||||
export const basemapOptions = [
|
||||
{ value: 'default', label: 'Default', icon: '🗺️', category: 'Standard' },
|
||||
|
||||
// 3D Terrain Maps (New Category)
|
||||
{ value: 'terrain-3d', label: '3D Terrain', icon: '🏔️', category: '3D Terrain' },
|
||||
{
|
||||
value: 'satellite-terrain-3d',
|
||||
label: '3D Satellite Terrain',
|
||||
icon: '🛰️',
|
||||
category: '3D Terrain'
|
||||
},
|
||||
{ value: 'topo-terrain-3d', label: '3D Topographic', icon: '🗻', category: '3D Terrain' },
|
||||
|
||||
// Standard & Vector
|
||||
{ value: 'osm-standard', label: 'OpenStreetMap', icon: '🌍', category: 'Standard' },
|
||||
{ value: 'wikimedia', label: 'Wikimedia', icon: '📖', category: 'Standard' },
|
||||
|
||||
// Satellite & Imagery
|
||||
{ value: 'satellite', label: 'Satellite', icon: '🛰️', category: 'Satellite' },
|
||||
{ value: 'satellite-labels', label: 'Satellite + Labels', icon: '🏷️', category: 'Satellite' },
|
||||
{ value: 'usgs-imagery', label: 'USGS Imagery', icon: '📸', category: 'Satellite' },
|
||||
{ value: 'usgs-imagery-topo', label: 'USGS Imagery + Topo', icon: '🗻', category: 'Satellite' },
|
||||
|
||||
// Topographic & Terrain
|
||||
{ value: 'elevation', label: 'Elevation', icon: '🏔️', category: 'Topographic' },
|
||||
{ value: 'usgs-topo', label: 'USGS Topo', icon: '📊', category: 'Topographic' },
|
||||
{ value: 'esri-topo', label: 'Esri Topo', icon: '🗾', category: 'Topographic' },
|
||||
{ value: 'opentopomap', label: 'OpenTopoMap', icon: '🧭', category: 'Topographic' },
|
||||
|
||||
// Clean & Minimal
|
||||
{ value: 'carto-light', label: 'Light', icon: '☀️', category: 'Clean' },
|
||||
{ value: 'carto-dark', label: 'Dark', icon: '🌙', category: 'Clean' },
|
||||
{ value: 'carto-positron', label: 'Positron', icon: '⚡', category: 'Clean' },
|
||||
{ value: 'carto-positron-labels', label: 'Positron + Labels', icon: '🏷️', category: 'Clean' },
|
||||
{ value: 'esri-gray', label: 'Gray Canvas', icon: '⬜', category: 'Clean' },
|
||||
|
||||
// Specialized
|
||||
{ value: 'carto-voyager', label: 'Voyager', icon: '🚢', category: 'Specialized' },
|
||||
{ value: 'osm-humanitarian', label: 'Humanitarian', icon: '🏥', category: 'Specialized' },
|
||||
{ value: 'esri-streets', label: 'Streets', icon: '🛣️', category: 'Specialized' },
|
||||
{
|
||||
value: 'esri-national-geographic',
|
||||
label: 'National Geographic',
|
||||
icon: '🌎',
|
||||
category: 'Specialized'
|
||||
},
|
||||
{ value: 'esri-oceans', label: 'Oceans', icon: '🌊', category: 'Specialized' },
|
||||
{ value: 'osm-france', label: 'France Style', icon: '🇫🇷', category: 'Specialized' }
|
||||
];
|
||||
|
||||
export function getBasemapLabel(value: string) {
|
||||
const option = basemapOptions.find((opt) => opt.value === value);
|
||||
return option ? option.label : 'Default';
|
||||
}
|
||||
|
||||
export function getDistance(measurementSystem: 'metric' | 'imperial', meters: number): string {
|
||||
if (measurementSystem === 'imperial') {
|
||||
const miles = meters / 1609.34;
|
||||
return miles.toFixed(2);
|
||||
} else {
|
||||
const km = meters / 1000;
|
||||
return km.toFixed(2);
|
||||
}
|
||||
}
|
||||
|
||||
export function getElevation(measurementSystem: 'metric' | 'imperial', elevation: number): string {
|
||||
if (measurementSystem === 'imperial') {
|
||||
const feet = elevation * 3.28084;
|
||||
return Math.round(feet).toString();
|
||||
} else {
|
||||
return Math.round(elevation).toString();
|
||||
}
|
||||
}
|
||||
|
||||
export let SPORT_TYPE_CHOICES = [
|
||||
// General Sports
|
||||
{ key: 'General', label: 'General', icon: '🏃', color: '#6B7280' },
|
||||
|
||||
// Foot Sports
|
||||
{ key: 'Run', label: 'Run', icon: '🏃♂️', color: '#F59E0B' },
|
||||
{ key: 'TrailRun', label: 'Trail Run', icon: '🏃♀️', color: '#F59E0B' },
|
||||
{ key: 'Walk', label: 'Walk', icon: '🚶', color: '#8B5CF6' },
|
||||
{ key: 'Hike', label: 'Hike', icon: '🥾', color: '#10B981' },
|
||||
{ key: 'VirtualRun', label: 'Virtual Run', icon: '💻', color: '#F59E0B' },
|
||||
|
||||
// Cycle Sports
|
||||
{ key: 'Ride', label: 'Ride', icon: '🚴', color: '#3B82F6' },
|
||||
{ key: 'MountainBikeRide', label: 'Mountain Bike Ride', icon: '🚵', color: '#3B82F6' },
|
||||
{ key: 'GravelRide', label: 'Gravel Ride', icon: '🚴♀️', color: '#3B82F6' },
|
||||
{ key: 'EBikeRide', label: 'E-Bike Ride', icon: '🔋', color: '#3B82F6' },
|
||||
{ key: 'EMountainBikeRide', label: 'E-Mountain Bike Ride', icon: '⚡', color: '#3B82F6' },
|
||||
{ key: 'Velomobile', label: 'Velomobile', icon: '🚲', color: '#3B82F6' },
|
||||
{ key: 'VirtualRide', label: 'Virtual Ride', icon: '🖥️', color: '#3B82F6' },
|
||||
|
||||
// Water Sports
|
||||
{ key: 'Canoeing', label: 'Canoe', icon: '🛶', color: '#06B6D4' },
|
||||
{ key: 'Kayaking', label: 'Kayak', icon: '🛶', color: '#06B6D4' },
|
||||
{ key: 'Kitesurfing', label: 'Kitesurf', icon: '🪁', color: '#06B6D4' },
|
||||
{ key: 'Rowing', label: 'Rowing', icon: '🚣', color: '#06B6D4' },
|
||||
{ key: 'StandUpPaddling', label: 'Stand Up Paddling', icon: '🏄', color: '#3B82F6' },
|
||||
{ key: 'Surfing', label: 'Surf', icon: '🏄♂️', color: '#06B6D4' },
|
||||
{ key: 'Swim', label: 'Swim', icon: '🏊', color: '#06B6D4' },
|
||||
{ key: 'Windsurfing', label: 'Windsurf', icon: '🏄♀️', color: '#06B6D4' },
|
||||
{ key: 'Sailing', label: 'Sail', icon: '⛵', color: '#06B6D4' },
|
||||
|
||||
// Winter Sports
|
||||
{ key: 'IceSkate', label: 'Ice Skate', icon: '⛸️', color: '#0EA5E9' },
|
||||
{ key: 'AlpineSki', label: 'Alpine Ski', icon: '⛷️', color: '#0EA5E9' },
|
||||
{ key: 'BackcountrySki', label: 'Backcountry Ski', icon: '🎿', color: '#0EA5E9' },
|
||||
{ key: 'NordicSki', label: 'Nordic Ski', icon: '🎿', color: '#0EA5E9' },
|
||||
{ key: 'Snowboard', label: 'Snowboard', icon: '🏂', color: '#0EA5E9' },
|
||||
{ key: 'Snowshoe', label: 'Snowshoe', icon: '🥾', color: '#0EA5E9' },
|
||||
|
||||
// Other Sports
|
||||
{ key: 'Handcycle', label: 'Handcycle', icon: '🚴♂️', color: '#EF4444' },
|
||||
{ key: 'InlineSkate', label: 'Inline Skate', icon: '🛼', color: '#8B5CF6' },
|
||||
{ key: 'RockClimbing', label: 'Rock Climb', icon: '🧗', color: '#DC2626' },
|
||||
{ key: 'RollerSki', label: 'Roller Ski', icon: '🎿', color: '#F97316' },
|
||||
{ key: 'Golf', label: 'Golf', icon: '⛳', color: '#22C55E' },
|
||||
{ key: 'Skateboard', label: 'Skateboard', icon: '🛹', color: '#F59E0B' },
|
||||
{ key: 'Soccer', label: 'Football (Soccer)', icon: '⚽', color: '#10B981' },
|
||||
{ key: 'Wheelchair', label: 'Wheelchair', icon: '♿', color: '#3B82F6' },
|
||||
{ key: 'Badminton', label: 'Badminton', icon: '🏸', color: '#F59E0B' },
|
||||
{ key: 'Tennis', label: 'Tennis', icon: '🎾', color: '#10B981' },
|
||||
{ key: 'Pickleball', label: 'Pickleball', icon: '🏓', color: '#F59E0B' },
|
||||
{ key: 'Crossfit', label: 'Crossfit', icon: '💪', color: '#DC2626' },
|
||||
{ key: 'Elliptical', label: 'Elliptical', icon: '🏃♀️', color: '#8B5CF6' },
|
||||
{ key: 'StairStepper', label: 'Stair Stepper', icon: '🪜', color: '#6B7280' },
|
||||
{ key: 'WeightTraining', label: 'Weight Training', icon: '🏋️', color: '#DC2626' },
|
||||
{ key: 'Yoga', label: 'Yoga', icon: '🧘', color: '#8B5CF6' },
|
||||
{ key: 'Workout', label: 'Workout', icon: '💪', color: '#EF4444' },
|
||||
{ key: 'HIIT', label: 'HIIT', icon: '⚡', color: '#F59E0B' },
|
||||
{ key: 'Pilates', label: 'Pilates', icon: '🧘♀️', color: '#8B5CF6' },
|
||||
{ key: 'TableTennis', label: 'Table Tennis', icon: '🏓', color: '#F59E0B' },
|
||||
{ key: 'Squash', label: 'Squash', icon: '🎾', color: '#F59E0B' },
|
||||
{ key: 'Racquetball', label: 'Racquetball', icon: '🎾', color: '#F59E0B' },
|
||||
{ key: 'VirtualRow', label: 'Virtual Rowing', icon: '🚣♂️', color: '#06B6D4' }
|
||||
];
|
||||
|
||||
export function getActivityColor(activityType: string) {
|
||||
const activity = SPORT_TYPE_CHOICES.find((a) => a.key === activityType);
|
||||
return activity ? activity.color : '#6B7280'; // Default gray if not found
|
||||
}
|
||||
|
||||
export function getActivityIcon(activityType: string) {
|
||||
const activity = SPORT_TYPE_CHOICES.find((a) => a.key === activityType);
|
||||
return activity ? activity.icon : '🏅'; // Default medal if not found
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user