@maptiler/geocoding-control 1.4.2-dev.2 → 2.0.0

package/svelte/maplibregl-controller.js

@@ -3,7 +3,7 @@ import union from "@turf/union";
 import MarkerIcon from "./MarkerIcon.svelte";
 import { setMask } from "./mask";
 const emptyGeojson = featureCollection([]);
-export function createMapLibreGlMapController(map, maplibregl, marker = true, showResultMarkers = true, flyToOptions = {}, fitBoundsOptions = {}, fullGeometryStyle = {
+const defaultGeometryStyle = {
     fill: {
         paint: {
             "fill-color": "#000",
@@ -22,31 +22,37 @@ export function createMapLibreGlMapController(map, maplibregl, marker = true, sh
         },
         filter: ["!", ["has", "isMask"]],
     },
-}) {
+};
+export function createMapLibreGlMapController(map, maplibregl, marker = true, showResultMarkers = true, flyToOptions = {}, fitBoundsOptions = {}, fullGeometryStyle = defaultGeometryStyle) {
     let eventHandler;
     const markers = [];
     let selectedMarker;
     let reverseMarker;
     let savedData; // used to restore features on style switch
     function addFullGeometryLayer() {
+        const effFullGeometryStyle = !fullGeometryStyle
+            ? undefined
+            : fullGeometryStyle === true
+                ? defaultGeometryStyle
+                : fullGeometryStyle;
         if (!map.getSource("full-geom") &&
-            (fullGeometryStyle?.fill || fullGeometryStyle?.line)) {
+            (effFullGeometryStyle?.fill || effFullGeometryStyle?.line)) {
             map.addSource("full-geom", {
                 type: "geojson",
                 data: emptyGeojson,
             });
         }
-        if (!map.getLayer("full-geom-fill") && fullGeometryStyle?.fill) {
+        if (!map.getLayer("full-geom-fill") && effFullGeometryStyle?.fill) {
             map.addLayer({
-                ...fullGeometryStyle?.fill,
+                ...effFullGeometryStyle?.fill,
                 id: "full-geom-fill",
                 type: "fill",
                 source: "full-geom",
             });
         }
-        if (!map.getLayer("full-geom-line") && fullGeometryStyle?.line) {
+        if (!map.getLayer("full-geom-line") && effFullGeometryStyle?.line) {
             map.addLayer({
-                ...fullGeometryStyle?.line,
+                ...effFullGeometryStyle?.line,
                 id: "full-geom-line",
                 type: "line",
                 source: "full-geom",
@@ -131,18 +137,20 @@ export function createMapLibreGlMapController(map, maplibregl, marker = true, sh
                 }
             }
             else if (coordinates) {
-                reverseMarker = (typeof marker === "object"
-                    ? new maplibregl.Marker(marker)
-                    : createMarker())
-                    .setLngLat(coordinates)
-                    .addTo(map);
-                reverseMarker.getElement().classList.add("marker-reverse");
+                if (marker instanceof Function) {
+                    reverseMarker = marker(map) ?? undefined;
+                }
+                else {
+                    reverseMarker = (typeof marker === "object"
+                        ? new maplibregl.Marker(marker)
+                        : createMarker())
+                        .setLngLat(coordinates)
+                        .addTo(map);
+                    reverseMarker.getElement().classList.add("marker-reverse");
+                }
             }
         },
         setMarkers(markedFeatures, picked) {
-            if (!marker) {
-                return;
-            }
             for (const marker of markers) {
                 marker.remove();
             }
@@ -190,12 +198,16 @@ export function createMapLibreGlMapController(map, maplibregl, marker = true, sh
                     setData(picked);
                     return; // no pin for (multi)linestrings
                 }
-                if (marker) {
-                    markers.push((typeof marker === "object"
+                if (marker instanceof Function) {
+                    const m = marker(map, picked);
+                    if (m) {
+                        markers.push(m);
+                    }
+                }
+                else if (marker) {
+                    markers.push(typeof marker === "object"
                         ? new maplibregl.Marker(marker)
-                        : createMarker())
-                        .setLngLat(picked.center)
-                        .addTo(map));
+                        : createMarker().setLngLat(picked.center).addTo(map));
                 }
             }
             if (showResultMarkers) {
@@ -203,19 +215,28 @@ export function createMapLibreGlMapController(map, maplibregl, marker = true, sh
                     if (feature === picked) {
                         continue;
                     }
-                    const marker = (typeof showResultMarkers === "object"
-                        ? new maplibregl.Marker(showResultMarkers)
-                        : createMarker(true))
-                        .setLngLat(feature.center)
-                        .setPopup(new maplibregl.Popup({
-                        offset: [1, -27],
-                        closeButton: false,
-                        closeOnMove: true,
-                        className: "maptiler-gc-popup",
-                    }).setText(feature.place_type[0] === "reverse"
-                        ? feature.place_name
-                        : feature.place_name.replace(/,.*/, "")))
-                        .addTo(map);
+                    let marker;
+                    if (showResultMarkers instanceof Function) {
+                        marker = showResultMarkers(map, feature);
+                        if (!marker) {
+                            continue;
+                        }
+                    }
+                    else {
+                        marker = (typeof showResultMarkers === "object"
+                            ? new maplibregl.Marker(showResultMarkers)
+                            : createMarker(true))
+                            .setLngLat(feature.center)
+                            .setPopup(new maplibregl.Popup({
+                            offset: [1, -27],
+                            closeButton: false,
+                            closeOnMove: true,
+                            className: "maptiler-gc-popup",
+                        }).setText(feature.place_type[0] === "reverse"
+                            ? feature.place_name
+                            : feature.place_name.replace(/,.*/, "")))
+                            .addTo(map);
+                    }
                     const element = marker.getElement();
                     element.addEventListener("click", (e) => {
                         e.stopPropagation();

package/svelte/maplibregl.d.ts

@@ -1,7 +1,6 @@
 import type { Map } from "maplibre-gl";
 import * as maplibregl from "maplibre-gl";
-import type GeocodingControlComponent from "./GeocodingControl.svelte";
-import { MapLibreBasedGeocodingControl, type MapLibreBaseControlOptions, type Props } from "./MapLibreBasedGeocodingControl";
+import { type MapLibreBaseControlOptions } from "./MapLibreBasedGeocodingControl";
 export { createMapLibreGlMapController } from "./maplibregl-controller";
 type Options = MapLibreBaseControlOptions & {
     /**
@@ -9,8 +8,33 @@ type Options = MapLibreBaseControlOptions & {
      */
     apiKey: string;
 };
-export declare class GeocodingControl extends MapLibreBasedGeocodingControl<Options> implements maplibregl.IControl {
-    getMapLibreGl(): typeof maplibregl;
+declare const Base: {
+    new <T extends MapLibreBaseControlOptions>(options?: T): {
+        "__#1@#gc"?: import("./GeocodingControl.svelte").default;
+        "__#1@#options": T;
+        onAddInt(map: Map): HTMLElement;
+        setOptions(options: T): void;
+        setQuery(value: string, submit?: boolean): void;
+        clearMap(): void;
+        clearList(): void;
+        setReverseMode(value: boolean): void;
+        focus(): void;
+        blur(): void;
+        onRemove(): void;
+        _listeners: maplibregl.Listeners;
+        _oneTimeListeners: maplibregl.Listeners;
+        _eventedParent: maplibregl.Evented;
+        _eventedParentData: any | (() => any);
+        on(type: string, listener: maplibregl.Listener): any;
+        off(type: string, listener: maplibregl.Listener): any;
+        once(type: string, listener?: maplibregl.Listener): Promise<any> | any;
+        fire(event: {
+            readonly type: string;
+        } | string, properties?: any): any;
+        listens(type: string): boolean;
+        setEventedParent(parent?: maplibregl.Evented | null, data?: any | (() => any)): any;
+    };
+};
+export declare class GeocodingControl extends Base<Options> implements maplibregl.IControl {
     onAdd(map: Map): HTMLElement;
-    getExtraProps(): Partial<Props<GeocodingControlComponent>>;
 }

package/svelte/maplibregl.js

@@ -1,14 +1,9 @@
 import * as maplibregl from "maplibre-gl";
-import { MapLibreBasedGeocodingControl, } from "./MapLibreBasedGeocodingControl";
+import { crateBaseClass, } from "./MapLibreBasedGeocodingControl";
 export { createMapLibreGlMapController } from "./maplibregl-controller";
-export class GeocodingControl extends MapLibreBasedGeocodingControl {
-    getMapLibreGl() {
-        return maplibregl;
-    }
+const Base = crateBaseClass(maplibregl.Evented, maplibregl);
+export class GeocodingControl extends Base {
     onAdd(map) {
         return super.onAddInt(map);
     }
-    getExtraProps() {
-        return {};
-    }
 }

package/svelte/maptilersdk.d.ts

@@ -1,11 +1,35 @@
 import * as maptilersdk from "@maptiler/sdk";
 import type * as maplibregl from "maplibre-gl";
 import type { Map } from "maplibre-gl";
-import type GeocodingControlComponent from "./GeocodingControl.svelte";
-import { MapLibreBasedGeocodingControl, type MapLibreBaseControlOptions, type Props } from "./MapLibreBasedGeocodingControl";
+import { type MapLibreBaseControlOptions } from "./MapLibreBasedGeocodingControl";
 export { createMapLibreGlMapController } from "./maplibregl-controller";
-export declare class GeocodingControl extends MapLibreBasedGeocodingControl<MapLibreBaseControlOptions> implements maptilersdk.IControl {
-    getMapLibreGl(): typeof maplibregl;
+declare const Base: {
+    new <T extends MapLibreBaseControlOptions>(options?: T): {
+        "__#1@#gc"?: import("./GeocodingControl.svelte").default;
+        "__#1@#options": T;
+        onAddInt(map: Map): HTMLElement;
+        setOptions(options: T): void;
+        setQuery(value: string, submit?: boolean): void;
+        clearMap(): void;
+        clearList(): void;
+        setReverseMode(value: boolean): void;
+        focus(): void;
+        blur(): void;
+        onRemove(): void;
+        _listeners: maptilersdk.Listeners;
+        _oneTimeListeners: maptilersdk.Listeners;
+        _eventedParent: maplibregl.Evented;
+        _eventedParentData: any | (() => any);
+        on(type: string, listener: maptilersdk.Listener): any;
+        off(type: string, listener: maptilersdk.Listener): any;
+        once(type: string, listener?: maptilersdk.Listener): Promise<any> | any;
+        fire(event: {
+            readonly type: string;
+        } | string, properties?: any): any;
+        listens(type: string): boolean;
+        setEventedParent(parent?: maplibregl.Evented | null, data?: any | (() => any)): any;
+    };
+};
+export declare class GeocodingControl extends Base<MapLibreBaseControlOptions> implements maptilersdk.IControl {
     onAdd(map: maptilersdk.Map): HTMLElement;
-    getExtraProps(map: Map, div: HTMLElement): Partial<Props<GeocodingControlComponent>>;
 }

package/svelte/maptilersdk.js

@@ -1,25 +1,22 @@
 import * as maptilersdk from "@maptiler/sdk";
-import { MapLibreBasedGeocodingControl, } from "./MapLibreBasedGeocodingControl";
+import { crateBaseClass, } from "./MapLibreBasedGeocodingControl";
 export { createMapLibreGlMapController } from "./maplibregl-controller";
-export class GeocodingControl extends MapLibreBasedGeocodingControl {
-    getMapLibreGl() {
-        return maptilersdk;
+const Base = crateBaseClass(maptilersdk.Evented, maptilersdk, (map, div) => {
+    const sdkConfig = {};
+    if (!("getSdkConfig" in map && typeof map.getSdkConfig === "function")) {
+        throw new Error("MapTiler SDK not detected");
     }
+    const { primaryLanguage, apiKey } = map.getSdkConfig();
+    sdkConfig.apiKey = apiKey;
+    const match = /^([a-z]{2})($|_|-)/.exec(primaryLanguage);
+    if (match) {
+        sdkConfig.language = match[1];
+    }
+    div.className += " maptiler-ctrl";
+    return sdkConfig;
+});
+export class GeocodingControl extends Base {
     onAdd(map) {
         return super.onAddInt(map);
     }
-    getExtraProps(map, div) {
-        const sdkConfig = {};
-        if (!("getSdkConfig" in map && typeof map.getSdkConfig === "function")) {
-            throw new Error("MapTiler SDK not detected");
-        }
-        const { primaryLanguage, apiKey } = map.getSdkConfig();
-        sdkConfig.apiKey = apiKey;
-        const match = /^([a-z]{2})($|_|-)/.exec(primaryLanguage);
-        if (match) {
-            sdkConfig.language = match[1];
-        }
-        div.className += " maptiler-ctrl";
-        return sdkConfig;
-    }
 }

package/svelte/types.d.ts

@@ -207,6 +207,12 @@ export type ControlOptions = {
      * Default value is `undefined` - all available feature types are returned.
      */
     types?: string[];
+    /**
+     * Use `limit` value for reverse geocoding even if `types` is not an array with a single element.
+     * Will work only if enabled on the server.
+     * Default value is `false`.
+     */
+    exhaustiveReverseGeocoding?: boolean;
     /**
      * If set to `true` then use all types except for those listed in `types`.
      * Default value is `false`.

package/types.d.ts

@@ -207,6 +207,12 @@ export type ControlOptions = {
      * Default value is `undefined` - all available feature types are returned.
      */
     types?: string[];
+    /**
+     * Use `limit` value for reverse geocoding even if `types` is not an array with a single element.
+     * Will work only if enabled on the server.
+     * Default value is `false`.
+     */
+    exhaustiveReverseGeocoding?: boolean;
     /**
      * If set to `true` then use all types except for those listed in `types`.
      * Default value is `false`.