@cyanheads/geonames-mcp-server 0.1.1 → 0.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (63) hide show
  1. package/AGENTS.md +13 -12
  2. package/CLAUDE.md +13 -12
  3. package/Dockerfile +16 -7
  4. package/README.md +75 -43
  5. package/changelog/0.1.x/0.1.2.md +26 -0
  6. package/changelog/0.1.x/0.1.3.md +45 -0
  7. package/dist/index.js +1 -1
  8. package/dist/index.js.map +1 -1
  9. package/dist/mcp-server/tools/definitions/find-postal-codes.tool.d.ts +13 -4
  10. package/dist/mcp-server/tools/definitions/find-postal-codes.tool.d.ts.map +1 -1
  11. package/dist/mcp-server/tools/definitions/find-postal-codes.tool.js +87 -38
  12. package/dist/mcp-server/tools/definitions/find-postal-codes.tool.js.map +1 -1
  13. package/dist/mcp-server/tools/definitions/get-children.tool.d.ts +6 -4
  14. package/dist/mcp-server/tools/definitions/get-children.tool.d.ts.map +1 -1
  15. package/dist/mcp-server/tools/definitions/get-children.tool.js +65 -20
  16. package/dist/mcp-server/tools/definitions/get-children.tool.js.map +1 -1
  17. package/dist/mcp-server/tools/definitions/get-countries.tool.d.ts.map +1 -1
  18. package/dist/mcp-server/tools/definitions/get-countries.tool.js +21 -13
  19. package/dist/mcp-server/tools/definitions/get-countries.tool.js.map +1 -1
  20. package/dist/mcp-server/tools/definitions/get-hierarchy.tool.js +3 -3
  21. package/dist/mcp-server/tools/definitions/get-hierarchy.tool.js.map +1 -1
  22. package/dist/mcp-server/tools/definitions/get-place.tool.d.ts.map +1 -1
  23. package/dist/mcp-server/tools/definitions/get-place.tool.js +18 -9
  24. package/dist/mcp-server/tools/definitions/get-place.tool.js.map +1 -1
  25. package/dist/mcp-server/tools/definitions/index.d.ts +41 -4
  26. package/dist/mcp-server/tools/definitions/index.d.ts.map +1 -1
  27. package/dist/mcp-server/tools/definitions/list-reference.tool.d.ts.map +1 -1
  28. package/dist/mcp-server/tools/definitions/list-reference.tool.js +22 -12
  29. package/dist/mcp-server/tools/definitions/list-reference.tool.js.map +1 -1
  30. package/dist/mcp-server/tools/definitions/reverse-geocode.tool.d.ts +8 -0
  31. package/dist/mcp-server/tools/definitions/reverse-geocode.tool.d.ts.map +1 -1
  32. package/dist/mcp-server/tools/definitions/reverse-geocode.tool.js +93 -39
  33. package/dist/mcp-server/tools/definitions/reverse-geocode.tool.js.map +1 -1
  34. package/dist/mcp-server/tools/definitions/search-places.tool.d.ts +23 -1
  35. package/dist/mcp-server/tools/definitions/search-places.tool.d.ts.map +1 -1
  36. package/dist/mcp-server/tools/definitions/search-places.tool.js +143 -25
  37. package/dist/mcp-server/tools/definitions/search-places.tool.js.map +1 -1
  38. package/dist/mcp-server/tools/shared-inputs.d.ts +93 -12
  39. package/dist/mcp-server/tools/shared-inputs.d.ts.map +1 -1
  40. package/dist/mcp-server/tools/shared-inputs.js +164 -21
  41. package/dist/mcp-server/tools/shared-inputs.js.map +1 -1
  42. package/dist/services/geonames/country-codes.d.ts +32 -0
  43. package/dist/services/geonames/country-codes.d.ts.map +1 -0
  44. package/dist/services/geonames/country-codes.js +298 -0
  45. package/dist/services/geonames/country-codes.js.map +1 -0
  46. package/dist/services/geonames/geonames-service.d.ts +14 -5
  47. package/dist/services/geonames/geonames-service.d.ts.map +1 -1
  48. package/dist/services/geonames/geonames-service.js +98 -42
  49. package/dist/services/geonames/geonames-service.js.map +1 -1
  50. package/dist/services/geonames/response-parsers.d.ts +12 -4
  51. package/dist/services/geonames/response-parsers.d.ts.map +1 -1
  52. package/dist/services/geonames/response-parsers.js +122 -23
  53. package/dist/services/geonames/response-parsers.js.map +1 -1
  54. package/dist/services/geonames/types.d.ts +37 -12
  55. package/dist/services/geonames/types.d.ts.map +1 -1
  56. package/dist/services/geonames/types.js +4 -3
  57. package/dist/services/geonames/types.js.map +1 -1
  58. package/dist/utils/inline-text.d.ts +52 -12
  59. package/dist/utils/inline-text.d.ts.map +1 -1
  60. package/dist/utils/inline-text.js +129 -14
  61. package/dist/utils/inline-text.js.map +1 -1
  62. package/package.json +12 -12
  63. package/server.json +16 -24
