From 7e39634cdb0121d5cb0eb8ba9cb9d6a3f1886151 Mon Sep 17 00:00:00 2001 From: vcoppe Date: Sun, 11 Aug 2024 13:47:10 +0200 Subject: [PATCH] rework some icons --- website/package-lock.json | 16 ++++++++-------- website/package.json | 6 +++--- website/src/lib/assets/layers.ts | 14 ++++++++------ website/src/lib/assets/symbols.ts | 10 +++++++--- website/src/lib/components/Menu.svelte | 6 +++--- website/src/locales/en.json | 4 ++++ 6 files changed, 33 insertions(+), 23 deletions(-) diff --git a/website/package-lock.json b/website/package-lock.json index f3a0988..de61508 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -18,8 +18,8 @@ "dexie": "^4.0.7", "gpx": "file:../gpx", "immer": "^10.1.1", - "lucide-static": "^0.408.0", - "lucide-svelte": "^0.395.0", + "lucide-static": "^0.427.0", + "lucide-svelte": "^0.427.0", "mapbox-gl": "^3.4.0", "mapillary-js": "^4.1.2", "mode-watcher": "^0.3.1", @@ -4468,14 +4468,14 @@ } }, "node_modules/lucide-static": { - "version": "0.408.0", - "resolved": "https://registry.npmjs.org/lucide-static/-/lucide-static-0.408.0.tgz", - "integrity": "sha512-XJioz3vKagiyA6qMDWkYqU1RUS/bMjqio0/TCOItievnV/C4wwgJZGAbk6eVDe6Wv+d0e9NbhS7Y8yMEpGkElQ==" + "version": "0.427.0", + "resolved": "https://registry.npmjs.org/lucide-static/-/lucide-static-0.427.0.tgz", + "integrity": "sha512-lsUNKUv6rZrRyQa5KMHZwxKMP1Am2L9BqQGxSvFhcPvZW86sF0YcLZFQ+V5SrBPr3VhNnebMS4SqloMDucd/YQ==" }, "node_modules/lucide-svelte": { - "version": "0.395.0", - "resolved": "https://registry.npmjs.org/lucide-svelte/-/lucide-svelte-0.395.0.tgz", - "integrity": "sha512-gl4HIIGUyj3seZf/CQ6vG38oMnNmdO1lcBQaMsB5pFpnL1T13qlfqjMjfTCnsKMFjiIFr3LttE/LFVi/GXmV0A==", + "version": "0.427.0", + "resolved": "https://registry.npmjs.org/lucide-svelte/-/lucide-svelte-0.427.0.tgz", + "integrity": "sha512-l0IJqYVBTxMkJPvZqyIMyVFlbZ18Mjg0n6p7Zo9bSQNvsmeviTyOxYmYdp/G5gXcSHaOGL6YoQW7fmbFklbW/w==", "peerDependencies": { "svelte": "^3 || ^4 || ^5.0.0-next.42" } diff --git a/website/package.json b/website/package.json index 18fa522..a5444d9 100644 --- a/website/package.json +++ b/website/package.json @@ -57,8 +57,8 @@ "dexie": "^4.0.7", "gpx": "file:../gpx", "immer": "^10.1.1", - "lucide-static": "^0.408.0", - "lucide-svelte": "^0.395.0", + "lucide-static": "^0.427.0", + "lucide-svelte": "^0.427.0", "mapbox-gl": "^3.4.0", "mapillary-js": "^4.1.2", "mode-watcher": "^0.3.1", @@ -69,4 +69,4 @@ "tailwind-merge": "^2.3.0", "tailwind-variants": "^0.2.1" } -} +} \ No newline at end of file diff --git a/website/src/lib/assets/layers.ts b/website/src/lib/assets/layers.ts index 3a6178a..a4e29f0 100644 --- a/website/src/lib/assets/layers.ts +++ b/website/src/lib/assets/layers.ts @@ -1,5 +1,5 @@ import { PUBLIC_MAPBOX_TOKEN } from '$env/static/public'; -import { TramFront, Utensils, ShoppingBasket, Droplet, ShowerHead, Fuel, CircleParking, Fence, FerrisWheel, Telescope, Bed, Mountain, Pickaxe, Store, TrainFront, Bus, Ship, Croissant, House, Tent, Wrench } from 'lucide-static'; +import { TramFront, Utensils, ShoppingBasket, Droplet, ShowerHead, Fuel, CircleParking, Fence, FerrisWheel, Bed, Mountain, Pickaxe, Store, TrainFront, Bus, Ship, Croissant, House, Tent, Wrench, Binoculars } from 'lucide-static'; import { type AnySourceData, type Style } from 'mapbox-gl'; import ignFrTopo from './custom/ign-fr-topo.json'; import ignFrPlan from './custom/ign-fr-plan.json'; @@ -803,7 +803,8 @@ export const overpassQueryData: Record = { }, tags: { shop: "bakery" - } + }, + symbol: "Convenience Store" }, "food-store": { icon: { @@ -860,13 +861,13 @@ export const overpassQueryData: Record = { }, shelter: { icon: { - svg: House, + svg: Tent, color: "#000000", }, tags: { amenity: "shelter" }, - symbol: "House" + symbol: "Shelter" }, "fuel-station": { icon: { @@ -918,7 +919,7 @@ export const overpassQueryData: Record = { }, viewpoint: { icon: { - svg: Telescope, + svg: Binoculars, color: "Green", }, tags: { @@ -1060,6 +1061,7 @@ export const overpassQueryData: Record = { }, tags: { amenity: "ferry_terminal" - } + }, + symbol: "Anchor" } }; \ No newline at end of file diff --git a/website/src/lib/assets/symbols.ts b/website/src/lib/assets/symbols.ts index 0249344..0fe9e0d 100644 --- a/website/src/lib/assets/symbols.ts +++ b/website/src/lib/assets/symbols.ts @@ -1,5 +1,5 @@ -import { Landmark, type Icon, Shell, Bike, Building, Tent, Car, Wrench, ShoppingBasket, Droplet, DoorOpen, Trees, Fuel, Home, Info, TreeDeciduous, CircleParking, Cross, Utensils, Construction, BrickWall, ShowerHead, Mountain, Phone, Eye, TrainFront, Bed } from "lucide-svelte"; -import { Landmark as LandmarkSvg, Shell as ShellSvg, Bike as BikeSvg, Building as BuildingSvg, Tent as TentSvg, Car as CarSvg, Wrench as WrenchSvg, ShoppingBasket as ShoppingBasketSvg, Droplet as DropletSvg, DoorOpen as DoorOpenSvg, Trees as TreesSvg, Fuel as FuelSvg, Home as HomeSvg, Info as InfoSvg, TreeDeciduous as TreeDeciduousSvg, CircleParking as CircleParkingSvg, Cross as CrossSvg, Utensils as UtensilsSvg, Construction as ConstructionSvg, BrickWall as BrickWallSvg, ShowerHead as ShowerHeadSvg, Mountain as MountainSvg, Phone as PhoneSvg, Eye as EyeSvg, TrainFront as TrainFrontSvg, Bed as BedSvg } from "lucide-static"; +import { Landmark, Icon, Shell, Bike, Building, Tent, Car, Wrench, ShoppingBasket, Droplet, DoorOpen, Trees, Fuel, Home, Info, TreeDeciduous, CircleParking, Cross, Utensils, Construction, BrickWall, ShowerHead, Mountain, Phone, TrainFront, Bed, Binoculars, TriangleAlert, Anchor } from "lucide-svelte"; +import { Landmark as LandmarkSvg, Shell as ShellSvg, Bike as BikeSvg, Building as BuildingSvg, Tent as TentSvg, Car as CarSvg, Wrench as WrenchSvg, ShoppingBasket as ShoppingBasketSvg, Droplet as DropletSvg, DoorOpen as DoorOpenSvg, Trees as TreesSvg, Fuel as FuelSvg, Home as HomeSvg, Info as InfoSvg, TreeDeciduous as TreeDeciduousSvg, CircleParking as CircleParkingSvg, Cross as CrossSvg, Utensils as UtensilsSvg, Construction as ConstructionSvg, BrickWall as BrickWallSvg, ShowerHead as ShowerHeadSvg, Mountain as MountainSvg, Phone as PhoneSvg, TrainFront as TrainFrontSvg, Bed as BedSvg, Binoculars as BinocularsSvg, TriangleAlert as TriangleAlertSvg, Anchor as AnchorSvg } from "lucide-static"; import type { ComponentType } from "svelte"; export type Symbol = { @@ -9,9 +9,12 @@ export type Symbol = { }; export const symbols: { [key: string]: Symbol } = { + alert: { value: 'Alert', icon: TriangleAlert, iconSvg: TriangleAlertSvg }, + anchor: { value: 'Anchor', icon: Anchor, iconSvg: AnchorSvg }, bank: { value: 'Bank', icon: Landmark, iconSvg: LandmarkSvg }, beach: { value: 'Beach', icon: Shell, iconSvg: ShellSvg }, bike_trail: { value: 'Bike Trail', icon: Bike, iconSvg: BikeSvg }, + binoculars: { value: 'Binoculars', icon: Binoculars, iconSvg: BinocularsSvg }, bridge: { value: 'Bridge' }, building: { value: 'Building', icon: Building, iconSvg: BuildingSvg }, campground: { value: 'Campground', icon: Tent, iconSvg: TentSvg }, @@ -38,7 +41,8 @@ export const symbols: { [key: string]: Symbol } = { restricted_area: { value: 'Restricted Area', icon: Construction, iconSvg: ConstructionSvg }, restroom: { value: 'Restroom' }, road: { value: 'Road', icon: BrickWall, iconSvg: BrickWallSvg }, - scenic_area: { value: 'Scenic Area', icon: Eye, iconSvg: EyeSvg }, + scenic_area: { value: 'Scenic Area', icon: Binoculars, iconSvg: BinocularsSvg }, + shelter: { value: 'Shelter', icon: Tent, iconSvg: TentSvg }, shopping_center: { value: 'Shopping Center', icon: ShoppingBasket }, shower: { value: 'Shower', icon: ShowerHead, iconSvg: ShowerHeadSvg }, summit: { value: 'Summit', icon: Mountain, iconSvg: MountainSvg }, diff --git a/website/src/lib/components/Menu.svelte b/website/src/lib/components/Menu.svelte index 8127056..5b7470a 100644 --- a/website/src/lib/components/Menu.svelte +++ b/website/src/lib/components/Menu.svelte @@ -22,7 +22,6 @@ Sun, Moon, Layers3, - MountainSnow, GalleryVertical, Languages, Settings, @@ -41,7 +40,8 @@ FolderOpen, FileStack, FileX, - BookOpenText + BookOpenText, + ChartArea } from 'lucide-svelte'; import { @@ -286,7 +286,7 @@ - + {$_('menu.elevation_profile')} diff --git a/website/src/locales/en.json b/website/src/locales/en.json index f51c6f1..c761b09 100644 --- a/website/src/locales/en.json +++ b/website/src/locales/en.json @@ -381,9 +381,12 @@ "waypoint": "Point of interest", "waypoints": "Points of interest", "symbol": { + "alert": "Alert", + "anchor": "Anchor", "bank": "Bank", "beach": "Beach", "bike_trail": "Bike Trail", + "binoculars": "Binoculars", "bridge": "Bridge", "building": "Building", "campground": "Campsite", @@ -411,6 +414,7 @@ "restroom": "Toilets", "road": "Road", "scenic_area": "Scenic Area", + "shelter": "Shelter", "shopping_center": "Shopping Center", "shower": "Shower", "summit": "Summit",