@ignfab/geocontext 0.9.6 → 0.9.7

package/dist/gpf/adminexpress.d.ts

@@ -1,16 +1,25 @@
 /**
- * Get administrative units (commune, departement,...) intersecting a given location
+ * Administrative units lookup via the Géoplateforme WFS service.
  *
- * @param {number} lon
- * @param {number} lat
- * @param {(url: string) => Promise<any>} [fetcher]
- * @returns {object[]}
+ * This module uses the structured WFS engine for request execution and
+ * response mapping, resolving geometry property names dynamically from
+ * the embedded catalog.
  */
-export function getAdminUnits(lon: number, lat: number, fetcher?: (url: string) => Promise<any>): object[];
+import { type FlatItem } from '../helpers/wfs_engine/response.js';
+type AdminUnit = FlatItem;
 /**
  * ADMINEXPRESS-COG.LATEST:{type}
  *
  * https://data.geopf.fr/wfs/ows?service=WFS&version=2.0.0&request=GetCapabilities
  */
-export const ADMINEXPRESS_SOURCE: "G\u00E9oplateforme (WFS, ADMINEXPRESS-COG.LATEST)";
-export const ADMINEXPRESS_TYPES: string[];
+export declare const ADMINEXPRESS_SOURCE = "G\u00E9oplateforme (WFS, ADMINEXPRESS-COG.LATEST)";
+export declare const ADMINEXPRESS_TYPES: string[];
+/**
+ * Get administrative units (commune, departement,...) intersecting a given location.
+ *
+ * @param lon Longitude of the query point.
+ * @param lat Latitude of the query point.
+ * @returns Administrative units covering the requested point.
+ */
+export declare function getAdminUnits(lon: number, lat: number): Promise<AdminUnit[]>;
+export {};

package/dist/gpf/adminexpress.js

@@ -1,5 +1,16 @@
-import { fetchWfsFeatures, mapWfsFeature } from '../helpers/wfs.js';
+/**
+ * Administrative units lookup via the Géoplateforme WFS service.
+ *
+ * This module uses the structured WFS engine for request execution and
+ * response mapping, resolving geometry property names dynamically from
+ * the embedded catalog.
+ */
 import logger from '../logger.js';
+import { getFeatureType } from '../helpers/wfs_engine/execution.js';
+import { fetchWfsMultiTypename } from '../helpers/wfs_engine/execution.js';
+import { getGeometryProperty } from '../helpers/wfs_engine/properties.js';
+import { compileIntersectsPointSpatialFilter } from '../helpers/wfs_engine/spatialCql.js';
+import { mapToFlatItems } from '../helpers/wfs_engine/response.js';
 /**
  * ADMINEXPRESS-COG.LATEST:{type}
  *
@@ -7,28 +18,40 @@ import logger from '../logger.js';
  */
 export const ADMINEXPRESS_SOURCE = "Géoplateforme (WFS, ADMINEXPRESS-COG.LATEST)";
 export const ADMINEXPRESS_TYPES = [
-    'commune',
+    'arrondissement',
+    'arrondissement_municipal',
     'canton',
     'collectivite_territoriale',
-    'epci',
+    'commune',
+    'commune_associee_ou_deleguee',
     'departement',
-    'region',
-    'arrondissement'
+    'epci',
+    'region'
 ];
+const ADMINEXPRESS_TYPENAMES = ADMINEXPRESS_TYPES.map((type) => `ADMINEXPRESS-COG.LATEST:${type}`);
 /**
- * Get administrative units (commune, departement,...) intersecting a given location
+ * Get administrative units (commune, departement,...) intersecting a given location.
  *
- * @param {number} lon
- * @param {number} lat
- * @param {(url: string) => Promise<any>} [fetcher]
- * @returns {object[]}
+ * @param lon Longitude of the query point.
+ * @param lat Latitude of the query point.
+ * @returns Administrative units covering the requested point.
  */
