@ignfab/geocontext 0.9.2 → 0.9.5

package/dist/tools/UrbanismeTool.js

@@ -1,34 +1,29 @@
 import { MCPTool } from "mcp-framework";
 import { z } from "zod";
 import { getUrbanisme, URBANISME_SOURCE } from "../gpf/urbanisme.js";
-import logger from "../logger.js";
-import { READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS } from "./toolAnnotations.js";
+import { READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS } from "../helpers/toolAnnotations.js";
+import { featureRefSchema, lonSchema, latSchema } from "../helpers/schemas.js";
 const urbanismeInputSchema = z.object({
-    lon: z
-        .number()
-        .min(-180)
-        .max(180)
-        .describe("La longitude du point."),
-    lat: z
-        .number()
-        .min(-90)
-        .max(90)
-        .describe("La latitude du point."),
-});
+    lon: lonSchema,
+    lat: latSchema,
+}).strict();
 const urbanismeResultSchema = z
     .object({
     type: z.string().describe("Le type d'objet d'urbanisme renvoyé."),
     id: z.string().describe("L'identifiant de l'objet d'urbanisme."),
     bbox: z.array(z.number()).describe("La boîte englobante de l'objet d'urbanisme.").optional(),
-    distance: z.number().describe("La distance entre le point demandé et l'objet d'urbanisme retenu."),
+    feature_ref: featureRefSchema.describe("Référence WFS réutilisable, notamment avec `gpf_wfs_get_features` et `spatial_operator = \"intersects_feature\"`.").optional(),
+    distance: z.number().describe("La distance en mètres entre le point demandé et l'objet d'urbanisme retenu."),
 })
     .catchall(z.unknown());
 const urbanismeOutputSchema = z.object({
     results: z.array(urbanismeResultSchema).describe("La liste des objets d'urbanisme pertinents pour le point demandé."),
 });
 const URBANISME_TOOL_DESCRIPTION = [
-    `Renvoie, pour un point donné par sa longitude et sa latitude, la liste des objets d'urbanisme pertinents du Géoportail de l'Urbanisme (document, zones, prescriptions, informations, etc.), avec leurs propriétés associées. (source : ${URBANISME_SOURCE}).`,
+    `Renvoie, pour un point donné par sa \`longitude\` et sa \`latitude\`, la liste des objets d'urbanisme pertinents du Géoportail de l'Urbanisme (document, zones, prescriptions, informations, etc.), avec leurs propriétés associées. (source : ${URBANISME_SOURCE}).`,
     "Les résultats peuvent notamment inclure le document d'urbanisme applicable ainsi que des éléments réglementaires associés à proximité du point.",
+    "Quand un objet correspond à une couche WFS réutilisable, il expose aussi un `feature_ref` compatible avec `gpf_wfs_get_features` et `spatial_operator=\"intersects_feature\"`.",
+    "Le zonage PLU (zone U, AU, A, N...) est inclus dans les zones retournées et constitue souvent l'information principale recherchée.",
     "Modèles d'URL Géoportail de l'Urbanisme :",
     "- fiche document: https://www.geoportail-urbanisme.gouv.fr/document/by-id/{gpu_doc_id}",
     "- carte: https://www.geoportail-urbanisme.gouv.fr/map/?documentId={gpu_doc_id}",
@@ -42,7 +37,6 @@ class UrbanismeTool extends MCPTool {
     outputSchemaShape = urbanismeOutputSchema;
     schema = urbanismeInputSchema;
     async execute(input) {
-        logger.info(`urbanisme(${input.lon},${input.lat})...`);
         return {
             results: await getUrbanisme(input.lon, input.lat),
         };

package/dist/tools/UrbanismeTool.js.map

@@ -1 +1 @@
-{"version":3,"file":"UrbanismeTool.js","sourceRoot":"","sources":["../../src/tools/UrbanismeTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,EAAE,qCAAqC,EAAE,MAAM,sBAAsB,CAAC;AAE7E,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,GAAG,EAAE,CAAC;SACH,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,GAAG,CAAC;SACT,GAAG,CAAC,GAAG,CAAC;SACR,QAAQ,CAAC,wBAAwB,CAAC;IACrC,GAAG,EAAE,CAAC;SACH,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,EAAE,CAAC;SACR,GAAG,CAAC,EAAE,CAAC;SACP,QAAQ,CAAC,uBAAuB,CAAC;CACrC,CAAC,CAAC;AAIH,MAAM,qBAAqB,GAAG,CAAC;KAC5B,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,sCAAsC,CAAC;IACjE,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,uCAAuC,CAAC;IAChE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,6CAA6C,CAAC,CAAC,QAAQ,EAAE;IAC5F,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mEAAmE,CAAC;CACnG,CAAC;KACD,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;AAEzB,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,QAAQ,CAAC,mEAAmE,CAAC;CACtH,CAAC,CAAC;AAEH,MAAM,0BAA0B,GAAG;IACjC,0OAA0O,gBAAgB,IAAI;IAC9P,iJAAiJ;IACjJ,2CAA2C;IAC3C,wFAAwF;IACxF,gFAAgF;IAChF,8FAA8F;CAC/F,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAGb,MAAM,aAAc,SAAQ,OAAuB;IACjD,IAAI,GAAG,WAAW,CAAC;IACnB,KAAK,GAAG,0BAA0B,CAAC;IACnC,WAAW,GAAG,qCAAqC,CAAC;IACpD,WAAW,GAAG,0BAA0B,CAAC;IAC/B,iBAAiB,GAAG,qBAAqB,CAAC;IAEpD,MAAM,GAAG,oBAAoB,CAAC;IAE9B,KAAK,CAAC,OAAO,CAAC,KAAqB;QACjC,MAAM,CAAC,IAAI,CAAC,aAAa,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC;QACvD,OAAO;YACL,OAAO,EAAE,MAAM,YAAY,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC;SAClD,CAAC;IACJ,CAAC;CACF;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"UrbanismeTool.js","sourceRoot":"","sources":["../../src/tools/UrbanismeTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAAE,qCAAqC,EAAE,MAAM,+BAA+B,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAE/E,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,GAAG,EAAE,SAAS;IACd,GAAG,EAAE,SAAS;CACf,CAAC,CAAC,MAAM,EAAE,CAAC;AAIZ,MAAM,qBAAqB,GAAG,CAAC;KAC5B,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,sCAAsC,CAAC;IACjE,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,uCAAuC,CAAC;IAChE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,6CAA6C,CAAC,CAAC,QAAQ,EAAE;IAC5F,WAAW,EAAE,gBAAgB,CAAC,QAAQ,CAAC,mHAAmH,CAAC,CAAC,QAAQ,EAAE;IACtK,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,6EAA6E,CAAC;CAC7G,CAAC;KACD,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;AAEzB,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,QAAQ,CAAC,mEAAmE,CAAC;CACtH,CAAC,CAAC;AAEH,MAAM,0BAA0B,GAAG;IACjC,kPAAkP,gBAAgB,IAAI;IACtQ,iJAAiJ;IACjJ,gLAAgL;IAChL,oIAAoI;IACpI,2CAA2C;IAC3C,wFAAwF;IACxF,gFAAgF;IAChF,8FAA8F;CAC/F,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAGb,MAAM,aAAc,SAAQ,OAAuB;IACjD,IAAI,GAAG,WAAW,CAAC;IACnB,KAAK,GAAG,0BAA0B,CAAC;IACnC,WAAW,GAAG,qCAAqC,CAAC;IACpD,WAAW,GAAG,0BAA0B,CAAC;IAC/B,iBAAiB,GAAG,qBAAqB,CAAC;IAEpD,MAAM,GAAG,oBAAoB,CAAC;IAE9B,KAAK,CAAC,OAAO,CAAC,KAAqB;QACjC,OAAO;YACL,OAAO,EAAE,MAAM,YAAY,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC;SAClD,CAAC;IACJ,CAAC;CACF;AAED,eAAe,aAAa,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ignfab/geocontext",
-  "version": "0.9.2",
+  "version": "0.9.5",
   "description": "An experimental MCP server providing access to the services and data of the french Geoplateform",
   "type": "module",
   "bin": {
@@ -27,19 +27,24 @@
   },
   "homepage": "https://github.com/ignfab/geocontext#readme",
   "scripts": {
-    "build": "tsc && npx mcp-build",
+    "clean:dist": "node scripts/dist-clean.js",
+    "build": "npm run clean:dist && tsc && npx mcp-build",
     "watch": "tsc --watch",
     "start": "node dist/index.js",
     "test": "node --no-warnings --experimental-vm-modules ./node_modules/jest/bin/jest.js",
-    "coverage": "node --no-warnings --experimental-vm-modules ./node_modules/jest/bin/jest.js --coverage"
+    "coverage": "node --no-warnings --experimental-vm-modules ./node_modules/jest/bin/jest.js --coverage",
+    "reset": "rm -rf node_modules package-lock.json dist build .next .turbo coverage",
+    "fresh": "npm run reset && npm cache verify && npm install && npm run build && npm test"
   },
   "dependencies": {
-    "@camptocamp/ogc-client": "^1.3.0",
-    "@ignfab/gpf-schema-store": "^0.1.1",
+    "@ignfab/gpf-schema-store": "^0.1.5",
+    "@rgrove/parse-xml": "^4.2.0",
+    "@turf/distance": "^7.3.4",
+    "@turf/helpers": "^7.3.4",
     "https-proxy-agent": "^7.0.6",
     "jsts": "^2.12.1",
     "lodash": "^4.17.21",
-    "mcp-framework": "^0.2.21",
+    "mcp-framework": "^0.2.22",
     "node-fetch": "^3.3.2",
     "winston": "^3.18.3",
     "zod": "^3.25.76"

package/dist/resources/WfsCqlFilterResource.d.ts

@@ -1,10 +0,0 @@
-import { MCPResource, ResourceContent } from "mcp-framework";
-declare class WfsCqlFilterResource extends MCPResource {
-    uri: string;
-    name: string;
-    description: string;
-    mimeType: string;
-    protected title: string;
-    read(): Promise<ResourceContent[]>;
-}
-export default WfsCqlFilterResource;

package/dist/resources/WfsCqlFilterResource.js

@@ -1,21 +0,0 @@
-import { MCPResource } from "mcp-framework";
-import { readMarkdownResource } from "./readMarkdownResource.js";
-class WfsCqlFilterResource extends MCPResource {
-    uri = "geocontext://wfs-cql-filter";
-    name = "geocontext-wfs-cql-filter";
-    description = "Aide-mémoire pour construire des cql_filter GeoServer utilisables avec les tools WFS.";
-    mimeType = "text/markdown";
-    title = "Cheatsheet cql_filter";
-    async read() {
-        const text = await readMarkdownResource(import.meta.url, "wfs-cql-filter.md");
-        return [
-            {
-                uri: this.uri,
-                mimeType: this.mimeType,
-                text,
-            },
-        ];
-    }
-}
-export default WfsCqlFilterResource;
-//# sourceMappingURL=WfsCqlFilterResource.js.map

package/dist/resources/WfsCqlFilterResource.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"WfsCqlFilterResource.js","sourceRoot":"","sources":["../../src/resources/WfsCqlFilterResource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAmB,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,MAAM,oBAAqB,SAAQ,WAAW;IAC5C,GAAG,GAAG,6BAA6B,CAAC;IACpC,IAAI,GAAG,2BAA2B,CAAC;IACnC,WAAW,GAAG,uFAAuF,CAAC;IACtG,QAAQ,GAAG,eAAe,CAAC;IACjB,KAAK,GAAG,uBAAuB,CAAC;IAE1C,KAAK,CAAC,IAAI;QACR,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;QAE9E,OAAO;YACL;gBACE,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,IAAI;aACL;SACF,CAAC;IACJ,CAAC;CACF;AAED,eAAe,oBAAoB,CAAC"}

package/dist/resources/readMarkdownResource.d.ts

@@ -1 +0,0 @@
-export declare function readMarkdownResource(importMetaUrl: string, filename: string): Promise<string>;

package/dist/resources/readMarkdownResource.js

@@ -1,21 +0,0 @@
-import { readFile } from "fs/promises";
-import { dirname, join } from "path";
-import { fileURLToPath } from "url";
-export async function readMarkdownResource(importMetaUrl, filename) {
-    const currentDir = dirname(fileURLToPath(importMetaUrl));
-    const candidates = [
-        join(currentDir, "content", filename),
-        join(currentDir, "../../src/resources/content", filename),
-    ];
-    let lastError;
-    for (const candidate of candidates) {
-        try {
-            return await readFile(candidate, "utf-8");
-        }
-        catch (error) {
-            lastError = error;
-        }
-    }
-    throw lastError;
-}
-//# sourceMappingURL=readMarkdownResource.js.map

package/dist/resources/readMarkdownResource.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"readMarkdownResource.js","sourceRoot":"","sources":["../../src/resources/readMarkdownResource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,aAAqB,EAAE,QAAgB;IAChF,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC;IACzD,MAAM,UAAU,GAAG;QACjB,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,CAAC;QACrC,IAAI,CAAC,UAAU,EAAE,6BAA6B,EAAE,QAAQ,CAAC;KAC1D,CAAC;IAEF,IAAI,SAAkB,CAAC;IACvB,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,CAAC;YACH,OAAO,MAAM,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,SAAS,GAAG,KAAK,CAAC;QACpB,CAAC;IACH,CAAC;IAED,MAAM,SAAS,CAAC;AAClB,CAAC"}

package/dist/tools/GpfWfsListTypesTool.d.ts

@@ -1,22 +0,0 @@
-import { MCPTool } from "mcp-framework";
-import { z } from "zod";
-declare const gpfWfsListTypesInputSchema: z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>;
-type GpfWfsListTypesInput = z.infer<typeof gpfWfsListTypesInputSchema>;
-declare class GpfWfsListTypesTool extends MCPTool<GpfWfsListTypesInput> {
-    name: string;
-    title: string;
-    annotations: {
-        readonly readOnlyHint: true;
-        readonly destructiveHint: false;
-        readonly idempotentHint: true;
-        readonly openWorldHint: true;
-    };
-    description: string;
-    schema: z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>;
-    execute(input: GpfWfsListTypesInput): Promise<{
-        id: string;
-        title: string;
-        description: string;
-    }[]>;
-}
-export default GpfWfsListTypesTool;

package/dist/tools/GpfWfsListTypesTool.js

@@ -1,26 +0,0 @@
-import { MCPTool } from "mcp-framework";
-import { z } from "zod";
-import { READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS } from "./toolAnnotations.js";
-import { wfsClient } from "../gpf/wfs.js";
-const gpfWfsListTypesInputSchema = z.object({});
-class GpfWfsListTypesTool extends MCPTool {
-    name = "gpf_wfs_list_types";
-    title = "Liste complète des types WFS";
-    annotations = READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS;
-    description = [
-        "Renvoie la liste complète des types WFS de la Géoplateforme (GPF).",
-        "Utiliser ce tool pour un inventaire exhaustif ou une exploration globale du catalogue.",
-        "Pour trouver rapidement un type pertinent à partir de mots-clés, utiliser de préférence gpf_wfs_search_types.",
-    ].join("\r\n");
-    schema = gpfWfsListTypesInputSchema;
-    async execute(input) {
-        const featureTypes = await wfsClient.getFeatureTypes();
-        return featureTypes.map((featureType) => ({
-            id: featureType.id,
-            title: featureType.title,
-            description: featureType.description,
-        }));
-    }
-}
-export default GpfWfsListTypesTool;
-//# sourceMappingURL=GpfWfsListTypesTool.js.map

package/dist/tools/GpfWfsListTypesTool.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"GpfWfsListTypesTool.js","sourceRoot":"","sources":["../../src/tools/GpfWfsListTypesTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,qCAAqC,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,MAAM,0BAA0B,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAIhD,MAAM,mBAAoB,SAAQ,OAA6B;IAC7D,IAAI,GAAG,oBAAoB,CAAC;IAC5B,KAAK,GAAG,8BAA8B,CAAC;IACvC,WAAW,GAAG,qCAAqC,CAAC;IACpD,WAAW,GAAG;QACZ,oEAAoE;QACpE,wFAAwF;QACxF,+GAA+G;KAChH,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACf,MAAM,GAAG,0BAA0B,CAAC;IAEpC,KAAK,CAAC,OAAO,CAAC,KAA2B;QACvC,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,eAAe,EAAE,CAAC;QACvD,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YACxC,EAAE,EAAE,WAAW,CAAC,EAAE;YAClB,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,WAAW,EAAE,WAAW,CAAC,WAAW;SACrC,CAAC,CAAC,CAAC;IACN,CAAC;CACF;AAED,eAAe,mBAAmB,CAAC"}

package/dist/tools/toolAnnotations.d.ts

@@ -1,6 +0,0 @@
-export declare const READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS: {
-    readonly readOnlyHint: true;
-    readonly destructiveHint: false;
-    readonly idempotentHint: true;
-    readonly openWorldHint: true;
-};

package/dist/tools/toolAnnotations.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"toolAnnotations.js","sourceRoot":"","sources":["../../src/tools/toolAnnotations.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,qCAAqC,GAAG;IACnD,YAAY,EAAE,IAAI;IAClB,eAAe,EAAE,KAAK;IACtB,cAAc,EAAE,IAAI;IACpB,aAAa,EAAE,IAAI;CACX,CAAC"}