bbox-mcp-server 1.2.3 → 1.2.5

package/README.md

@@ -4,7 +4,7 @@ The geospatial toolkit for AI agents. **6 tools, zero config** — give any LLM
 
 Every response includes a verification link to **[vibhorsingh.com/boundingbox](https://vibhorsingh.com/boundingbox/)** so you can visually confirm results on an interactive map.
 
-[![Node.js](https://img.shields.io/badge/node-%3E%3D18-green)](https://nodejs.org/) [![License: MIT](https://img.shields.io/badge/license-MIT-blue)](./LICENSE)
+[![Node.js](https://img.shields.io/badge/node-%3E%3D18-green)](https://nodejs.org/) [![License: MIT](https://img.shields.io/badge/license-MIT-blue)](./LICENSE) [![MCP Badge](https://lobehub.com/badge/mcp/iamvibhorsingh-bbox-mcp-server)](https://lobehub.com/mcp/iamvibhorsingh-bbox-mcp-server)
 
 ---
 

package/dist/index.js

@@ -7,7 +7,7 @@ import proj4 from "proj4";
 import proj4defs from "./proj4defs.json" with { type: "json" };
 import { wktToGeoJSON as parseWKT } from "@terraformer/wkt";
 const SERVER_NAME = "bbox-mcp-server";
-const SERVER_VERSION = "1.2.3";
+const SERVER_VERSION = "1.2.5";
 const MAX_H3_CELLS = process.env.MAX_H3_CELLS ? parseInt(process.env.MAX_H3_CELLS, 10) : 50000;
 const MAPBOX_ACCESS_TOKEN = process.env.MAPBOX_ACCESS_TOKEN;
 const MAX_INPUT_LENGTH = 1_000_000; // 1 MB input size guard
@@ -131,7 +131,9 @@ function parseBBox(input) {
                 return ensureValidBBox(minCoords[1], minCoords[0], maxCoords[1], maxCoords[0]);
             }
         }
-        catch (e) { /* Fall through to next parser */ }
+        catch (e) {
+            log('info', 'parseBBox: ogrinfo extent parse failed, trying next parser', { error: e?.message });
+        }
     }
     // --- 2. GeoJSON Sniffer ---
     try {
@@ -148,7 +150,9 @@ function parseBBox(input) {
             return ensureValidBBox(safeMin(lats), safeMin(lngs), safeMax(lats), safeMax(lngs));
         }
     }
-    catch (e) { /* Not valid JSON, fall through */ }
+    catch (e) {
+        log('info', 'parseBBox: GeoJSON parse failed, trying next parser', { error: e?.message });
+    }
     // --- 3. WKT Sniffer ---
     if (input.toUpperCase().includes("POLYGON") || input.toUpperCase().includes("POINT") || input.toUpperCase().includes("LINESTRING")) {
         try {
@@ -160,7 +164,9 @@ function parseBBox(input) {
                 return ensureValidBBox(safeMin(lats), safeMin(lngs), safeMax(lats), safeMax(lngs));
             }
         }
-        catch (e) { /* Full WKT parse failed */ }
+        catch (e) {
+            log('info', 'parseBBox: WKT parse failed, trying next parser', { error: e?.message });
+        }
     }
     // --- 4. Standard Coordinate Array Sniffer ---
     // Strip brackets/parentheses and split by commas or spaces
@@ -316,6 +322,21 @@ function buildShareUrl(bbox) {
     const hash = `${bbox.lat1.toFixed(6)},${bbox.lng1.toFixed(6)},${bbox.lat2.toFixed(6)},${bbox.lng2.toFixed(6)}`;
     return `https://vibhorsingh.com/boundingbox/#${hash}`;
 }
+function buildShareUrlWithMarkers(bbox, elements) {
+    const bboxPart = `${bbox.lat1.toFixed(6)},${bbox.lng1.toFixed(6)},${bbox.lat2.toFixed(6)},${bbox.lng2.toFixed(6)}`;
+    const MAX_MARKERS = 30;
+    const markerParts = elements
+        .filter(e => e.coordinates?.lat !== undefined && e.coordinates?.lon !== undefined)
+        .slice(0, MAX_MARKERS)
+        .map(e => {
+        let name = e.name || 'Point';
+        if (name.length > 30)
+            name = name.slice(0, 27) + '...';
+        return `${e.coordinates.lat.toFixed(6)},${e.coordinates.lon.toFixed(6)},${encodeURIComponent(name)}`;
+    });
+    const hashParts = [bboxPart, ...markerParts];
+    return `https://vibhorsingh.com/boundingbox/#${hashParts.join('|')}`;
+}
 function getH3Cells(bbox, resolution, compact) {
     if (resolution < 0 || resolution > 15 || !Number.isInteger(resolution)) {
         throw new Error(`Invalid H3 resolution: ${resolution}. Must be an integer between 0 and 15.`);
@@ -428,6 +449,54 @@ async function geocodeLocation(query) {
         clearTimeout(timeout);
     }
 }
+async function geocodeLocationPoint(query) {
+    if (!MAPBOX_ACCESS_TOKEN) {
+        throw new Error('Mapbox API token not configured. Set MAPBOX_ACCESS_TOKEN to use location search. Provide explicit coordinates via bbox instead.');
+    }
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
+    try {
+        const url = `https://api.mapbox.com/geocoding/v5/mapbox.places/${encodeURIComponent(query)}.json?access_token=${MAPBOX_ACCESS_TOKEN}&limit=1`;
+        const response = await fetch(url, { signal: controller.signal });
+        if (!response.ok)
+            throw new Error(`Geocoding failed: ${response.status} ${response.statusText}`);
+        const data = await response.json();
+        if (!data?.features?.length)
+            throw new Error(`No results found for location: ${query}`);
+        const feature = data.features[0];
+        if (feature.center) {
+            return { lat: feature.center[1], lng: feature.center[0] };
+        }
+        else if (feature.bbox) {
+            return { lat: (feature.bbox[1] + feature.bbox[3]) / 2, lng: (feature.bbox[0] + feature.bbox[2]) / 2 };
+        }
+        else {
+            throw new Error(`Unable to determine center point for location: ${query}`);
+        }
+    }
+    catch (err) {
+        if (err.name === 'AbortError')
+            throw new Error(`Geocoding timed out after ${FETCH_TIMEOUT_MS / 1000}s for: ${query}`);
+        throw err;
+    }
+    finally {
+        clearTimeout(timeout);
+    }
+}
+function buildShareUrlCircleWithMarkers(center, radiusMeters, elements) {
+    const circlePart = `C:${center.lat.toFixed(6)},${center.lng.toFixed(6)},${radiusMeters.toFixed(2)}`;
+    const MAX_MARKERS = 30;
+    const markerParts = elements
+        .filter(e => e.coordinates?.lat !== undefined && e.coordinates?.lon !== undefined)
+        .slice(0, MAX_MARKERS)
+        .map(e => {
+        let name = e.name || 'Point';
+        if (name.length > 30)
+            name = name.slice(0, 27) + '...';
+        return `${e.coordinates.lat.toFixed(6)},${e.coordinates.lon.toFixed(6)},${encodeURIComponent(name)}`;
+    });
+    return `https://vibhorsingh.com/boundingbox/#${[circlePart, ...markerParts].join('|')}`;
+}
 // ---------------------------------------------------------------------------
 // Tool Handlers
 // ---------------------------------------------------------------------------
@@ -527,13 +596,13 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
             },
             {
                 name: "search_overpass",
-                description: "Execute an Overpass QL query to find POIs, roads, or other OSM features within a bounding box. You must provide the base query. The server automatically wraps it in a bbox filter and returns structured JSON.\n\nCOMMON TAG EXAMPLES:\n- Restaurants: `nwr[\"amenity\"=\"restaurant\"]`\n- Pizza: `nwr[\"amenity\"=\"fast_food\"][\"cuisine\"=\"pizza\"]`\n- Supermarkets: `nwr[\"shop\"=\"supermarket\"]`\n- Parks: `nwr[\"leisure\"=\"park\"]`\n- Hospitals: `nwr[\"amenity\"=\"hospital\"]`\n- Schools: `nwr[\"amenity\"=\"school\"]`\n- Parking: `nwr[\"amenity\"=\"parking\"]`\n- Highways/Roads: `way[\"highway\"]`",
+                description: "Execute an Overpass QL query to find POIs, roads, or other OSM features within a bounding box or radius. The server wraps your query in the appropriate spatial filter and returns structured JSON with a map link.\n\nSEARCH MODES:\n- Bounding box (default): searches a rectangular area. Use for region/area queries ('hospitals in Manhattan', 'parks in downtown Seattle').\n- Circle: searches within an exact radius. Use ONLY when the user specifies an explicit distance ('within 2km of JFK', '500 metres from the Eiffel Tower', '1 mile from Times Square'). Omit radius_meters for vague terms like 'near' or 'close to'.\n\nCOMMON TAG EXAMPLES:\n- Restaurants: `nwr[\"amenity\"=\"restaurant\"]`\n- Pizza: `nwr[\"amenity\"=\"fast_food\"][\"cuisine\"=\"pizza\"]`\n- Supermarkets: `nwr[\"shop\"=\"supermarket\"]`\n- Parks: `nwr[\"leisure\"=\"park\"]`\n- Hospitals: `nwr[\"amenity\"=\"hospital\"]`\n- Schools: `nwr[\"amenity\"=\"school\"]`\n- Parking: `nwr[\"amenity\"=\"parking\"]`\n- Highways/Roads: `way[\"highway\"]`",
                 inputSchema: {
                     type: "object",
                     properties: {
                         location: {
                             type: "string",
-                            description: "A text location to search for (e.g. 'San Francisco'). Requires MAPBOX_ACCESS_TOKEN env var. Either 'location' or 'bbox' MUST be provided."
+                            description: "A text location to search for (e.g. 'San Francisco', 'JFK Airport'). Requires MAPBOX_ACCESS_TOKEN env var. Either 'location' or 'bbox' MUST be provided."
                         },
                         bbox: {
                             type: "string",
@@ -541,11 +610,15 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                         },
                         query: {
                             type: "string",
-                            description: "The Overpass QL core query. Example: `node[\"amenity\"=\"cafe\"]` or `nwr[\"leisure\"=\"park\"]`. DO NOT include the bounding box `(S,W,N,E)` or output format (`out json`), the server handles that automatically."
+                            description: "The Overpass QL core query. Example: `node[\"amenity\"=\"cafe\"]` or `nwr[\"leisure\"=\"park\"]`. DO NOT include spatial filters, bounding box, or output directives — the server handles those automatically."
+                        },
+                        radius_meters: {
+                            type: "number",
+                            description: "Search radius in metres. Enables circle mode — use ONLY when the user specifies an explicit distance (e.g. '2km' → 2000, '500 metres' → 500, '1 mile' → 1609). Omit entirely for area/region queries or vague terms like 'near'."
                         },
                         limit: {
                             type: "number",
-                            description: "Maximum number of elements to return. Helps prevent enormous JSON responses. Default is 100. Set to a higher number if you need more results."
+                            description: "Maximum number of elements to return. Default is 100. Increase if you need more results."
                         }
                     },
                     required: ["query"],
@@ -731,7 +804,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 content: [
                     {
                         type: "text",
-                        text: `H3 Cells Generated: ${cells.length.toLocaleString()}\nResolution: ${resolution}\nCompacted: ${compact}\n\nCells:\n${JSON.stringify(cells)}\n\nView original bounding box on map: ${shareUrl}`
+                        text: `H3 cells generated: ${cells.length.toLocaleString()}\nResolution: ${resolution} | Compacted: ${compact}\n\nCells:\n${JSON.stringify(cells)}\n\nView on map: ${shareUrl}`
                     },
                     {
                         type: "text",
@@ -753,7 +826,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 content: [
                     {
                         type: "text",
-                        text: `View on map: ${shareUrl}\nNote: you can paste this URL directly in your browser.`
+                        text: `View on map: ${shareUrl}`
                     },
                     {
                         type: "text",
@@ -769,6 +842,8 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             const args = request.params.arguments || {};
             const queryRaw = args.query;
             const limit = args.limit || 100;
+            const radiusMeters = args.radius_meters;
+            const useCircle = typeof radiusMeters === 'number' && radiusMeters > 0;
             if (!queryRaw) {
                 return { content: [{ type: "text", text: "Error: 'query' is required (e.g. `node[\"amenity\"=\"restaurant\"]`)." }], isError: true };
             }
@@ -776,29 +851,65 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 return { content: [{ type: "text", text: "Error: Query is too long (maximum 2000 characters)." }], isError: true };
             }
             if (queryRaw.includes("[out:") || queryRaw.includes("[timeout:") || queryRaw.includes("[bbox:")) {
-                return { content: [{ type: "text", text: "Error: Query must not contain direct [out:], [timeout:], or [bbox:] directives. The server handles these automatically." }], isError: true };
+                return { content: [{ type: "text", text: "Error: Query must not contain [out:], [timeout:], or [bbox:] directives. The server handles these automatically." }], isError: true };
             }
+            let overpassQuery;
+            let searchModeLabel;
+            let centerPoint;
             let bboxObj;
-            if (args.location) {
-                try {
-                    bboxObj = await geocodeLocation(args.location);
-                }
-                catch (err) {
-                    if (!args.bbox) {
-                        log('error', `Geocoding failed for overpass location: ${args.location}`, { error: err.message });
-                        return { content: [{ type: "text", text: `Error: ${err.message}` }], isError: true };
+            if (useCircle) {
+                if (args.location) {
+                    try {
+                        centerPoint = await geocodeLocationPoint(args.location);
+                    }
+                    catch (err) {
+                        if (args.bbox) {
+                            log('warn', `Geocoding failed for radius search, using bbox center`, { error: err.message });
+                            const fb = parseBBox(args.bbox);
+                            centerPoint = { lat: (fb.lat1 + fb.lat2) / 2, lng: (fb.lng1 + fb.lng2) / 2 };
+                        }
+                        else {
+                            log('error', `Geocoding failed for radius search: ${args.location}`, { error: err.message });
+                            return { content: [{ type: "text", text: `Error: ${err.message}` }], isError: true };
+                        }
                     }
-                    bboxObj = parseBBox(args.bbox);
                 }
-            }
-            else if (args.bbox) {
-                bboxObj = parseBBox(args.bbox);
+                else if (args.bbox) {
+                    const fb = parseBBox(args.bbox);
+                    centerPoint = { lat: (fb.lat1 + fb.lat2) / 2, lng: (fb.lng1 + fb.lng2) / 2 };
+                }
+                else {
+                    return { content: [{ type: "text", text: "Error: Either 'location' or 'bbox' argument must be provided." }], isError: true };
+                }
+                overpassQuery = `[out:json][timeout:25];\n(${queryRaw}(around:${radiusMeters},${centerPoint.lat},${centerPoint.lng}););\nout center;`;
+                searchModeLabel = `circle — ${radiusMeters}m radius around (${centerPoint.lat.toFixed(5)}, ${centerPoint.lng.toFixed(5)})`;
             }
             else {
-                return { content: [{ type: "text", text: "Error: Either 'location' or 'bbox' argument must be provided." }], isError: true };
+                if (args.location) {
+                    try {
+                        bboxObj = await geocodeLocation(args.location);
+                    }
+                    catch (err) {
+                        if (args.bbox) {
+                            log('warn', `Geocoding failed, falling back to bbox argument`, { error: err.message });
+                            bboxObj = parseBBox(args.bbox);
+                        }
+                        else {
+                            log('error', `Geocoding failed for overpass location: ${args.location}`, { error: err.message });
+                            return { content: [{ type: "text", text: `Error: ${err.message}` }], isError: true };
+                        }
+                    }
+                }
+                else if (args.bbox) {
+                    bboxObj = parseBBox(args.bbox);
+                }
+                else {
+                    return { content: [{ type: "text", text: "Error: Either 'location' or 'bbox' argument must be provided." }], isError: true };
+                }
+                overpassQuery = `[out:json][timeout:25][bbox:${bboxObj.lat1},${bboxObj.lng1},${bboxObj.lat2},${bboxObj.lng2}];\n(${queryRaw};);\nout center;`;
+                searchModeLabel = `bounding box`;
             }
-            log('info', `search_overpass starting`, { query: queryRaw });
-            const overpassQuery = `[out:json][timeout:25][bbox:${bboxObj.lat1},${bboxObj.lng1},${bboxObj.lat2},${bboxObj.lng2}];\n(${queryRaw};);\nout center;`;
+            log('info', `search_overpass starting`, { query: queryRaw, mode: useCircle ? 'circle' : 'bbox', radius_meters: radiusMeters });
             const endpoints = [
                 "https://overpass-api.de/api/interpreter",
                 "https://overpass.kumi.systems/api/interpreter"
@@ -808,7 +919,6 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             }
             let data = null;
             let lastError = null;
-            // Formatting payload precisely for Overpass
             const params = new URLSearchParams();
             params.append('data', overpassQuery);
             for (const endpoint of endpoints) {
@@ -830,7 +940,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                         throw new Error(`Overpass API returned status: ${response.status} ${response.statusText}`);
                     }
                     data = await response.json();
-                    break; // Success!
+                    break;
                 }
                 catch (err) {
                     lastError = err;
@@ -842,20 +952,17 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             }
             if (!data) {
                 if (lastError?.name === 'AbortError') {
-                    return { content: [{ type: "text", text: `Error: Overpass API request timed out on all endpoints after ${(FETCH_TIMEOUT_MS * 4) / 1000}s overall. The query might be too broad.` }], isError: true };
+                    return { content: [{ type: "text", text: `Error: Overpass API request timed out on all endpoints after ${(FETCH_TIMEOUT_MS * 4) / 1000}s. The query or radius may be too large.` }], isError: true };
                 }
                 throw new Error(`Overpass query failed on all endpoints: ${lastError?.message}`);
             }
-            let rawElements = data.elements || [];
-            // Parse raw elements into structured output
             const seenIds = new Set();
-            let parsedElements = rawElements.reduce((acc, e) => {
+            let parsedElements = (data.elements || []).reduce((acc, e) => {
                 if (seenIds.has(e.id))
                     return acc;
                 seenIds.add(e.id);
                 const lat = e.lat ?? e.center?.lat;
                 const lon = e.lon ?? e.center?.lon;
-                // Only keep elements that actually have coordinates and tags (or allow untagged if requested, but structured output is better)
                 if (lat !== undefined && lon !== undefined) {
                     acc.push({
                         id: e.id,
@@ -873,23 +980,32 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 parsedElements = parsedElements.slice(0, limit);
                 truncated = true;
             }
-            const shareUrl = buildShareUrl(bboxObj);
-            log('info', `search_overpass completed`, { elements: elementCount, returned: parsedElements.length, truncated });
+            const shareUrl = useCircle && centerPoint
+                ? buildShareUrlCircleWithMarkers(centerPoint, radiusMeters, parsedElements)
+                : buildShareUrlWithMarkers(bboxObj, parsedElements);
+            log('info', `search_overpass completed`, { elements: elementCount, returned: parsedElements.length, truncated, mode: useCircle ? 'circle' : 'bbox' });
             const responseData = {
+                search_mode: useCircle ? 'circle' : 'bbox',
+                ...(useCircle && centerPoint
+                    ? { center: centerPoint, radius_meters: radiusMeters }
+                    : { original_bbox: bboxObj }),
                 generator: data.generator,
                 osm3s: data.osm3s,
                 elements: parsedElements,
                 total_count: elementCount,
                 returned_count: parsedElements.length,
                 truncated,
-                original_bbox: bboxObj,
                 share_url: shareUrl
             };
+            const topResults = parsedElements.slice(0, 5)
+                .map((e) => `- [${e.type}] ${e.name} (${e.coordinates.lat.toFixed(5)}, ${e.coordinates.lon.toFixed(5)})`)
+                .join('\n');
+            const moreNote = parsedElements.length > 5 ? `\n  … and ${parsedElements.length - 5} more (see JSON)` : '';
             return {
                 content: [
                     {
                         type: "text",
-                        text: `Successfully executed Overpass query.\nFound ${elementCount} elements${truncated ? ` (truncated to ${limit})` : ''}.\n\nSummary:\n${parsedElements.slice(0, 5).map((e) => `- [${e.type}] ${e.id} (${e.name})`).join('\n')}${parsedElements.length > 5 ? '\n... (see JSON for full results)' : ''}\n\nView original bounding box on map: ${shareUrl}`
+                        text: `Overpass query executed within a ${searchModeLabel}.\nFound ${elementCount} element${elementCount !== 1 ? 's' : ''}${truncated ? ` (showing first ${limit})` : ''}.\n\nTop results:\n${topResults}${moreNote}\n\nView on map: ${shareUrl}`
                     },
                     {
                         type: "text",
@@ -1058,7 +1174,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 content: [
                     {
                         type: "text",
-                        text: `Aggregated ${totalGrouped} elements into ${activeHexes.length} H3 hexagons at resolution ${resolution}.\n\nTop Hexagons by Density:\n${topHexes.map(([hex, count]) => `- Hex ${hex}: ${count} elements`).join('\n')}\n\nView bounding area on map: ${shareUrl}`
+                        text: `Aggregated ${totalGrouped} element${totalGrouped !== 1 ? 's' : ''} into ${activeHexes.length} H3 hexagon${activeHexes.length !== 1 ? 's' : ''} at resolution ${resolution}.\n\nTop hexagons by density:\n${topHexes.map(([hex, count]) => `- ${hex}: ${count} element${count !== 1 ? 's' : ''}`).join('\n')}\n\nView on map: ${shareUrl}`
                     },
                     {
                         type: "text",

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "bbox-mcp-server",
     "mcpName": "io.github.iamvibhorsingh/bbox-mcp-server",
-    "version": "1.2.3",
+    "version": "1.2.5",
     "description": "MCP server for bounding box coordinate conversion, EPSG projections, Uber H3 hexagonal indexing, Overpass OSM queries, and shareable map links",
     "type": "module",
     "license": "MIT",
@@ -47,7 +47,7 @@
         "prepublishOnly": "npm run build"
     },
     "dependencies": {
-        "@modelcontextprotocol/sdk": "^1.6.1",
+        "@modelcontextprotocol/sdk": "^1.27.1",
         "@terraformer/wkt": "^2.2.1",
         "h3-js": "^4.1.0",
         "proj4": "^2.15.0"