minor improvements

tjhorner · Sep 21, 2024 · c36abd7 · c36abd7
1 parent 956b868
commit c36abd7
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 11 deletions.
diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -22,7 +22,6 @@
   "dependencies": {
     "@bull-board/express": "^5.21.5",
     "@bull-board/nestjs": "^5.21.5",
-    "@hapi/accept": "^6.0.3",
     "@nestjs/bullmq": "^10.2.1",
     "@nestjs/common": "^10.0.0",
     "@nestjs/core": "^10.0.0",
@@ -84,4 +83,4 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   }
-}
+}
diff --git a/packages/backend/src/notifications/notifications.service.ts b/packages/backend/src/notifications/notifications.service.ts
@@ -19,7 +19,7 @@ export class NotificationsService {
     @InjectRepository(NotificationTarget)
     private readonly notificationTargetRepository: Repository<NotificationTarget>,
     private readonly eventEmitter: EventEmitter2,
-  ) { }
+  ) {}
 
   createTarget(appriseUrl: string) {
     return this.notificationTargetRepository.save({ appriseUrl })

diff --git a/packages/backend/src/tracks/import/track-import.processor.ts b/packages/backend/src/tracks/import/track-import.processor.ts
@@ -11,7 +11,7 @@ import { forwardRef, Inject } from "@nestjs/common"
 import { smoothTrackSegment } from "./gpx-smooth"
 import { EventEmitter2 } from "@nestjs/event-emitter"
 import { runCmd } from "src/util/run-command"
-import { TRACK_IMPORT_QUEUE } from "../queue-names"
+import { TRACK_IMPORT_QUEUE } from "../queues.constants"
 
 export interface TrackImportPayload {
   filePath: string

diff --git a/packages/backend/src/tracks/queue-names.ts → ...es/backend/src/tracks/queues.constants.ts b/packages/backend/src/tracks/queue-names.ts → ...es/backend/src/tracks/queues.constants.ts
diff --git a/packages/backend/src/tracks/track-images/import/image-import.processor.ts b/packages/backend/src/tracks/track-images/import/image-import.processor.ts
@@ -8,7 +8,7 @@ import { TracksService } from "../../tracks.service"
 import { TrackImage } from "../track-image.entity"
 import { Inject, forwardRef } from "@nestjs/common"
 import { EventEmitter2 } from "@nestjs/event-emitter"
-import { IMAGE_IMPORT_QUEUE } from "src/tracks/queue-names"
+import { IMAGE_IMPORT_QUEUE } from "src/tracks/queues.constants"
 
 export interface ImageImportPayload {
   trackId: number

diff --git a/packages/backend/src/tracks/tracks.module.ts b/packages/backend/src/tracks/tracks.module.ts
@@ -10,7 +10,7 @@ import { TrackImage } from "./track-images/track-image.entity"
 import { Track } from "./track.entity"
 import { TracksController } from "./tracks.controller"
 import { TracksService } from "./tracks.service"
-import { IMAGE_IMPORT_QUEUE, TRACK_IMPORT_QUEUE } from "./queue-names"
+import { IMAGE_IMPORT_QUEUE, TRACK_IMPORT_QUEUE } from "./queues.constants"
 
 @Module({
   imports: [

diff --git a/packages/backend/src/tracks/tracks.service.ts b/packages/backend/src/tracks/tracks.service.ts
@@ -12,7 +12,7 @@ import { TrackImportPayload } from "./import/track-import.processor"
 import { ImageImportPayload } from "./track-images/import/image-import.processor"
 import { TrackImage } from "./track-images/track-image.entity"
 import { Track } from "./track.entity"
-import { IMAGE_IMPORT_QUEUE, TRACK_IMPORT_QUEUE } from "./queue-names"
+import { IMAGE_IMPORT_QUEUE, TRACK_IMPORT_QUEUE } from "./queues.constants"
 
 export interface TrackFilters {
   start?: Date

diff --git a/packages/frontend/src/lib/components/SequenceViewer.svelte b/packages/frontend/src/lib/components/SequenceViewer.svelte
@@ -16,6 +16,7 @@
   export let captureDate: Date
   export let hasPrevious: boolean = true
   export let hasNext: boolean = true
+  export let el: HTMLElement | undefined = undefined
 
   const dispatch = createEventDispatcher<{
     yawChange: number
@@ -40,7 +41,7 @@
   $: projection = new EquirectProjection({ src: imageUrl })
 </script>
 
-<div class="sequence-viewer" transition:fly|global={{ duration: 500, y: 500 }}>
+<div bind:this={el} class="sequence-viewer" transition:fly|global={{ duration: 500, y: 500 }}>
   <button
     title="Close Image Viewer"
     class="close"

diff --git a/packages/frontend/src/lib/components/TrackViewer.svelte b/packages/frontend/src/lib/components/TrackViewer.svelte
@@ -13,7 +13,7 @@
   import bbox from "@turf/bbox"
   import HeadingMarker from "./HeadingMarker.svelte"
   import SequenceViewer from "./SequenceViewer.svelte"
-  import { onDestroy, type SvelteComponent } from "svelte"
+  import { tick } from "svelte"
   import TrackInfo from "./TrackInfo.svelte"
   import { fly } from "svelte/transition"
 
@@ -31,6 +31,7 @@
 
   const map = mapContext().map
 
+  let sequenceViewerElement: HTMLElement | undefined
   let selectedImage: Feature<Point, TrackImageProps> | undefined
   let hasPreviousImage = false
   let hasNextImage = false
@@ -53,7 +54,7 @@
     selectImage(features[0].id as number)
   }
 
-  function selectImage(id?: number) {
+  async function selectImage(id?: number) {
     if (selectedImage) {
       $map?.setFeatureState(
         { source: "trackImages", id: selectedImage.id },
@@ -75,12 +76,14 @@
     hasNextImage = index < trackImages.features.length - 1
     hasPreviousImage = index > 0
 
+    await tick()
+
     $map?.easeTo({
       center: selectedImage.geometry.coordinates as [number, number],
       zoom: 16,
       duration: 500,
       padding: {
-        bottom: window.innerHeight / 2,
+        bottom: sequenceViewerElement?.clientHeight ?? 0,
       },
     })
   }
@@ -128,6 +131,7 @@
 {#if selectedImage}
   <Control class="image-control" position="bottom-left">
     <SequenceViewer
+      bind:el={sequenceViewerElement}
       imageUrl={`/api/images/${selectedImage.id}.jpg`}
       captureDate={new Date(selectedImage.properties.captureDate)}
       hasNext={hasNextImage}