-export async function getAdminUnits(lon, lat, fetcher) {
-    logger.info(`[adminexpress] getAdminUnits(${lon},${lat})...`);
-    // Using EWKT format with SRID=4326 prefix for standard lon,lat order
-    const cql_filter = `INTERSECTS(geometrie,SRID=4326;POINT(${lon} ${lat}))`;
-    const typeNames = ADMINEXPRESS_TYPES.map((type) => `ADMINEXPRESS-COG.LATEST:${type}`);
-    const features = await fetchWfsFeatures(typeNames, cql_filter, 'ADMINEXPRESS', fetcher);
-    return features.map((feature) => mapWfsFeature(feature, typeNames));
+export async function getAdminUnits(lon, lat) {
+    logger.debug(`[gpf:adminexpress] getAdminUnits(${lon},${lat})...`);
+    const spatialFilter = { operator: "intersects_point", lon, lat };
+    // Resolve and compile one spatial filter per typename to avoid relying on
+    // cross-layer geometry property homogeneity.
+    const cqlFilters = await Promise.all(ADMINEXPRESS_TYPENAMES.map(async (typename) => {
+        const featureType = await getFeatureType(typename);
+        const geometryProperty = getGeometryProperty(featureType);
+        return compileIntersectsPointSpatialFilter(geometryProperty, spatialFilter);
+    }));
+    // Execute the multi-typename WFS query
+    const featureCollection = await fetchWfsMultiTypename({
+        typenames: ADMINEXPRESS_TYPENAMES,
+        cqlFilters,
+        errorLabel: 'ADMINEXPRESS',
+    });
+    return mapToFlatItems(featureCollection, ADMINEXPRESS_TYPENAMES);
 }
 //# sourceMappingURL=adminexpress.js.map

package/dist/gpf/adminexpress.js.map

@@ -1 +1 @@
-{"version":3,"file":"adminexpress.js","sourceRoot":"","sources":["../../src/gpf/adminexpress.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC;;;;GAIG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,8CAA8C,CAAC;AAClF,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAC9B,SAAS;IACT,QAAQ;IACR,2BAA2B;IAC3B,MAAM;IACN,aAAa;IACb,QAAQ;IACR,gBAAgB;CACnB,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO;IACjD,MAAM,CAAC,IAAI,CAAC,gCAAgC,GAAG,IAAI,GAAG,MAAM,CAAC,CAAC;IAE9D,qEAAqE;IACrE,MAAM,UAAU,GAAG,wCAAwC,GAAG,IAAI,GAAG,IAAI,CAAC;IAC1E,MAAM,SAAS,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,2BAA2B,IAAI,EAAE,CAAC,CAAC;IAEtF,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,SAAS,EAAE,UAAU,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;IACxF,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;AACxE,CAAC"}
+{"version":3,"file":"adminexpress.js","sourceRoot":"","sources":["../../src/gpf/adminexpress.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,mCAAmC,EAAE,MAAM,qCAAqC,CAAC;AAC1F,OAAO,EAAE,cAAc,EAAiB,MAAM,mCAAmC,CAAC;AAMlF;;;;GAIG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,8CAA8C,CAAC;AAClF,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAC9B,gBAAgB;IAChB,0BAA0B;IAC1B,QAAQ;IACR,2BAA2B;IAC3B,SAAS;IACT,8BAA8B;IAC9B,aAAa;IACb,MAAM;IACN,QAAQ;CACX,CAAC;AAEF,MAAM,sBAAsB,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,2BAA2B,IAAI,EAAE,CAAC,CAAC;AAEnG;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,GAAW,EAAE,GAAW;IACxD,MAAM,CAAC,KAAK,CAAC,oCAAoC,GAAG,IAAI,GAAG,MAAM,CAAC,CAAC;IAEnE,MAAM,aAAa,GAAkB,EAAE,QAAQ,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IAEhF,0EAA0E;IAC1E,6CAA6C;IAC7C,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QAC/E,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,QAAQ,CAAC,CAAC;QACnD,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,WAAW,CAAC,CAAC;QAC1D,OAAO,mCAAmC,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;IAChF,CAAC,CAAC,CAAC,CAAC;IAEJ,uCAAuC;IACvC,MAAM,iBAAiB,GAAiC,MAAM,qBAAqB,CAAC;QAChF,SAAS,EAAE,sBAAsB;QACjC,UAAU;QACV,UAAU,EAAE,cAAc;KAC7B,CAAC,CAAC;IAEH,OAAO,cAAc,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,CAAC;AACrE,CAAC"}

package/dist/gpf/altitude.d.ts

@@ -1,3 +1,20 @@
+import type { JsonFetcher } from "../helpers/http.js";
+export declare const ALTITUDE_SOURCE = "G\u00E9oplateforme (altim\u00E9trie)";
+type RawElevation = {
+    lon: number;
+    lat: number;
+    z: number;
+    acc: string;
+};
+type RawAltitudeResponse = {
+    elevations?: RawElevation[];
+};
+type AltitudeResult = {
+    lon: number;
+    lat: number;
+    altitude: number;
+    accuracy: string;
+};
 /**
  * Get altitude for a given location.
  *
@@ -5,13 +22,8 @@
  *
  * @param {number} lon
  * @param {number} lat
- * @param {(url: string) => Promise<any>} [fetcher]
- * @returns
+ * @param {JsonFetcher<RawAltitudeResponse>} [fetcher] - optional custom fetcher function
+ * @returns {Promise<AltitudeResult>}
  */
-export function getAltitudeByLocation(lon: number, lat: number, fetcher?: (url: string) => Promise<any>): Promise<{
-    lon: number;
-    lat: number;
-    altitude: any;
-    accuracy: any;
-}>;
-export const ALTITUDE_SOURCE: "G\u00E9oplateforme (altim\u00E9trie)";
+export declare function getAltitudeByLocation(lon: number, lat: number, fetcher?: JsonFetcher<RawAltitudeResponse>): Promise<AltitudeResult>;
+export {};

package/dist/gpf/altitude.js

@@ -1,4 +1,4 @@
-import { fetchJSON } from "../helpers/http.js";
+import { fetchJSONGet } from "../helpers/http.js";
 import logger from "../logger.js";
 export const ALTITUDE_SOURCE = "Géoplateforme (altimétrie)";
 /**
@@ -8,11 +8,11 @@ export const ALTITUDE_SOURCE = "Géoplateforme (altimétrie)";
  *
  * @param {number} lon
  * @param {number} lat
- * @param {(url: string) => Promise<any>} [fetcher]
- * @returns
+ * @param {JsonFetcher<RawAltitudeResponse>} [fetcher] - optional custom fetcher function
+ * @returns {Promise<AltitudeResult>}
  */
-export async function getAltitudeByLocation(lon, lat, fetcher = fetchJSON) {
-    logger.info(`getAltitudeByLocation(${lon},${lat})...`);
+export async function getAltitudeByLocation(lon, lat, fetcher = fetchJSONGet) {
+    logger.debug(`[gpf:altitude] getAltitudeByLocation(${lon},${lat})...`);
     const url = `https://data.geopf.fr/altimetrie/1.0/calcul/alti/rest/elevation.json?lon=${lon}&lat=${lat}&resource=ign_rge_alti_wld`;
     const json = await fetcher(url);
     const elevation = json?.elevations?.[0];

package/dist/gpf/altitude.js.map

@@ -1 +1 @@
-{"version":3,"file":"altitude.js","sourceRoot":"","sources":["../../src/gpf/altitude.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,MAAM,CAAC,MAAM,eAAe,GAAG,4BAA4B,CAAC;AAE5D;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,GAAG,SAAS;IACrE,MAAM,CAAC,IAAI,CAAC,yBAAyB,GAAG,IAAI,GAAG,MAAM,CAAC,CAAC;IAEvD,MAAM,GAAG,GAAG,4EAA4E,GAAG,QAAQ,GAAG,4BAA4B,CAAC;IAEnI,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;IAChC,MAAM,SAAS,GAAG,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;IAExC,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;IAClF,CAAC;IAED,OAAO;QACH,GAAG,EAAE,GAAG;QACR,GAAG,EAAE,GAAG;QACR,QAAQ,EAAE,SAAS,CAAC,CAAC;QACrB,QAAQ,EAAE,SAAS,CAAC,GAAG;KAC1B,CAAC;AAEN,CAAC"}
+{"version":3,"file":"altitude.js","sourceRoot":"","sources":["../../src/gpf/altitude.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,MAAM,CAAC,MAAM,eAAe,GAAG,4BAA4B,CAAC;AAoB5D;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,GAAW,EAAE,GAAW,EAAE,UAA4C,YAAY;IAC1H,MAAM,CAAC,KAAK,CAAC,wCAAwC,GAAG,IAAI,GAAG,MAAM,CAAC,CAAC;IAEvE,MAAM,GAAG,GAAG,4EAA4E,GAAG,QAAQ,GAAG,4BAA4B,CAAC;IAEnI,MAAM,IAAI,GAAwB,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;IAExC,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;IAClF,CAAC;IAED,OAAO;QACH,GAAG,EAAE,GAAG;QACR,GAAG,EAAE,GAAG;QACR,QAAQ,EAAE,SAAS,CAAC,CAAC;QACrB,QAAQ,EAAE,SAAS,CAAC,GAAG;KAC1B,CAAC;AAEN,CAAC"}

package/dist/gpf/geocode.d.ts

@@ -1,3 +1,24 @@
+import type { JsonFetcher } from "../helpers/http.js";
+export declare const GEOCODE_SOURCE = "G\u00E9oplateforme (service d'autocompl\u00E9tion)";
+type RawGeocodeResult = {
+    x: number;
+    y: number;
+    fulltext: string;
+    kind: string;
+    city: string;
+    zipcode: string;
+};
+type GeocodeResult = {
+    lon: number;
+    lat: number;
+    fulltext: string;
+    kind: string;
+    city: string;
+    zipcode: string;
+};
+type RawGeocodeResponse = {
+    results?: RawGeocodeResult[];
+};
 /**
  * Get coordinates for a given location
  *
@@ -5,8 +26,8 @@
  *
  * @param {string} text
  * @param {number} [maximumResponses=3]
- * @param {(url: string) => Promise<any>} [fetcher]
- * @returns
+ * @param {JsonFetcher<RawGeocodeResponse>} [fetcher] - optional custom fetcher function
+ * @returns {Promise<GeocodeResult[]>}
  */
-export function geocode(text: string, maximumResponses?: number, fetcher?: (url: string) => Promise<any>): Promise<any>;
-export const GEOCODE_SOURCE: "G\u00E9oplateforme (service d'autocompl\u00E9tion)";
+export declare function geocode(text: string, maximumResponses?: number, fetcher?: JsonFetcher<RawGeocodeResponse>): Promise<GeocodeResult[]>;
+export {};

package/dist/gpf/geocode.js

@@ -1,4 +1,4 @@
-import { fetchJSON } from "../helpers/http.js";
+import { fetchJSONGet } from "../helpers/http.js";
 import logger from "../logger.js";
 export const GEOCODE_SOURCE = "Géoplateforme (service d'autocomplétion)";
 // https://data.geopf.fr/geocodage/completion/openapi does not provide all the necessary information yet
@@ -9,15 +9,15 @@ export const GEOCODE_SOURCE = "Géoplateforme (service d'autocomplétion)";
  *
  * @param {string} text
  * @param {number} [maximumResponses=3]
- * @param {(url: string) => Promise<any>} [fetcher]
- * @returns
+ * @param {JsonFetcher<RawGeocodeResponse>} [fetcher] - optional custom fetcher function
+ * @returns {Promise<GeocodeResult[]>}
  */
-export async function geocode(text, maximumResponses = 3, fetcher = fetchJSON) {
+export async function geocode(text, maximumResponses = 3, fetcher = fetchJSONGet) {
     const normalizedText = typeof text === "string" ? text.trim() : "";
     if (!normalizedText) {
         return [];
     }
-    logger.info(`geocode(${JSON.stringify(normalizedText)}, ${maximumResponses})...`);
+    logger.debug(`[gpf:geocode] geocode(${JSON.stringify(normalizedText)}, ${maximumResponses})...`);
     const url = 'https://data.geopf.fr/geocodage/completion/?' + new URLSearchParams({
         text: normalizedText,
         maximumResponses: String(maximumResponses)

package/dist/gpf/geocode.js.map

@@ -1 +1 @@
-{"version":3,"file":"geocode.js","sourceRoot":"","sources":["../../src/gpf/geocode.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,MAAM,CAAC,MAAM,cAAc,GAAG,0CAA0C,CAAC;AAEzE,wGAAwG;AAExG;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAI,EAAE,gBAAgB,GAAG,CAAC,EAAE,OAAO,GAAG,SAAS;IACzE,MAAM,cAAc,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAEnE,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,gBAAgB,MAAM,CAAC,CAAC;IAElF,MAAM,GAAG,GAAG,8CAA8C,GAAG,IAAI,eAAe,CAAC;QAC/E,IAAI,EAAE,cAAc;QACpB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,CAAC;KAC3C,CAAC,CAAC,QAAQ,EAAE,CAAC;IAEd,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;IAChC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAC,EAAE;QAAC,OAAO;YACjC,GAAG,EAAE,IAAI,CAAC,CAAC;YACX,GAAG,EAAE,IAAI,CAAC,CAAC;YACX,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAA;IAAA,CAAC,CAAC,CAAC;AACR,CAAC"}
+{"version":3,"file":"geocode.js","sourceRoot":"","sources":["../../src/gpf/geocode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,MAAM,CAAC,MAAM,cAAc,GAAG,0CAA0C,CAAC;AAwBzE,wGAAwG;AAExG;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAY,EAAE,gBAAgB,GAAG,CAAC,EAAE,UAA2C,YAAY;IACrH,MAAM,cAAc,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAEnE,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,yBAAyB,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,gBAAgB,MAAM,CAAC,CAAC;IAEjG,MAAM,GAAG,GAAG,8CAA8C,GAAG,IAAI,eAAe,CAAC;QAC/E,IAAI,EAAE,cAAc;QACpB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,CAAC;KAC3C,CAAC,CAAC,QAAQ,EAAE,CAAC;IAEd,MAAM,IAAI,GAAuB,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAC,EAAE;QAAC,OAAO;YACjC,GAAG,EAAE,IAAI,CAAC,CAAC;YACX,GAAG,EAAE,IAAI,CAAC,CAAC;YACX,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAA;IAAA,CAAC,CAAC,CAAC;AACR,CAAC"}

package/dist/gpf/parcellaire-express.d.ts

@@ -1,13 +1,23 @@
 /**
- * Get items from CADASTRALPARCELS.PARCELLAIRE_EXPRESS near of a given location.
+ * Cadastral objects lookup via the Géoplateforme WFS service.
  *
- * @see https://data.geopf.fr/wfs/ows?service=WFS&version=2.0.0&request=GetCapabilities
+ * This module uses the structured WFS engine for request execution and
+ * response mapping, resolving geometry property names dynamically from
+ * the embedded catalog.
+ */
+import { type FlatItem } from '../helpers/wfs_engine/response.js';
+type ParcellaireExpressItem = FlatItem & {
+    distance: number;
+    source: string;
+};
+export declare const PARCELLAIRE_EXPRESS_SOURCE = "G\u00E9oplateforme (WFS, CADASTRALPARCELS.PARCELLAIRE_EXPRESS)";
+export declare const PARCELLAIRE_EXPRESS_TYPES: string[];
+/**
+ * Get items from CADASTRALPARCELS.PARCELLAIRE_EXPRESS near a given location.
  *
- * @param {number} lon
- * @param {number} lat
- * @param {(url: string) => Promise<any>} [fetcher]
- * @returns
+ * @param lon Longitude of the query point.
+ * @param lat Latitude of the query point.
+ * @returns The nearest cadastral objects, at most one per cadastral type.
  */
-export function getParcellaireExpress(lon: number, lat: number, fetcher?: (url: string) => Promise<any>): Promise<array<object>>;
-export const PARCELLAIRE_EXPRESS_SOURCE: "G\u00E9oplateforme (WFS, CADASTRALPARCELS.PARCELLAIRE_EXPRESS)";
-export const PARCELLAIRE_EXPRESS_TYPES: string[];
+export declare function getParcellaireExpress(lon: number, lat: number): Promise<ParcellaireExpressItem[]>;
+export {};

package/dist/gpf/parcellaire-express.js

@@ -1,7 +1,16 @@
-import _ from 'lodash';
-import distance from '../helpers/distance.js';
-import { fetchWfsFeatures, mapWfsFeature, toGeoJsonPoint } from '../helpers/wfs.js';
+/**
+ * Cadastral objects lookup via the Géoplateforme WFS service.
+ *
+ * This module uses the structured WFS engine for request execution and
+ * response mapping, resolving geometry property names dynamically from
+ * the embedded catalog.
+ */
 import logger from '../logger.js';
+import distance from '../helpers/distance.js';
+import { getFeatureType, fetchWfsMultiTypename } from '../helpers/wfs_engine/execution.js';
+import { getGeometryProperty } from '../helpers/wfs_engine/properties.js';
+import { compileDwithinSpatialFilter } from '../helpers/wfs_engine/spatialCql.js';
+import { mapToFlatItemsWithGeometry } from '../helpers/wfs_engine/response.js';
 // CADASTRALPARCELS.PARCELLAIRE_EXPRESS:
 // https://data.geopf.fr/wfs/ows?service=WFS&version=2.0.0&request=GetCapabilities
 export const PARCELLAIRE_EXPRESS_SOURCE = "Géoplateforme (WFS, CADASTRALPARCELS.PARCELLAIRE_EXPRESS)";
@@ -13,17 +22,22 @@ export const PARCELLAIRE_EXPRESS_TYPES = [
     'subdivision_fiscale',
     'localisant'
 ];
+const PARCELLAIRE_EXPRESS_TYPENAMES = PARCELLAIRE_EXPRESS_TYPES.map((type) => `CADASTRALPARCELS.PARCELLAIRE_EXPRESS:${type}`);
 /**
  * Filter items by distance keeping the nearest for each type.
  *
- * @param {array<object>} items
- * @returns {array<object>}
+ * @param items Items sorted by type then distance.
+ * @returns One item per type (the nearest).
  */
 function filterByDistance(items) {
-    const sortedItems = _.orderBy(items, ['type', 'distance'], ['asc', 'asc']);
+    const sorted = [...items].sort((a, b) => {
+        if (a.type !== b.type)
+            return a.type.localeCompare(b.type);
+        return a.distance - b.distance;
+    });
     const result = [];
     let lastType = null;
-    for (const item of sortedItems) {
+    for (const item of sorted) {
         if (lastType === item.type) {
             continue;
         }
@@ -33,26 +47,45 @@ function filterByDistance(items) {
     return result;
 }
 /**
- * Get items from CADASTRALPARCELS.PARCELLAIRE_EXPRESS near of a given location.
- *
- * @see https://data.geopf.fr/wfs/ows?service=WFS&version=2.0.0&request=GetCapabilities
+ * Get items from CADASTRALPARCELS.PARCELLAIRE_EXPRESS near a given location.
  *
- * @param {number} lon
- * @param {number} lat
- * @param {(url: string) => Promise<any>} [fetcher]
- * @returns
+ * @param lon Longitude of the query point.
+ * @param lat Latitude of the query point.
+ * @returns The nearest cadastral objects, at most one per cadastral type.
  */
-export async function getParcellaireExpress(lon, lat, fetcher) {
-    logger.info(`getParcellaireExpress(${lon},${lat}) ...`);
-    // Using EWKT format with SRID=4326 prefix for standard lon,lat order
-    const cql_filter = `DWITHIN(geom,SRID=4326;POINT(${lon} ${lat}),10,meters)`;
-    const typeNames = PARCELLAIRE_EXPRESS_TYPES.map((type) => `CADASTRALPARCELS.PARCELLAIRE_EXPRESS:${type}`);
-    const sourceGeom = toGeoJsonPoint(lon, lat);
-    const features = await fetchWfsFeatures(typeNames, cql_filter, 'PARCELLAIRE_EXPRESS', fetcher);
-    return filterByDistance(features.map((feature) => ({
-        ...mapWfsFeature(feature, typeNames),
-        distance: distance(sourceGeom, feature.geometry),
-        source: PARCELLAIRE_EXPRESS_SOURCE,
-    })));
+export async function getParcellaireExpress(lon, lat) {
+    logger.debug(`[gpf:parcellaire-express] getParcellaireExpress(${lon},${lat}) ...`);
+    const spatialFilter = {
+        operator: "dwithin_point",
+        lon,
+        lat,
+        distance_m: 10,
+    };
+    // Resolve and compile one spatial filter per typename to avoid relying on
+    // cross-layer geometry property homogeneity.
+    const cqlFilters = await Promise.all(PARCELLAIRE_EXPRESS_TYPENAMES.map(async (typename) => {
+        const featureType = await getFeatureType(typename);
+        const geometryProperty = getGeometryProperty(featureType);
+        return compileDwithinSpatialFilter(geometryProperty, spatialFilter);
+    }));
+    // Execute the multi-typename WFS query
+    const featureCollection = await fetchWfsMultiTypename({
+        typenames: PARCELLAIRE_EXPRESS_TYPENAMES,
+        cqlFilters,
+        errorLabel: 'PARCELLAIRE_EXPRESS',
+    });
+    // Map to flat items preserving geometry for distance calculation
+    const sourceGeom = { type: "Point", coordinates: [lon, lat] };
+    const items = mapToFlatItemsWithGeometry(featureCollection, PARCELLAIRE_EXPRESS_TYPENAMES);
+    // Calculate distances, strip temporary geometry, and filter
+    const enrichedItems = items.map((item) => {
+        const { _rawGeometry: _, ...rest } = item;
+        return {
+            ...rest,
+            distance: distance(sourceGeom, item._rawGeometry),
+            source: PARCELLAIRE_EXPRESS_SOURCE,
+        };
+    });
+    return filterByDistance(enrichedItems);
 }
 //# sourceMappingURL=parcellaire-express.js.map

package/dist/gpf/parcellaire-express.js.map

@@ -1 +1 @@
-{"version":3,"file":"parcellaire-express.js","sourceRoot":"","sources":["../../src/gpf/parcellaire-express.js"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAC;AAEvB,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,wCAAwC;AACxC,kFAAkF;AAElF,MAAM,CAAC,MAAM,0BAA0B,GAAG,2DAA2D,CAAC;AACtG,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACrC,gBAAgB;IAChB,SAAS;IACT,SAAS;IACT,UAAU;IACV,qBAAqB;IACrB,YAAY;CACf,CAAC;AAEF;;;;;GAKG;AACH,SAAS,gBAAgB,CAAC,KAAK;IAC3B,MAAM,WAAW,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAE3E,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,IAAI,QAAQ,GAAG,IAAI,CAAC;IACpB,KAAM,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;QAC9B,IAAK,QAAQ,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;YAC1B,SAAS;QACb,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClB,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC;IACzB,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAGD;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO;IACzD,MAAM,CAAC,IAAI,CAAC,yBAAyB,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC;IACxD,qEAAqE;IACrE,MAAM,UAAU,GAAG,gCAAgC,GAAG,IAAI,GAAG,cAAc,CAAC;IAC5E,MAAM,SAAS,GAAG,yBAAyB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,wCAAwC,IAAI,EAAE,CAAC,CAAC;IAE1G,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAE5C,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,SAAS,EAAE,UAAU,EAAE,qBAAqB,EAAE,OAAO,CAAC,CAAC;IAC/F,OAAO,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC/C,GAAG,aAAa,CAAC,OAAO,EAAE,SAAS,CAAC;QACpC,QAAQ,EAAE,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC;QAChD,MAAM,EAAE,0BAA0B;KACrC,CAAC,CAAC,CAAC,CAAC;AACT,CAAC"}
+{"version":3,"file":"parcellaire-express.js","sourceRoot":"","sources":["../../src/gpf/parcellaire-express.ts"],"names":[],"mappings":"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"}

package/dist/gpf/urbanisme.d.ts

@@ -1,22 +1,30 @@
 /**
- * Get urbanism infos for a given location
+ * Urban planning and SUP (servitudes d'utilité publique) lookup via the Géoplateforme WFS service.
  *
- * @param {number} lon
- * @param {number} lat
- * @param {(url: string) => Promise<any>} [fetcher]
- * @returns
+ * This module uses the structured WFS engine for request execution and
+ * response mapping, resolving geometry property names dynamically from
+ * the embedded catalog.
  */
-export function getUrbanisme(lon: number, lat: number, fetcher?: (url: string) => Promise<any>): Promise<{}[]>;
+import { type FlatItem } from '../helpers/wfs_engine/response.js';
+type UrbanismeItem = FlatItem & {
+    distance: number;
+};
+export declare const URBANISME_TYPES: string[];
+export declare const URBANISME_SOURCE = "G\u00E9oplateforme - (WFS G\u00E9oportail de l'Urbanisme)";
 /**
- * Get SUP infos for a given location
+ * Get urbanism infos for a given location.
  *
- * @param {number} lon
- * @param {number} lat
- * @param {(url: string) => Promise<any>} [fetcher]
- * @returns
+ * @param lon Longitude of the query point.
+ * @param lat Latitude of the query point.
+ * @returns Urban planning objects relevant to the requested point.
  */
-export function getAssiettesServitudes(lon: number, lat: number, fetcher?: (url: string) => Promise<any>): Promise<{
-    distance: number;
-}[]>;
-export const URBANISME_TYPES: string[];
-export const URBANISME_SOURCE: "G\u00E9oplateforme - (WFS G\u00E9oportail de l'Urbanisme)";
+export declare function getUrbanisme(lon: number, lat: number): Promise<Record<string, unknown>[]>;
+/**
+ * Get SUP infos for a given location.
+ *
+ * @param lon Longitude of the query point.
+ * @param lat Latitude of the query point.
+ * @returns SUP footprints relevant to the requested point.
+ */
+export declare function getAssiettesServitudes(lon: number, lat: number): Promise<UrbanismeItem[]>;
+export {};

package/dist/gpf/urbanisme.js

@@ -1,6 +1,16 @@
-import distance from "../helpers/distance.js";
-import { fetchWfsFeatures, mapWfsFeature, toGeoJsonPoint } from "../helpers/wfs.js";
-import logger from "../logger.js";
+/**
+ * Urban planning and SUP (servitudes d'utilité publique) lookup via the Géoplateforme WFS service.
+ *
+ * This module uses the structured WFS engine for request execution and
+ * response mapping, resolving geometry property names dynamically from
+ * the embedded catalog.
+ */
+import logger from '../logger.js';
+import distance from '../helpers/distance.js';
+import { getFeatureType, fetchWfsMultiTypename } from '../helpers/wfs_engine/execution.js';
+import { getGeometryProperty } from '../helpers/wfs_engine/properties.js';
+import { compileDwithinSpatialFilter } from '../helpers/wfs_engine/spatialCql.js';
+import { mapToFlatItemsWithGeometry } from '../helpers/wfs_engine/response.js';
 // https://data.geopf.fr/wfs/ows?service=WFS&version=2.0.0&request=GetCapabilities
 export const URBANISME_TYPES = [
     'wfs_scot:scot',
@@ -33,25 +43,43 @@ function sanitizeUrbanismeItem(item) {
     return sanitized;
 }
 /**
- * Get urbanism infos for a given location
+ * Get urbanism infos for a given location.
  *
- * @param {number} lon
- * @param {number} lat
- * @param {(url: string) => Promise<any>} [fetcher]
- * @returns
+ * @param lon Longitude of the query point.
+ * @param lat Latitude of the query point.
+ * @returns Urban planning objects relevant to the requested point.
  */
-export async function getUrbanisme(lon, lat, fetcher) {
-    logger.info(`getUrbanisme(${lon},${lat})...`);
-    // Using EWKT format with SRID=4326 prefix for standard lon,lat order
-    const cql_filter = `DWITHIN(the_geom,SRID=4326;POINT(${lon} ${lat}),30,meters)`;
-    const sourceGeom = toGeoJsonPoint(lon, lat);
-    const features = await fetchWfsFeatures(URBANISME_TYPES, cql_filter, 'Urbanisme', fetcher);
-    return features.map((feature) => {
-        const item = {
-            ...mapWfsFeature(feature, URBANISME_TYPES),
-            distance: distance(sourceGeom, feature.geometry),
+export async function getUrbanisme(lon, lat) {
+    logger.debug(`[gpf:urbanisme] getUrbanisme(${lon},${lat})...`);
+    const spatialFilter = {
+        operator: "dwithin_point",
+        lon,
+        lat,
+        distance_m: 30,
+    };
+    // Resolve and compile one spatial filter per typename to avoid relying on
+    // cross-layer geometry property homogeneity.
+    const cqlFilters = await Promise.all(URBANISME_TYPES.map(async (typename) => {
+        const featureType = await getFeatureType(typename);
+        const geometryProperty = getGeometryProperty(featureType);
+        return compileDwithinSpatialFilter(geometryProperty, spatialFilter);
+    }));
+    // Execute the multi-typename WFS query
+    const featureCollection = await fetchWfsMultiTypename({
+        typenames: URBANISME_TYPES,
+        cqlFilters,
+        errorLabel: 'Urbanisme',
+    });
+    // Map to flat items preserving geometry for distance calculation
+    const sourceGeom = { type: "Point", coordinates: [lon, lat] };
+    const items = mapToFlatItemsWithGeometry(featureCollection, URBANISME_TYPES);
+    return items.map((item) => {
+        const { _rawGeometry: _, ...rest } = item;
+        const urbanismeItem = {
+            ...rest,
+            distance: distance(sourceGeom, item._rawGeometry),
         };
-        return sanitizeUrbanismeItem(item);
+        return sanitizeUrbanismeItem(urbanismeItem);
     });
 }
 const ASSIETTES_SUP_TYPES = [
@@ -60,22 +88,42 @@ const ASSIETTES_SUP_TYPES = [
     'wfs_sup:assiette_sup_s',
 ];
 /**
- * Get SUP infos for a given location
+ * Get SUP infos for a given location.
  *
- * @param {number} lon
- * @param {number} lat
- * @param {(url: string) => Promise<any>} [fetcher]
- * @returns
+ * @param lon Longitude of the query point.
+ * @param lat Latitude of the query point.
+ * @returns SUP footprints relevant to the requested point.
  */
-export async function getAssiettesServitudes(lon, lat, fetcher) {
-    logger.info(`getAssiettesServitudes(${lon},${lat})...`);
-    // Using EWKT format with SRID=4326 prefix for standard lon,lat order
-    const cql_filter = `DWITHIN(the_geom,SRID=4326;POINT(${lon} ${lat}),30,meters)`;
-    const sourceGeom = toGeoJsonPoint(lon, lat);
-    const features = await fetchWfsFeatures(ASSIETTES_SUP_TYPES, cql_filter, 'Urbanisme', fetcher);
-    return features.map((feature) => ({
-        ...mapWfsFeature(feature, ASSIETTES_SUP_TYPES),
-        distance: distance(sourceGeom, feature.geometry),
+export async function getAssiettesServitudes(lon, lat) {
+    logger.debug(`[gpf:urbanisme] getAssiettesServitudes(${lon},${lat})...`);
+    const spatialFilter = {
+        operator: "dwithin_point",
+        lon,
+        lat,
+        distance_m: 30,
+    };
+    // Resolve and compile one spatial filter per typename to avoid relying on
+    // cross-layer geometry property homogeneity.
+    const cqlFilters = await Promise.all(ASSIETTES_SUP_TYPES.map(async (typename) => {
+        const featureType = await getFeatureType(typename);
+        const geometryProperty = getGeometryProperty(featureType);
+        return compileDwithinSpatialFilter(geometryProperty, spatialFilter);
     }));
+    // Execute the multi-typename WFS query
+    const featureCollection = await fetchWfsMultiTypename({
+        typenames: ASSIETTES_SUP_TYPES,
+        cqlFilters,
+        errorLabel: 'Urbanisme',
+    });
+    // Map to flat items preserving geometry for distance calculation
+    const sourceGeom = { type: "Point", coordinates: [lon, lat] };
+    const items = mapToFlatItemsWithGeometry(featureCollection, ASSIETTES_SUP_TYPES);
+    return items.map((item) => {
+        const { _rawGeometry: _, ...rest } = item;
+        return {
+            ...rest,
+            distance: distance(sourceGeom, item._rawGeometry),
+        };
+    });
 }
 //# sourceMappingURL=urbanisme.js.map

package/dist/gpf/urbanisme.js.map

@@ -1 +1 @@
-{"version":3,"file":"urbanisme.js","sourceRoot":"","sources":["../../src/gpf/urbanisme.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"urbanisme.js","sourceRoot":"","sources":["../../src/gpf/urbanisme.ts"],"names":[],"mappings":"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"}