@osm-editor-kit/street-imagery-react 0.1.0-alpha.6 → 0.1.0-alpha.7

package/dist/{chunk-HA4GJWHI.js → chunk-EE7V3OIZ.js}

@@ -1,4 +1,4 @@
-import { DEFAULT_STREET_IMAGERY_LOCALE, mapillaryValueName } from '@osm-editor-kit/street-imagery';
+import { DEFAULT_STREET_IMAGERY_LOCALE } from '@osm-editor-kit/street-imagery';
 import { createContext, use } from 'react';
 import { jsx } from 'react/jsx-runtime';
 
@@ -11,11 +11,11 @@ var en = {
     forwardInHistory: "Forward in history (])",
     minimize: "Minimize",
     close: "Close (Esc)",
-    views: "Views",
     suggestedViews: "Suggested views",
     suggestedViewsHint: "Suggested views: where the photo is taken from, and which way it looks",
     noPhoto: (label) => `${label} (no photo)`,
-    noMatchingPhoto: (label) => `${label}: no matching photo`
+    noMatchingPhoto: (label) => `${label}: no matching photo`,
+    nextPhotoOfView: (label) => `${label} \u2014 click for the next photo`
   },
   unknownDate: "Unknown date",
   viewpointRole: {
@@ -25,24 +25,22 @@ var en = {
     "into-node": "Junction",
     custom: "View"
   },
+  compass: ["N", "NE", "E", "SE", "S", "SW", "W", "NW"],
   viewDirection: (role, kind) => {
     switch (kind) {
       case "forward":
         return `${role}, looking along the street`;
       case "back":
         return `${role}, looking back along the street`;
+      case "right":
+        return `${role}, looking right across the street`;
+      case "left":
+        return `${role}, looking left across the street`;
       case "into":
         return `${role}, looking into the junction`;
       default:
         return `${role}, looking ${kind}`;
     }
-  },
-  feature: {
-    name: (value) => mapillaryValueName(value, "en"),
-    seen: "Seen",
-    noPhotos: "Mapillary lists no photos for this feature.",
-    daysSummary: (photos, days) => `${photos} photos on ${days} days`,
-    dayPhotos: (photos, canStep) => `${photos} photo${photos === 1 ? "" : "s"}${canStep ? " \u2014 click for the next one" : ""}`
   }
 };
 var COMPASS_DE = { N: "Norden", E: "Osten", S: "S\xFCden", W: "Westen" };
