goblin-swiss 0.2.0 → 0.3.0

package/lib/getAddress.js

@@ -1,69 +1,102 @@
-const BASE_URL = 'https://api3.geo.admin.ch/rest/services/ech/MapServer/find';
+const BASE_URL = 'https://api3.geo.admin.ch/rest/services/ech/MapServer/';
 
 const LAYER = 'ch.swisstopo.amtliches-gebaeudeadressverzeichnis';
 
-/**
- * Resolve a structured address from a GeoAdmin SearchServer featureId.
- *
- * @param {string} featureId - SearchServer featureId, e.g. "1487827_0".
- * @param {AbortSignal} [signal] - Optional abort signal.
- * @returns {Promise<{
- *   street: string|null,
- *   houseNumber: string|null,
- *   zip: string|null,
- *   city: string|null,
- *   municipality: string|null,
- *   municipalityId: number|null,
- *   egid: number|null,
- *   edid: number|null,
- *   egaid: number|null
- * }|null>}
- */
-async function getAddress(featureId, signal) {
-  const [egid, edid = '0'] = String(featureId).split('_');
+function parseZipLabel(zipLabel) {
+  const match = String(zipLabel ?? '')
+    .trim()
+    .match(/^(\d{4})\s+(.+)$/);
+  return match ? {zip: match[1], city: match[2]} : {zip: null, city: null};
+}
 
+async function findAddress(featureId, locale, signal) {
+  const [egid, edid = '0'] = String(featureId).split('_');
   const params = new URLSearchParams({
     layer: LAYER,
     searchText: egid,
     searchField: 'bdg_egid',
     contains: 'false',
     returnGeometry: 'false',
-    lang: 'fr',
-  });
-
-  const response = await fetch(`${BASE_URL}?${params}`, {
-    signal,
+    lang: locale,
   });
 
+  const response = await fetch(`${BASE_URL}find?${params}`, {signal});
   if (!response.ok) {
     throw new Error(
       `GeoAdmin lookup failed: ${response.status} ${response.statusText}`
     );
   }
 
-  const data = await response.json();
+  const {results = []} = await response.json();
+  return (
+    results.find(({attributes}) => String(attributes?.adr_edid ?? '0') === edid)
+      ?.attributes ??
+    results[0]?.attributes ??
+    null
+  );
+}
 
-  const candidates = data.results ?? [];
+async function getFeatureAddress(featureId, locale, signal) {
+  if (String(featureId).includes('_')) {
+    return findAddress(featureId, locale, signal);
+  }
 
-  const result =
-    candidates.find(
-      ({attributes}) => String(attributes?.adr_edid ?? '0') === edid
-    ) ?? candidates[0];
+  const params = new URLSearchParams({
+    returnGeometry: 'false',
+    lang: locale,
+  });
+  const response = await fetch(
+    `${BASE_URL}${LAYER}/${encodeURIComponent(featureId)}?${params}`,
+    {signal}
+  );
+  if (!response.ok) {
+    throw new Error(
+      `GeoAdmin lookup failed: ${response.status} ${response.statusText}`
+    );
+  }
 
-  if (!result) {
+  const {feature} = await response.json();
+  return feature?.attributes ?? null;
+}
+
+/**
+ * Resolve a structured address from a GeoAdmin SearchServer featureId.
+ *
+ * @param {string|number} featureId - SearchServer featureId.
+ * @param {string} [locale='fr'] - Result language.
+ * @param {AbortSignal} [signal] - Optional abort signal.
+ * @returns {Promise<{
+ *   street: string|null,
+ *   houseNumber: string|null,
+ *   zip: string|null,
+ *   city: string|null,
+ *   municipality: string|null,
+ *   municipalityId: number|null,
+ *   egid: number|null,
+ *   edid: number|null,
+ *   egaid: number|null,
+ *   canton: string|null
+ * }|null>}
+ */
+async function getAddress(featureId, locale = 'fr', signal) {
+  const attrs = await getFeatureAddress(featureId, locale, signal);
+  if (!attrs) {
     return null;
   }
 
-  const attrs = result.attributes ?? {};
+  const {zip, city} = parseZipLabel(attrs.zip_label);
 
   return {
-    street: attrs.stn_label ?? attrs.str_label ?? null,
+    street: attrs.stn_label ?? null,
     houseNumber: attrs.adr_number ?? null,
+    zip,
+    city,
     municipality: attrs.com_name ?? null,
     municipalityId: attrs.com_fosnr ?? null,
     egid: attrs.bdg_egid ?? null,
     edid: attrs.adr_edid ?? null,
     egaid: attrs.adr_egaid ?? null,
+    canton: attrs.com_canton ?? null,
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goblin-swiss",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Swiss stuff",
   "author": "Epsitec SA",
   "contributors": [