geotap-mcp-server 2.1.0 → 2.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geotap-mcp-server",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "MCP server for GeoTap — access 37 US federal environmental and infrastructure data sources from Claude, Cursor, and other AI tools",
   "type": "module",
   "main": "src/index.js",

package/src/consolidatedTools.js

@@ -26,7 +26,7 @@ Actions:
 - "polygon" — Query features in a polygon area. Set geometry="none" and specify layers.
 - "summary" — Quick feature counts for an area (no geometry, just numbers). Fastest option for "how many?" questions.
 - "geocode" — Convert address/place name to coordinates. Use only when you need coordinates for other tools.
-- "list_layers" — List all 71 available data layers.
+- "list_layers" — List available data layers.
 - "layer_details" — Get metadata about a specific layer.
 - "layer_features" — Get features from one specific layer in a bbox.`,
     parameters: {
@@ -76,7 +76,7 @@ Actions:
 - "hyetograph" — Generate a design storm hyetograph (rainfall over time) for hydrologic modeling.
 - "export_hyetograph" — Export hyetograph as CSV/JSON for HEC-HMS, SWMM, etc.
 - "distributions" — List available rainfall distribution types (SCS Type I/IA/II/III, Huff, etc.).
-- "recommend_distribution" — Determine which distribution type applies at a location.
+- "recommend_distribution" — Determine which distribution type applies at a location. Note: this uses coastal/inland boundaries. For SCS design storms, prefer get_hydrology(action=distribution_for_location) which uses NRCS regional mapping.
 - "climate_scenarios" — List available SSP scenarios and time horizons.
 - "climate_factors" — Get climate change adjustment multipliers for a location.
 - "climate_projection" — Apply climate change projections to Atlas 14 data.
@@ -396,7 +396,7 @@ Actions:
   // ═══════════════════════════════════════════════════════════════════
   {
     name: 'export_data',
-    description: `Export environmental data layers to GIS formats (GeoJSON, Shapefile, KML, CSV, GeoPackage).
+    description: `Export environmental data layers to GIS formats (GeoJSON, Shapefile, CSV).
 
 Actions:
 - "export" — Export layers to a file format. Supports CRS transformation and clipping.
@@ -406,7 +406,7 @@ Actions:
       action: z.enum(['export', 'options', 'status'])
         .describe('Which export operation'),
       layers: z.array(z.string()).optional().describe('Layer names to export'),
-      format: z.enum(['geojson', 'shapefile', 'kml', 'csv', 'geopackage']).optional().describe('Output format'),
+      format: z.enum(['geojson', 'shapefile', 'csv']).optional().describe('Output format'),
       crs: z.string().optional().describe('Target CRS (e.g., "EPSG:4326")'),
       geometry: z.any().optional().describe('GeoJSON geometry to clip export area'),
       options: z.any().optional().describe('Additional options: {dem, satellite, nlcd, contours}'),
@@ -555,10 +555,10 @@ Actions:
 - "fire_stations" — Fire stations: type, status.
 - "schools" — Public schools: enrollment, grade levels, teacher count.
 - "power_plants" — Power plants: fuel type, installed capacity (MW).
-- "airports" — FAA airports: facility type, ownership, operations counts.
+- "airports" — FAA airports: name, FAA code, city, state.
 - "railroad_crossings" — FRA highway-rail crossings: warning devices, trains/day, crash data.
 - "bridges" — DOT bridges: condition ratings (0-9), sufficiency rating (0-100), year built.
-- "historic_places" — National Register of Historic Places: significance, category, period.`,
+- "historic_places" — National Register of Historic Places: name, NRIS reference number.`,
     parameters: {
       action: z.enum(['hospitals', 'fire_stations', 'schools', 'power_plants', 'airports', 'railroad_crossings', 'bridges', 'historic_places'])
         .describe('Which infrastructure data to query'),

package/src/discoverTools.js

@@ -7,6 +7,20 @@
  */
 
 import { tools } from './tools.js';
+import { consolidatedTools } from './consolidatedTools.js';
+
+/**
+ * Build reverse mapping: legacy tool name → consolidated "tool(action=X)" format.
+ * Used to translate discover_tools results when running in consolidated mode.
+ */
+const legacyToConsolidated = {};
+for (const ctool of consolidatedTools) {
+  for (const [action, legacyName] of Object.entries(ctool._actionMap)) {
+    legacyToConsolidated[legacyName] = { tool: ctool.name, action };
+  }
+}
+
+const useLegacyTools = process.env.GEOTAP_LEGACY_TOOLS === 'true';
 
 /**
  * Tool categories with keywords for matching.
@@ -156,8 +170,14 @@ export function discoverTools(question, maxResults = 5) {
       }
     }
 
+    // In consolidated mode, translate legacy name to consolidated tool+action format
+    const consolidated = !useLegacyTools ? legacyToConsolidated[tool.name] : null;
+    const displayName = consolidated
+      ? `${consolidated.tool}(action="${consolidated.action}")`
+      : tool.name;
+
     return {
-      name: tool.name,
+      name: displayName,
       description: tool.description.split('.')[0] + '.', // First sentence only
       method: tool.method,
       parameters: params,
@@ -183,7 +203,9 @@ export function discoverTools(question, maxResults = 5) {
     allCategories: Object.keys(TOOL_CATEGORIES),
     hint: results.length > 0
       ? `Start with "${results[0].name}" — it's the best match for your question.`
-      : 'No strong matches found. Try query_address for location-based questions, or list_data_layers to see available data.',
+      : useLegacyTools
+        ? 'No strong matches found. Try query_address for location-based questions, or list_data_layers to see available data.'
+        : 'No strong matches found. Try query_location(action="address") for location-based questions, or query_location(action="list_layers") to see available data.',
     totalToolsAvailable: tools.length
   };
 }

