Revert "[tools] Add compact parameter to reduce response verbosity and token …" (#83)

mattpodwysocki · web-flow · commit 617f56200822 · 2025-12-19T14:58:06.000-05:00
This reverts commit f3f439b.
diff --git a/src/tools/category-search-tool/CategorySearchTool.input.schema.ts b/src/tools/category-search-tool/CategorySearchTool.input.schema.ts
@@ -44,12 +44,5 @@ export const CategorySearchInputSchema = z.object({
     .default('formatted_text')
     .describe(
       'Output format: "json_string" returns raw GeoJSON data as a JSON string that can be parsed; "formatted_text" returns human-readable text with place names, addresses, and coordinates. Both return as text content but json_string contains parseable JSON data while formatted_text is for display.'
-    ),
-  compact: z
-    .boolean()
-    .optional()
-    .default(true)
-    .describe(
-      'When true (default), returns simplified GeoJSON with only essential fields (name, address, coordinates, categories, brand). When false, returns full verbose Mapbox API response with all metadata. Only applies to structured content output.'
     )
 });
diff --git a/src/tools/category-search-tool/CategorySearchTool.ts b/src/tools/category-search-tool/CategorySearchTool.ts
@@ -93,62 +93,6 @@ export class CategorySearchTool extends MapboxApiBasedTool<
     return results.join('\n\n');
   }
 
-  /**
-   * Simplify GeoJSON response to only essential fields
-   * Removes verbose nested context, attribution, and metadata while keeping valid GeoJSON structure
-   */
-  private compactGeoJsonResponse(
-    geoJsonResponse: MapboxFeatureCollection
-  ): Record<string, unknown> {
-    return {
-      type: 'FeatureCollection',
-      features: geoJsonResponse.features.map((feature) => {
-        const props = feature.properties || {};
-        const context = (props.context || {}) as Record<string, any>;
-        const geom = feature.geometry;
-
-        // Extract coordinates safely
-        let coordinates: [number, number] | undefined;
-        if (geom && geom.type === 'Point' && 'coordinates' in geom) {
-          coordinates = geom.coordinates as [number, number];
-        }
-
-        return {
-          type: 'Feature',
-          geometry: geom
-            ? {
-                type: geom.type,
-                coordinates:
-                  'coordinates' in geom ? geom.coordinates : undefined
-              }
-            : null,
-          properties: {
-            name: props.name,
-            full_address: props.full_address,
-            place_formatted: props.place_formatted,
-            feature_type: props.feature_type,
-            coordinates: coordinates
-              ? {
-                  longitude: coordinates[0],
-                  latitude: coordinates[1]
-                }
-              : undefined,
-            poi_category: props.poi_category,
-            brand: props.brand,
-            maki: props.maki,
-            address: context.address?.name,
-            street: context.street?.name,
-            postcode: context.postcode?.name,
-            place: context.place?.name,
-            district: context.district?.name,
-            region: context.region?.name,
-            country: context.country?.name
-          }
-        };
-      })
-    };
-  }
-
   protected async execute(
     input: z.infer<typeof CategorySearchInputSchema>,
     accessToken: string
@@ -231,23 +175,16 @@ export class CategorySearchTool extends MapboxApiBasedTool<
       data = rawData as MapboxFeatureCollection;
     }
 
-    // Determine which structured content to return
-    const structuredContent = input.compact
-      ? this.compactGeoJsonResponse(data)
-      : (data as unknown as Record<string, unknown>);
-
     if (input.format === 'json_string') {
       return {
-        content: [
-          { type: 'text', text: JSON.stringify(structuredContent, null, 2) }
-        ],
-        structuredContent,
+        content: [{ type: 'text', text: JSON.stringify(data, null, 2) }],
+        structuredContent: data as unknown as Record<string, unknown>,
         isError: false
       };
     } else {
       return {
         content: [{ type: 'text', text: this.formatGeoJsonToText(data) }],
-        structuredContent,
+        structuredContent: data as unknown as Record<string, unknown>,
         isError: false
       };
     }