@@ -1 +1 @@
1
- {"version":3,"file":"geonames-service.d.ts","sourceRoot":"","sources":["../../../src/services/geonames/geonames-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"geonames-service.d.ts","sourceRoot":"","sources":["../../../src/services/geonames/geonames-service.ts"],"names":[],"mappings":"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"}
@@ -60,6 +60,18 @@ function cacheKeyOf(endpoint, params) {
60
60
  const sorted = params.toSorted(([a, av], [b, bv]) => a.localeCompare(b) || av.localeCompare(bv));
61
61
  return `${endpoint}?${new URLSearchParams(sorted.map(([k, v]) => [k, v])).toString()}`;
62
62
  }
63
+ /**
64
+ * The `date` sent to `timezoneJSON` (Design Decision 51). GeoNames' default sunrise and
65
+ * sunset are for the solar day of the UTC date at the point's longitude, and `date` asks
66
+ * for one more solar day. The solar day whose events fall on the point's local date is the
67
+ * default day or the one before it while UTC hours plus `lng / 15` stay below 12, and the
68
+ * default day or the one after it from then on, so `date` is that other day.
69
+ */
70
+ function solarDateParam(nowMs, lng) {
71
+ const dayStart = nowMs - (nowMs % DAY_MS);
72
+ const solarHours = (nowMs - dayStart) / HOUR_MS + lng / 15;
73
+ return new Date(dayStart + (solarHours < 12 ? -DAY_MS : DAY_MS)).toISOString().slice(0, 10);
74
+ }
63
75
  /** `withRetry` predicate: the framework default, except a spent quota fails at once. */
64
76
  const isTransient = (error) => reasonOf(error) !== 'quota_exhausted' && defaultIsTransient(error);
65
77
  /** Upstream access for every GeoNames tool. Construct through {@link initGeoNamesService}. */
@@ -69,6 +81,7 @@ export class GeoNamesService {
69
81
  #createPacer;
70
82
  #fetch;
71
83
  #flights = new Map();
84
+ #now;
72
85
  /** Caller-account pacers, least recently used first. */
73
86
  #pacers = new Map();
74
87
  #serverAccount;
@@ -77,10 +90,11 @@ export class GeoNamesService {
77
90
  this.#baseUrl = (options.baseUrl ?? DEFAULT_BASE_URL).replace(/\/+$/, '');
78
91
  this.#createPacer = options.createPacer ?? createPacer;
79
92
  this.#fetch = options.fetch ?? ((url, init) => fetch(url, init));
93
+ this.#now = options.now ?? Date.now;
80
94
  this.#cache = new ResponseCache({
81
95
  maxBytes: 32 * 1024 * 1024,
82
96
  maxEntries: 5_000,
83
- now: options.now ?? Date.now,
97
+ now: this.#now,
84
98
  });
85
99
  this.#serverAccount =
86
100
  options.serverUsername === undefined
@@ -131,6 +145,11 @@ export class GeoNamesService {
131
145
  }
132
146
  for (const country of params.countries ?? [])
133
147
  query.push(['country', country]);
148
+ for (const name of ['adminCode1', 'adminCode2', 'adminCode3', 'adminCode4']) {
149
+ const code = params[name];
150
+ if (code !== undefined)
151
+ query.push([name, code]);
152
+ }
134
153
  for (const featureClass of params.featureClasses ?? [])
135
154
  query.push(['featureClass', featureClass]);
136
155
  for (const featureCode of params.featureCodes ?? [])
@@ -141,8 +160,8 @@ export class GeoNamesService {
141
160
  const { north, south, east, west } = params.boundingBox;
142
161
  query.push(['north', String(north)], ['south', String(south)], ['east', String(east)], ['west', String(west)]);
143
162
  }
144
- if (params.orderBy === 'population')
145
- query.push(['orderby', 'population']);
163
+ if (params.orderBy)
164
+ query.push(['orderby', params.orderBy]);
146
165
  query.push(['maxRows', String(params.limit)], ['startRow', String(params.offset)]);
147
166
  return this.#call({
148
167
  endpoint: 'searchJSON',
@@ -204,16 +223,22 @@ export class GeoNamesService {
204
223
  }
205
224
  /**
206
225
  * `countrySubdivisionJSON?level=5` (1 credit, cached 24 h). `undefined` when no country
207
- * contains the point (status 15) — a result, cached like any other.
226
+ * contains the point (status 15) — a result, cached like any other. A `bufferKm` above 0
227
+ * is sent as `radius`, matching the nearest country within it; at 0 no `radius` is sent,
228
+ * so the request and its cache key are the unbuffered ones. `maxRows` is never sent:
229
+ * beside `radius` it switches the response to a list of subdivisions.
208
230
  */
209
- subdivision(lat, lng, account, ctx) {
231
+ subdivision(lat, lng, account, ctx, options = {}) {
232
+ const params = [
233
+ ['lat', String(lat)],
234
+ ['lng', String(lng)],
235
+ ['level', '5'],
236
+ ];
237
+ if (options.bufferKm)
238
+ params.push(['radius', String(options.bufferKm)]);
210
239
  return this.#call({
211
240
  endpoint: 'countrySubdivisionJSON',
212
- params: [
213
- ['lat', String(lat)],
214
- ['lng', String(lng)],
215
- ['level', '5'],
216
- ],
241
+ params,
217
242
  ttlMs: DAY_MS,
218
243
  parse: (payload) => bodyOr(payload, undefined, parseSubdivision),
219
244
  }, account, ctx);
@@ -271,8 +296,9 @@ export class GeoNamesService {
271
296
  }, account, ctx);
272
297
  }