package/src/index.js

@@ -25,12 +25,12 @@ const legacyToolMap = new Map(tools.map(t => [t.name, t]));
 const server = new McpServer({
   name: 'geotap',
   version: '2.0.0',
-  description: 'Access 71 US federal environmental and infrastructure data layers from 64+ agencies. Query flood zones, wetlands, soils, rainfall, watersheds, water quality, endangered species, elevation, land use, hazards, energy, infrastructure, transportation, and more for any location in the United States.',
+  description: 'Access US federal environmental and infrastructure data layers from 64+ agencies. Query flood zones, wetlands, soils, rainfall, watersheds, water quality, endangered species, elevation, land use, hazards, energy, infrastructure, transportation, and more for any location in the United States.',
   instructions: useLegacyTools
     ? `You have access to GeoTap with 85 individual tools. Use discover_tools to find the right one.`
     : `You have access to GeoTap, which provides real-time data from 37 US federal agencies (FEMA, USGS, NOAA, EPA, NRCS, USFWS, USACE, and more).
 
-TOOL OVERVIEW (12 tools + 2 meta-tools):
+TOOL OVERVIEW (16 tools + 2 meta-tools):
 1. query_location — Start here. Query environmental data by address, coordinates, bbox, polygon, or radius.
 2. get_rainfall — NOAA Atlas 14 precipitation, IDF curves, hyetographs, climate projections.
 3. get_watershed — Watershed delineation, flow statistics, flowlines, HUC boundaries, FIRM panels.
@@ -40,9 +40,13 @@ TOOL OVERVIEW (12 tools + 2 meta-tools):
 7. analyze_gage — USGS stream gage analysis: flood frequency, flow duration, storm events.
 8. estimate_ungaged — Flow estimation at ungaged sites: regression, similarity, transfer methods.
 9. generate_report — Site analysis, constraints, and developability reports with scoring.
-10. export_data — Export layers to GeoJSON, Shapefile, KML, CSV, GeoPackage.
+10. export_data — Export layers to GeoJSON, Shapefile, CSV.
 11. find_stations — Find monitoring stations (USGS, NOAA) and analyze waterway permit requirements.
 12. check_status — API health and federal data source connectivity.
+13. get_hazards — FEMA risk index, seismic design values, wildfires, landslides, coastal vulnerability, flood insurance claims, social vulnerability.
+14. get_energy — Solar resource, PVWatts production estimates, utility rates, EV charging stations.
+15. get_infrastructure — Hospitals, fire stations, schools, power plants, airports, railroad crossings, bridges, historic places.
+16. get_ecology — Species occurrences, essential fish habitat.
 
 Every tool uses an "action" parameter to select the specific operation. Read the tool description to see available actions.
 

package/src/paramNormalize.js

@@ -112,7 +112,66 @@ export function normalizeParams(toolName, params) {
     p.geometry = 'none';
   }
 
-  // ── 3. Strip undefined/null optional params ──────────────────────
+  // ── 3. Ungaged estimation: map `parameters` → `basinCharacteristics` ──
+  // The MCP tool accepts friendly names (drainageArea, meanBasinSlope)
+  // but the backend NSS API expects USGS codes (DRNAREA, BSLDEM)
+  if (toolName === 'estimate_ungaged_flood_frequency' ||
+      toolName === 'estimate_all_ungaged_statistics') {
+    const paramObj = p.parameters || p.characteristics || {};
+    if (Object.keys(paramObj).length > 0) {
+      // Map friendly names → USGS NSS parameter codes
+      const PARAM_MAP = {
+        drainageArea: 'DRNAREA',
+        contributingDrainageArea: 'CONTDA',
+        meanAnnualPrecipitation: 'PRECIP',
+        meanBasinSlope: 'BSLDEM',
+        percentForest: 'FOREST',
+        percentStorage: 'STORAGE',
+        percentImpervious: 'IMPERV',
+        meanBasinElevation: 'ELEV',
+        basinLength: 'BSHAPE',
+        annualRunoff: 'RUNOFF',
+      };
+
+      const basinChars = {};
+      for (const [key, value] of Object.entries(paramObj)) {
+        // Use mapped name if available, otherwise pass through as-is
+        // (allows users to send DRNAREA directly too)
+        const mappedKey = PARAM_MAP[key] || key;
+        basinChars[mappedKey] = Number(value);
+      }
+
+      p.basinCharacteristics = basinChars;
+      delete p.parameters;
+      delete p.characteristics;
+    }
+  }
+
+  // Also map for find_similar tools
+  if (toolName === 'find_similar_watersheds' ||
+      toolName === 'find_similar_watersheds_with_stats') {
+    const charObj = p.characteristics || p.parameters || {};
+    if (Object.keys(charObj).length > 0) {
+      const PARAM_MAP = {
+        drainageArea: 'DRNAREA',
+        contributingDrainageArea: 'CONTDA',
+        meanAnnualPrecipitation: 'PRECIP',
+        meanBasinSlope: 'BSLDEM',
+        percentForest: 'FOREST',
+      };
+
+      const mapped = {};
+      for (const [key, value] of Object.entries(charObj)) {
+        const mappedKey = PARAM_MAP[key] || key;
+        mapped[mappedKey] = Number(value);
+      }
+      p.basinCharacteristics = mapped;
+      delete p.characteristics;
+      delete p.parameters;
+    }
+  }
+
+  // ── 4. Strip undefined/null optional params ──────────────────────
   for (const [key, value] of Object.entries(p)) {
     if (value === undefined || value === null) {
       delete p[key];