Use /lat,lon[/name][?z=zoom] format instead of /lat,lon,zoom[/name]

Signed-off-by: Alexander Borsuk <me@alex.bio>

Author: biodranik

src/ge0.ts

@@ -43,9 +43,9 @@ export function normalizeNameAndTitle(name: string | undefined): [string, string
   return [name, title];
 }
 
-export function normalizeZoom(zoom: string | undefined): number {
+export function normalizeZoom(zoom: string | null | undefined): number {
   const DEFAULT_ZOOM = 14;
-  // Upper bound mirrors the app's kMaxZoom (organicmaps libs/ge0/geo_url_parser.cpp, GeoURLInfo::SetZoom).
+  // Clamp a shared zoom to a sane range; out-of-range or non-numeric values fall back to the default.
   const MAX_ZOOM = 20;
   if (!zoom || !/^\d+$/.test(zoom)) return DEFAULT_ZOOM;
   const z = Number(zoom);
@@ -106,12 +106,13 @@ function renderTemplate(template: string, llz: LatLonZoom, name: string, title:
   return new Response(template, { headers: { 'content-type': 'text/html' } });
 }
 
-// Clear decimal coordinates: /lat,lon[,zoom][/name]. An optional ?z=<zoom> query param takes
-// precedence over the path zoom (see onGe0Decode). Kept in sync with the app's clear-coordinate
-// parser (organicmaps libs/ge0/geo_url_parser.cpp) — same grammar, same ?z= precedence and zoom cap.
-// Coordinates and zoom are validated separately.
+// Clear decimal coordinates: /lat,lon[/name], with the zoom in an optional ?z= query param.
+// Grammar-identical to the app's clear-coordinate parser (organicmaps libs/ge0/parser.cpp,
+// Ge0Parser::ParseClearCoordinates; zoom read in libs/map/mwm_url.cpp) so a shared link resolves the
+// same here and in the app. There is no in-path zoom, so a trailing number stays part of the name
+// (e.g. "7-Eleven"). Coordinates are validated below.
 export const CLEAR_COORDINATES_REGEX =
-  /(?<lat>-?\d+\.\d+)[^.](?<lon>-?\d+\.\d+)(?:[^.](?<zoom>\d{1,2}))?(?:[^\d.](?<name>.+))?/;
+  /(?<lat>-?\d+\.\d+)[^.](?<lon>-?\d+\.\d+)(?:[^\d.](?<name>.+))?/;
 
 // Throws on decode error.
 export async function onGe0Decode(template: string, url: string): Promise<Response> {
@@ -120,8 +121,8 @@ export async function onGe0Decode(template: string, url: string): Promise<Respon
 
   const m = pathname.match(CLEAR_COORDINATES_REGEX);
   if (m && m.groups) {
-    // Zoom precedence: ?z= query param, then a legacy /lat,lon,zoom path segment, then the default.
-    const zoom = normalizeZoom(new URLSearchParams(search).get('z') ?? m.groups.zoom);
+    // Zoom comes from the ?z= query param (or the default when absent).
+    const zoom = normalizeZoom(new URLSearchParams(search).get('z'));
     const llz = { lat: Number(m.groups.lat), lon: Number(m.groups.lon), zoom };
     if (llz.lat <= -90.0 || llz.lat >= 90.0 || llz.lon <= -180.0 || llz.lon >= 180.0)
       throw new Error(`Invalid coordinates ${m.groups.lat} and ${m.groups.lon}`);

test/api.test.ts

@@ -58,16 +58,20 @@ describe('normalizeNameAndTitle', () => {
 });
 
 describe('CLEAR_COORDINATES_REGEX', () => {
-  test('captures lat/lon plus optional zoom and name from a clear-text path', () => {
+  test('captures lat/lon and an optional /name from a clear-text path', () => {
     expect('/53.9,27.56'.match(CLEAR_COORDINATES_REGEX)?.groups).toMatchObject({ lat: '53.9', lon: '27.56' });
-    expect('/53.9,27.56,15,Minsk'.match(CLEAR_COORDINATES_REGEX)?.groups).toMatchObject({
+    expect('/53.9,27.56/Minsk'.match(CLEAR_COORDINATES_REGEX)?.groups).toMatchObject({
       lat: '53.9',
       lon: '27.56',
-      zoom: '15',
       name: 'Minsk',
     });
   });
 
+  test('keeps a digit-initial name intact (there is no in-path zoom to swallow it)', () => {
+    expect('/48.85,2.29/7-Eleven'.match(CLEAR_COORDINATES_REGEX)?.groups?.name).toBe('7-Eleven');
+    expect('/48.85,2.29/24-hour-shop'.match(CLEAR_COORDINATES_REGEX)?.groups?.name).toBe('24-hour-shop');
+  });
+
   test('does not match an encoded ge0 payload, so it falls through to the binary decoder', () => {
     expect('/B4srhdHVVt'.match(CLEAR_COORDINATES_REGEX)).toBeNull();
   });
@@ -98,7 +102,7 @@ describe('onGe0Decode — end to end', () => {
   });
 
   test('renders clear-text coordinates', async () => {
-    const html = await (await onGe0Decode(TEMPLATE, 'https://omaps.app/53.9,27.56,15,Minsk')).text();
+    const html = await (await onGe0Decode(TEMPLATE, 'https://omaps.app/53.9,27.56/Minsk?z=15')).text();
     expect(html).toContain('<coords>53.9,27.56@15</coords>');
     expect(html).toContain('<name>Minsk</name>');
   });
@@ -109,7 +113,7 @@ describe('onGe0Decode — end to end', () => {
   });
 
   test('HTML-escapes the pin name of a clear-text link to prevent XSS', async () => {
-    const html = await (await onGe0Decode(TEMPLATE, 'https://omaps.app/12.3,45.6,15,<script>alert(1)</script>')).text();
+    const html = await (await onGe0Decode(TEMPLATE, 'https://omaps.app/12.3,45.6/<script>alert(1)</script>')).text();
     expect(html).toContain('<name>&lt;script&gt;alert(1)&lt;/script&gt;</name>');
     expect(html).not.toContain('<script>alert(1)</script>');
   });
@@ -139,14 +143,13 @@ describe('onGe0Decode — end to end', () => {
     expect(html).toContain('<coords>53.9,27.56@16</coords>');
   });
 
-  test('?z= takes precedence over a legacy path zoom', async () => {
-    const html = await (await onGe0Decode(TEMPLATE, 'https://omaps.app/53.9,27.56,15?z=16')).text();
-    expect(html).toContain('<coords>53.9,27.56@16</coords>');
+  test('a digit-initial name is not mistaken for a zoom', async () => {
+    const html = await (await onGe0Decode(TEMPLATE, 'https://omaps.app/48.85,2.29/7-Eleven?z=16')).text();
+    expect(html).toContain('<coords>48.85,2.29@16</coords>');
+    expect(html).toContain('<name>7-Eleven</name>');
   });
 
-  test('?z= is optional — falls back to the path zoom, then the default', async () => {
-    const path = await (await onGe0Decode(TEMPLATE, 'https://omaps.app/53.9,27.56,15')).text();
-    expect(path).toContain('<coords>53.9,27.56@15</coords>');
+  test('?z= is optional — a bare link falls back to the default zoom', async () => {
     const bare = await (await onGe0Decode(TEMPLATE, 'https://omaps.app/53.9,27.56')).text();
     expect(bare).toContain('<coords>53.9,27.56@14</coords>');
   });