273
298
  /**
274
- * `timezoneJSON` (1 credit, never cached: it carries the current local time).
275
- * `undefined` when GeoNames answers status 15.
299
+ * `timezoneJSON` (1 credit, never cached: it carries the current local time), with the
300
+ * `date` whose solar day covers the point's local date when GeoNames' default one does
301
+ * not. `undefined` when GeoNames answers status 15.
276
302
  */
277
303
  timezone(lat, lng, account, ctx) {
278
304
  return this.#call({
@@ -280,12 +306,16 @@ export class GeoNamesService {
280
306
  params: [
281
307
  ['lat', String(lat)],
282
308
  ['lng', String(lng)],
309
+ ['date', solarDateParam(this.#now(), lng)],
283
310
  ],
284
311
  ttlMs: 0,
285
312
  parse: (payload) => bodyOr(payload, undefined, parseTimezone),
286
313
  }, account, ctx);
287
314
  }
288
- /** `postalCodeSearchJSON` (1 credit, cached 24 h): by postal code or by place name. */
315
+ /**
316
+ * `postalCodeSearchJSON` (1 credit, cached 24 h): by postal code or by place name. GeoNames
317
+ * documents no `startRow` here but honors it in both lookups, up to 5000.
318
+ */
289
319
  postalSearch(params, account, ctx) {
290
320
  const query = [];
291
321
  if (params.postalCode !== undefined)
@@ -294,7 +324,7 @@ export class GeoNamesService {
294
324
  query.push(['placename', params.placeName]);
295
325
  for (const country of params.countries ?? [])
296
326
  query.push(['country', country]);
297
- query.push(['maxRows', String(params.limit)]);
327
+ query.push(['maxRows', String(params.limit)], ['startRow', String(params.offset)]);
298
328
  return this.#call({
299
329
  endpoint: 'postalCodeSearchJSON',
300
330
  params: query,
@@ -342,8 +372,8 @@ export class GeoNamesService {
342
372
  if (hit)
343
373
  return Promise.resolve(hit.value);
344
374
  }
345
- return this.#singleFlight(`${account.key} ${cacheKey}`, ctx, async () => {
346
- const { value, bytes } = await this.#fetchWithRetry(spec, account, ctx);
375
+ return this.#singleFlight(`${account.key} ${cacheKey}`, ctx.signal, async (signal) => {
376
+ const { value, bytes } = await this.#fetchWithRetry(spec, account, ctx, signal);
347
377
  if (spec.ttlMs > 0 && (spec.cacheable?.(value) ?? true)) {
348
378
  this.#cache.set(cacheKey, value, bytes, spec.ttlMs);
349
379
  }
@@ -351,37 +381,61 @@ export class GeoNamesService {
351
381
  });
352
382
  }
353
383
  /**
354
- * Joins an identical in-flight request on the same account, else starts one. A joiner
355
- * whose leader was cancelled starts its own request instead of inheriting the abort.
384
+ * Joins an identical in-flight request on the same account, else starts one. Each
385
+ * caller races the shared request against its own signal: a cancelled caller rejects
386
+ * at once with its own `signal.reason` while the others keep waiting, and the request
387
+ * aborts only when its last caller has left. Its outcome, failure included, reaches
388
+ * every caller still waiting.
356
389
  */
357
- async #singleFlight(key, ctx, run) {
358
- const existing = this.#flights.get(key);
359
- if (existing) {
360
- try {
361
- return (await existing.promise);
362
- }
363
- catch (error) {
364
- if (!existing.signal.aborted || ctx.signal.aborted)
365
- throw error;
366
- }
367
- }
368
- const flight = { promise: run(), signal: ctx.signal };
390
+ #singleFlight(key, signal, run) {
391
+ if (signal.aborted)
392
+ return Promise.reject(signal.reason);
393
+ const flight = this.#flights.get(key) ?? this.#startFlight(key, run);
394
+ flight.waiting++;
395
+ return new Promise((resolve, reject) => {
396
+ const leave = () => {
397
+ reject(signal.reason);
398
+ if (--flight.waiting > 0)
399
+ return;
400
+ if (this.#flights.get(key) === flight)
401
+ this.#flights.delete(key);
402
+ flight.controller.abort(signal.reason);
403
+ };
404
+ signal.addEventListener('abort', leave, { once: true });
405
+ flight.promise.then((value) => {
406
+ signal.removeEventListener('abort', leave);
407
+ resolve(value);
408
+ }, (error) => {
409
+ signal.removeEventListener('abort', leave);
410
+ reject(error);
411
+ });
412
+ });
413
+ }
414
+ /**
415
+ * Starts a shared request on a flight-owned signal, so no caller's cancellation
416
+ * reaches it. It leaves the map when it settles, or sooner when its last caller leaves.
417
+ */
418
+ #startFlight(key, run) {
419
+ const controller = new AbortController();
420
+ const flight = { controller, promise: run(controller.signal), waiting: 0 };
369
421
  this.#flights.set(key, flight);
370
- try {
371
- return (await flight.promise);
372
- }
373
- finally {
422
+ const land = () => {
374
423
  if (this.#flights.get(key) === flight)
375
424
  this.#flights.delete(key);
376
- }
425
+ };
426
+ flight.promise.then(land, land);
427
+ return flight;
377
428
  }
378
- /** The retry ladder; its total-deadline expiry is restated as `upstream_timeout`. */
379
- #fetchWithRetry(spec, account, ctx) {
429
+ /**
430
+ * The retry ladder, run on the flight's signal rather than a caller's; `ctx` only
431
+ * correlates its log records. Its total-deadline expiry is restated as `upstream_timeout`.
432
+ */
433
+ #fetchWithRetry(spec, account, ctx, signal) {
380
434
  const pacer = this.#pacerFor(account);
381
- const ladder = withRetry(async ({ remainingMs, signal }) => {
435
+ const ladder = withRetry(async ({ remainingMs, signal: attemptSignal }) => {
382
436
  try {
383
437
  return await pacer.run((taskSignal) => this.#attempt(spec, account, ctx, taskSignal), {
384
- signal,
438
+ signal: attemptSignal,
385
439
  maxWaitMs: Math.min(MAX_QUEUE_WAIT_MS, remainingMs),
386
440
  });
387
441
  }
@@ -394,7 +448,7 @@ export class GeoNamesService {
394
448
  }, {
395
449
  operation: `GeoNamesService.${spec.endpoint}`,
396
450
  context: ctx,
397
- signal: ctx.signal,
451
+ signal,
398
452
  maxRetries: 2,
399
453
  baseDelayMs: 1_000,
400
454
  maxDelayMs: 5_000,
@@ -412,7 +466,9 @@ export class GeoNamesService {
412
466
  * while the call is cancelled or out of time surfaces as the abort reason, so the
413
467
  * runtime's own error, which can carry the request URL, never enters an error chain.
414
468
  * The response record goes to the process logger only: through `ctx.log` it would
415
- * tell the client a cache miss from a hit.
469
+ * tell the client a cache miss from a hit. It names the account side as `payer`,
470
+ * since every log sink redacts a key holding an `account` or `user` word
471
+ * (`USERNAME_LOG_FIELDS`).
416
472
  */
417
473
  async #attempt(spec, account, ctx, signal) {
418
474
  const timer = AbortSignal.timeout(ATTEMPT_TIMEOUT_MS);
@@ -438,7 +494,7 @@ export class GeoNamesService {
438
494
  endpoint: spec.endpoint,
439
495
  httpStatus: response.status,
440
496
  bodyBytes: bytes,
441
- account: account.source,
497
+ payer: account.source,
442
498
  }));
443
499
  return { bytes, value: spec.parse(this.#toPayload(response.status, text, account)) };
444
500
  }
@@ -1 +1 @@
1
- {"version":3,"file":"geonames-service.js","sourceRoot":"","sources":["../../../src/services/geonames/geonames-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"geonames-service.js","sourceRoot":"","sources":["../../../src/services/geonames/geonames-service.ts"],"names":[],"mappings":"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"}
@@ -2,8 +2,11 @@
2
2
  * @fileoverview Parses GeoNames JSON bodies into domain rows. Each parser checks the
3
3
  * endpoint's root key (missing → unreadable), validates the rows with Zod (mismatch
4
4
  * → unexpected shape), then normalizes: string numbers parsed, and GeoNames'
5
- * absence placeholders (`population: 0`, `geonameId: 0`, `adminCode1: "00"`,
6
- * empty strings, the -32768/-9999 DEM sentinels) dropped.
5
+ * absence placeholders (`population: 0`, `geonameId: 0`, `adminCode1: "00"` with no
6
+ * admin id, `isoNumeric: "0"`, empty strings, the -32768/-9999 DEM sentinels) dropped. A
7
+ * country record lists no admin level. Timezone offsets on 1 January and 1 July come from
8
+ * the IANA zone in the local year; offshore, both are `rawOffset`. Sunrise and sunset
9
+ * are the pair on the local date.
7
10
  * @module services/geonames/response-parsers
8
11
  */
9
12
  import { type ChildrenResult, type CountryInfo, type Ocean, type PlaceRecord, type PostalCode, type PostalCountry, type SearchResult, type Subdivision, type TimezoneInfo, type Toponym } from './types.js';
@@ -19,11 +22,16 @@ export declare function parseToponyms(body: Body, endpoint: string): Toponym[];
19
22
  export declare function parseChildren(body: Body): ChildrenResult;
20
23
  /** `getJSON`: the full record, with pseudo-language alternate names split out. */
21
24
  export declare function parsePlace(body: Body): PlaceRecord;
22
- /** `countrySubdivisionJSON?level=5`: country plus ADM1–ADM5 with ISO 3166-2 codes. */
25
+ /** `countrySubdivisionJSON?level=5[&radius]`: country plus ADM1–ADM5 with ISO 3166-2 codes. */
23
26
  export declare function parseSubdivision(body: Body): Subdivision;
24
27
  /** `oceanJSON`; a `geonameId` of 0 means GeoNames has no feature for the water body. */
25
28
  export declare function parseOcean(body: Body): Ocean;
26
- /** `timezoneJSON`; offshore answers carry only the three offsets. */
29
+ /**
30
+ * `timezoneJSON`; offshore answers carry only the offsets. With a `timezoneId`, the 1
31
+ * January and 1 July offsets come from the zone (Design Decision 50), and GeoNames'
32
+ * `gmtOffset`/`dstOffset`, which it no longer documents, stand in only when the zone or
33
+ * the local year cannot be read. Offshore, open water has no DST, so both are `rawOffset`.
34
+ */
27
35
  export declare function parseTimezone(body: Body): TimezoneInfo;
28
36
  /** `postalCodeSearchJSON` / `findNearbyPostalCodesJSON`. */
29
37
  export declare function parsePostalCodes(body: Body, endpoint: string): PostalCode[];
@@ -1 +1 @@
1
- {"version":3,"file":"response-parsers.d.ts","sourceRoot":"","sources":["../../../src/services/geonames/response-parsers.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAIL,KAAK,cAAc,EACnB,KAAK,WAAW,EAGhB,KAAK,KAAK,EACV,KAAK,WAAW,EAEhB,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,OAAO,EACb,MAAM,YAAY,CAAC;AAGpB,kCAAkC;AAClC,MAAM,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAS3C,mDAAmD;AACnD,eAAO,MAAM,QAAQ,UAAW,OAAO,KAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CACH,CAAC;AA0GvE,oBAAoB;AACpB,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,CAQpD;AAED,qFAAqF;AACrF,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,EAAE,CAErE;AAED,sBAAsB;AACtB,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,cAAc,CAQxD;AA4CD,kFAAkF;AAClF,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,WAAW,CAoDlD;AASD,sFAAsF;AACtF,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,GAAG,WAAW,CA+BxD;AAID,wFAAwF;AACxF,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,KAAK,CAG5C;AAQD,qEAAqE;AACrE,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,CAatD;AAUD,4DAA4D;AAC5D,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,UAAU,EAAE,CAiB3E;AAiBD,wCAAwC;AACxC,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,GAAG,WAAW,EAAE,CA0BxD;AAYD,8CAA8C;AAC9C,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,aAAa,EAAE,CAehE"}
1
+ {"version":3,"file":"response-parsers.d.ts","sourceRoot":"","sources":["../../../src/services/geonames/response-parsers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EAIL,KAAK,cAAc,EACnB,KAAK,WAAW,EAGhB,KAAK,KAAK,EACV,KAAK,WAAW,EAEhB,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,OAAO,EACb,MAAM,YAAY,CAAC;AAGpB,kCAAkC;AAClC,MAAM,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAS3C,mDAAmD;AACnD,eAAO,MAAM,QAAQ,UAAW,OAAO,KAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CACH,CAAC;AAoHvE,oBAAoB;AACpB,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,CAQpD;AAED,qFAAqF;AACrF,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,EAAE,CAErE;AAED,sBAAsB;AACtB,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,cAAc,CAQxD;AA4FD,kFAAkF;AAClF,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,WAAW,CAyDlD;AAkBD,+FAA+F;AAC/F,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,GAAG,WAAW,CAgCxD;AAID,wFAAwF;AACxF,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,KAAK,CAG5C;AAiCD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,CAmBtD;AAUD,4DAA4D;AAC5D,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,UAAU,EAAE,CAiB3E;AAiBD,wCAAwC;AACxC,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,GAAG,WAAW,EAAE,CA0BxD;AAYD,8CAA8C;AAC9C,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,aAAa,EAAE,CAehE"}
@@ -2,8 +2,11 @@
2
2
  * @fileoverview Parses GeoNames JSON bodies into domain rows. Each parser checks the
3
3
  * endpoint's root key (missing → unreadable), validates the rows with Zod (mismatch
4
4
  * → unexpected shape), then normalizes: string numbers parsed, and GeoNames'
5
- * absence placeholders (`population: 0`, `geonameId: 0`, `adminCode1: "00"`,
6
- * empty strings, the -32768/-9999 DEM sentinels) dropped.
5
+ * absence placeholders (`population: 0`, `geonameId: 0`, `adminCode1: "00"` with no
6
+ * admin id, `isoNumeric: "0"`, empty strings, the -32768/-9999 DEM sentinels) dropped. A
7
+ * country record lists no admin level. Timezone offsets on 1 January and 1 July come from
8
+ * the IANA zone in the local year; offshore, both are `rawOffset`. Sunrise and sunset
9
+ * are the pair on the local date.
7
10
  * @module services/geonames/response-parsers
8
11
  */
9
12
  import { z } from '@cyanheads/mcp-ts-core';
@@ -39,10 +42,19 @@ function coordinates(lat, lng) {
39
42
  const longitude = toNumber(lng);
40
43
  return latitude === undefined || longitude === undefined ? {} : { lat: latitude, lng: longitude };
41
44
  }
42
- /** Admin codes, with the `"00"` that GeoNames puts on country rows dropped. */
43
- const adminCode = (value) => {
44
- const code = text(value);
45
- return code === '00' ? undefined : code;
45
+ /** An ISO 3166-1 numeric code; GeoNames sends `"0"` for a country ISO gives none (Kosovo). */
46
+ const isoNumeric = (value) => {
47
+ const code = codeText(value);
48
+ return code !== undefined && Number(code) === 0 ? undefined : code;
49
+ };
50
+ /**
51
+ * A first-level admin code. GeoNames' `"00"` is a placeholder when no admin id comes with
52
+ * it, as on a country row, and dropped; with an id it is a real code (Monaco's one
53
+ * division, 3319178) and kept.
54
+ */
55
+ const adminCode1 = (code, adminId) => {
56
+ const value = text(code);
57
+ return value === '00' && positive(adminId) === undefined ? undefined : value;
46
58
  };
47
59
  function boundingBox(value) {
48
60
  const north = toNumber(value.north);
@@ -89,7 +101,7 @@ function toToponym(row) {
89
101
  countryCode: text(row.countryCode),
90
102
  countryName: text(row.countryName),
91
103
  countryGeonameId: positive(row.countryId),
92
- adminCode1: adminCode(row.adminCode1),
104
+ adminCode1: adminCode1(row.adminCode1, row.adminId1),
93
105
  adminName1: text(row.adminName1),
94
106
  iso3166_2: text(isoCodes.ISO3166_2),
95
107
  population: positive(row.population),
@@ -128,20 +140,60 @@ const IDENTIFIER_LANGS = new Set(IDENTIFIER_TYPES);
128
140
  const isIdentifierLang = (lang) => lang !== undefined && IDENTIFIER_LANGS.has(lang);
129
141
  /** GeoNames' `srtm3` / `astergdem` no-data values. */
130
142
  const DEM_NO_DATA = new Set([-32768, -9999]);
143
+ /** The `YYYY-MM-DD` a GeoNames local timestamp (`YYYY-MM-DD HH:mm`) opens with. */
144
+ const localDate = (value) => value === undefined ? undefined : /^\d{4}-\d{2}-\d{2}/.exec(value)?.[0];
145
+ /** `Intl`'s `longOffset` zone name: `GMT`, `GMT+05:45`, with seconds for a historical offset. */
146
+ const LONG_OFFSET = /^GMT(?:([+-])(\d{1,2}):(\d{2})(?::(\d{2}))?)?$/;
147
+ function offsetHours(format, instant) {
148
+ const name = format.formatToParts(instant).find((part) => part.type === 'timeZoneName')?.value;
149
+ const match = LONG_OFFSET.exec(name ?? '');
150
+ if (!match)
151
+ throw new Error(`The runtime named a UTC offset in an unknown form: ${name}`);
152
+ const [, sign, hours = '0', minutes = '0', seconds = '0'] = match;
153
+ const value = Number(hours) + Number(minutes) / 60 + Number(seconds) / 3600;
154
+ return sign === '-' ? -value : value;
155
+ }
156
+ /**
157
+ * The offsets of `timezoneId` at noon UTC on 1 January and 1 July of `localTime`'s year,
158
+ * from the runtime's tz data (Design Decision 50). `undefined` when `localTime` carries no
159
+ * date or the runtime has no such zone, so the caller falls back to GeoNames' own pair.
160
+ */
161
+ function zoneOffsets(timezoneId, localTime) {
162
+ const date = localDate(localTime);
163
+ if (date === undefined)
164
+ return;
165
+ let format;
166
+ try {
167
+ format = new Intl.DateTimeFormat('en-US', { timeZone: timezoneId, timeZoneName: 'longOffset' });
168
+ }
169
+ catch (error) {
170
+ if (error instanceof RangeError)
171
+ return;
172
+ throw error;
173
+ }
174
+ const year = Number(date.slice(0, 4));
175
+ return {
176
+ january: offsetHours(format, Date.UTC(year, 0, 1, 12)),
177
+ july: offsetHours(format, Date.UTC(year, 6, 1, 12)),
178
+ };
179
+ }
180
+ /** `getJSON`'s timezone block; GeoNames' pair, each optional, stands in where no zone resolves. */
131
181
  function placeTimezone(value) {
132
182
  if (!isRecord(value))
133
183
  return;
184
+ const timezoneId = text(value.timeZoneId);
185
+ const derived = timezoneId === undefined ? undefined : zoneOffsets(timezoneId, text(value.time));
134
186
  const timezone = prune({
135
- timezoneId: text(value.timeZoneId),
136
- gmtOffsetInHours: toNumber(value.gmtOffset),
137
- dstOffsetInHours: toNumber(value.dstOffset),
187
+ timezoneId,
188
+ gmtOffsetInHours: derived?.january ?? toNumber(value.gmtOffset),
189
+ dstOffsetInHours: derived?.july ?? toNumber(value.dstOffset),
138
190
  });
139
191
  return Object.keys(timezone).length > 0 ? timezone : undefined;
140
192
  }
141
193
  function placeAdminLevels(row) {
142
194
  const levels = [];
143
195
  for (let level = 1; level <= 5; level++) {
144
- const code = level === 1 ? adminCode(row.adminCode1) : text(row[`adminCode${level}`]);
196
+ const code = level === 1 ? adminCode1(row.adminCode1, row.adminId1) : text(row[`adminCode${level}`]);
145
197
  const name = text(row[`adminName${level}`]);
146
198
  if (code === undefined && name === undefined)
147
199
  continue;
@@ -175,6 +227,11 @@ export function parsePlace(body) {
175
227
  }
176
228
  const base = toToponym(row);
177
229
  const dem = toNumber(row.srtm3);
230
+ /**
231
+ * A record whose `countryId` is its own id is the country, and every division lies
232
+ * below it, though GeoNames sends Monaco's with its one division as ADM1.
233
+ */
234
+ const isCountry = base.countryGeonameId === base.geonameId;
178
235
  return prune({
179
236
  geonameId: base.geonameId,
180
237
  name: base.name,
@@ -191,7 +248,7 @@ export function parsePlace(body) {
191
248
  countryGeonameId: base.countryGeonameId,
192
249
  continentCode: text(row.continentCode),
193
250
  iso3166_2: base.iso3166_2,
194
- adminLevels: placeAdminLevels(row),
251
+ adminLevels: isCountry ? [] : placeAdminLevels(row),
195
252
  population: base.population,
196
253
  elevationInMeters: toNumber(row.elevation),
197
254
  demElevationInMeters: dem !== undefined && !DEM_NO_DATA.has(dem) ? dem : undefined,
@@ -210,7 +267,15 @@ const SubdivisionSchema = z.looseObject({
210
267
  .array(z.looseObject({ code: z.string(), level: z.string(), type: z.string() }))
211
268
  .optional(),
212
269
  });
213
- /** `countrySubdivisionJSON?level=5`: country plus ADM1–ADM5 with ISO 3166-2 codes. */
270
+ /**
271
+ * The km from the point to a country matched within the `radius` buffer, to the metre. A
272
+ * contained point reports `distance: 0`, so only a positive gap is kept.
273
+ */
274
+ function bufferGap(value) {
275
+ const km = toNumber(value);
276
+ return km === undefined ? undefined : positive(Math.round(km * 1000) / 1000);
277
+ }
278
+ /** `countrySubdivisionJSON?level=5[&radius]`: country plus ADM1–ADM5 with ISO 3166-2 codes. */
214
279
  export function parseSubdivision(body) {
215
280
  const row = validate(body, 'countryCode', SubdivisionSchema, 'countrySubdivisionJSON');
216
281
  const adminLevels = [];
@@ -235,6 +300,7 @@ export function parseSubdivision(body) {
235
300
  : prune({
236
301
  countryCode,
237
302
  countryName: text(row.countryName),
303
+ distanceInKm: bufferGap(row.distance),
238
304
  }),
239
305
  adminLevels,
240
306
  });
@@ -247,22 +313,55 @@ export function parseOcean(body) {
247
313
  }
248
314
  const TimezoneSchema = z.looseObject({
249
315
  rawOffset: z.number(),
250
- gmtOffset: z.number(),
251
- dstOffset: z.number(),
316
+ gmtOffset: z.number().optional(),
317
+ dstOffset: z.number().optional(),
252
318
  });
253
- /** `timezoneJSON`; offshore answers carry only the three offsets. */
319
+ /** GeoNames' own `gmtOffset`/`dstOffset` pair, when it sends both. */
320
+ const sentOffsets = (january, july) => january === undefined || july === undefined ? undefined : { january, july };
321
+ /**
322
+ * The sunrise and sunset on the local date `today` (Design Decision 51): GeoNames' default
323
+ * pair or the `dates[0]` pair the request's `date` asked for, whichever has its sunrise
324
+ * (else its sunset) on that date. Neither offshore, in polar day or night, or when no
325
+ * pair falls on it.
326
+ */
327
+ function solarEvents(row, today) {
328
+ if (today === undefined)
329
+ return {};
330
+ const requested = Array.isArray(row.dates) ? row.dates[0] : undefined;
331
+ for (const pair of [row, requested]) {
332
+ if (!isRecord(pair))
333
+ continue;
334
+ const sunrise = text(pair.sunrise);
335
+ const sunset = text(pair.sunset);
336
+ if (localDate(sunrise ?? sunset) === today)
337
+ return { sunrise, sunset };
338
+ }
339
+ return {};
340
+ }
341
+ /**
342
+ * `timezoneJSON`; offshore answers carry only the offsets. With a `timezoneId`, the 1
343
+ * January and 1 July offsets come from the zone (Design Decision 50), and GeoNames'
344
+ * `gmtOffset`/`dstOffset`, which it no longer documents, stand in only when the zone or
345
+ * the local year cannot be read. Offshore, open water has no DST, so both are `rawOffset`.
346
+ */
254
347
  export function parseTimezone(body) {
255
348
  const row = validate(body, 'rawOffset', TimezoneSchema, 'timezoneJSON');
349
+ const timezoneId = text(row.timezoneId);
350
+ const localTime = text(row.time);
351
+ const offsets = timezoneId === undefined
352
+ ? { january: row.rawOffset, july: row.rawOffset }
353
+ : (zoneOffsets(timezoneId, localTime) ?? sentOffsets(row.gmtOffset, row.dstOffset));
354
+ if (offsets === undefined)
355
+ throw upstreamUnexpectedShape('timezoneJSON');
256
356
  return prune({
257
- timezoneId: text(row.timezoneId),
357
+ timezoneId,
258
358
  countryCode: text(row.countryCode),
259
359
  countryName: text(row.countryName),
260
360
  rawOffsetInHours: row.rawOffset,
261
- gmtOffsetInHours: row.gmtOffset,
262
- dstOffsetInHours: row.dstOffset,
263
- localTime: text(row.time),
264
- sunrise: text(row.sunrise),
265
- sunset: text(row.sunset),
361
+ gmtOffsetInHours: offsets.january,
362
+ dstOffsetInHours: offsets.july,
363
+ localTime,
364
+ ...solarEvents(row, localDate(localTime)),
266
365
  });
267
366
  }
268
367
  const PostalRowSchema = z.looseObject({
@@ -312,7 +411,7 @@ export function parseCountries(body) {
312
411
  countryCode: row.countryCode,
313
412
  countryName: row.countryName,
314
413
  isoAlpha3: row.isoAlpha3,
315
- isoNumeric: codeText(row.isoNumeric),
414
+ isoNumeric: isoNumeric(row.isoNumeric),
316
415
  fipsCode: text(row.fipsCode),
317
416
  geonameId: row.geonameId,
318
417
  capital: text(row.capital),