@ignfab/geocontext 0.9.3 → 0.9.5

package/dist/tools/GpfWfsGetFeaturesTool.d.ts

@@ -1,28 +1,7 @@
 import { MCPTool } from "mcp-framework";
-import { z } from "zod";
-declare const gpfWfsGetFeaturesInputSchema: z.ZodObject<{
-    typename: z.ZodString;
-    property_names: z.ZodOptional<z.ZodString>;
-    sort_by: z.ZodOptional<z.ZodString>;
-    count: z.ZodOptional<z.ZodNumber>;
-    cql_filter: z.ZodOptional<z.ZodString>;
-    result_type: z.ZodOptional<z.ZodEnum<["results", "hits", "url"]>>;
-}, "strip", z.ZodTypeAny, {
-    cql_filter?: string;
-    typename?: string;
-    property_names?: string;
-    sort_by?: string;
-    count?: number;
-    result_type?: "results" | "hits" | "url";
-}, {
-    cql_filter?: string;
-    typename?: string;
-    property_names?: string;
-    sort_by?: string;
-    count?: number;
-    result_type?: "results" | "hits" | "url";
-}>;
-type GpfWfsGetFeaturesInput = z.infer<typeof gpfWfsGetFeaturesInputSchema>;
+import type { Collection } from "@ignfab/gpf-schema-store";
+import { type CompiledRequest } from "../helpers/wfs_internal/request.js";
+import { type GpfWfsGetFeaturesInput } from "../helpers/wfs_internal/schema.js";
 declare class GpfWfsGetFeaturesTool extends MCPTool<GpfWfsGetFeaturesInput> {
     name: string;
     title: string;
@@ -33,28 +12,121 @@ declare class GpfWfsGetFeaturesTool extends MCPTool<GpfWfsGetFeaturesInput> {
         openWorldHint: boolean;
     };
     description: string;
-    schema: z.ZodObject<{
-        typename: z.ZodString;
-        property_names: z.ZodOptional<z.ZodString>;
-        sort_by: z.ZodOptional<z.ZodString>;
-        count: z.ZodOptional<z.ZodNumber>;
-        cql_filter: z.ZodOptional<z.ZodString>;
-        result_type: z.ZodOptional<z.ZodEnum<["results", "hits", "url"]>>;
-    }, "strip", z.ZodTypeAny, {
-        cql_filter?: string;
+    schema: import("zod").ZodObject<{
+        typename: import("zod").ZodString;
+        limit: import("zod").ZodDefault<import("zod").ZodNumber>;
+        result_type: import("zod").ZodDefault<import("zod").ZodEnum<["results", "hits", "request"]>>;
+        select: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodString, "many">>;
+        order_by: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodObject<{
+            property: import("zod").ZodString;
+            direction: import("zod").ZodDefault<import("zod").ZodEnum<["asc", "desc"]>>;
+        }, "strict", import("zod").ZodTypeAny, {
+            property?: string;
+            direction?: "asc" | "desc";
+        }, {
+            property?: string;
+            direction?: "asc" | "desc";
+        }>, "many">>;
+        where: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodObject<{
+            property: import("zod").ZodString;
+            operator: import("zod").ZodEnum<["eq", "ne", "lt", "lte", "gt", "gte", "in", "is_null"]>;
+            value: import("zod").ZodOptional<import("zod").ZodString>;
+            values: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodString, "many">>;
+        }, "strict", import("zod").ZodTypeAny, {
+            values?: string[];
+            value?: string;
+            property?: string;
+            operator?: "gte" | "gt" | "lte" | "lt" | "eq" | "ne" | "in" | "is_null";
+        }, {
+            values?: string[];
+            value?: string;
+            property?: string;
+            operator?: "gte" | "gt" | "lte" | "lt" | "eq" | "ne" | "in" | "is_null";
+        }>, "many">>;
+        spatial_operator: import("zod").ZodOptional<import("zod").ZodEnum<["bbox", "intersects_point", "dwithin_point", "intersects_feature"]>>;
+        bbox_west: import("zod").ZodOptional<import("zod").ZodNumber>;
+        bbox_south: import("zod").ZodOptional<import("zod").ZodNumber>;
+        bbox_east: import("zod").ZodOptional<import("zod").ZodNumber>;
+        bbox_north: import("zod").ZodOptional<import("zod").ZodNumber>;
+        intersects_lon: import("zod").ZodOptional<import("zod").ZodNumber>;
+        intersects_lat: import("zod").ZodOptional<import("zod").ZodNumber>;
+        dwithin_lon: import("zod").ZodOptional<import("zod").ZodNumber>;
+        dwithin_lat: import("zod").ZodOptional<import("zod").ZodNumber>;
+        dwithin_distance_m: import("zod").ZodOptional<import("zod").ZodNumber>;
+        intersects_feature_typename: import("zod").ZodOptional<import("zod").ZodString>;
+        intersects_feature_id: import("zod").ZodOptional<import("zod").ZodString>;
+    }, "strict", import("zod").ZodTypeAny, {
         typename?: string;
-        property_names?: string;
-        sort_by?: string;
-        count?: number;
-        result_type?: "results" | "hits" | "url";
+        limit?: number;
+        result_type?: "request" | "results" | "hits";
+        select?: string[];
+        order_by?: {
+            property?: string;
+            direction?: "asc" | "desc";
+        }[];
+        where?: {
+            values?: string[];
+            value?: string;
+            property?: string;
+            operator?: "gte" | "gt" | "lte" | "lt" | "eq" | "ne" | "in" | "is_null";
+        }[];
+        spatial_operator?: "bbox" | "intersects_point" | "dwithin_point" | "intersects_feature";
+        bbox_west?: number;
+        bbox_south?: number;
+        bbox_east?: number;
+        bbox_north?: number;
+        intersects_lon?: number;
+        intersects_lat?: number;
+        dwithin_lon?: number;
+        dwithin_lat?: number;
+        dwithin_distance_m?: number;
+        intersects_feature_typename?: string;
+        intersects_feature_id?: string;
     }, {
-        cql_filter?: string;
         typename?: string;
-        property_names?: string;
-        sort_by?: string;
-        count?: number;
-        result_type?: "results" | "hits" | "url";
+        limit?: number;
+        result_type?: "request" | "results" | "hits";
+        select?: string[];
+        order_by?: {
+            property?: string;
+            direction?: "asc" | "desc";
+        }[];
+        where?: {
+            values?: string[];
+            value?: string;
+            property?: string;
+            operator?: "gte" | "gt" | "lte" | "lt" | "eq" | "ne" | "in" | "is_null";
+        }[];
+        spatial_operator?: "bbox" | "intersects_point" | "dwithin_point" | "intersects_feature";
+        bbox_west?: number;
+        bbox_south?: number;
+        bbox_east?: number;
+        bbox_north?: number;
+        intersects_lon?: number;
+        intersects_lat?: number;
+        dwithin_lon?: number;
+        dwithin_lat?: number;
+        dwithin_distance_m?: number;
+        intersects_feature_typename?: string;
+        intersects_feature_id?: string;
     }>;
+    /**
+     * Exposes an input schema variant that stays compatible with most MCP integrations.
+     *
+     * @returns The published input schema exposed through the MCP tool definition.
+     */
+    get inputSchema(): {
+        type: "object";
+        properties?: Record<string, object>;
+        required?: string[];
+    };
+    /**
+     * Formats compact responses (`hits`, `request`) into `structuredContent`.
+     * Full result sets are still delegated to the framework default behavior.
+     *
+     * @param data Raw execution result returned by the tool implementation.
+     * @returns An MCP success response, optionally enriched with structured content.
+     */
     protected createSuccessResponse(data: unknown): import("mcp-framework").ToolResponse | {
         content: {
             type: "text";
@@ -70,10 +142,64 @@ declare class GpfWfsGetFeaturesTool extends MCPTool<GpfWfsGetFeaturesInput> {
             text: string;
         }[];
         structuredContent: {
+            body?: string;
+            result_type?: "request";
+            method?: "POST";
             url?: string;
-            result_type?: "url";
+            query?: Record<string, string>;
+            get_url?: string;
         };
     };
-    execute(input: GpfWfsGetFeaturesInput): Promise<any>;
+    /**
+     * Loads a WFS feature type description from the embedded catalog.
+     *
+     * @param typename Exact WFS typename to load from the embedded schema store.
+     * @returns The matching feature type description.
+     */
+    protected getFeatureType(typename: string): Promise<Collection>;
+    /**
+     * Executes a compiled WFS request as POST and returns the JSON FeatureCollection.
+     *
+     * @param request Compiled request split into query-string parameters and POST body.
+     * @returns The parsed JSON response returned by the WFS endpoint.
+     */
+    protected fetchFeatureCollection(request: CompiledRequest): Promise<any>;
+    /**
+     * Extracts a result count from a WFS response, preferring `numberMatched`.
+     * Explicitly rejects responses that do not provide a usable total.
+     *
+     * @param featureCollection Parsed WFS response object.
+     * @returns The total number of matching features.
+     */
+    protected getMatchedFeatureCount(featureCollection: Record<string, unknown>): number;
+    /**
+     * Enriches transformed features with a complete `feature_ref`, reusable
+     * in particular by `intersects_feature`.
+     *
+     * @param featureCollection Raw WFS FeatureCollection response.
+     * @param typename Typename of the main queried layer.
+     * @returns The transformed FeatureCollection with fully populated feature references.
+     */
+    protected attachFeatureRefs(featureCollection: Record<string, unknown>, typename: string): Record<string, unknown>;
+    /**
+     * Resolves the geometry of a reference feature when `intersects_feature` is used,
+     * then converts it to EWKT for CQL compilation.
+     *
+     * @param input Normalized tool input.
+     * @returns The resolved reference geometry, or `undefined` when no reference feature is needed.
+     */
+    protected resolveIntersectsFeatureGeometry(input: GpfWfsGetFeaturesInput): Promise<{
+        typename: string;
+        feature_id: string;
+        geometry_ewkt: string;
+    }>;
+    /**
+     * Orchestrates the full tool execution flow:
+     * catalog lookup -> compilation -> WFS request -> response post-processing.
+     *
+     * @param input Normalized tool input.
+     * @returns Either a compiled request, a hit count, or a transformed FeatureCollection.
+     */
+    execute(input: GpfWfsGetFeaturesInput): Promise<Record<string, unknown>>;
 }
 export default GpfWfsGetFeaturesTool;

package/dist/tools/GpfWfsGetFeaturesTool.js

@@ -1,76 +1,40 @@
 import { MCPTool } from "mcp-framework";
-import { z } from "zod";
-import { GPF_WFS_URL } from "../gpf/wfs.js";
-import { fetchJSON } from "../helpers/http.js";
+import { wfsClient } from "../gpf/wfs.js";
+import { fetchJSONPost } from "../helpers/http.js";
 import logger from "../logger.js";
 import { READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS } from "../helpers/toolAnnotations.js";
-// This tool intentionally does not expose a single outputSchemaShape.
-// - `result_type="results"` can return a large FeatureCollection, and we
-// avoid duplicating that payload into structuredContent. 
-// - Compact modes (`hits`, `url`) are handled explicitly in createSuccessResponse().
-const gpfWfsGetFeaturesInputSchema = z.object({
-    typename: z
-        .string()
-        .trim()
-        .min(1, "le nom du type ne doit pas être vide")
-        .describe("L'identifiant exact du type WFS à interroger (ex : `BDTOPO_V3:batiment`). Ce paramètre détermine la collection interrogée et doit correspondre à un type valide. Utiliser `gpf_wfs_search_types` pour trouver un `typename` pertinent, puis `gpf_wfs_describe_type` pour inspecter ses propriétés avant la requête."),
-    property_names: z
-        .string()
-        .optional()
-        .describe("La liste des propriétés à inclure dans chaque objet renvoyé, séparées par des virgules (ex : \"code_insee,nom_officiel,geometrie\"). Ce paramètre limite les champs présents dans la réponse, sans filtrer les objets eux-mêmes. Les noms doivent correspondre exactement aux propriétés du type WFS ; utiliser `gpf_wfs_describe_type` pour les connaître."),
-    sort_by: z
-        .string()
-        .optional()
-        .describe("Les propriétés à utiliser pour trier les objets renvoyés, avec la syntaxe `field [A|D]` où `A` signifie tri ascendant et `D` tri descendant. Plusieurs critères peuvent être séparés par des virgules (ex : `nom_officiel A, population D`). Les noms doivent correspondre exactement aux propriétés du type WFS ; utiliser `gpf_wfs_describe_type` pour les connaître."),
-    count: z
-        .number()
-        .int()
-        .min(1)
-        .max(1000)
-        .optional()
-        .describe("Le nombre maximum d'objets à retourner dans la réponse (entre 1 et 1000). Ce paramètre limite les résultats renvoyés, sans modifier le nombre total d'objets correspondant à la requête. Il est surtout utile avec `result_type=\"results\"`."),
-    cql_filter: z
-        .string()
-        .optional()
-        .describe([
-        "Un filtre `cql_filter` GeoServer pour restreindre les objets renvoyés par la requête.",
-        "Il faut utiliser les noms exacts des propriétés du type WFS ; utiliser `gpf_wfs_describe_type` pour les connaître.",
-        "Attention : en `EPSG:4326`, les coordonnées des géométries doivent être exprimées en `lat lon` (y x), y compris pour les points, lignes et polygones.",
-        "Exemples :",
-        "- filtre attributaire : `code_insee = '75056'`",
-        "- filtre spatial point : `DWITHIN(geom,Point(48.8566 2.3522),100,meters)`",
-        "- filtre spatial polygone : `INTERSECTS(geom,POLYGON((48.85 2.34,48.86 2.34,48.86 2.36,48.85 2.36,48.85 2.34)))`",
-    ].join("\r\n")),
-    result_type: z
-        .enum(["results", "hits", "url"])
-        .optional()
-        .describe([
-        "Choisit le type de résultat renvoyé par le tool :",
-        "- `results` : retourne les objets trouvés sous forme de `FeatureCollection` GeoJSON complète (défaut)",
-        "- `hits` : retourne uniquement le nombre total d'objets correspondant à la requête",
-        "- `url` : retourne uniquement l'URL WFS construite pour la requête, utile pour inspection, débogage ou réutilisation côté client",
-    ].join("\r\n"))
-});
-const gpfWfsGetFeaturesHitsOutputSchema = z.object({
-    result_type: z.literal("hits").describe("Indique que la réponse contient uniquement un comptage."),
-    totalFeatures: z.number().describe("Le nombre total d'objets correspondant à la requête."),
-});
-const gpfWfsGetFeaturesUrlOutputSchema = z.object({
-    result_type: z.literal("url").describe("Indique que la réponse contient uniquement l'URL de la requête."),
-    url: z.string().describe("L'URL WFS générée pour la requête."),
-});
+import { compileQueryParts, geometryToEwkt, getGeometryProperty, getSpatialFilter } from "../helpers/wfs_internal/compile.js";
+import { buildMainRequest, buildReferenceGeometryRequest } from "../helpers/wfs_internal/request.js";
+import { transformFeatureCollectionResponse } from "../helpers/wfs_internal/response.js";
+import { gpfWfsGetFeaturesHitsOutputSchema, gpfWfsGetFeaturesInputSchema, gpfWfsGetFeaturesPublishedInputSchema, gpfWfsGetFeaturesRequestOutputSchema, } from "../helpers/wfs_internal/schema.js";
 class GpfWfsGetFeaturesTool extends MCPTool {
     name = "gpf_wfs_get_features";
     title = "Lecture d’objets WFS";
     annotations = READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS;
     description = [
-        "Récupère les objets d'un type WFS à partir d'un `typename` valide, avec filtres, tri et sélection de propriétés optionnels.",
-        "Exécute une requête WFS sur un type connu (`typename`) et renvoie soit les objets trouvés, soit leur nombre total, soit l'URL WFS correspondante.",
-        "Utiliser `gpf_wfs_search_types` puis `gpf_wfs_describe_type` avant ce tool lorsque le type ou ses propriétés ne sont pas connus.",
-        "Le paramètre `result_type` permet de récupérer soit les données complètes (`results`), soit uniquement le comptage (`hits`), soit l'URL WFS générée (`url`).",
-        "Les paramètres optionnels permettent de filtrer, trier ou restreindre les champs et le nombre d'objets renvoyés.",
-    ].join("\r\n");
+        "Interroge un type WFS et renvoie des résultats structurés sans demander au modèle d'écrire du CQL ou du WFS.",
+        "Utiliser `select` pour choisir les propriétés, `where` pour filtrer, `order_by` pour trier et `spatial_operator` avec ses paramètres dédiés pour le spatial. Avec `result_type=\"request\"`, la géométrie est automatiquement ajoutée aux propriétés sélectionnées pour garantir une requête cartographiable.",
+        "Exemple attributaire : `where=[{ property: \"code_insee\", operator: \"eq\", value: \"75056\" }]`.",
+        "Exemple bbox : `spatial_operator=\"bbox\"` avec `bbox_west`, `bbox_south`, `bbox_east`, `bbox_north` en `lon/lat`.",
+        "Exemple distance : `spatial_operator=\"dwithin_point\"` avec `dwithin_lon`, `dwithin_lat`, `dwithin_distance_m`.",
+        "Exemple réutilisation : `spatial_operator=\"intersects_feature\"` avec `intersects_feature_typename` et `intersects_feature_id` issus d'une `feature_ref`.",
+    ].join("\n");
     schema = gpfWfsGetFeaturesInputSchema;
+    /**
+     * Exposes an input schema variant that stays compatible with most MCP integrations.
+     *
+     * @returns The published input schema exposed through the MCP tool definition.
+     */
+    get inputSchema() {
+        return gpfWfsGetFeaturesPublishedInputSchema;
+    }
+    /**
+     * Formats compact responses (`hits`, `request`) into `structuredContent`.
+     * Full result sets are still delegated to the framework default behavior.
+     *
+     * @param data Raw execution result returned by the tool implementation.
+     * @returns An MCP success response, optionally enriched with structured content.
+     */
     createSuccessResponse(data) {
         if (typeof data === "object" &&
             data !== null &&
@@ -79,80 +43,163 @@ class GpfWfsGetFeaturesTool extends MCPTool {
             "totalFeatures" in data &&
             typeof data.totalFeatures === "number") {
             return {
-                content: [
-                    {
-                        type: "text",
-                        text: JSON.stringify(data.totalFeatures),
-                    },
-                ],
+                content: [{ type: "text", text: JSON.stringify(data.totalFeatures) }],
                 structuredContent: gpfWfsGetFeaturesHitsOutputSchema.parse(data),
             };
         }
         if (typeof data === "object" &&
             data !== null &&
             "result_type" in data &&
-            data.result_type === "url" &&
-            "url" in data &&
-            typeof data.url === "string") {
+            data.result_type === "request") {
             return {
-                content: [
-                    {
-                        type: "text",
-                        text: data.url,
-                    },
-                ],
-                structuredContent: gpfWfsGetFeaturesUrlOutputSchema.parse(data),
+                content: [{ type: "text", text: JSON.stringify(data) }],
+                structuredContent: gpfWfsGetFeaturesRequestOutputSchema.parse(data),
             };
         }
         return super.createSuccessResponse(data);
     }
-    async execute(input) {
-        const params = {
-            service: 'WFS',
-            request: 'GetFeature',
-            typeName: input.typename,
-            outputFormat: 'application/json'
-        };
-        // Only add optional parameters if they are defined
-        if (input.cql_filter) {
-            params.cql_filter = input.cql_filter;
+    /**
+     * Loads a WFS feature type description from the embedded catalog.
+     *
+     * @param typename Exact WFS typename to load from the embedded schema store.
+     * @returns The matching feature type description.
+     */
+    async getFeatureType(typename) {
+        return wfsClient.getFeatureType(typename);
+    }
+    /**
+     * Executes a compiled WFS request as POST and returns the JSON FeatureCollection.
+     *
+     * @param request Compiled request split into query-string parameters and POST body.
+     * @returns The parsed JSON response returned by the WFS endpoint.
+     */
+    async fetchFeatureCollection(request) {
+        const url = `${request.url}?${new URLSearchParams(request.query).toString()}`;
+        return fetchJSONPost(url, request.body, {
+            "Content-Type": "application/x-www-form-urlencoded",
+            "Accept": "application/json",
+        });
+    }
+    /**
+     * Extracts a result count from a WFS response, preferring `numberMatched`.
+     * Explicitly rejects responses that do not provide a usable total.
+     *
+     * @param featureCollection Parsed WFS response object.
+     * @returns The total number of matching features.
+     */
+    getMatchedFeatureCount(featureCollection) {
+        if (typeof featureCollection.numberMatched === "number") {
+            return featureCollection.numberMatched;
         }
-        if (input.count) {
-            params.count = String(input.count);
+        if (featureCollection.numberMatched === "unknown") {
+            throw new Error("Le service WFS a renvoyé un comptage indéterminé (numberMatched=\"unknown\").");
         }
-        if (input.sort_by) {
-            params.sortBy = input.sort_by;
+        if (typeof featureCollection.totalFeatures === "number") {
+            return featureCollection.totalFeatures;
+        }
+        throw new Error("Le service WFS n'a pas retourné de comptage exploitable");
+    }
+    /**
+     * Enriches transformed features with a complete `feature_ref`, reusable
+     * in particular by `intersects_feature`.
+     *
+     * @param featureCollection Raw WFS FeatureCollection response.
+     * @param typename Typename of the main queried layer.
+     * @returns The transformed FeatureCollection with fully populated feature references.
+     */
+    attachFeatureRefs(featureCollection, typename) {
+        const transformed = transformFeatureCollectionResponse(featureCollection);
+        if (!Array.isArray(transformed.features)) {
+            return transformed;
+        }
+        transformed.features = transformed.features.map((feature) => {
+            if (typeof feature !== "object" || feature === null || !("feature_ref" in feature)) {
+                return feature;
+            }
+            const featureRef = feature.feature_ref;
+            if (typeof featureRef !== "object" || featureRef === null) {
+                return feature;
+            }
+            return {
+                ...feature,
+                feature_ref: {
+                    ...featureRef,
+                    typename,
+                },
+            };
+        });
+        return transformed;
+    }
+    /**
+     * Resolves the geometry of a reference feature when `intersects_feature` is used,
+     * then converts it to EWKT for CQL compilation.
+     *
+     * @param input Normalized tool input.
+     * @returns The resolved reference geometry, or `undefined` when no reference feature is needed.
+     */
+    async resolveIntersectsFeatureGeometry(input) {
+        const spatialFilter = getSpatialFilter(input);
+        if (!spatialFilter || spatialFilter.operator !== "intersects_feature") {
+            return undefined;
         }
-        if (input.property_names && input.property_names.length > 0) {
-            params.propertyName = input.property_names;
+        const referenceFeatureType = await this.getFeatureType(spatialFilter.typename);
+        const referenceGeometryProperty = getGeometryProperty(referenceFeatureType);
+        const request = buildReferenceGeometryRequest(spatialFilter.typename, spatialFilter.feature_id, referenceGeometryProperty.name);
+        const featureCollection = await this.fetchFeatureCollection(request);
+        const referenceFeature = Array.isArray(featureCollection?.features) ? featureCollection.features[0] : undefined;
+        if (!referenceFeature) {
+            throw new Error(`Le feature de référence '${spatialFilter.feature_id}' est introuvable dans '${spatialFilter.typename}'.`);
         }
-        // Si result_type est 'hits', on utilise count=1 pour récupérer juste le totalFeatures
-        // On fait cela parce que Geoserver ne renvoie pas de json avec resultType=hits
-        // On est obligé de faire une requete getfeature pour récupérer le totalFeatures...
-        if (input.result_type === 'hits') {
-            params.count = "1";
-            // On n'a pas besoin des propriétés détaillées pour un comptage
-            delete params.propertyName;
+        if (!referenceFeature?.geometry) {
+            throw new Error(`Le feature de référence '${spatialFilter.feature_id}' n'a pas de géométrie exploitable.`);
         }
-        const url = `${GPF_WFS_URL}?` + new URLSearchParams(params).toString();
-        logger.info(`[gpf_wfs_get_features] ${url}`);
-        if (input.result_type === 'url') {
+        return {
+            typename: spatialFilter.typename,
+            feature_id: spatialFilter.feature_id,
+            geometry_ewkt: geometryToEwkt(referenceFeature.geometry),
+        };
+    }
+    /**
+     * Orchestrates the full tool execution flow:
+     * catalog lookup -> compilation -> WFS request -> response post-processing.
+     *
+     * @param input Normalized tool input.
+     * @returns Either a compiled request, a hit count, or a transformed FeatureCollection.
+     */
+    async execute(input) {
+        const featureType = await this.getFeatureType(input.typename);
+        const resolvedGeometryRef = await this.resolveIntersectsFeatureGeometry(input);
+        const compiled = compileQueryParts(input, featureType, resolvedGeometryRef);
+        const request = buildMainRequest(input, compiled);
+        if (input.result_type === "request") {
             return {
-                result_type: "url",
-                url,
+                result_type: "request",
+                method: request.method,
+                url: request.url,
+                query: request.query,
+                body: request.body,
+                get_url: request.get_url ?? null,
             };
         }
-        const featureCollection = await fetchJSON(url);
-        if (input.result_type === 'hits') {
-            if (typeof featureCollection?.totalFeatures !== "number") {
-                throw new Error("Le service WFS n'a pas retourné de comptage exploitable");
+        let featureCollection;
+        try {
+            logger.info(`[gpf_wfs_get_features] POST ${request.url}?${new URLSearchParams(request.query).toString()}`);
+            featureCollection = await this.fetchFeatureCollection(request);
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            if (message.includes(`Illegal property name: ${compiled.geometryProperty.name}`)) {
+                throw new Error(`Le champ géométrique '${compiled.geometryProperty.name}' issu du catalogue embarqué est rejeté par le WFS live pour '${input.typename}'. Le catalogue embarqué est probablement désynchronisé. Détail : ${message}`);
             }
+            throw error;
+        }
+        if (input.result_type === "hits") {
             return {
                 result_type: "hits",
-                totalFeatures: featureCollection.totalFeatures,
+                totalFeatures: this.getMatchedFeatureCount(featureCollection),
             };
         }
-        return featureCollection;
+        return this.attachFeatureRefs(featureCollection, input.typename);
     }
 }
 export default GpfWfsGetFeaturesTool;

package/dist/tools/GpfWfsGetFeaturesTool.js.map

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