diff --git a/src/tools/reverse-geocode-tool/ReverseGeocodeTool.input.schema.ts b/src/tools/reverse-geocode-tool/ReverseGeocodeTool.input.schema.ts
@@ -56,12 +56,5 @@ export const ReverseGeocodeInputSchema = z.object({
     .default('formatted_text')
     .describe(
       'Output format: "json_string" returns raw GeoJSON data as a JSON string that can be parsed; "formatted_text" returns human-readable text with place names, addresses, and coordinates. Both return as text content but json_string contains parseable JSON data while formatted_text is for display.'
-    ),
-  compact: z
-    .boolean()
-    .optional()
-    .default(true)
-    .describe(
-      'When true (default), returns simplified GeoJSON with only essential fields (name, address, coordinates, location hierarchy). When false, returns full verbose Mapbox API response with all metadata. Only applies to structured content output.'
     )
 });
diff --git a/src/tools/reverse-geocode-tool/ReverseGeocodeTool.ts b/src/tools/reverse-geocode-tool/ReverseGeocodeTool.ts
@@ -86,58 +86,6 @@ export class ReverseGeocodeTool extends MapboxApiBasedTool<
     return results.join('\n\n');
   }
 
-  /**
-   * Simplify GeoJSON response to only essential fields
-   * Removes verbose nested context and attribution while keeping valid GeoJSON structure
-   */
-  private compactGeoJsonResponse(
-    geoJsonResponse: MapboxFeatureCollection
-  ): Record<string, unknown> {
-    return {
-      type: 'FeatureCollection',
-      features: geoJsonResponse.features.map((feature) => {
-        const props = feature.properties || {};
-        const context = (props.context || {}) as Record<string, any>;
-        const geom = feature.geometry;
-
-        // Extract coordinates safely
-        let coordinates: [number, number] | undefined;
-        if (geom && geom.type === 'Point' && 'coordinates' in geom) {
-          coordinates = geom.coordinates as [number, number];
-        }
-
-        return {
-          type: 'Feature',
-          geometry: geom
-            ? {
-                type: geom.type,
-                coordinates:
-                  'coordinates' in geom ? geom.coordinates : undefined
-              }
-            : null,
-          properties: {
-            name: props.name,
-            full_address: props.full_address,
-            place_formatted: props.place_formatted,
-            feature_type: props.feature_type,
-            coordinates: coordinates
-              ? {
-                  longitude: coordinates[0],
-                  latitude: coordinates[1]
-                }
-              : undefined,
-            address: context.address?.name,
-            postcode: context.postcode?.name,
-            place: context.place?.name,
-            district: context.district?.name,
-            region: context.region?.name,
-            country: context.country?.name
-          }
-        };
-      })
-    };
-  }
-
   protected async execute(
     input: z.infer<typeof ReverseGeocodeInputSchema>,
     accessToken: string
@@ -223,23 +171,16 @@ export class ReverseGeocodeTool extends MapboxApiBasedTool<
       };
     }
 
-    // Determine which structured content to return
-    const structuredContent = input.compact
-      ? this.compactGeoJsonResponse(data)
-      : (data as unknown as Record<string, unknown>);
-
     if (input.format === 'json_string') {
       return {
-        content: [
-          { type: 'text', text: JSON.stringify(structuredContent, null, 2) }
-        ],
-        structuredContent,
+        content: [{ type: 'text', text: JSON.stringify(data, null, 2) }],
+        structuredContent: data as unknown as Record<string, unknown>,
         isError: false
       };
     } else {
       return {
         content: [{ type: 'text', text: this.formatGeoJsonToText(data) }],
-        structuredContent,
+        structuredContent: data as unknown as Record<string, unknown>,
         isError: false
       };
     }
