AGI-164-introduce-search-and-geocode-tool (#45)

* Introduce SearchAndGeocodeTool

* Update SearchAndGeocodeTool not to use z.tuple

* Remove ForwardGeocodeTool and PoiSearchTool; their functionality is combined in the new SearchAndGeocodeTool

* Update version and notes about the change

* Include SearchAndGeocodeTool blurb in Readme

* Fix typo

* Use snake case name to follow conventions

---------

Co-authored-by: Alexis Raykhel <[email protected]>

Author: alexisraykhel

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.5.0
+
+- Introduce new tool: SearchAndGeocodeTool
+- Remove former tools: ForwardGeocodeTool, PoiSearchTool; their
+  capabilities are combined in the new tool
+
 ## 0.4.1
 
 - Minor changes to tool descriptions for clarity

README.md

@@ -107,15 +107,6 @@ Generates static map images using the [Mapbox static image API](https://docs.map
 - Overlay options including polylines and polygons
 - Auto-fitting to specified coordinates
 
-#### POI search tool
-
-Finds specific points of interest or brand locations by name using the [Mapbox Search Box forward search API](https://docs.mapbox.com/api/search/search-box/#search-request). Features include:
-
-- Search for specific points of interest by proper name or unique brand (e.g., "Amalie Arena", "Starbucks")
-- Find all nearby branches of a brand (e.g., "Macy's stores near me")
-- Geographic proximity biasing for more relevant results
-- Support for multiple languages and countries
-
 #### Category search tool
 
 Performs a category search using the [Mapbox Search Box category search API](https://docs.mapbox.com/api/search/search-box/#category-search). Features include:
@@ -126,16 +117,6 @@ Performs a category search using the [Mapbox Search Box category search API](htt
 - Rich metadata for each result
 - Support for multiple languages
 
-#### Forward geocoding tool
-
-Performs forward geocoding using the [Mapbox geocoding V6 API](https://docs.mapbox.com/api/search/geocoding/#forward-geocoding-with-search-text-input). Features include:
-
-- Convert addresses or place names to geographic coordinates
-- Fuzzy matching for partial or misspelled inputs
-- Results filtering by country, region, or bounding box
-- Customizable result limits
-- Multiple language support
-
 #### Reverse geocoding tool
 
 Performs reverse geocoding using the [Mapbox geocoding V6 API](https://docs.mapbox.com/api/search/geocoding/#reverse-geocoding). Features include:
@@ -175,6 +156,11 @@ Computes areas that are reachable within a specified amount of times from a loca
 - Optional departure or arrival time specification
 - Color customization for visualization
 
+#### Search and geocode tool
+
+Uses the [Mapbox Search Box Text Search API](https://docs.mapbox.com/api/search/search-box/#search-request) endpoint to power searching for and geocoding POIs, addresses, places, and any other types supported by that API.
+This tool consolidates the functionality that was previously provided by the ForwardGeocodeTool and PoiSearchTool (from earlier versions of this MCP server) into a single tool.
+
 # Development
 
 ## Inspecting server

TOOL_CONFIGURATION.md

@@ -28,6 +28,7 @@ The following tools are available in the Mapbox MCP Server:
 - `category_search_tool` - Search for POIs by category
 - `directions_tool` - Get directions between locations
 - `forward_geocode_tool` - Convert addresses to coordinates
+- `search_and_geocode_tool` - Search for POIs, brands, chains, geocode cities, towns, addresses
 - `isochrone_tool` - Calculate reachable areas from a point
 - `matrix_tool` - Calculate travel times between multiple points
 - `poi_search_tool` - Search for points of interest

manifest.json

@@ -2,7 +2,7 @@
   "dxt_version": "0.1",
   "name": "@mapbox/mcp-server",
   "display_name": "Mapbox MCP Server",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "Mapbox MCP server.",
   "author": {
     "name": "Mapbox, Inc."

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapbox/mcp-server",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "Mapbox MCP server.",
   "main": "./dist/commonjs/index.js",
   "module": "./dist/esm/index.js",