fix(Edit > Album): Paste DMS geo coordinates

Author: danactive

eslint.config.js

@@ -2,7 +2,6 @@ import js from '@eslint/js'
 import next from '@next/eslint-plugin-next'
 import ts from '@typescript-eslint/eslint-plugin'
 import tsParser from '@typescript-eslint/parser'
-import jestDom from 'eslint-plugin-jest-dom'
 import jsdoc from 'eslint-plugin-jsdoc'
 import testingLibrary from 'eslint-plugin-testing-library'
 
@@ -17,7 +16,6 @@ export default [
       js, // ESLint core recommended rules
       '@typescript-eslint': ts, // TypeScript recommended rules
       'testing-library': testingLibrary,
-      'jest-dom': jestDom,
       '@next/next': next,
       jsdoc,
     },

src/components/AdminAlbum/Fields.tsx

@@ -23,8 +23,8 @@ const REFERENCE_SOURCES: ItemReferenceSource[] = ['facebook', 'google', 'instagr
 
 // Parse DMS (Degrees Minutes Seconds) format to decimal
 // Supports formats like: 50° 22' 51.51" N or 50°22'51.51"N or 50 22 51.51 N
-function parseDMS(dms: string): number | null {
-  const dmsPattern = /(\d+)[°\s]+(\d+)['\s]+(\d+(?:\.\d+)?)["\s]*([NSEW])?/i
+export function parseDMS(dms: string): number | null {
+  const dmsPattern = /(\d+)[°\s]+(\d+)[\'’′\s]+(\d+(?:\.\d+)?)[\"”″\s]*([NSEW])?/i
   const match = dms.trim().match(dmsPattern)
 
   if (!match) return null
@@ -44,6 +44,50 @@ function parseDMS(dms: string): number | null {
   return decimal
 }
 
+export function parseLatInput(value: string, prevGeo?: RawXmlItem['geo']): RawXmlItem['geo'] | undefined {
+  const trimmed = value.trim()
+  const hasDms = /\d+[°\s]+\d+[\'’′\s]+\d+/.test(trimmed)
+  const hasComma = trimmed.includes(',')
+
+  const splitDmsPair = (input: string): [string, string] | null => {
+    if (hasComma) {
+      const parts = input.split(',').map(s => s.trim()).filter(Boolean)
+      return parts.length === 2 ? [parts[0], parts[1]] : null
+    }
+    const match = input.match(/\d+[°\s]+\d+[\'’′\s]+\d+(?:\.\d+)?[\"”″\s]*[NSEW]?/ig)
+    if (match && match.length >= 2) {
+      return [match[0].trim(), match[1].trim()]
+    }
+    return null
+  }
+
+  // Check if value contains DMS format (degrees, minutes, seconds)
+  if (hasDms) {
+    const pair = splitDmsPair(trimmed)
+    if (pair) {
+      const lat = parseDMS(pair[0])
+      const lon = parseDMS(pair[1])
+      if (lat !== null && lon !== null) {
+        return { lat: lat.toString(), lon: lon.toString(), accuracy: prevGeo?.accuracy || '' }
+      }
+    }
+    const lat = parseDMS(trimmed)
+    if (lat !== null) {
+      return { lat: lat.toString(), lon: prevGeo?.lon || '', accuracy: prevGeo?.accuracy || '' }
+    }
+  }
+
+  // Check if the value contains a comma (decimal lat,lon format)
+  if (hasComma) {
+    const [lat, lon] = trimmed.split(',').map(s => s.trim())
+    return { lat: lat || '', lon: lon || '', accuracy: prevGeo?.accuracy || '' }
+  }
+
+  // Plain value for latitude
+  const lat = trimmed
+  return lat || prevGeo?.lon ? { lat, lon: prevGeo?.lon || '', accuracy: prevGeo?.accuracy || '' } : undefined
+}
+
 export default function Fields(
   { xmlAlbum, gallery, item, children, onItemUpdate, onXmlGenerated, editedItems, applyEditsToItems }:
   {
@@ -212,51 +256,10 @@ export default function Fields(
             value={editedItem?.geo?.lat ?? ''}
             onChange={(e) => {
               const value = e.target.value
-
-              // Check if value contains DMS format (degrees, minutes, seconds)
-              if (/\d+[°\s]+\d+['\s]+\d+/.test(value)) {
-                // Split by comma to check for lat,lon DMS pair
-                const parts = value.split(',').map(s => s.trim())
-
-                if (parts.length === 2) {
-                  // Parse both lat and lon as DMS
-                  const lat = parseDMS(parts[0])
-                  const lon = parseDMS(parts[1])
-                  if (lat !== null && lon !== null) {
-                    updateItem((prev: RawXmlItem | null) => prev ? {
-                      ...prev,
-                      geo: { lat: lat.toString(), lon: lon.toString(), accuracy: prev.geo?.accuracy || '' },
-                    } : null)
-                    return
-                  }
-                } else {
-                  // Single DMS value for latitude only
-                  const lat = parseDMS(value)
-                  if (lat !== null) {
-                    updateItem((prev: RawXmlItem | null) => prev ? {
-                      ...prev,
-                      geo: { lat: lat.toString(), lon: prev.geo?.lon || '', accuracy: prev.geo?.accuracy || '' },
-                    } : null)
-                    return
-                  }
-                }
-              }
-
-              // Check if the value contains a comma (decimal lat,lon format)
-              if (value.includes(',')) {
-                const [lat, lon] = value.split(',').map(s => s.trim())
-                updateItem((prev: RawXmlItem | null) => prev ? {
-                  ...prev,
-                  geo: { lat: lat || '', lon: lon || '', accuracy: prev.geo?.accuracy || '' },
-                } : null)
-              } else {
-                // Plain value for latitude
-                const lat = value
-                updateItem((prev: RawXmlItem | null) => prev ? {
-                  ...prev,
-                  geo: lat || prev.geo?.lon ? { lat, lon: prev.geo?.lon || '', accuracy: prev.geo?.accuracy || '' } : undefined,
-                } : null)
-              }
+              updateItem((prev: RawXmlItem | null) => prev ? {
+                ...prev,
+                geo: parseLatInput(value, prev.geo),
+              } : null)
             }}
             placeholder="Latitude (or lat,lon or DMS)"
             title="Latitude (geo.lat) - paste lat,lon or DMS format to auto-split"

src/components/AdminAlbum/__tests__/Fields.vitest.ts

@@ -0,0 +1,66 @@
+import { describe, expect, test } from 'vitest'
+
+import { parseDMS, parseLatInput } from '../Fields'
+
+const toDecimal = (degrees: number, minutes: number, seconds: number) => (
+  degrees + (minutes / 60) + (seconds / 3600)
+)
+
+describe('parseDMS', () => {
+  test('parses standard DMS with direction', () => {
+    const value = parseDMS('50° 22\' 51.51" N')
+    expect(value).not.toBeNull()
+    expect(value).toBeCloseTo(toDecimal(50, 22, 51.51), 6)
+  })
+
+  test('parses compact DMS without spaces', () => {
+    const value = parseDMS('50°22\'51.51"N')
+    expect(value).not.toBeNull()
+    expect(value).toBeCloseTo(toDecimal(50, 22, 51.51), 6)
+  })
+
+  test('parses DMS with spaces and no symbols', () => {
+    const value = parseDMS('50 22 51.51 N')
+    expect(value).not.toBeNull()
+    expect(value).toBeCloseTo(toDecimal(50, 22, 51.51), 6)
+  })
+
+  test('negates for south and west', () => {
+    const south = parseDMS('12° 30\' 0" S')
+    const west = parseDMS('120° 0\' 30" W')
+    expect(south).toBeCloseTo(-toDecimal(12, 30, 0), 6)
+    expect(west).toBeCloseTo(-toDecimal(120, 0, 30), 6)
+  })
+
+  test('parses DMS with prime symbols for lat/lon pair', () => {
+    const lat = parseDMS('50°45′42″N')
+    const lon = parseDMS('111°29′06″W')
+    expect(lat).toBeCloseTo(toDecimal(50, 45, 42), 6)
+    expect(lon).toBeCloseTo(-toDecimal(111, 29, 6), 6)
+  })
+
+  test('returns null for invalid input', () => {
+    expect(parseDMS('not a coordinate')).toBeNull()
+  })
+})
+
+describe('parseLatInput', () => {
+  test('parses comma-delimited decimal lat,lon', () => {
+    const geo = parseLatInput('50.75, -111.485', { lat: '', lon: '', accuracy: '3' })
+    expect(geo).toEqual({ lat: '50.75', lon: '-111.485', accuracy: '3' })
+  })
+
+  test('parses single number latitude and preserves longitude', () => {
+    const geo = parseLatInput('12.34', { lat: '0', lon: '99', accuracy: '5' })
+    expect(geo).toEqual({ lat: '12.34', lon: '99', accuracy: '5' })
+  })
+
+  test('parses DMS lat/lon pair without comma', () => {
+    const geo = parseLatInput('50°45′42″N 111°29′06″W', { lat: '', lon: '', accuracy: '' })
+    expect(geo).toEqual({
+      lat: (50 + (45 / 60) + (42 / 3600)).toString(),
+      lon: (-(111 + (29 / 60) + (6 / 3600))).toString(),
+      accuracy: '',
+    })
+  })
+})

src/utils/__tests__/walk.vitest.ts

@@ -535,7 +535,7 @@ describe('Walk - util', () => {
     test('JPG', () => {
       const fileGroup = associateMedia(generateImageFilenames(2, 'jpgraw')).grouped.get('DSC03721')
       if (!fileGroup) {
-        fail('Mock data is bad')
+        throw new Error('Mock data is bad')
       }
       const received = getJpgLike(fileGroup)
       expect(received?.ext).toEqual('JPG')
@@ -545,7 +545,7 @@ describe('Walk - util', () => {
     test('JPEG', () => {
       const fileGroup = associateMedia(generateImageFilenames(1, 'jpeg')).grouped.get('DSC03721')
       if (!fileGroup) {
-        fail('Mock data is bad')
+        throw new Error('Mock data is bad')
       }
       const received = getJpgLike(fileGroup)
       expect(received?.ext).toEqual('JPEG')
@@ -555,7 +555,7 @@ describe('Walk - util', () => {
     test('check immutability', () => {
       const fileGroup = associateMedia(generateImageFilenames(1, 'jpeg')).grouped.get('DSC03721')
       if (!fileGroup) {
-        fail('Mock data is bad')
+        throw new Error('Mock data is bad')
       }
       const generated = generateImageFilenames(1, 'jpeg')
       getJpgLike(fileGroup)

tsconfig.json

@@ -19,6 +19,9 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "react-jsx",
+    "types": [
+      "vitest/globals"
+    ],
     "plugins": [
       {
         "name": "next"