diff --git a/src/tools/search-and-geocode-tool/SearchAndGeocodeTool.input.schema.ts b/src/tools/search-and-geocode-tool/SearchAndGeocodeTool.input.schema.ts
@@ -61,12 +61,5 @@ export const SearchAndGeocodeInputSchema = z.object({
       longitude: z.number().min(-180).max(180),
       latitude: z.number().min(-90).max(90)
     })
-    .optional(),
-  compact: z
-    .boolean()
     .optional()
-    .default(true)
-    .describe(
-      'When true (default), returns simplified GeoJSON with only essential fields (name, address, coordinates, categories, brand). When false, returns full verbose Mapbox API response with all metadata. Only applies to structured content output.'
-    )
 });
diff --git a/src/tools/search-and-geocode-tool/SearchAndGeocodeTool.ts b/src/tools/search-and-geocode-tool/SearchAndGeocodeTool.ts
@@ -96,62 +96,6 @@ export class SearchAndGeocodeTool extends MapboxApiBasedTool<
     return results.join('\n\n');
   }
 
-  /**
-   * Simplify GeoJSON response to only essential fields
-   * Removes verbose nested context, attribution, and metadata while keeping valid GeoJSON structure
-   */
-  private compactGeoJsonResponse(
-    geoJsonResponse: MapboxFeatureCollection
-  ): Record<string, unknown> {
-    return {
-      type: 'FeatureCollection',
-      features: geoJsonResponse.features.map((feature) => {
-        const props = feature.properties || {};
-        const context = (props.context || {}) as Record<string, any>;
-        const geom = feature.geometry;
-
-        // Extract coordinates safely
-        let coordinates: [number, number] | undefined;
-        if (geom && geom.type === 'Point' && 'coordinates' in geom) {
-          coordinates = geom.coordinates as [number, number];
-        }
-
-        return {
-          type: 'Feature',
-          geometry: geom
-            ? {
-                type: geom.type,
-                coordinates:
-                  'coordinates' in geom ? geom.coordinates : undefined
-              }
-            : null,
-          properties: {
-            name: props.name,
-            full_address: props.full_address,
-            place_formatted: props.place_formatted,
-            feature_type: props.feature_type,
-            coordinates: coordinates
-              ? {
-                  longitude: coordinates[0],
-                  latitude: coordinates[1]
-                }
-              : undefined,
-            poi_category: props.poi_category,
-            brand: props.brand,
-            maki: props.maki,
-            address: context.address?.name,
-            street: context.street?.name,
-            postcode: context.postcode?.name,
-            place: context.place?.name,
-            district: context.district?.name,
-            region: context.region?.name,
-            country: context.country?.name
-          }
-        };
-      })
-    };
-  }
-
   protected async execute(
     input: z.infer<typeof SearchAndGeocodeInputSchema>,
     accessToken: string
@@ -267,19 +211,14 @@ export class SearchAndGeocodeTool extends MapboxApiBasedTool<
       `SearchAndGeocodeTool: Successfully completed search, found ${data.features?.length || 0} results`
     );
 
-    // Determine which structured content to return
-    const structuredContent = input.compact
-      ? this.compactGeoJsonResponse(data as MapboxFeatureCollection)
-      : (data as unknown as Record<string, unknown>);
-
     return {
       content: [
         {
           type: 'text',
           text: this.formatGeoJsonToText(data as MapboxFeatureCollection)
         }
       ],
-      structuredContent,
+      structuredContent: data,
       isError: false
     };
   }
diff --git a/test/tools/category-search-tool/CategorySearchTool.test.ts b/test/tools/category-search-tool/CategorySearchTool.test.ts
diff --git a/test/tools/reverse-geocode-tool/ReverseGeocodeTool.test.ts b/test/tools/reverse-geocode-tool/ReverseGeocodeTool.test.ts
diff --git a/test/tools/search-and-geocode-tool/SearchAndGeocodeTool.test.ts b/test/tools/search-and-geocode-tool/SearchAndGeocodeTool.test.ts
