@ignfab/geocontext 0.9.0 → 0.9.1

package/README.md

@@ -14,7 +14,7 @@ L'idée est ici d'**expérimenter la conception d'un MCP rendant les données et
 
 ## Mises en garde
 
-- Ce développement est un POC en incubation avec IgnFab (archivage en cours de [mborne/geocontext](https://github.com/mborne/geocontext))
+- Ce développement est un POC en incubation au sein d'ignfab (archivage en cours de [mborne/geocontext](https://github.com/mborne/geocontext))
 - S'il s'avère utile de l'industrialiser, le dépôt sera migré sous responsabilité IGN et l'outil sera renommé (ex : `IGNF/mcp-gpf-server`)
 - Plusieurs problèmes et améliorations possibles ont été identifiés et sont en cours de mitigation/résolution (c.f. [issues](https://github.com/ignfab/geocontext/issues?q=is%3Aissue%20state%3Aopen%20label%3Ametadata)).
 - Cet outil n'est pas magique (voir [Fonctionnalités](#fonctionnalités) pour avoir une idée de ses capacités)
@@ -74,6 +74,8 @@ npm run build
 
 ### Utilisation de la version locale
 
+#### Avec un client MCP compatible JSON
+
 ```json
 {
   "mcpServers": {
@@ -85,6 +87,27 @@ npm run build
 }
 ```
 
+#### Avec Codex CLI / VS Code
+
+Avec Codex CLI ou l'extension Codex pour VS Code, la configuration se fait dans `~/.codex/config.toml` :
+
+```toml
+[mcp_servers.geocontext]
+command = "node"
+args = ["/chemin/absolu/vers/geocontext/dist/index.js"]
+
+# Définition d'un corporate proxy si nécessaire
+[mcp_servers.geocontext.env]
+HTTPS_PROXY = "http://proxy.domain.fr:3128"
+HTTP_PROXY = "http://proxy.domain.fr:3128"
+NO_PROXY = "localhost,127.0.0.1"
+http_proxy = "http://proxy.domain.fr:3128"
+https_proxy = "http://proxy.domain.fr:3128"
+no_proxy = "localhost,127.0.0.1"
+```
+
+Après mise à jour de `~/.codex/config.toml`, relancer la session Codex CLI ou recharger VS Code si l'extension Codex est déjà ouverte.
+
 ### Debug de la version locale
 
 ```bash
@@ -98,15 +121,15 @@ Pour une utilisation avancée :
 | Nom              | Description                                                                                                          | Valeur par défaut |
 | ---------------- | -------------------------------------------------------------------------------------------------------------------- | ----------------- |
 | `TRANSPORT_TYPE` | [Transport](https://mcp-framework.com/docs/Transports/transports-overview) permet de choisir entre "stdio" et "http" | "stdio"           |
-| `GPF_WFS_SEARCH_OPTIONS` | Chaîne JSON optionnelle pour ajuster la recherche `gpf_wfs_search_types` (`fuzzy`, `boost.namespace`, `boost.name`, `boost.title`, `boost.description`, `boost.properties`). | options par défaut de `@ignfab/gpf-schema-store` |
+| `GPF_WFS_MINISEARCH_OPTIONS` | Chaîne JSON optionnelle pour ajuster les options MiniSearch utilisées par `gpf_wfs_search_types` (`fields`, `combineWith`, `fuzzy`, `boost.namespace`, `boost.name`, `boost.title`, `boost.description`, `boost.properties`, `boost.enums`, `boost.identifierTokens`). | options par défaut de `@ignfab/gpf-schema-store` |
 
 Exemple :
 
 ```bash
-export GPF_WFS_SEARCH_OPTIONS='{"fuzzy":0.05,"boost":{"title":4,"name":5}}'
+export GPF_WFS_MINISEARCH_OPTIONS='{"fields":["title","identifierTokens"],"combineWith":"OR","fuzzy":0.05,"boost":{"title":4,"name":5}}'
 ```
 
-Si `GPF_WFS_SEARCH_OPTIONS` est absent ou vide, les options par défaut restent celles de `@ignfab/gpf-schema-store`.
+Si `GPF_WFS_MINISEARCH_OPTIONS` est absent ou vide, les options par défaut restent celles de `@ignfab/gpf-schema-store`, y compris le comportement par défaut `OR` de MiniSearch pour `combineWith`.
 
 Remarque :
 
@@ -148,18 +171,18 @@ L'idée est ici de répondre à des précises en traitant côté serveur les app
 
 ### Explorer les données vecteurs
 
-#### Explorer les tables
-
-* [gpf_wfs_list_types()](src/tools/GpfWfsListTypesTool.ts) pour **lister les tables connues du catalogue de schémas embarqué** - **déprécié (trop de résultats)**
-* [gpf_wfs_search_types(keywords,max_results=10)](src/tools/GpfWfsSearchTypesTool.ts) pour **rechercher des tables dans le catalogue de schémas embarqué**. La recherche est textuelle et configurable via `GPF_WFS_SEARCH_OPTIONS`.
+#### Explorer les tables
+
+* [gpf_wfs_list_types()](src/tools/GpfWfsListTypesTool.ts) pour **lister de façon exhaustive les types WFS connus du catalogue de schémas embarqué**. Cet outil est surtout utile pour un inventaire complet ou une exploration globale du catalogue ; pour trouver rapidement un type pertinent, préférer `gpf_wfs_search_types`.
+* [gpf_wfs_search_types(keywords,max_results=10)](src/tools/GpfWfsSearchTypesTool.ts) pour **rechercher un type WFS pertinent à partir de mots-clés et obtenir un `typename` valide**. La recherche est textuelle et configurable via `GPF_WFS_MINISEARCH_OPTIONS`.
 
 > - Quels sont les millésimes ADMINEXPRESS disponibles sur la Géoplateforme?
 > - Quelle est la table de la BDTOPO correspondant aux bâtiments?
 > - Dans quelle table de la BDTOPO peut-on trouver les ponts?
 
-#### Explorer la structure des tables
-
-* [gpf_wfs_describe_type(typename)](src/tools/GpfWfsDescribeTypeTool.ts) pour récupérer le **schéma détaillé d'une table** depuis le catalogue embarqué (`id`, `namespace`, `name`, `title`, `description`, `properties`)
+#### Explorer la structure des tables
+
+* [gpf_wfs_describe_type(typename)](src/tools/GpfWfsDescribeTypeTool.ts) pour récupérer le **schéma détaillé d'un type WFS** depuis le catalogue embarqué (`id`, `namespace`, `name`, `title`, `description`, `properties`), en particulier avant d'appeler `gpf_wfs_get_features`
 
 > - Quelles sont les informations disponibles pour les communes avec ADMINEXPRESS-COG.LATEST?
 > - Compare le modèle des communes entre ADMINEXPRESS-COG:2024 et ADMINEXPRESS-COG.LATEST

package/dist/gpf/adminexpress.d.ts

@@ -3,9 +3,10 @@
  *
  * @param {number} lon
  * @param {number} lat
+ * @param {(url: string) => Promise<any>} [fetcher]
  * @returns {object[]}
  */
-export function getAdminUnits(lon: number, lat: number): object[];
+export function getAdminUnits(lon: number, lat: number, fetcher?: (url: string) => Promise<any>): object[];
 /**
  * ADMINEXPRESS-COG.LATEST:{type}
  *

package/dist/gpf/adminexpress.js

@@ -1,6 +1,6 @@
+import _ from 'lodash';
 import { fetchJSON } from '../helpers/http.js';
 import logger from '../logger.js';
-import _ from 'lodash';
 /**
  * ADMINEXPRESS-COG.LATEST:{type}
  *
@@ -21,9 +21,10 @@ export const ADMINEXPRESS_TYPES = [
  *
  * @param {number} lon
  * @param {number} lat
+ * @param {(url: string) => Promise<any>} [fetcher]
  * @returns {object[]}
  */
-export async function getAdminUnits(lon, lat) {
+export async function getAdminUnits(lon, lat, fetcher = fetchJSON) {
     logger.info(`[adminexpress] getAdminUnits(${lon},${lat})...`);
     // note that EPSG:4326 means lat,lon order for GeoServer -> flipped coordinates...
     const cql_filter = `INTERSECTS(geometrie,Point(${lat} ${lon}))`;
@@ -35,7 +36,10 @@ export async function getAdminUnits(lon, lat) {
         outputFormat: 'application/json',
         cql_filter: cql_filter
     }).toString();
-    const featureCollection = await fetchJSON(url);
+    const featureCollection = await fetcher(url);
+    if (!Array.isArray(featureCollection?.features)) {
+        throw new Error("Le service ADMINEXPRESS n'a pas retourné de collection d'objets exploitable");
+    }
     return featureCollection.features.map((feature) => {
         // parse type from id (ex: "commune.3837")
         const type = feature.id.split('.')[0];

package/dist/gpf/adminexpress.js.map

@@ -1 +1 @@
-{"version":3,"file":"adminexpress.js","sourceRoot":"","sources":["../../src/gpf/adminexpress.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,OAAO,CAAC,MAAM,QAAQ,CAAC;AAEvB;;;;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;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,GAAG,EAAE,GAAG;IACxC,MAAM,CAAC,IAAI,CAAC,gCAAgC,GAAG,IAAI,GAAG,MAAM,CAAC,CAAC;IAE9D,kFAAkF;IAClF,MAAM,UAAU,GAAG,8BAA8B,GAAG,IAAI,GAAG,IAAI,CAAC;IAEhE,uDAAuD;IACvD,MAAM,GAAG,GAAG,4BAA4B,GAAG,IAAI,eAAe,CAAC;QAC3D,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,YAAY;QACrB,QAAQ,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,2BAA2B,IAAI,EAAE,CAAA,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAClG,YAAY,EAAE,kBAAkB;QAChC,UAAU,EAAE,UAAU;KACzB,CAAC,CAAC,QAAQ,EAAE,CAAC;IAEd,MAAM,iBAAiB,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,CAAC;IAC/C,OAAO,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC9C,0CAA0C;QAC1C,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACtC,wCAAwC;QACxC,OAAO,MAAM,CAAC,MAAM,CAAC;YACjB,IAAI,EAAE,IAAI;YACV,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,OAAO,CAAC,IAAI;SACrB,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"adminexpress.js","sourceRoot":"","sources":["../../src/gpf/adminexpress.js"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAC;AAEvB,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,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,GAAG,SAAS;IAC7D,MAAM,CAAC,IAAI,CAAC,gCAAgC,GAAG,IAAI,GAAG,MAAM,CAAC,CAAC;IAE9D,kFAAkF;IAClF,MAAM,UAAU,GAAG,8BAA8B,GAAG,IAAI,GAAG,IAAI,CAAC;IAEhE,uDAAuD;IACvD,MAAM,GAAG,GAAG,4BAA4B,GAAG,IAAI,eAAe,CAAC;QAC3D,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,YAAY;QACrB,QAAQ,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,2BAA2B,IAAI,EAAE,CAAA,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAClG,YAAY,EAAE,kBAAkB;QAChC,UAAU,EAAE,UAAU;KACzB,CAAC,CAAC,QAAQ,EAAE,CAAC;IAEd,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,KAAK,CAAC,6EAA6E,CAAC,CAAC;IACnG,CAAC;IACD,OAAO,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC9C,0CAA0C;QAC1C,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACtC,wCAAwC;QACxC,OAAO,MAAM,CAAC,MAAM,CAAC;YACjB,IAAI,EAAE,IAAI;YACV,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,OAAO,CAAC,IAAI;SACrB,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/gpf/altitude.d.ts

@@ -5,9 +5,10 @@
  *
  * @param {number} lon
  * @param {number} lat
+ * @param {(url: string) => Promise<any>} [fetcher]
  * @returns
  */
-export function getAltitudeByLocation(lon: number, lat: number): Promise<{
+export function getAltitudeByLocation(lon: number, lat: number, fetcher?: (url: string) => Promise<any>): Promise<{
     lon: number;
     lat: number;
     altitude: any;

package/dist/gpf/altitude.js

@@ -1,5 +1,5 @@
-import logger from "../logger.js";
 import { fetchJSON } from "../helpers/http.js";
+import logger from "../logger.js";
 export const ALTITUDE_SOURCE = "Géoplateforme (altimétrie)";
 /**
  * Get altitude for a given location.
@@ -8,28 +8,22 @@ export const ALTITUDE_SOURCE = "Géoplateforme (altimétrie)";
  *
  * @param {number} lon
  * @param {number} lat
+ * @param {(url: string) => Promise<any>} [fetcher]
  * @returns
  */
-export async function getAltitudeByLocation(lon, lat) {
+export async function getAltitudeByLocation(lon, lat, fetcher = fetchJSON) {
     logger.info(`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`;
-    try {
-        const json = await fetchJSON(url);
-        const elevation = json.elevations[0];
-        return {
-            lon: lon,
-            lat: lat,
-            altitude: elevation.z,
-            accuracy: elevation.acc,
-        };
-    }
-    catch (e) {
-        return {
-            lon: lon,
-            lat: lat,
-            altitude: null,
-            accuracy: 'No data',
-        };
+    const json = await fetcher(url);
+    const elevation = json?.elevations?.[0];
+    if (!elevation) {
+        throw new Error("Le service d'altitude n'a renvoyé aucune donnée d'altitude");
     }
+    return {
+        lon: lon,
+        lat: lat,
+        altitude: elevation.z,
+        accuracy: elevation.acc,
+    };
 }
 //# sourceMappingURL=altitude.js.map

package/dist/gpf/altitude.js.map

@@ -1 +1 @@
-{"version":3,"file":"altitude.js","sourceRoot":"","sources":["../../src/gpf/altitude.js"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,MAAM,CAAC,MAAM,eAAe,GAAG,4BAA4B,CAAC;AAE5D;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,GAAG,EAAE,GAAG;IAChD,MAAM,CAAC,IAAI,CAAC,yBAAyB,GAAG,IAAI,GAAG,MAAM,CAAC,CAAC;IAEvD,MAAM,GAAG,GAAG,4EAA4E,GAAG,QAAQ,GAAG,4BAA4B,CAAC;IACnI,IAAI,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,CAAC;QAClC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAE;QACtC,OAAO;YACH,GAAG,EAAE,GAAG;YACR,GAAG,EAAE,GAAG;YACR,QAAQ,EAAE,SAAS,CAAC,CAAC;YACrB,QAAQ,EAAE,SAAS,CAAC,GAAG;SAC1B,CAAC;IACN,CAAC;IAAA,OAAM,CAAC,EAAC,CAAC;QACN,OAAO;YACH,GAAG,EAAE,GAAG;YACR,GAAG,EAAE,GAAG;YACR,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,SAAS;SACtB,CAAC;IACN,CAAC;AAGL,CAAC"}
+{"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"}

package/dist/gpf/geocode.d.ts

@@ -4,7 +4,9 @@
  * @see https://geoservices.ign.fr/documentation/services/services-geoplateforme/autocompletion
  *
  * @param {string} text
+ * @param {number} [maximumResponses=3]
+ * @param {(url: string) => Promise<any>} [fetcher]
  * @returns
  */
-export function geocode(text: string): Promise<any>;
+export function geocode(text: string, maximumResponses?: number, fetcher?: (url: string) => Promise<any>): Promise<any>;
 export const GEOCODE_SOURCE: "G\u00E9oplateforme (service d'autocompl\u00E9tion)";

package/dist/gpf/geocode.js

@@ -1,26 +1,37 @@
-import logger from "../logger.js";
 import { fetchJSON } 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
 /**
  * Get coordinates for a given location
  *
  * @see https://geoservices.ign.fr/documentation/services/services-geoplateforme/autocompletion
  *
  * @param {string} text
+ * @param {number} [maximumResponses=3]
+ * @param {(url: string) => Promise<any>} [fetcher]
  * @returns
  */
-export async function geocode(text) {
-    logger.info(`geocode(${JSON.stringify(text)})...`);
+export async function geocode(text, maximumResponses = 3, fetcher = fetchJSON) {
+    const normalizedText = typeof text === "string" ? text.trim() : "";
+    if (!normalizedText) {
+        return [];
+    }
+    logger.info(`geocode(${JSON.stringify(normalizedText)}, ${maximumResponses})...`);
     const url = 'https://data.geopf.fr/geocodage/completion/?' + new URLSearchParams({
-        text: text,
-        maximumResponses: 3
+        text: normalizedText,
+        maximumResponses: String(maximumResponses)
     }).toString();
-    const json = await fetchJSON(url);
-    return json.results.map((item) => {
+    const json = await fetcher(url);
+    const results = Array.isArray(json?.results) ? json.results : [];
+    return results.map((item) => {
         return {
             lon: item.x,
             lat: item.y,
-            fulltext: item.fulltext
+            fulltext: item.fulltext,
+            kind: item.kind,
+            city: item.city,
+            zipcode: item.zipcode
         };
     });
 }

package/dist/gpf/geocode.js.map

@@ -1 +1 @@
-{"version":3,"file":"geocode.js","sourceRoot":"","sources":["../../src/gpf/geocode.js"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,MAAM,CAAC,MAAM,cAAc,GAAG,0CAA0C,CAAC;AAEzE;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAI;IAC9B,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEnD,MAAM,GAAG,GAAG,8CAA8C,GAAG,IAAI,eAAe,CAAC;QAC/E,IAAI,EAAE,IAAI;QACV,gBAAgB,EAAE,CAAC;KACpB,CAAC,CAAC,QAAQ,EAAE,CAAC;IAEd,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,CAAC;IAClC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAC,EAAE;QAAC,OAAO;YACtC,GAAG,EAAE,IAAI,CAAC,CAAC;YACX,GAAG,EAAE,IAAI,CAAC,CAAC;YACX,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAA;IAAA,CAAC,CAAC,CAAC;AACR,CAAC"}
+{"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"}

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

@@ -5,8 +5,9 @@
  *
  * @param {number} lon
  * @param {number} lat
+ * @param {(url: string) => Promise<any>} [fetcher]
  * @returns
  */
-export function getParcellaireExpress(lon: number, lat: number): Promise<array<object>>;
+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[];

package/dist/gpf/parcellaire-express.js

@@ -1,7 +1,7 @@
-import logger from '../logger.js';
-import distance from '../helpers/distance.js';
 import _ from 'lodash';
+import distance from '../helpers/distance.js';
 import { fetchJSON } from '../helpers/http.js';
+import logger from '../logger.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)";
@@ -39,9 +39,10 @@ function filterByDistance(items) {
  *
  * @param {number} lon
  * @param {number} lat
+ * @param {(url: string) => Promise<any>} [fetcher]
  * @returns
  */
-export async function getParcellaireExpress(lon, lat) {
+export async function getParcellaireExpress(lon, lat, fetcher = fetchJSON) {
     logger.info(`getParcellaireExpress(${lon},${lat}) ...`);
     // note that EPSG:4326 means lat,lon order for GeoServer -> flipped coordinates...
     const cql_filter = `DWITHIN(geom,Point(${lat} ${lon}),10,meters)`;
@@ -57,7 +58,10 @@ export async function getParcellaireExpress(lon, lat) {
         outputFormat: 'application/json',
         cql_filter: cql_filter
     }).toString();
-    const featureCollection = await fetchJSON(url);
+    const featureCollection = await fetcher(url);
+    if (!Array.isArray(featureCollection?.features)) {
+        throw new Error("Le service PARCELLAIRE_EXPRESS n'a pas retourné de collection d'objets exploitable");
+    }
     return filterByDistance(featureCollection.features.map((feature) => {
         // parse type from id (ex: "commune.3837")
         const type = feature.id.split('.')[0];

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,MAAM,MAAM,cAAc,CAAC;AAElC,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAE9C,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,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,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACzB,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;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,GAAG,EAAE,GAAG;IAChD,MAAM,CAAC,IAAI,CAAC,yBAAyB,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC;IACxD,kFAAkF;IAClF,MAAM,UAAU,GAAG,sBAAsB,GAAG,IAAI,GAAG,cAAc,CAAC;IAElE,MAAM,UAAU,GAAG;QACf,MAAM,EAAE,OAAO;QACf,aAAa,EAAE,CAAC,GAAG,EAAC,GAAG,CAAC;KAC3B,CAAC;IAEF,uDAAuD;IACvD,MAAM,GAAG,GAAG,4BAA4B,GAAG,IAAI,eAAe,CAAC;QAC3D,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,YAAY;QACrB,QAAQ,EAAE,yBAAyB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,wCAAwC,IAAI,EAAE,CAAA,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QACtH,YAAY,EAAE,kBAAkB;QAChC,UAAU,EAAE,UAAU;KACzB,CAAC,CAAC,QAAQ,EAAE,CAAC;IAEd,MAAM,iBAAiB,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,CAAC;IAC/C,OAAO,gBAAgB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC/D,0CAA0C;QAC1C,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACtC,wCAAwC;QACxC,OAAO,MAAM,CAAC,MAAM,CAAC;YACjB,IAAI,EAAE,IAAI;YACV,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,QAAQ,EAAE,QAAQ,CACd,UAAU,EACV,OAAO,CAAC,QAAQ,CACnB;YACD,MAAM,EAAE,0BAA0B;SACrC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC,CAAC;AACR,CAAC"}
+{"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,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,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,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACzB,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,GAAG,SAAS;IACrE,MAAM,CAAC,IAAI,CAAC,yBAAyB,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC;IACxD,kFAAkF;IAClF,MAAM,UAAU,GAAG,sBAAsB,GAAG,IAAI,GAAG,cAAc,CAAC;IAElE,MAAM,UAAU,GAAG;QACf,MAAM,EAAE,OAAO;QACf,aAAa,EAAE,CAAC,GAAG,EAAC,GAAG,CAAC;KAC3B,CAAC;IAEF,uDAAuD;IACvD,MAAM,GAAG,GAAG,4BAA4B,GAAG,IAAI,eAAe,CAAC;QAC3D,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,YAAY;QACrB,QAAQ,EAAE,yBAAyB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,wCAAwC,IAAI,EAAE,CAAA,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QACtH,YAAY,EAAE,kBAAkB;QAChC,UAAU,EAAE,UAAU;KACzB,CAAC,CAAC,QAAQ,EAAE,CAAC;IAEd,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,KAAK,CAAC,oFAAoF,CAAC,CAAC;IAC1G,CAAC;IACD,OAAO,gBAAgB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC/D,0CAA0C;QAC1C,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACtC,wCAAwC;QACxC,OAAO,MAAM,CAAC,MAAM,CAAC;YACjB,IAAI,EAAE,IAAI;YACV,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,QAAQ,EAAE,QAAQ,CACd,UAAU,EACV,OAAO,CAAC,QAAQ,CACnB;YACD,MAAM,EAAE,0BAA0B;SACrC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC,CAAC;AACR,CAAC"}

package/dist/gpf/urbanisme.d.ts

@@ -3,16 +3,18 @@
  *
  * @param {number} lon
  * @param {number} lat
+ * @param {(url: string) => Promise<any>} [fetcher]
  * @returns
  */
-export function getUrbanisme(lon: number, lat: number): Promise<any>;
+export function getUrbanisme(lon: number, lat: number, fetcher?: (url: string) => Promise<any>): Promise<any>;
 /**
  * Get SUP infos for a given location
  *
  * @param {number} lon
  * @param {number} lat
+ * @param {(url: string) => Promise<any>} [fetcher]
  * @returns
  */
-export function getAssiettesServitudes(lon: number, lat: number): Promise<any>;
+export function getAssiettesServitudes(lon: number, lat: number, fetcher?: (url: string) => Promise<any>): Promise<any>;
 export const URBANISME_TYPES: string[];
 export const URBANISME_SOURCE: "G\u00E9oplateforme - (WFS G\u00E9oportail de l'Urbanisme)";

package/dist/gpf/urbanisme.js

@@ -15,14 +15,33 @@ export const URBANISME_TYPES = [
     'wfs_du:prescription_surf'
 ];
 export const URBANISME_SOURCE = "Géoplateforme - (WFS Géoportail de l'Urbanisme)";
+const URBANISME_INVALID_COLLECTION_ERROR = "Le service Urbanisme n'a pas retourné de collection d'objets exploitable";
+const URBANISME_EXCLUDED_PROPERTIES = new Set([
+    'gpu_status',
+    'urlfic'
+]);
+function sanitizeUrbanismeItem(item) {
+    const sanitized = {};
+    for (const [key, value] of Object.entries(item)) {
+        if (URBANISME_EXCLUDED_PROPERTIES.has(key)) {
+            continue;
+        }
+        if (value === null || value === '') {
+            continue;
+        }
+        sanitized[key] = value;
+    }
+    return sanitized;
+}
 /**
  * Get urbanism infos for a given location
  *
  * @param {number} lon
  * @param {number} lat
+ * @param {(url: string) => Promise<any>} [fetcher]
  * @returns
  */
-export async function getUrbanisme(lon, lat) {
+export async function getUrbanisme(lon, lat, fetcher = fetchJSON) {
     logger.info(`getUrbanisme(${lon},${lat})...`);
     // note that EPSG:4326 means lat,lon order for GeoServer -> flipped coordinates...
     const cql_filter = `DWITHIN(the_geom,Point(${lat} ${lon}),30,meters)`;
@@ -38,17 +57,21 @@ export async function getUrbanisme(lon, lat) {
         outputFormat: 'application/json',
         cql_filter: cql_filter
     }).toString();
-    const featureCollection = await fetchJSON(url);
+    const featureCollection = await fetcher(url);
+    if (!Array.isArray(featureCollection?.features)) {
+        throw new Error(URBANISME_INVALID_COLLECTION_ERROR);
+    }
     return featureCollection.features.map((feature) => {
         // parse type from id (ex: "commune.3837")
         const type = feature.id.split('.')[0];
         // ignore geometry and extend properties
-        return Object.assign({
+        const item = Object.assign({
             type: type,
             id: feature.id,
             bbox: feature.bbox,
             distance: (distance(sourceGeom, feature.geometry) * 1000.0)
         }, feature.properties);
+        return sanitizeUrbanismeItem(item);
     });
 }
 const ASSIETTES_SUP_TYPES = [
@@ -61,9 +84,10 @@ const ASSIETTES_SUP_TYPES = [
  *
  * @param {number} lon
  * @param {number} lat
+ * @param {(url: string) => Promise<any>} [fetcher]
  * @returns
  */
-export async function getAssiettesServitudes(lon, lat) {
+export async function getAssiettesServitudes(lon, lat, fetcher = fetchJSON) {
     logger.info(`getAssiettesServitudes(${lon},${lat})...`);
     // note that EPSG:4326 means lat,lon order for GeoServer -> flipped coordinates...
     const cql_filter = `DWITHIN(the_geom,Point(${lat} ${lon}),30,meters)`;
@@ -79,7 +103,10 @@ export async function getAssiettesServitudes(lon, lat) {
         outputFormat: 'application/json',
         cql_filter: cql_filter
     }).toString();
-    const featureCollection = await fetchJSON(url);
+    const featureCollection = await fetcher(url);
+    if (!Array.isArray(featureCollection?.features)) {
+        throw new Error(URBANISME_INVALID_COLLECTION_ERROR);
+    }
     return featureCollection.features.map((feature) => {
         // parse type from id (ex: "commune.3837")
         const type = feature.id.split('.')[0];

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.js"],"names":[],"mappings":"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"}

package/dist/gpf/wfs.d.ts

@@ -1,17 +1,19 @@
-import { Collection, MiniSearchCollectionSearchEngineOptions } from '@ignfab/gpf-schema-store';
+import { Collection, MiniSearchCollectionSearchOptions } from '@ignfab/gpf-schema-store';
 export declare const GPF_WFS_URL = "https://data.geopf.fr/wfs";
+type MiniSearchOptions = MiniSearchCollectionSearchOptions;
 export declare class FeatureTypeNotFoundError extends Error {
     constructor(name: string);
 }
-export declare function loadSearchOptionsFromEnv(): MiniSearchCollectionSearchEngineOptions | undefined;
+export declare function loadMiniSearchOptionsFromEnv(): MiniSearchOptions | undefined;
 export declare class WfsClient {
     baseUrl: string;
     private readonly catalog;
     constructor(baseUrl?: string, options?: {
-        search?: MiniSearchCollectionSearchEngineOptions;
+        miniSearch?: MiniSearchOptions;
     });
     getFeatureTypes(): Promise<Collection[]>;
     searchFeatureTypes(query: string, maxResults?: number): Promise<Collection[]>;
     getFeatureType(name: string): Promise<Collection>;
 }
 export declare const wfsClient: WfsClient;
+export {};

package/dist/gpf/wfs.js

@@ -2,22 +2,28 @@
 import { getCollectionCatalog, MiniSearchCollectionSearchEngine, } from '@ignfab/gpf-schema-store';
 // --- Constants ---
 export const GPF_WFS_URL = "https://data.geopf.fr/wfs";
-// Environment variable used to inject search engine options at runtime (JSON string).
-const GPF_WFS_SEARCH_OPTIONS_ENV = "GPF_WFS_SEARCH_OPTIONS";
+// Environment variable used to inject MiniSearch options at runtime (JSON string).
+const GPF_WFS_MINISEARCH_OPTIONS_ENV = "GPF_WFS_MINISEARCH_OPTIONS";
 // Keys accepted at the top level of the search options object.
-const TOP_LEVEL_SEARCH_OPTION_KEYS = ["fuzzy", "boost"];
-// Keys accepted inside the nested `boost` object.
-const BOOST_SEARCH_OPTION_KEYS = [
+const TOP_LEVEL_MINISEARCH_OPTION_KEYS = ["fields", "combineWith", "fuzzy", "boost"];
+// Shared keys used by both `fields` and `boost` in MiniSearchCollectionSearchOptions.
+const MINISEARCH_INDEXED_OPTION_KEYS = [
     "namespace",
     "name",
     "title",
     "description",
     "properties",
+    "enums",
+    "identifierTokens",
 ];
+const MINISEARCH_FIELD_OPTION_KEYS = MINISEARCH_INDEXED_OPTION_KEYS;
+const MINISEARCH_COMBINE_WITH_VALUES = ["AND", "OR"];
+const MINISEARCH_BOOST_OPTION_KEYS = MINISEARCH_INDEXED_OPTION_KEYS;
 // --- Errors ---
 export class FeatureTypeNotFoundError extends Error {
     constructor(name) {
-        super(`Type '${name}' not found`);
+        super(`Le type '${name}' est introuvable`);
+        this.name = "FeatureTypeNotFoundError";
     }
 }
 // --- Helpers ---
@@ -28,21 +34,47 @@ function isFiniteNumber(value) {
     return typeof value === "number" && Number.isFinite(value);
 }
 function invalidSearchOptionsError(reason) {
-    return new Error(`Invalid ${GPF_WFS_SEARCH_OPTIONS_ENV}: ${reason}`);
+    return new Error(`Invalid ${GPF_WFS_MINISEARCH_OPTIONS_ENV}: ${reason}`);
 }
 // --- Search options parsing ---
-// Parses and validates a plain-object value into MiniSearchCollectionSearchEngineOptions.
+// Parses and validates a plain-object value into MiniSearchCollectionSearchOptions.
 // Throws a descriptive error if the value has unexpected keys or wrong value types.
-function parseSearchOptions(value) {
+function parseMiniSearchOptions(value) {
     if (!isPlainObject(value)) {
         throw invalidSearchOptionsError("expected a JSON object");
     }
     for (const key of Object.keys(value)) {
-        if (!TOP_LEVEL_SEARCH_OPTION_KEYS.includes(key)) {
+        if (!TOP_LEVEL_MINISEARCH_OPTION_KEYS.includes(key)) {
             throw invalidSearchOptionsError(`unexpected key '${key}'`);
         }
     }
     const options = {};
+    if (value.fields !== undefined) {
+        if (!Array.isArray(value.fields)) {
+            throw invalidSearchOptionsError("expected 'fields' to be an array");
+        }
+        const fields = [];
+        for (const field of value.fields) {
+            if (typeof field !== "string") {
+                throw invalidSearchOptionsError("expected every 'fields' item to be a string");
+            }
+            if (!MINISEARCH_FIELD_OPTION_KEYS.includes(field)) {
+                throw invalidSearchOptionsError(`unexpected value 'fields.${field}'`);
+            }
+            fields.push(field);
+        }
+        options.fields = fields;
+    }
+    if (value.combineWith !== undefined) {
+        if (typeof value.combineWith !== "string") {
+            throw invalidSearchOptionsError("expected 'combineWith' to be a string");
+        }
+        const combineWith = value.combineWith;
+        if (!MINISEARCH_COMBINE_WITH_VALUES.includes(combineWith)) {
+            throw invalidSearchOptionsError("expected 'combineWith' to be 'AND' or 'OR'");
+        }
+        options.combineWith = combineWith;
+    }
     if (value.fuzzy !== undefined) {
         if (!isFiniteNumber(value.fuzzy)) {
             throw invalidSearchOptionsError("expected 'fuzzy' to be a finite number");
@@ -55,7 +87,7 @@ function parseSearchOptions(value) {
         }
         const boost = {};
         for (const key of Object.keys(value.boost)) {
-            if (!BOOST_SEARCH_OPTION_KEYS.includes(key)) {
+            if (!MINISEARCH_BOOST_OPTION_KEYS.includes(key)) {
                 throw invalidSearchOptionsError(`unexpected key 'boost.${key}'`);
             }
             const rawScore = value.boost[key];
@@ -68,10 +100,18 @@ function parseSearchOptions(value) {
     }
     return options;
 }
-// Reads search options from the GPF_WFS_SEARCH_OPTIONS environment variable.
+function createMiniSearchEngineOptions(miniSearch) {
+    if (!miniSearch) {
+        return undefined;
+    }
+    return {
+        defaultSearchOptions: miniSearch,
+    };
+}
+// Reads MiniSearch options from the GPF_WFS_MINISEARCH_OPTIONS environment variable.
 // Returns undefined when the variable is absent or empty.
-export function loadSearchOptionsFromEnv() {
-    const rawValue = process.env[GPF_WFS_SEARCH_OPTIONS_ENV];
+export function loadMiniSearchOptionsFromEnv() {
+    const rawValue = process.env[GPF_WFS_MINISEARCH_OPTIONS_ENV];
     if (!rawValue || rawValue.trim() === "") {
         return undefined;
     }
@@ -83,7 +123,7 @@ export function loadSearchOptionsFromEnv() {
         const reason = error instanceof Error ? error.message : "unknown JSON parse error";
         throw invalidSearchOptionsError(`expected valid JSON (${reason})`);
     }
-    return parseSearchOptions(parsedValue);
+    return parseMiniSearchOptions(parsedValue);
 }
 // --- WFS client ---
 export class WfsClient {
@@ -91,8 +131,9 @@ export class WfsClient {
     catalog;
     constructor(baseUrl = GPF_WFS_URL, options = {}) {
         this.baseUrl = baseUrl;
+        const searchEngineOptions = createMiniSearchEngineOptions(options.miniSearch);
         this.catalog = getCollectionCatalog({
-            engineFactory: (items) => new MiniSearchCollectionSearchEngine(items, options.search),
+            engineFactory: (items) => new MiniSearchCollectionSearchEngine(items, searchEngineOptions),
         });
     }
     async getFeatureTypes() {
@@ -101,7 +142,6 @@ export class WfsClient {
     async searchFeatureTypes(query, maxResults = 20) {
         return this.catalog.search(query, {
             limit: maxResults,
-            combineWith: 'AND',
         });
     }
     async getFeatureType(name) {
@@ -113,8 +153,8 @@ export class WfsClient {
     }
 }
 // --- Default singleton ---
-// Pre-configured client using the default GPF endpoint and optional env-based search options.
+// Pre-configured client using the default GPF endpoint and optional env-based MiniSearch options.
 export const wfsClient = new WfsClient(undefined, {
-    search: loadSearchOptionsFromEnv(),
+    miniSearch: loadMiniSearchOptionsFromEnv(),
 });
 //# sourceMappingURL=wfs.js.map