@@ -54,11 +52,11 @@ var de = {
     forwardInHistory: "Vor im Verlauf (])",
     minimize: "Minimieren",
     close: "Schlie\xDFen (Esc)",
-    views: "Blicke",
     suggestedViews: "Vorgeschlagene Blicke",
     suggestedViewsHint: "Vorgeschlagene Blicke: von wo das Foto aufgenommen ist und wohin es schaut",
     noPhoto: (label) => `${label} (kein Foto)`,
-    noMatchingPhoto: (label) => `${label}: kein passendes Foto`
+    noMatchingPhoto: (label) => `${label}: kein passendes Foto`,
+    nextPhotoOfView: (label) => `${label} \u2014 klicken f\xFCr das n\xE4chste Foto`
   },
   unknownDate: "Datum unbekannt",
   viewpointRole: {
@@ -68,24 +66,22 @@ var de = {
     "into-node": "Knoten",
     custom: "Blick"
   },
+  compass: ["N", "NO", "O", "SO", "S", "SW", "W", "NW"],
   viewDirection: (role, kind) => {
     switch (kind) {
       case "forward":
         return `${role}, Blick entlang der Stra\xDFe`;
       case "back":
         return `${role}, Blick zur\xFCck entlang der Stra\xDFe`;
+      case "right":
+        return `${role}, Blick nach rechts quer zur Stra\xDFe`;
+      case "left":
+        return `${role}, Blick nach links quer zur Stra\xDFe`;
       case "into":
         return `${role}, Blick in den Knoten`;
       default:
         return `${role}, Blick nach ${COMPASS_DE[kind] ?? kind}`;
     }
-  },
-  feature: {
-    name: (value) => mapillaryValueName(value, "de"),
-    seen: "Gesehen",
-    noPhotos: "Mapillary f\xFChrt keine Fotos zu diesem Objekt.",
-    daysSummary: (photos, days) => `${photos} Fotos an ${days} Tagen`,
-    dayPhotos: (photos, canStep) => `${photos} Foto${photos === 1 ? "" : "s"}${canStep ? " \u2014 klicken f\xFCr das n\xE4chste" : ""}`
   }
 };
 var STREET_IMAGERY_MESSAGES = {
@@ -101,8 +97,8 @@ var mergeMessages = (base, overrides) => overrides ? {
   unknownDate: overrides.unknownDate ?? base.unknownDate,
   viewer: { ...base.viewer, ...overrides.viewer },
   viewpointRole: { ...base.viewpointRole, ...overrides.viewpointRole },
-  viewDirection: overrides.viewDirection ?? base.viewDirection,
-  feature: { ...base.feature, ...overrides.feature }
+  compass: overrides.compass?.length === 8 ? overrides.compass : base.compass,
+  viewDirection: overrides.viewDirection ?? base.viewDirection
 } : base;
 var StreetImageryLocaleProvider = ({
   locale,

package/dist/i18n/PhotoCount.d.ts

@@ -0,0 +1,12 @@
+type PhotoCountProps = {
+    /** Position of the shown photo, starting at 1; leave out to show only the total. */
+    index?: number;
+    total: number;
+    className?: string;
+};
+/**
+ * "1/5" behind a small picture icon: this button has several photos and a click on it shows the
+ * next one.
+ */
+export declare const PhotoCount: ({ index, total, className }: PhotoCountProps) => import("react").JSX.Element;
+export {};

package/dist/i18n/StreetImageryLocaleProvider.d.ts

@@ -7,7 +7,7 @@ type StreetImageryI18n = {
 };
 /** Overrides per group, e.g. `{ feature: { name: germanSignName } }`. */
 export type StreetImageryMessageOverrides = {
-    [Group in keyof StreetImageryMessages]?: StreetImageryMessages[Group] extends object ? StreetImageryMessages[Group] extends (...args: never[]) => unknown ? StreetImageryMessages[Group] : Partial<StreetImageryMessages[Group]> : StreetImageryMessages[Group];
+    [Group in keyof StreetImageryMessages]?: StreetImageryMessages[Group] extends object ? StreetImageryMessages[Group] extends ((...args: never[]) => unknown) | readonly unknown[] ? StreetImageryMessages[Group] : Partial<StreetImageryMessages[Group]> : StreetImageryMessages[Group];
 };
 type StreetImageryLocaleProviderProps = {
     /** Language of the package's texts and date formats. Without a provider: English. */

package/dist/i18n/messages.d.ts

@@ -11,25 +11,17 @@ export type StreetImageryMessages = {
         forwardInHistory: string;
         minimize: string;
         close: string;
-        views: string;
         suggestedViews: string;
         suggestedViewsHint: string;
         noPhoto: (label: string) => string;
         noMatchingPhoto: (label: string) => string;
+        nextPhotoOfView: (label: string) => string;
     };
     viewpointRole: Record<ViewpointRole, string>;
+    /** Eight compass points, clockwise from north: N, NE, E, SE, S, SW, W, NW. */
+    compass: readonly string[];
     unknownDate: string;
     /** e.g. "Start, looking along the street"; `role` is the viewpoint's label. */
     viewDirection: (role: string, kind: ViewDirection['kind']) => string;
-    feature: {
-        /** Name of a Mapillary value like `regulatory--turn-right-ahead--g1`. */
-        name: (value: string) => string;
-        /** Line below the name; `first` and `last` are the rendered dates. */
-        seen: string;
-        noPhotos: string;
-        daysSummary: (photos: number, days: number) => string;
-        /** Third tooltip line of a day button, below date and age. */
-        dayPhotos: (photos: number, canStep: boolean) => string;
-    };
 };
 export declare const STREET_IMAGERY_MESSAGES: Record<StreetImageryLocale, StreetImageryMessages>;

package/dist/index.d.ts

@@ -22,6 +22,8 @@ export * from './mapillary/useMapillaryFeatures';
 export { LocationPickOnMap, type LocationPickOnMapProps } from './openers/LocationPickOnMap';
 export * from './openers/useLocationPickStore';
 export { MapillaryFeatureBar, type MapillaryFeatureBarProps } from './mapillary/MapillaryFeatureBar';
+export { MAPILLARY_FEATURE_BAR_LABELS, type MapillaryFeatureBarLabels, } from './mapillary/featureBarLabels';
 export { STREET_IMAGERY_MESSAGES, type StreetImageryMessages } from './i18n/messages';
 export { StreetImageryLocaleProvider, useStreetImageryI18n, type StreetImageryMessageOverrides, } from './i18n/StreetImageryLocaleProvider';
 export { PhotoDate } from './i18n/PhotoDate';
+export { PhotoCount } from './i18n/PhotoCount';

package/dist/index.js

@@ -1,9 +1,9 @@
-import { useStreetImageryI18n } from './chunk-HA4GJWHI.js';
-export { STREET_IMAGERY_MESSAGES, StreetImageryLocaleProvider, useStreetImageryI18n } from './chunk-HA4GJWHI.js';
+import { useStreetImageryI18n } from './chunk-EE7V3OIZ.js';
+export { STREET_IMAGERY_MESSAGES, StreetImageryLocaleProvider, useStreetImageryI18n } from './chunk-EE7V3OIZ.js';
 export { MapillaryPanel, mapillaryViewFor, setMapillaryViewerOutlines, turnMapillaryViewerTo } from './chunk-53RA4OSJ.js';
 export { PanoramaxPanel } from './chunk-EQ2JKLGT.js';
 export { useViewerActions, useViewerBearing, useViewerHfov, useViewerLngLat } from './chunk-25UGGXIE.js';
-import { distanceMeters, sequencesToFeatureCollection, emptyLineCollection, adapterById, viewConeGeoJson, viewShapeRadiusMeters, setStreetImageryConfig, viewfieldLayerId, photoLayerId, featureLayerId, PROVIDER_IDS, mapFeatureMatchesDateRange, isBrowserAvailableProvider, photoMatchesFilters, resolvePhotoPanoramaUrl, photoFullUrlQueryKey, resolvePhotoThumbnailUrl, photoThumbnailQueryKey, formatLocalDateTime, formatMonth, formatRelativeDate, formatDateTooltip, mapillaryPhotoSource, buildViewSuggestions, yearsToMs, SIGN_TARGET, fetchMapFeatureImages, fetchMapillaryMapFeaturesInBbox, bboxAround, fetchImageDetections, findLocationOpener, mapillaryIconUrl, openLocationInNewTab, alignLineToPoints, coneRadiusMeters, mapFeaturesToFeatureCollection, emptyPointCollection, buildMapFeatureLayerFilter, featureSourceId, photosToFeatureCollection, photosToViewfieldsFeatureCollection, emptyPolygonCollection, buildPhotoLayerFilter, photoSourceId, viewfieldSourceId, sequenceSourceId, sequenceLayerId, viewfieldLineLayerId, VIEWFIELD_MIN_ZOOM } from '@osm-editor-kit/street-imagery';
+import { distanceMeters, sequencesToFeatureCollection, emptyLineCollection, adapterById, providerById, providerCoversBbox, viewConeGeoJson, viewShapeRadiusMeters, setStreetImageryConfig, viewfieldLayerId, photoLayerId, featureLayerId, PROVIDER_IDS, mapFeatureMatchesDateRange, isBrowserAvailableProvider, photoMatchesFilters, resolvePhotoPanoramaUrl, photoFullUrlQueryKey, resolvePhotoThumbnailUrl, photoThumbnailQueryKey, formatLocalDateTime, formatMonth, formatRelativeDate, formatDateTooltip, mapillaryPhotoSource, buildViewSuggestions, yearsToMs, SIGN_TARGET, fetchMapFeatureImages, fetchMapillaryMapFeaturesInBbox, bboxAround, fetchImageDetections, findLocationOpener, mapillaryValueName, mapillaryIconUrl, openLocationInNewTab, alignLineToPoints, coneRadiusMeters, mapFeaturesToFeatureCollection, emptyPointCollection, buildMapFeatureLayerFilter, featureSourceId, photosToFeatureCollection, photosToViewfieldsFeatureCollection, emptyPolygonCollection, buildPhotoLayerFilter, photoSourceId, viewfieldSourceId, sequenceSourceId, sequenceLayerId, viewfieldLineLayerId, VIEWFIELD_MIN_ZOOM } from '@osm-editor-kit/street-imagery';
 import { Source, Layer, useMap } from 'react-map-gl/maplibre';
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { lazy, useEffect, Fragment as Fragment$1, Suspense, useState, useRef, useEffectEvent } from 'react';
@@ -139,7 +139,8 @@ var withinBbox = (bbox) => (item) => {
 };
 var useProviderPhotos = (providerId, bbox, zoom) => {
   const adapter = adapterById[providerId];
-  const enabled = adapter.kind === "photo" && bbox != null && zoom >= adapter.minZoom && adapter.fetchPhotos != null;
+  const meta = providerById[providerId];
+  const enabled = meta.kind === "photo" && bbox != null && providerCoversBbox(providerId, bbox) && zoom >= meta.minZoom && adapter?.fetchPhotos != null;
   return useQuery({
     queryKey: ["provider-photos", providerId, bboxKey(bbox), zoom],
     queryFn: async ({ signal }) => {
@@ -152,18 +153,20 @@ var useProviderPhotos = (providerId, bbox, zoom) => {
 };
 var useProviderSequences = (providerId, bbox, zoom) => {
   const adapter = adapterById[providerId];
-  const sequencesMinZoom = adapter.sequencesMinZoom ?? adapter.minZoom;
-  const enabled = adapter.kind === "photo" && bbox != null && zoom >= sequencesMinZoom && adapter.fetchSequences != null;
+  const meta = providerById[providerId];
+  const sequencesMinZoom = meta.sequencesMinZoom;
+  const enabled = meta.kind === "photo" && bbox != null && providerCoversBbox(providerId, bbox) && zoom >= sequencesMinZoom && adapter?.fetchSequences != null;
   return useQuery({
     queryKey: ["provider-sequences", providerId, bboxKey(bbox), zoom],
-    queryFn: ({ signal }) => adapter.fetchSequences?.(bbox, zoom, signal) ?? [],
+    queryFn: ({ signal }) => adapter?.fetchSequences?.(bbox, zoom, signal) ?? [],
     enabled,
     placeholderData: (previous) => previous
   });
 };
 var useProviderMapFeatures = (providerId, bbox, zoom) => {
   const adapter = adapterById[providerId];
-  const enabled = adapter.kind === "mapFeature" && bbox != null && zoom >= adapter.minZoom && adapter.fetchMapFeatures != null;
+  const meta = providerById[providerId];
+  const enabled = meta.kind === "mapFeature" && bbox != null && providerCoversBbox(providerId, bbox) && zoom >= meta.minZoom && adapter?.fetchMapFeatures != null;
   return useQuery({
     queryKey: ["provider-map-features", providerId, bboxKey(bbox), zoom],
     queryFn: async ({ signal }) => {
@@ -283,11 +286,12 @@ var PhotoProviderLayer = ({
   shownPhotoId
 }) => {
   const adapter = adapterById[providerId];
+  const meta = providerById[providerId];
   const { data: photos = [] } = useProviderPhotos(providerId, bbox, zoom);
   const { data: sequences = [] } = useProviderSequences(providerId, bbox, zoom);
-  const visiblePhotos = zoom >= adapter.minZoom ? photos.filter((photo) => photoMatchesFilters(photo, filter?.photoTypes, filter?.date)) : [];
+  const visiblePhotos = zoom >= meta.minZoom ? photos.filter((photo) => photoMatchesFilters(photo, filter?.photoTypes, filter?.date)) : [];
   const drawBbox = bbox ? padBbox(bbox, 0.25) : null;
-  const photoCollection = zoom >= adapter.minZoom ? photosToFeatureCollection(
+  const photoCollection = zoom >= meta.minZoom ? photosToFeatureCollection(
     drawBbox ? visiblePhotos.filter((photo) => lngLatInBbox(photo.lngLat, drawBbox)) : visiblePhotos
   ) : emptyPointCollection();
   const viewfieldsActive = showViewfields && zoom >= VIEWFIELD_MIN_ZOOM;
@@ -338,7 +342,7 @@ var PhotoProviderLayer = ({
       sequenceCapturedAtById.set(photo.sequenceId, photo.capturedAt);
     }
   }
-  const filteredSequences = showSequences && zoom >= (adapter.sequencesMinZoom ?? adapter.minZoom) ? sequences.map((sequence) => {
+  const filteredSequences = showSequences && zoom >= meta.sequencesMinZoom ? sequences.map((sequence) => {
     if (sequence.capturedAt != null) return sequence;
     const fromPhotos = sequenceCapturedAtById.get(sequence.sequenceId);
     return fromPhotos != null ? { ...sequence, capturedAt: fromPhotos } : sequence;
@@ -383,7 +387,29 @@ var PhotoProviderLayer = ({
   });
   const sequenceCollection = alignedSequences.length > 0 ? sequencesToFeatureCollection(alignedSequences) : emptyLineCollection();
   return /* @__PURE__ */ jsxs(Fragment, { children: [
-    adapter.fetchSequences && showSequences ? /* @__PURE__ */ jsxs(Fragment, { children: [
+    meta.coverageTiles ? /* @__PURE__ */ jsxs(Fragment, { children: [
+      /* @__PURE__ */ jsx(
+        Source,
+        {
+          id: `coverage-tiles-source-${providerId}`,
+          minzoom: meta.coverageTiles.minZoom,
+          tileSize: meta.coverageTiles.tileSize,
+          tiles: [meta.coverageTiles.url],
+          type: "raster"
+        }
+      ),
+      /* @__PURE__ */ jsx(
+        Layer,
+        {
+          id: `coverage-tiles-${providerId}`,
+          minzoom: meta.coverageTiles.minZoom,
+          paint: { "raster-opacity": 0.7 },
+          source: `coverage-tiles-source-${providerId}`,
+          type: "raster"
+        }
+      )
+    ] }) : null,
+    adapter?.fetchSequences && showSequences ? /* @__PURE__ */ jsxs(Fragment, { children: [
       /* @__PURE__ */ jsx(
         Source,
         {
@@ -484,10 +510,10 @@ var MapFeatureProviderLayer = ({
   filter,
   mapFeatureCircleColor
 }) => {
-  const adapter = adapterById[providerId];
+  const meta = providerById[providerId];
   const { data: features = [] } = useProviderMapFeatures(providerId, bbox, zoom);
   const valueFilter = filter?.mapFeatureValue;
-  const featureCollection = zoom >= adapter.minZoom ? mapFeaturesToFeatureCollection(
+  const featureCollection = zoom >= meta.minZoom ? mapFeaturesToFeatureCollection(
     valueFilter ? features.filter((feature) => valueFilter(feature.value)) : features
   ) : emptyPointCollection();
   const featureFilter = buildMapFeatureLayerFilter(filter?.date);
@@ -520,8 +546,7 @@ var MapFeatureProviderLayer = ({
   ] });
 };
 var ProviderLayer = (props) => {
-  const adapter = adapterById[props.providerId];
-  return adapter.kind === "mapFeature" ? /* @__PURE__ */ jsx(MapFeatureProviderLayer, { ...props }) : /* @__PURE__ */ jsx(PhotoProviderLayer, { ...props });
+  return providerById[props.providerId].kind === "mapFeature" ? /* @__PURE__ */ jsx(MapFeatureProviderLayer, { ...props }) : /* @__PURE__ */ jsx(PhotoProviderLayer, { ...props });
 };
 var StreetLevelImagerySourcesAndLayers = ({
   providers,
@@ -562,7 +587,7 @@ var StreetLevelImagerySourcesAndLayers = ({
   const selectedSequence = resolveSelectedSequence(selectedPhoto, sequences, activeSequenceId);
   const providerDrawsSequences = selectedProviderId != null && showSequences && providers.includes(selectedProviderId);
   const firstPhotoProvider = providers.find(
-    (id) => adapterById[id].kind === "photo" && adapterById[id].fetchPhotos
+    (id) => providerById[id].kind === "photo" && adapterById[id]?.fetchPhotos
   );
   const sequenceBeforeId = firstPhotoProvider ? showViewfields ? viewfieldLayerId(firstPhotoProvider) : photoLayerId(firstPhotoProvider) : void 0;
   return /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -814,6 +839,24 @@ var usePhotoThumbnail = (photo) => useQuery({
   enabled: photo != null,
   staleTime: 24 * 60 * 60 * 1e3
 });
+var PhotoCount = ({ index, total, className }) => /* @__PURE__ */ jsxs("span", { className: `inline-flex shrink-0 items-center gap-0.5 tabular-nums ${className ?? ""}`, children: [
+  /* @__PURE__ */ jsx(
+    "svg",
+    {
+      "aria-hidden": true,
+      className: "size-3 shrink-0",
+      fill: "none",
+      stroke: "currentColor",
+      strokeLinecap: "round",
+      strokeLinejoin: "round",
+      strokeWidth: 1.75,
+      viewBox: "0 0 24 24",
+      children: /* @__PURE__ */ jsx("path", { d: "M4 6h16v12H4ZM4 15l4.5-4.5 4 4L15 12l5 5M9 9.5h.01" })
+    }
+  ),
+  index != null ? `${index}/` : "",
+  total
+] });
 var PhotoDate = ({ timestamp, className, localDateTime }) => {
   const { locale, messages } = useStreetImageryI18n();
   if (timestamp == null) {
@@ -896,40 +939,74 @@ var ToolbarButton = ({
 var SuggestionChip = ({
   suggestion,
   active,
+  shownPhotoId,
+  showPlace,
   onSelect
 }) => {
   const { messages } = useStreetImageryI18n();
-  const best = suggestion.candidates[0];
-  const label = viewSuggestionLabel(suggestion, messages);
+  const { candidates } = suggestion;
+  const best = candidates[0];
+  const shownIndex = active ? candidates.findIndex((candidate) => candidate.photo.photoId === shownPhotoId) : -1;
+  const shown = shownIndex >= 0 ? candidates[shownIndex] : best;
+  const canStep = active && candidates.length > 1;
+  const hasCount = candidates.length > 0;
+  const name = viewSuggestionLabel(suggestion, messages);
+  const label = canStep ? messages.viewer.nextPhotoOfView(name) : name;
   return /* @__PURE__ */ jsxs(
     "button",
     {
       "aria-label": best ? label : messages.viewer.noPhoto(label),
       "aria-pressed": active,
       className: [
-        "inline-flex shrink-0 items-center gap-1 rounded-full border px-2 py-0.5 text-xs whitespace-nowrap",
+        "flex min-w-0 flex-col items-center rounded-md border px-1 py-0.5 text-xs leading-tight",
         active ? "border-fuchsia-600 bg-fuchsia-600 text-white" : best ? "border-slate-300 bg-white text-slate-700 hover:border-fuchsia-500" : "border-dashed border-slate-200 bg-white text-slate-400"
       ].join(" "),
       disabled: !best,
-      onClick: onSelect,
+      onClick: () => {
+        const next = canStep ? candidates[(shownIndex + 1) % candidates.length] : best;
+        if (next) {
+          onSelect(next);
+        }
+      },
       title: best ? label : messages.viewer.noMatchingPhoto(label),
       type: "button",
       children: [
-        /* @__PURE__ */ jsx("span", { className: "font-medium", children: suggestion.viewpoint.label ?? messages.viewpointRole[suggestion.viewpoint.role] }),
-        /* @__PURE__ */ jsx(
+        /* @__PURE__ */ jsxs(
           "span",
           {
-            "aria-hidden": true,
-            className: "inline-flex",
-            style: { transform: `rotate(${suggestion.direction.bearing}deg)` },
-            children: /* @__PURE__ */ jsx(Icon, { className: "size-3", path: ICONS.arrow })
+            className: `flex items-center gap-1 font-medium ${hasCount ? "w-full justify-between px-1" : "max-w-full"}`,
+            children: [
+              /* @__PURE__ */ jsxs("span", { className: "flex min-w-0 items-center gap-1", children: [
+                /* @__PURE__ */ jsx(
+                  "span",
+                  {
+                    "aria-hidden": true,
+                    className: "inline-flex shrink-0",
+                    style: { transform: `rotate(${suggestion.direction.bearing}deg)` },
+                    children: /* @__PURE__ */ jsx(Icon, { className: "size-3", path: ICONS.arrow })
+                  }
+                ),
+                /* @__PURE__ */ jsxs("span", { className: "truncate", children: [
+                  showPlace ? `${suggestion.viewpoint.label ?? messages.viewpointRole[suggestion.viewpoint.role]} ` : "",
+                  messages.compass[Math.round(suggestion.direction.bearing / 45) % 8]
+                ] })
+              ] }),
+              hasCount ? /* @__PURE__ */ jsx(
+                PhotoCount,
+                {
+                  className: `font-normal ${active ? "text-fuchsia-100" : "text-slate-500"}`,
+                  index: shownIndex >= 0 ? shownIndex + 1 : void 0,
+                  total: candidates.length
+                }
+              ) : null
+            ]
           }
         ),
-        best ? /* @__PURE__ */ jsx(
+        shown ? /* @__PURE__ */ jsx(
           PhotoDate,
           {
-            className: active ? "text-fuchsia-100" : "text-slate-400",
-            timestamp: best.photo.capturedAt
+            className: `max-w-full truncate ${active ? "text-fuchsia-100" : "text-slate-400"}`,
+            timestamp: shown.photo.capturedAt
           }
         ) : /* @__PURE__ */ jsx("span", { className: "text-slate-400", children: "\u2014" })
       ]
@@ -946,6 +1023,7 @@ var FloatingPhotoViewer = ({
   suggestions,
   activeDirectionKey,
   onSelectSuggestion,
+  shownPhotoId,
   canGoBack,
   canGoForward,
   onBack,
@@ -960,6 +1038,7 @@ var FloatingPhotoViewer = ({
   storageKey = "street-imagery:floating-viewer"
 }) => {
   const { messages } = useStreetImageryI18n();
+  const severalViewpoints = new Set(suggestions.map((suggestion) => suggestion.viewpoint.id)).size > 1;
   const [layout, setLayout] = useState(() => readLayout(storageKey));
   const [drawerOpen, setDrawerOpen] = useState(false);
   const dragRef = useRef(null);
@@ -1105,24 +1184,23 @@ var FloatingPhotoViewer = ({
             ]
           }
         ),
-        toolbar ? /* @__PURE__ */ jsx("div", { className: "border-b border-slate-100 px-2 py-1.5", children: toolbar }) : suggestions.length > 0 ? /* @__PURE__ */ jsxs(
+        toolbar ? /* @__PURE__ */ jsx("div", { className: "border-b border-slate-100 px-2 py-1.5", children: toolbar }) : suggestions.length > 0 ? /* @__PURE__ */ jsx(
           "nav",
           {
             "aria-label": messages.viewer.suggestedViews,
-            className: "flex gap-1 overflow-x-auto border-b border-slate-100 px-2 py-1.5",
+            className: "grid grid-cols-[repeat(auto-fit,minmax(5.25rem,1fr))] gap-1 border-b border-slate-100 px-2 py-1.5",
             title: messages.viewer.suggestedViewsHint,
-            children: [
-              /* @__PURE__ */ jsx("span", { className: "shrink-0 self-center pr-0.5 text-xs text-slate-500", children: messages.viewer.views }),
-              suggestions.map((suggestion) => /* @__PURE__ */ jsx(
-                SuggestionChip,
-                {
-                  active: suggestion.direction.key === activeDirectionKey,
-                  onSelect: () => onSelectSuggestion(suggestion),
-                  suggestion
-                },
-                suggestion.direction.key
-              ))
-            ]
+            children: suggestions.map((suggestion) => /* @__PURE__ */ jsx(
+              SuggestionChip,
+              {
+                active: suggestion.direction.key === activeDirectionKey,
+                onSelect: (candidate) => onSelectSuggestion(suggestion, candidate),
+                shownPhotoId,
+                showPlace: severalViewpoints,
+                suggestion
+              },
+              suggestion.direction.key
+            ))
           }
         ) : null,
         /* @__PURE__ */ jsxs("div", { className: "min-h-0 overflow-y-auto", children: [
@@ -1269,7 +1347,12 @@ var useViewpointSessionStore = create()((set, get) => ({
     showPhoto: (entry) => set((state) => {
       const current = state.history[state.historyIndex];
       if (samePhoto(current?.photo, entry.photo)) {
-        return entry.directionKey != null && entry.directionKey !== state.activeDirectionKey ? { activeDirectionKey: entry.directionKey } : state;
+        if (entry.directionKey == null || entry.directionKey === current?.directionKey) {
+          return entry.directionKey != null && entry.directionKey !== state.activeDirectionKey ? { activeDirectionKey: entry.directionKey } : state;
+        }
+        const history2 = [...state.history];
+        history2[state.historyIndex] = { ...entry };
+        return { history: history2, activeDirectionKey: entry.directionKey };
       }
       const history = [...state.history.slice(0, state.historyIndex + 1), entry].slice(
         -100
@@ -1452,9 +1535,30 @@ var LocationPickOnMap = ({ onPick }) => {
   );
   return null;
 };
-var MapillaryFeatureBar = ({ data, shownImage, onShow }) => {
-  const { locale, messages } = useStreetImageryI18n();
-  const labels = messages.feature;
+var MAPILLARY_FEATURE_BAR_LABELS = {
+  en: {
+    name: (value) => mapillaryValueName(value, "en"),
+    seen: "Seen",
+    noPhotos: "Mapillary lists no photos for this feature.",
+    daysSummary: (photos, days) => `${photos} photos on ${days} days`,
+    dayPhotos: (photos, canStep) => `${photos} photo${photos === 1 ? "" : "s"}${canStep ? " \u2014 click for the next one" : ""}`
+  },
+  de: {
+    name: (value) => mapillaryValueName(value, "de"),
+    seen: "Gesehen",
+    noPhotos: "Mapillary f\xFChrt keine Fotos zu diesem Objekt.",
+    daysSummary: (photos, days) => `${photos} Fotos an ${days} Tagen`,
+    dayPhotos: (photos, canStep) => `${photos} Foto${photos === 1 ? "" : "s"}${canStep ? " \u2014 klicken f\xFCr das n\xE4chste" : ""}`
+  }
+};
+var MapillaryFeatureBar = ({
+  data,
+  shownImage,
+  onShow,
+  labels: labelOverrides
+}) => {
+  const { locale } = useStreetImageryI18n();
+  const labels = { ...MAPILLARY_FEATURE_BAR_LABELS[locale], ...labelOverrides };
   const { feature, days, images } = data;
   return /* @__PURE__ */ jsxs("div", { className: "space-y-1.5", children: [
     /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-1.5", title: feature.value, children: [
@@ -1509,10 +1613,14 @@ ${labels.dayPhotos(day.images.length, active && day.images.length > 1)}`,
               children: [
                 /* @__PURE__ */ jsx("span", { className: "font-medium", children: formatMonth(noon, locale) }),
                 " ",
-                /* @__PURE__ */ jsxs("span", { className: active ? "text-amber-800" : "text-slate-500", children: [
-                  active ? `${shownIndex + 1}/` : "",
-                  day.images.length
-                ] })
+                /* @__PURE__ */ jsx(
+                  PhotoCount,
+                  {
+                    className: `align-[-1px] ${active ? "text-amber-800" : "text-slate-500"}`,
+                    index: active ? shownIndex + 1 : void 0,
+                    total: day.images.length
+                  }
+                )
               ]
             },
             day.day
@@ -1523,4 +1631,4 @@ ${labels.dayPhotos(day.images.length, active && day.images.length > 1)}`,
   ] });
 };
 
-export { BASE_COLOR, FloatingPhotoViewer, FloatingViewerInfoButton, LocationPickOnMap, MapillaryFeatureBar, PhotoDate, SELECTION_COLOR, StreetLevelImagerySelectionOverlay, StreetLevelImagerySourcesAndLayers, StreetLevelImageryViewCone, StreetLevelImageryViewer, VIEWPOINT_DEFAULT_COLOR, VIEWPOINT_DIRECTION_LAYER_ID, VIEW_SHAPE_FILL_OPACITY, ViewpointLayer, getViewpointSession, queryStreetImageryFeatures, resolveSelectedSequence, streetImageryInteractiveLayerIds, useActiveDirectionKey, useAllProviderMapFeatures, useAllProviderPhotos, useArmedLocationOpenerId, useCanGoBack, useCanGoForward, useCurrentHistoryEntry, useLocationPickActions, useMapViewportBbox, useMapillaryImageDetections, useMapillaryMapFeatureImages, useMapillaryMapFeaturesNear, usePhotoFullUrl, usePhotoThumbnail, useProviderMapFeatures, useProviderPhotos, useProviderSequences, useViewSuggestions, useViewpointLine, useViewpoints, viewDirectionKeyFromFeatures, viewSuggestionLabel };
+export { BASE_COLOR, FloatingPhotoViewer, FloatingViewerInfoButton, LocationPickOnMap, MAPILLARY_FEATURE_BAR_LABELS, MapillaryFeatureBar, PhotoCount, PhotoDate, SELECTION_COLOR, StreetLevelImagerySelectionOverlay, StreetLevelImagerySourcesAndLayers, StreetLevelImageryViewCone, StreetLevelImageryViewer, VIEWPOINT_DEFAULT_COLOR, VIEWPOINT_DIRECTION_LAYER_ID, VIEW_SHAPE_FILL_OPACITY, ViewpointLayer, getViewpointSession, queryStreetImageryFeatures, resolveSelectedSequence, streetImageryInteractiveLayerIds, useActiveDirectionKey, useAllProviderMapFeatures, useAllProviderPhotos, useArmedLocationOpenerId, useCanGoBack, useCanGoForward, useCurrentHistoryEntry, useLocationPickActions, useMapViewportBbox, useMapillaryImageDetections, useMapillaryMapFeatureImages, useMapillaryMapFeaturesNear, usePhotoFullUrl, usePhotoThumbnail, useProviderMapFeatures, useProviderPhotos, useProviderSequences, useViewSuggestions, useViewpointLine, useViewpoints, viewDirectionKeyFromFeatures, viewSuggestionLabel };

package/dist/mapillary/MapillaryFeatureBar.d.ts

@@ -1,8 +1,11 @@
 import { type MapFeatureImages, type TargetImage } from '@osm-editor-kit/street-imagery';
+import { type MapillaryFeatureBarLabels } from './featureBarLabels';
 export type MapillaryFeatureBarProps = {
     data: MapFeatureImages;
     shownImage: TargetImage | null;
     onShow: (image: TargetImage) => void;
+    /** Replace single texts, e.g. `name` to map values to your own sign catalogue. */
+    labels?: Partial<MapillaryFeatureBarLabels>;
 };
 /**
  * A Mapillary sign or object above its photo: what it is, when Mapillary saw it, and one button
@@ -10,4 +13,4 @@ export type MapillaryFeatureBarProps = {
  * that day's photos. Dates show month and year; the tooltip has the full date and the age.
  * Texts and dates follow the `StreetImageryLocaleProvider`.
  */
-export declare const MapillaryFeatureBar: ({ data, shownImage, onShow }: MapillaryFeatureBarProps) => import("react").JSX.Element;
+export declare const MapillaryFeatureBar: ({ data, shownImage, onShow, labels: labelOverrides, }: MapillaryFeatureBarProps) => import("react").JSX.Element;

package/dist/mapillary/featureBarLabels.d.ts

@@ -0,0 +1,16 @@
+import { type StreetImageryLocale } from '@osm-editor-kit/street-imagery';
+/**
+ * Texts of `MapillaryFeatureBar`. Kept out of the package-wide messages, so the German sign names
+ * are only bundled by apps that show the feature bar.
+ */
+export type MapillaryFeatureBarLabels = {
+    /** Name of a Mapillary value like `regulatory--turn-right-ahead--g1`. */
+    name: (value: string) => string;
+    /** Line below the name; `first` and `last` are the rendered dates. */
+    seen: string;
+    noPhotos: string;
+    daysSummary: (photos: number, days: number) => string;
+    /** Third tooltip line of a day button, below date and age. */
+    dayPhotos: (photos: number, canStep: boolean) => string;
+};
+export declare const MAPILLARY_FEATURE_BAR_LABELS: Record<StreetImageryLocale, MapillaryFeatureBarLabels>;

package/dist/photo-details.js

@@ -1,4 +1,4 @@
-import { useStreetImageryI18n } from './chunk-HA4GJWHI.js';
+import { useStreetImageryI18n } from './chunk-EE7V3OIZ.js';
 import { providerById, formatLocalDateTime, formatDate, formatRelativeDate } from '@osm-editor-kit/street-imagery';
 import { useRef, useEffect } from 'react';
 import { jsx, jsxs } from 'react/jsx-runtime';

package/dist/viewpoints/FloatingPhotoViewer.d.ts

@@ -1,4 +1,4 @@
-import type { ViewSuggestion } from '@osm-editor-kit/street-imagery';
+import type { PhotoCandidate, ViewSuggestion } from '@osm-editor-kit/street-imagery';
 import { type ReactNode } from 'react';
 /** Info button for `titleActions`; `label` is its tooltip and accessible name. */
 export declare const FloatingViewerInfoButton: ({ label, onClick, }: {
@@ -12,7 +12,13 @@ export type FloatingPhotoViewerProps = {
     /** Suggested views (viewpoint × direction); shown as chips. Empty hides the strip. */
     suggestions: ViewSuggestion[];
     activeDirectionKey: string | null;
-    onSelectSuggestion: (suggestion: ViewSuggestion) => void;
+    /**
+     * A view button was clicked. `candidate` is the photo to show: the view's best one, or the next
+     * one when the active view is clicked again.
+     */
+    onSelectSuggestion: (suggestion: ViewSuggestion, candidate: PhotoCandidate) => void;
+    /** The photo in the viewer, so the active view can show which of its photos that is. */
+    shownPhotoId?: string | null;
     canGoBack: boolean;
     canGoForward: boolean;
     onBack: () => void;
@@ -51,4 +57,4 @@ export type FloatingPhotoViewerProps = {
  * Drag the header to move, drag the left edge to resize. Keys: Esc closes, [ and ] step history,
  * Alt + arrow left/right step along (`step`).
  */
-export declare const FloatingPhotoViewer: ({ title, titleActions, suggestions, activeDirectionKey, onSelectSuggestion, canGoBack, canGoForward, onBack, onForward, onClose, step, toolbar, status, children, footer, drawer, storageKey, }: FloatingPhotoViewerProps) => import("react").JSX.Element;
+export declare const FloatingPhotoViewer: ({ title, titleActions, suggestions, activeDirectionKey, onSelectSuggestion, shownPhotoId, canGoBack, canGoForward, onBack, onForward, onClose, step, toolbar, status, children, footer, drawer, storageKey, }: FloatingPhotoViewerProps) => import("react").JSX.Element;

package/dist/viewpoints/useViewpointSessionStore.d.ts

@@ -19,7 +19,10 @@ export declare const useCanGoForward: () => boolean;
 export declare const getViewpointSession: () => {
     actions: {
         open: (input: OpenInput) => void;
-        /** Show a photo; truncates forward history. No-op when it is already the current photo. */
+        /**
+         * Show a photo; truncates forward history. For the photo that is shown already, only its
+         * direction changes.
+         */
         showPhoto: (entry: ViewpointHistoryEntry) => void;
         back: () => ViewpointHistoryEntry | null;
         forward: () => ViewpointHistoryEntry | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osm-editor-kit/street-imagery-react",
-  "version": "0.1.0-alpha.6",
+  "version": "0.1.0-alpha.7",
   "description": "React MapLibre layers and photo viewers for street-level imagery providers.",
   "homepage": "https://github.com/osmberlin/street-space-editor/tree/main/packages/street-imagery-react",
   "license": "MIT",
@@ -14,6 +14,7 @@
     "dist"
   ],
   "type": "module",
+  "sideEffects": false,
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -55,7 +56,7 @@
     "zustand": "^5.0.7"
   },
   "peerDependencies": {
-    "@osm-editor-kit/street-imagery": "^0.1.0-alpha.5",
+    "@osm-editor-kit/street-imagery": "^0.1.0-alpha.6",
     "@panoramax/web-viewer": "^5",
     "@tanstack/react-query": "^5",
     "mapillary-js": "^4",