GO-180 added excludeTypes to query

maptiler · Dec 4, 2023 · 2299ab1 · 2299ab1
1 parent 5f79843
commit 2299ab1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/services/geocoding.ts b/src/services/geocoding.ts
@@ -243,7 +243,7 @@ export type GeocodingSearchResult = {
 
 function addLanguageGeocodingOptions(
   searchParams: URLSearchParams,
-  options: LanguageGeocodingOptions
+  options: LanguageGeocodingOptions,
 ) {
   const { language } = options;
 
@@ -254,19 +254,19 @@ function addLanguageGeocodingOptions(
   const languages = Array.from(
     new Set(
       (Array.isArray(language) ? language : [language]).map((lang) =>
-        lang === LanguageGeocoding.AUTO ? getAutoLanguageGeocoding() : lang
-      )
-    )
+        lang === LanguageGeocoding.AUTO ? getAutoLanguageGeocoding() : lang,
+      ),
+    ),
   ).join(",");
 
   searchParams.set("language", languages);
 }
 
 function addCommonForwardAndReverseGeocodingOptions(
   searchParams: URLSearchParams,
-  options: CommonForwardAndReverseGeocodingOptions
+  options: CommonForwardAndReverseGeocodingOptions,
 ) {
-  const { apiKey, limit, types } = options;
+  const { apiKey, limit, types, excludeTypes } = options;
 
   searchParams.set("key", apiKey ?? config.apiKey);
 
@@ -278,12 +278,16 @@ function addCommonForwardAndReverseGeocodingOptions(
     searchParams.set("types", types.join(","));
   }
 
+  if (excludeTypes != undefined) {
+    searchParams.set("excludeTypes", String(excludeTypes));
+  }
+
   addLanguageGeocodingOptions(searchParams, options);
 }
 
 function addForwardGeocodingOptions(
   searchParams: URLSearchParams,
-  options: GeocodingOptions
+  options: GeocodingOptions,
 ) {
   addCommonForwardAndReverseGeocodingOptions(searchParams, options);
 
@@ -296,7 +300,7 @@ function addForwardGeocodingOptions(
   if (proximity != undefined) {
     searchParams.set(
       "proximity",
-      proximity === "ip" ? proximity : proximity.join(",")
+      proximity === "ip" ? proximity : proximity.join(","),
     );
   }
 
@@ -324,15 +328,15 @@ function addForwardGeocodingOptions(
  */
 async function forward(
   query: string,
-  options: GeocodingOptions = {}
+  options: GeocodingOptions = {},
 ): Promise<GeocodingSearchResult> {
   if (typeof query !== "string" || query.trim().length === 0) {
     throw new Error("The query must be a non-empty string");
   }
 
   const endpoint = new URL(
     `geocoding/${encodeURIComponent(query)}.json`,
-    defaults.maptilerApiURL
+    defaults.maptilerApiURL,
   );
 
   const { searchParams } = endpoint;
@@ -362,15 +366,15 @@ async function forward(
  */
 async function reverse(
   position: Position,
-  options: ReverseGeocodingOptions = {}
+  options: ReverseGeocodingOptions = {},
 ): Promise<GeocodingSearchResult> {
   if (!Array.isArray(position) || position.length < 2) {
     throw new Error("The position must be an array of form [lng, lat].");
   }
 
   const endpoint = new URL(
     `geocoding/${position[0]},${position[1]}.json`,
-    defaults.maptilerApiURL
+    defaults.maptilerApiURL,
   );
 
   addCommonForwardAndReverseGeocodingOptions(endpoint.searchParams, options);
@@ -399,7 +403,7 @@ async function reverse(
  */
 async function byId(
   id: string,
-  options: ByIdGeocodingOptions = {}
+  options: ByIdGeocodingOptions = {},
 ): Promise<GeocodingSearchResult> {
   const endpoint = new URL(`geocoding/${id}.json`, defaults.maptilerApiURL);
   endpoint.searchParams.set("key", options.apiKey ?? config.apiKey);
@@ -429,7 +433,7 @@ async function byId(
  */
 async function batch(
   queries: string[],
-  options: GeocodingOptions = {}
+  options: GeocodingOptions = {},
 ): Promise<GeocodingSearchResult[]> {
   if (!queries.length) {
     return [];
@@ -441,7 +445,7 @@ async function batch(
 
   const endpoint = new URL(
     `geocoding/${joinedQuery}.json`,
-    defaults.maptilerApiURL
+    defaults.maptilerApiURL,
   );
 
   const { searchParams } = endpoint;