From 75e74798d4a58b25078fdb1dcb53a08de10378f2 Mon Sep 17 00:00:00 2001 From: shweta2101 Date: Thu, 5 Nov 2026 11:11:12 +0530 Subject: [PATCH 1/2] Introduce street-images util and update usage Replace the old kartaview util with a new util/street-images.ts that extracts ext:street_images or ext:kartaview_url tags and resolves legacy KartaView/OpenStreetCam storage URLs into the CDN-proxied form. Update components and pages: rename UI label from "KartaView" to "Street Image" and switch imports/logic in review.vue to use streetImageUrl and resolveStreetImageUrl. Remove util/kartaview.ts and add unit tests (test/unit/util/street-images.test.ts) covering extraction and URL resolution behavior. --- components/review/FeatureImage.vue | 2 +- pages/workspace/[id]/review.vue | 8 ++--- test/unit/util/street-images.test.ts | 46 ++++++++++++++++++++++++++++ util/kartaview.ts | 27 ---------------- util/street-images.ts | 45 +++++++++++++++++++++++++++ 5 files changed, 96 insertions(+), 32 deletions(-) create mode 100644 test/unit/util/street-images.test.ts delete mode 100644 util/kartaview.ts create mode 100644 util/street-images.ts diff --git a/components/review/FeatureImage.vue b/components/review/FeatureImage.vue index a037636e..70fc9518 100644 --- a/components/review/FeatureImage.vue +++ b/components/review/FeatureImage.vue @@ -40,7 +40,7 @@ rel="noopener noreferrer" class="feature-image__link" > - KartaView + Street Image diff --git a/pages/workspace/[id]/review.vue b/pages/workspace/[id]/review.vue index 9c6d1541..77fb5f95 100644 --- a/pages/workspace/[id]/review.vue +++ b/pages/workspace/[id]/review.vue @@ -129,7 +129,7 @@ status API and refreshes the list (assert() the request body and that the item l import { toast } from 'vue3-toastify'; import { rapid3Manager, reviewManager, tdeiClient, workspacesClient } from '~/services/index'; -import { kartaViewImageUrl, convertKartaViewUrl } from '~/util/kartaview'; +import { streetImageUrl, resolveStreetImageUrl } from '~/util/street-images'; import { parsePositiveIntegerQuery } from '~/util/route-query'; import type ReviewMap from '~/components/review/Map.vue'; import type AppImageViewer from '~/components/AppImageViewer.vue'; @@ -173,9 +173,9 @@ const changesetNotFound = computed(() => { ); }); const currentImageUrl = computed(() => { - const raw = kartaViewImageUrl(currentDiff.value?.new?.tags) - ?? kartaViewImageUrl(currentDiff.value?.old?.tags); - return raw ? convertKartaViewUrl(raw) : undefined; + const raw = streetImageUrl(currentDiff.value?.new?.tags) + ?? streetImageUrl(currentDiff.value?.old?.tags); + return raw ? resolveStreetImageUrl(raw) : undefined; }); await refresh(); diff --git a/test/unit/util/street-images.test.ts b/test/unit/util/street-images.test.ts new file mode 100644 index 00000000..d47d607b --- /dev/null +++ b/test/unit/util/street-images.test.ts @@ -0,0 +1,46 @@ +import { describe, expect, it } from 'vitest'; +import { resolveStreetImageUrl, streetImageUrl } from '~/util/street-images'; + +describe('streetImageUrl', () => { + it('extracts trimmed ext:street_images tag value', () => { + expect(streetImageUrl({ 'ext:street_images': ' https://panoramax.example.com/api/pictures/1/hd.jpg ' })) + .toBe('https://panoramax.example.com/api/pictures/1/hd.jpg'); + }); + + it('extracts trimmed ext:kartaview_url tag value', () => { + expect(streetImageUrl({ 'ext:kartaview_url': ' https://example.com/img.jpg ' })) + .toBe('https://example.com/img.jpg'); + }); + + it('returns undefined when tag is missing or empty', () => { + expect(streetImageUrl(undefined)).toBeUndefined(); + expect(streetImageUrl({})).toBeUndefined(); + expect(streetImageUrl({ 'ext:street_images': ' ' })).toBeUndefined(); + expect(streetImageUrl({ 'ext:kartaview_url': ' ' })).toBeUndefined(); + }); +}); + +describe('resolveStreetImageUrl', () => { + it('returns self-hosted Panoramax URLs unchanged', () => { + const panoramaxUrl = 'https://panoramax-dev-faaadghgcfgwcchk.westus2-01.azurewebsites.net/api/pictures/018ce3ad-d8ed-4c50-846b-a255f6af64ae/hd.jpg'; + expect(resolveStreetImageUrl(panoramaxUrl)).toBe(panoramaxUrl); + }); + + it('returns existing KartaView CDN URLs unchanged', () => { + const cdnUrl = 'https://cdn.kartaview.org/pr:sharp/aHR0cHM6Ly9zdG9yYWdlMTMub3BlbnN0cmVldGNhbS5vcmcvZmlsZXMvcGhvdG8vMS5qcGc'; + expect(resolveStreetImageUrl(cdnUrl)).toBe(cdnUrl); + }); + + it('converts legacy OpenStreetCam and KartaView storage URLs to CDN-proxied base64 URLs', () => { + const legacyOscUrl = 'https://storage13.openstreetcam.org/files/photo/1.jpg'; + expect(resolveStreetImageUrl(legacyOscUrl)).toBe( + 'https://cdn.kartaview.org/pr:sharp/aHR0cHM6Ly9zdG9yYWdlMTMub3BlbnN0cmVldGNhbS5vcmcvZmlsZXMvcGhvdG8vMS5qcGc' + ); + + const legacyKvUrl = 'https://storage.kartaview.org/files/photo/2.jpg'; + expect(resolveStreetImageUrl(legacyKvUrl)).toBe( + 'https://cdn.kartaview.org/pr:sharp/aHR0cHM6Ly9zdG9yYWdlLmthcnRhdmlldy5vcmcvZmlsZXMvcGhvdG8vMi5qcGc' + ); + }); +}); + diff --git a/util/kartaview.ts b/util/kartaview.ts deleted file mode 100644 index 49981ce6..00000000 --- a/util/kartaview.ts +++ /dev/null @@ -1,27 +0,0 @@ -import type { OsmTags } from '~/types/osm'; - -export const KARTAVIEW_URL_TAG = 'ext:kartaview_url'; -const KARTAVIEW_CDN_PREFIX = 'https://cdn.kartaview.org/pr:sharp/'; - -/** - * Extracts a KartaView image URL from an element's tags if present. - */ -export function kartaViewImageUrl(tags: OsmTags | undefined): string | undefined { - const value = tags?.[KARTAVIEW_URL_TAG]?.trim(); - return value || undefined; -} - -/** - * Converts a legacy KartaView/OpenStreetCam storage URL to the new CDN-proxied - * form. Returns CDN URLs already in the new form unchanged. - */ -export function convertKartaViewUrl(url: string): string { - if (url.startsWith(KARTAVIEW_CDN_PREFIX)) { - return url; - } - const cleanUrl = url.trim(); - const bytes = new TextEncoder().encode(cleanUrl); - const binaryStr = Array.from(bytes, b => String.fromCharCode(b)).join(''); - const base64 = btoa(binaryStr).replace(/=+$/, ''); - return `${KARTAVIEW_CDN_PREFIX}${base64}`; -} diff --git a/util/street-images.ts b/util/street-images.ts new file mode 100644 index 00000000..e085b2f1 --- /dev/null +++ b/util/street-images.ts @@ -0,0 +1,45 @@ +import type { OsmTags } from '~/types/osm'; + +export const STREET_IMAGES_TAG = 'ext:street_images'; +export const KARTAVIEW_URL_TAG = 'ext:kartaview_url'; + +const KARTAVIEW_CDN_PREFIX = 'https://cdn.kartaview.org/pr:sharp/'; +const LEGACY_KARTAVIEW_HOSTS = ['kartaview.org', 'openstreetcam.org']; + +function isLegacyKartaViewUrl(url: string): boolean { + try { + const { hostname } = new URL(url); + return LEGACY_KARTAVIEW_HOSTS.some( + domain => hostname === domain || hostname.endsWith(`.${domain}`) + ); + } + catch { + return false; + } +} + +/** + * Extracts a street-level image URL from an element's tags (`ext:street_images` + * or `ext:kartaview_url`) if present. + */ +export function streetImageUrl(tags: OsmTags | undefined): string | undefined { + const value = tags?.[STREET_IMAGES_TAG]?.trim() || tags?.[KARTAVIEW_URL_TAG]?.trim(); + return value || undefined; +} + +/** + * Resolves a street-level image URL for display. Returns standard image URLs + * (such as self-hosted Panoramax URLs or KartaView CDN URLs) unchanged, and + * converts legacy KartaView/OpenStreetCam storage URLs to the CDN-proxied form. + */ +export function resolveStreetImageUrl(url: string): string { + const cleanUrl = url.trim(); + if (cleanUrl.startsWith(KARTAVIEW_CDN_PREFIX) || !isLegacyKartaViewUrl(cleanUrl)) { + return cleanUrl; + } + const bytes = new TextEncoder().encode(cleanUrl); + const binaryStr = Array.from(bytes, b => String.fromCharCode(b)).join(''); + const base64 = btoa(binaryStr).replace(/=+$/, ''); + return `${KARTAVIEW_CDN_PREFIX}${base64}`; +} + From d5b342418961fb678a716b2e5897a06b974cba7c Mon Sep 17 00:00:00 2001 From: shweta2101 Date: Thu, 5 Nov 2026 11:46:41 +0530 Subject: [PATCH 2/2] Remove extra trailing blank lines Trim trailing blank lines at end of test/unit/util/street-images.test.ts and util/street-images.ts for code cleanliness. No functional changes are made. --- test/unit/util/street-images.test.ts | 1 - util/street-images.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/test/unit/util/street-images.test.ts b/test/unit/util/street-images.test.ts index d47d607b..3d92be26 100644 --- a/test/unit/util/street-images.test.ts +++ b/test/unit/util/street-images.test.ts @@ -43,4 +43,3 @@ describe('resolveStreetImageUrl', () => { ); }); }); - diff --git a/util/street-images.ts b/util/street-images.ts index e085b2f1..b00e58af 100644 --- a/util/street-images.ts +++ b/util/street-images.ts @@ -42,4 +42,3 @@ export function resolveStreetImageUrl(url: string): string { const base64 = btoa(binaryStr).replace(/=+$/, ''); return `${KARTAVIEW_CDN_PREFIX}${base64}`; } -