From c5cb63e4577202f27d7d6650c196ae2d62a74d33 Mon Sep 17 00:00:00 2001 From: Noah Spannbauer Date: Sat, 22 Mar 2025 23:17:16 -0500 Subject: [PATCH] adding tracks swiper --- app/package.json | 2 ++ .../components/logTrackMaps/LogTrackMaps.tsx | 4 +-- pnpm-lock.yaml | 35 ++++++++++++++++--- 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/app/package.json b/app/package.json index 29d833a..85c933a 100644 --- a/app/package.json +++ b/app/package.json @@ -17,8 +17,10 @@ "@mapbox/leaflet-omnivore": "^0.3.4", "@mapbox/togeojson": "^0.16.2", "@noahspan/noahspan-components": "1.6.0", + "@types/mapbox__mapbox-gl-geocoder": "^5.0.0", "axios": "^1.7.2", "dotenv": "^16.4.7", + "install": "^0.13.0", "leaflet": "^1.9.4", "pure-react-carousel": "^1.32.0", "react": "19.0.0-rc.1", diff --git a/app/src/components/logTrackMaps/LogTrackMaps.tsx b/app/src/components/logTrackMaps/LogTrackMaps.tsx index de80c0e..ea6bbf4 100644 --- a/app/src/components/logTrackMaps/LogTrackMaps.tsx +++ b/app/src/components/logTrackMaps/LogTrackMaps.tsx @@ -7,7 +7,7 @@ import { useIsAuthenticated } from '@azure/msal-react'; import { Swiper, SwiperSlide } from 'swiper/react'; import { Pagination } from 'swiper/modules'; import { MapContainer, TileLayer, GeoJSON } from 'react-leaflet'; -import * as tj from '@mapbox/togeojson'; +import toGeoJSON from '@mapbox/togeojson'; import rewind from '@mapbox/geojson-rewind'; import 'swiper/css'; import 'swiper/css/pagination'; @@ -36,7 +36,7 @@ const LogTrackMaps = ({ rowKey, trackUrls }: LogTrackMapsProps) => { config ); const dom = new DOMParser().parseFromString(response.data, 'text/xml') - const converted = tj.kml(dom); + const converted = toGeoJSON.kml(dom); rewind(converted, false); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 52e7f6d..3d86fab 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -169,12 +169,18 @@ importers: '@noahspan/noahspan-components': specifier: 1.6.0 version: 1.6.0(@mui/system@6.4.8(@emotion/react@11.14.0(@types/react@18.3.18)(react@19.0.0-rc.1))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@18.3.18)(react@19.0.0-rc.1))(@types/react@18.3.18)(react@19.0.0-rc.1))(@types/react@18.3.18)(react@19.0.0-rc.1))(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(less@4.2.2)(moment@2.30.1)(postcss@8.5.1)(react-dom@19.0.0-rc.1(react@19.0.0-rc.1))(react@19.0.0-rc.1)(storybook@8.6.8(prettier@3.2.5))(typescript@5.7.3)(webpack@5.97.1(esbuild@0.18.20)) + '@types/mapbox__mapbox-gl-geocoder': + specifier: ^5.0.0 + version: 5.0.0 axios: specifier: ^1.7.2 version: 1.7.9 dotenv: specifier: ^16.4.7 version: 16.4.7 + install: + specifier: ^0.13.0 + version: 0.13.0 leaflet: specifier: ^1.9.4 version: 1.9.4 @@ -2290,6 +2296,12 @@ packages: '@types/leaflet@1.9.16': resolution: {integrity: sha512-wzZoyySUxkgMZ0ihJ7IaUIblG8Rdc8AbbZKLneyn+QjYsj5q1QU7TEKYqwTr10BGSzY5LI7tJk9Ifo+mEjdFRw==} + '@types/mapbox-gl@3.4.1': + resolution: {integrity: sha512-NsGKKtgW93B+UaLPti6B7NwlxYlES5DpV5Gzj9F75rK5ALKsqSk15CiEHbOnTr09RGbr6ZYiCdI+59NNNcAImg==} + + '@types/mapbox__mapbox-gl-geocoder@5.0.0': + resolution: {integrity: sha512-eGBWdFiP2QgmwndPyhwK6eBeOfyB8vRscp2C6Acqasx5dH8FvTo/VgXWCrCKFR3zkWek/H4w4/CwmBFOs7OLBA==} + '@types/methods@1.1.4': resolution: {integrity: sha512-ymXWVrDiCxTBE3+RIrrP533E70eA+9qu7zdWoHuOmGujkYtzf4HQF96b8nwHLqhuf4ykX61IGRIB38CC6/sImQ==} @@ -3862,6 +3874,10 @@ packages: resolution: {integrity: sha512-vI2w4zl/mDluHt9YEQ/543VTCwPKWiHzKtm9dM2V0NdFcqEexDAjUHzO1oA60HRNaVifGXXM1tRRNluLVHa0Kg==} engines: {node: '>=18'} + install@0.13.0: + resolution: {integrity: sha512-zDml/jzr2PKU9I8J/xyZBQn8rPCAY//UOYNmR01XwNwyfhEWObo2SWfSl1+0tm1u6PhxLwDnfsT/6jB7OUxqFA==} + engines: {node: '>= 0.10'} + ipaddr.js@1.9.1: resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==} engines: {node: '>= 0.10'} @@ -8450,6 +8466,15 @@ snapshots: dependencies: '@types/geojson': 7946.0.16 + '@types/mapbox-gl@3.4.1': + dependencies: + '@types/geojson': 7946.0.16 + + '@types/mapbox__mapbox-gl-geocoder@5.0.0': + dependencies: + '@types/geojson': 7946.0.16 + '@types/mapbox-gl': 3.4.1 + '@types/methods@1.1.4': {} '@types/mime@1.3.5': {} @@ -10302,11 +10327,13 @@ snapshots: strip-ansi: 6.0.1 wrap-ansi: 6.2.0 + install@0.13.0: {} + ipaddr.js@1.9.1: {} is-arguments@1.2.0: dependencies: - call-bound: 1.0.3 + call-bound: 1.0.4 has-tostringtag: 1.0.2 is-arrayish@0.2.1: {} @@ -10337,7 +10364,7 @@ snapshots: is-generator-function@1.1.0: dependencies: - call-bound: 1.0.3 + call-bound: 1.0.4 get-proto: 1.0.1 has-tostringtag: 1.0.2 safe-regex-test: 1.1.0 @@ -10356,7 +10383,7 @@ snapshots: is-regex@1.2.1: dependencies: - call-bound: 1.0.3 + call-bound: 1.0.4 gopd: 1.2.0 has-tostringtag: 1.0.2 hasown: 2.0.2 @@ -11853,7 +11880,7 @@ snapshots: safe-regex-test@1.1.0: dependencies: - call-bound: 1.0.3 + call-bound: 1.0.4 es-errors: 1.3.0 is-regex: 1.2.1