Search favorites or tracks by name

map/src/context/AppContext.js

@@ -28,6 +28,10 @@ import supportedLanguages from '../resources/translations/supportedLanguages.jso
 import { normalizeLang } from '../util/lang';
 
 export const collator = new Intl.Collator(supportedLanguages.map(normalizeLang), { numeric: true });
+export const searchCollator = new Intl.Collator(supportedLanguages.map(normalizeLang), {
+    usage: 'search',
+    sensitivity: 'base',
+});
 
 export const OBJECT_TYPE_LOCAL_TRACK = 'local_track'; // track in localStorage
 export const OBJECT_TYPE_CLOUD_TRACK = 'cloud_track'; // track in OsmAnd Cloud
@@ -329,6 +333,9 @@ export const AppContextProvider = (props) => {
     const [selectedCloudTrackObj, setSelectedCloudTrackObj] = useState(null);
     const [selectedLocalTrackObj, setSelectedLocalTrackObj] = useState(null);
     const [selectedPoiObj, setSelectedPoiObj] = useState(null);
+    const [selectedSearchObj, setSelectedSearchObj] = useState(null);
+    // Group IDs of favorites visible in current search results — their map markers must always show.
+    const [searchFavoriteGroupIds, setSearchFavoriteGroupIds] = useState(null);
 
     const [processingPoiByUrl, setProcessingPoiByUrl] = useState(false);
     const [processingStopByUrl, setProcessingStopByUrl] = useState(false);
@@ -736,6 +743,10 @@ export const AppContextProvider = (props) => {
                 setPoiCatMenu,
                 selectedPoiObj,
                 setSelectedPoiObj,
+                selectedSearchObj,
+                setSelectedSearchObj,
+                searchFavoriteGroupIds,
+                setSearchFavoriteGroupIds,
                 zoomToCoords,
                 setZoomToCoords,
                 poiByUrl,

map/src/infoblock/components/InformationBlock.jsx

@@ -27,6 +27,7 @@ import {
     SHARE_MENU_URL,
     TRACKS_URL,
 } from '../../manager/GlobalManager';
+import { isTrackFromSearch, navigateBackToSearchResults } from '../../manager/SearchManager';
 import { isVisibleTrack } from '../../menu/visibletracks/VisibleTracks';
 import WptDetails from './wpt/WptDetails';
 import WptPhotoList from './wpt/WptPhotoList';
@@ -154,6 +155,7 @@ export default function InformationBlock({
             ctx.setTrackRange(null);
             setClearState(true);
             if (!ctx.currentObjectType) {
+                setTrackName(null);
                 hideTrackFromMapIfNotVisible(ctx.selectedGpxFile);
                 if (!isEmpty(ctx.selectedGpxFile)) {
                     ctx.setSelectedGpxFile({});
@@ -388,7 +390,7 @@ export default function InformationBlock({
         if (ctx.selectedGpxFile.mapObj) {
             closeMapObjectMenu();
         } else if (isCloudTrack(ctx)) {
-            closeCloudTrack();
+            closeCloudTrack({ fromSearch: isTrackFromSearch(ctx) });
         } else if (isLocalTrack(ctx)) {
             if (!isEmpty(ctx.selectedGpxFile)) {
                 ctx.setSelectedGpxFile({});
@@ -418,7 +420,7 @@ export default function InformationBlock({
         ctx.setCurrentObjectType(null);
     }
 
-    function closeCloudTrack() {
+    function closeCloudTrack({ fromSearch = false } = {}) {
         hideTrackFromMapIfNotVisible(ctx.selectedGpxFile);
 
         // If openGroups is empty (e.g. track was opened directly from Garmin last-sync menu),
@@ -446,6 +448,13 @@ export default function InformationBlock({
         setSavePrevState(true);
         ctx.setSelectedCloudTrackObj(null);
 
+        if (fromSearch) {
+            ctx.setSelectedSearchObj(null);
+            if (navigateBackToSearchResults(navigate, ctx, location)) {
+                return;
+            }
+        }
+
         navigate({
             pathname: MAIN_URL_WITH_SLASH + trackType,
             hash: location.hash,

map/src/infoblock/components/favorite/WptEditPanel.jsx

@@ -486,7 +486,7 @@ export default function WptEditPanel({ setShowInfoBlock }) {
             mapObj: true,
         };
 
-        openFavoriteObj(ctx, newGpxFile);
+        openFavoriteObj({ ctx, favoriteObj: newGpxFile });
 
         // Clear state
         ctx.setAddFavorite((prev) => ({

map/src/infoblock/components/wpt/WptDetails.jsx

@@ -92,6 +92,7 @@ import {
 import { useWindowSize } from '../../../util/hooks/useWindowSize';
 import gStyles from '../../../menu/gstylesmenu.module.css';
 import { buildSearchParamsFromQuery } from '../../../util/hooks/search/useSearchNav';
+import { isFavoriteFromSearch, navigateBackToSearchResults } from '../../../manager/SearchManager';
 import { useLocation, useNavigate } from 'react-router-dom';
 import LocationInfoLine from '../common/LocationInfoLine';
 import OpeningHoursInfo, { getOpeningHours } from './OpeningHoursInfo';
@@ -319,7 +320,7 @@ export default function WptDetails({ setOpenWptTab, setShowInfoBlock }) {
 
         const type = getWptType(ctx.selectedWpt);
 
-        if ((type?.isFav && !ctx.selectedWpt.mapObj) || type?.isShareFav) {
+        if ((type?.isFav && !ctx.selectedWpt.mapObj && !isFavoriteFromSearch(ctx)) || type?.isShareFav) {
             recentSaver(FAVORITES_KEY, ctx.selectedWpt);
             ctx.setSelectedFavoriteObj({ ...ctx.selectedWpt });
         }
@@ -546,7 +547,10 @@ export default function WptDetails({ setOpenWptTab, setShowInfoBlock }) {
             isSearch: ctx.currentObjectType === OBJECT_SEARCH && wpt?.poi && !wpt?.wikidata,
             isWikiPoi: wpt?.wikidata,
             isWpt: isTrack(ctx) && wpt?.trackWpt,
-            isFav: ctx.currentObjectType === OBJECT_TYPE_FAVORITE && wpt?.markerCurrent,
+            isFav:
+                (ctx.currentObjectType === OBJECT_TYPE_FAVORITE ||
+                    ctx.selectedSearchObj?.type === OBJECT_TYPE_FAVORITE) &&
+                wpt?.markerCurrent,
             isShareFav: ctx.currentObjectType === OBJECT_TYPE_SHARE_FILE && wpt?.markerCurrent,
             isStop: ctx.currentObjectType === OBJECT_TYPE_STOP && wpt?.stop,
         };
@@ -599,13 +603,22 @@ export default function WptDetails({ setOpenWptTab, setShowInfoBlock }) {
                 });
             }
         } else if (type.isFav) {
-            if (!wpt.mapObj) {
+            if (isFavoriteFromSearch(ctx)) {
+                // Opened from search — always return to search results.
+                ctx.setSelectedSearchObj(null);
+                setShowInfoBlock(false);
+                if (!wpt.mapObj) {
+                    ctx.setSelectedFavoriteObj(null);
+                }
+                navigateBackToSearchResults(navigate, ctx, location);
+            } else if (!wpt.mapObj) {
                 ctx.setSelectedFavoriteObj(null);
+                closeOnlyFavDetails();
             } else {
                 // remove the selected pin from the map
                 ctx.setCloseMapObj(true);
+                closeOnlyFavDetails();
             }
-            closeOnlyFavDetails();
         } else if (type.isShareFav) {
             setShowInfoBlock(false);
             ctx.setSelectedGpxFile((prev) => ({ ...prev, markerCurrent: null, favItem: false, name: null }));

map/src/manager/FavoritesManager.js

@@ -10,7 +10,7 @@ import isEmpty from 'lodash-es/isEmpty';
 import { apiPost } from '../util/HttpApi';
 import TracksManager from './track/TracksManager';
 import { refreshGlobalFiles } from './track/SaveTrackManager';
-import { OBJECT_TYPE_FAVORITE, FAVORITES_URL_PARAM_FOLDER } from '../context/AppContext';
+import { OBJECT_SEARCH, OBJECT_TYPE_FAVORITE, FAVORITES_URL_PARAM_FOLDER } from '../context/AppContext';
 import FavoriteHelper from '../infoblock/components/favorite/FavoriteHelper';
 import { getUniqFileId, MAIN_URL_WITH_SLASH, FAVORITES_URL } from './GlobalManager';
 import { getFavoriteFromDB, saveFavoriteToDB } from '../context/FavoriteStorage';
@@ -692,6 +692,19 @@ export function getSize(group, t) {
         : 'empty';
 }
 
+/** Build icon HTML for a favorite waypoint marker in the menu list. */
+export function getFavoriteMenuIconHtml({ wpt = null, icon, color, background } = {}) {
+    const rawHtml = createPoiIcon({
+        point: wpt ?? {},
+        icon,
+        color,
+        background,
+        hasBackgroundLight: false,
+    }).options.html;
+
+    return changeIconSizeWpt(removeShadowFromIconWpt(rawHtml), 18, 30, background);
+}
+
 export function getFavMenuListByLayers({ layers, wpts, currentLoc, pointsGroups = null }) {
     let markerList = [];
     Object.values(layers).forEach((value) => {
@@ -704,14 +717,9 @@ export function getFavMenuListByLayers({ layers, wpts, currentLoc, pointsGroups
             return;
         }
         const appearance = resolveWptAppearance(wpt, pointsGroups);
-        const icon = createPoiIcon({
-            point: wpt,
-            ...appearance,
-            hasBackgroundLight: false,
-        }).options.html;
         const marker = {
             name: value.options.name,
-            icon: changeIconSizeWpt(removeShadowFromIconWpt(icon), 18, 30, appearance.background),
+            icon: getFavoriteMenuIconHtml({ wpt, ...appearance }),
             layer: value,
             color: appearance.color,
             background: appearance.background,
@@ -725,6 +733,37 @@ export function getWptByTitle(title, wpts) {
     return wpts.find((wpt) => wpt.name === title);
 }
 
+/** Build menu marker + group for opening a favorite from search (requires map markers loaded). */
+export function resolveFavoriteMarkerForSearch(ctx, groupId, wptName) {
+    const group = ctx.favorites?.groups?.find((g) => g.id === groupId);
+    const mapObj = ctx.favorites?.mapObjs?.[groupId];
+    if (!group || !mapObj?.wpts || !mapObj?.markers?._layers) {
+        return null;
+    }
+    const wpt = getWptByTitle(wptName, mapObj.wpts);
+    if (!wpt) {
+        return null;
+    }
+    const layer = Object.values(mapObj.markers._layers).find((l) => l.options?.name === wptName);
+    if (!layer) {
+        return null;
+    }
+    const appearance = resolveWptAppearance(wpt, mapObj.pointsGroups);
+    const marker = {
+        name: wptName,
+        icon: getFavoriteMenuIconHtml({
+            wpt,
+            icon: appearance.icon,
+            color: appearance.color,
+            background: appearance.background,
+        }),
+        layer,
+        color: appearance.color,
+        background: appearance.background,
+    };
+    return { group, marker };
+}
+
 export function addLocDist({ location, markers = null, wpts = null }) {
     let res = [];
     if (location && location !== LOCATION_UNAVAILABLE) {
@@ -774,11 +813,63 @@ export function getFavoriteId(layer) {
     return `fav:${lat}:${lng}`;
 }
 
-export function openFavoriteObj(ctx, object) {
-    ctx.setCurrentObjectType(OBJECT_TYPE_FAVORITE);
-    const selectionId = getFavoriteId(object.markerCurrent?.layer);
-    ctx.setSelectedWpt({ ...object, selectionId, id: selectionId, groupId: object.id });
-    ctx.setSelectedGpxFile({ ...object });
+export function getSelectedFavoriteObj({
+    group,
+    marker,
+    ctx,
+    sharedFile = false,
+    mapObj = false,
+    openedFolder = undefined,
+}) {
+    const favObj = {};
+    if (marker?.layer) {
+        marker.latlng = marker.layer.getLatLng();
+    }
+    favObj.markerCurrent = { ...marker, groupId: group.id };
+    if (!ctx.selectedGpxFile.markerPrev || ctx.selectedGpxFile.markerPrev !== ctx.selectedGpxFile.markerCurrent) {
+        favObj.markerPrev = ctx.selectedGpxFile.markerCurrent;
+    }
+    let trackData;
+    Object.keys(ctx.favorites.mapObjs).forEach((fileId) => {
+        if (fileId === group.id) {
+            favObj.nameGroup = group.name;
+            Object.values(ctx.favorites.mapObjs[fileId].markers._layers).forEach((m) => {
+                if (m.options.name === marker.name) {
+                    trackData = ctx.favorites.mapObjs[fileId];
+                }
+            });
+        }
+    });
+    favObj.id = group.id;
+    favObj.key = `${group.id}:${marker.name}`;
+    favObj.trackData = trackData;
+    favObj.sharedWithMe = sharedFile;
+    favObj.file = ctx.favorites.groups.find((g) => g.name === group.name).file;
+    favObj.name = marker.name;
+    favObj.prevState = ctx.selectedGpxFile;
+    favObj.favItem = true;
+    favObj.mapObj = mapObj;
+    favObj.openedFolder = openedFolder;
+
+    return favObj;
+}
+
+export function addFavoriteToMap({ group, marker, ctx, sharedFile = false, mapObj = false, openedFolder = undefined }) {
+    const favoriteObj = getSelectedFavoriteObj({ group, marker, ctx, sharedFile, mapObj, openedFolder });
+    openFavoriteObj({ ctx, favoriteObj });
+}
+
+export function addFavoriteToMapFromSearch(ctx, { group, marker }) {
+    const favoriteObj = getSelectedFavoriteObj({ group, marker, ctx, mapObj: false });
+    ctx.setSelectedSearchObj({ type: OBJECT_TYPE_FAVORITE, object: favoriteObj });
+    openFavoriteObj({ ctx, favoriteObj, options: { fromSearch: true } });
+}
+
+export function openFavoriteObj({ ctx, favoriteObj, options = {} }) {
+    ctx.setCurrentObjectType(options.fromSearch === true ? OBJECT_SEARCH : OBJECT_TYPE_FAVORITE);
+    const selectionId = getFavoriteId(favoriteObj.markerCurrent?.layer);
+    ctx.setSelectedWpt({ ...favoriteObj, selectionId, id: selectionId, groupId: favoriteObj.id });
+    ctx.setSelectedGpxFile({ ...favoriteObj });
 }
 
 export function navigateToFavoritesMenu(navigate, ctx) {
@@ -798,11 +889,9 @@ const FavoritesManager = {
     deleteFavorite,
     updateFavorite,
     prepareTrackData,
-    getShapesSvg,
     orderList,
     getColorGroup,
     createGroup,
-    createDefaultWptGroup,
     getGroupSize,
     DEFAULT_TAB_ICONS: DEFAULT_TAB_ICONS,
     DEFAULT_GROUP_NAME: DEFAULT_FAV_GROUP_NAME,