Merge branch 'master' into navi

Author: karussell

README.md

@@ -8,7 +8,7 @@ We have developed an intuitive and simple user interface to find routes:
 
 [![GraphHopper Maps route planner](https://www.graphhopper.com/wp-content/uploads/2026/03/maps-screenshot.png)](https://graphhopper.com/maps/)
 
-With autocomplete, alternative routes, information along the route and POI search and everything available in all major browsers including mobile browsers. Read more details about it [here](https://www.graphhopper.com/maps-route-planner/).
+With address search (autocomplete), alternative routes, information along the route and POI search and everything available in all major browsers including mobile browsers. Read more details about it [here](https://www.graphhopper.com/maps-route-planner/).
 
 ## Turn-by-Turn navigation
 

package-lock.json

@@ -91,8 +91,7 @@ export default function AddressInput(props: AddressInputProps) {
             return
         }
         if (text === '') {
-            const recents = buildRecentItems(undefined, 5, excludeCoord)
-            if (recents.length > 0) setAutocompleteItems(recents)
+            setAutocompleteItems(buildRecentItems(undefined, 5, excludeCoord))
         }
     }, [hasFocus, excludeCoord])
 
@@ -230,18 +229,15 @@ export default function AddressInput(props: AddressInputProps) {
                         setText(query)
                         if (query === '') {
                             geocoder.cancel()
-                            const recents = buildRecentItems(undefined, 5, excludeCoord)
-                            if (recents.length > 0) setAutocompleteItems(recents)
-                            else setAutocompleteItems([])
+                            setAutocompleteItems(buildRecentItems(undefined, 5, excludeCoord))
                         } else {
                             const coordinate = textToCoordinate(query)
                             if (coordinate) {
                                 geocoder.cancel()
                                 setAutocompleteItems([])
                             } else {
                                 if (query.length < 2) {
-                                    const recents = buildRecentItems(query, 5, excludeCoord)
-                                    if (recents.length > 0) setAutocompleteItems(recents)
+                                    setAutocompleteItems(buildRecentItems(query, 5, excludeCoord))
                                 }
                                 geocoder.request(query, biasCoord, getMap().getView().getZoom())
                             }
@@ -274,9 +270,7 @@ export default function AddressInput(props: AddressInputProps) {
                     onClick={e => {
                         setText('')
                         props.onChange('')
-                        const recents = buildRecentItems(undefined, 5, excludeCoord)
-                        if (recents.length > 0) setAutocompleteItems(recents)
-                        else setAutocompleteItems([])
+                        setAutocompleteItems(buildRecentItems(undefined, 5, excludeCoord))
                         // if we clear the text without focus then explicitly request it to improve usability:
                         searchInput.current!.focus()
                     }}

src/sidebar/search/AddressInput.tsx

@@ -58,22 +58,26 @@ export function saveRecentLocation(
     try {
         const all = getRecentLocations()
         let prevCount = 0
-        const filtered = all.filter(e => {
+        const others = all.filter(e => {
             const isDuplicate = calcDist({ lat: e.lat, lng: e.lng }, coordinate) <= DEDUP_DISTANCE_METERS
             if (isDuplicate) prevCount = e.count
             return !isDuplicate
         })
 
-        filtered.push({
+        const newEntry: RecentLocation = {
             mainText,
             secondText,
             lat: coordinate.lat,
             lng: coordinate.lng,
             timestamp: now,
             count: prevCount + 1,
-        })
-        filtered.sort((a, b) => b.timestamp - a.timestamp)
-        localStorage.setItem(STORAGE_KEY, JSON.stringify(filtered.slice(0, MAX_ENTRIES)))
+        }
+        // Always keep the just-saved entry so a brand-new one-off can enter even if the cache is full of
+        // favorites (otherwise it would be starved and never accumulate count). Rank the remaining slots
+        // by count desc then timestamp desc so frequently-used entries survive pressure from one-offs.
+        others.sort((a, b) => b.count - a.count || b.timestamp - a.timestamp)
+        const kept = [newEntry, ...others].slice(0, MAX_ENTRIES)
+        localStorage.setItem(STORAGE_KEY, JSON.stringify(kept))
     } catch {
         // localStorage unavailable (private browsing, quota exceeded)
     }

src/sidebar/search/RecentLocations.ts

@@ -41,4 +41,37 @@ describe('RecentLocations', () => {
         expect(names()).toContain('P0')
         expect(names()).not.toContain('P1') // now the oldest
     })
+
+    it('should keep a frequently used (high count) location even if older than new one-off entries', () => {
+        // user visits Home many times long ago
+        for (let i = 0; i < 5; i++) save('Home', 42, 1000 + i)
+        // then visits MAX_ENTRIES brand-new one-off locations
+        for (let i = 0; i < MAX_ENTRIES; i++) save(`One${i}`, 10 + i, 100_000 + i)
+
+        // Home has count 5 and should not be evicted by single-count newer entries
+        expect(names()).toContain('Home')
+    })
+
+    it('should save a new one-off even when the cache is full of frequently-used entries', () => {
+        // every slot taken by a favorite (count=2)
+        for (let i = 0; i < MAX_ENTRIES; i++) {
+            save(`Fav${i}`, 10 + i, 1000 + i)
+            save(`Fav${i}`, 10 + i, 2000 + i) // re-visit → count=2
+        }
+        expect(getRecentLocations()).toHaveLength(MAX_ENTRIES)
+
+        save('New', 100, 10_000)
+        // a brand-new one-off must still be stored, otherwise it can never accumulate count on future visits
+        expect(names()).toContain('New')
+    })
+
+    it('should sort by count desc, then timestamp desc', () => {
+        save('Once', 1, 5000)
+        save('Twice', 2, 1000)
+        save('Twice', 2, 2000) // count=2
+
+        const locs = getRecentLocations()
+        expect(locs[0].mainText).toBe('Twice') // higher count first
+        expect(locs[1].mainText).toBe('Once')
+    })
 })