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

package/svelte/GeocodingControl.svelte

@@ -67,13 +67,14 @@ export let selectFirst = true;
 export let flyToSelected = false;
 export let markerOnSelected = true;
 export let types = undefined;
+export let exhaustiveReverseGeocoding = false;
 export let excludeTypes = false;
 export let zoom = ZOOM_DEFAULTS;
 export let maxZoom = undefined;
 export let apiUrl = "https://api.maptiler.com/geocoding";
 export let fetchParameters = {};
 export let iconsBaseUrl = "https://cdn.maptiler.com/maptiler-geocoding-control/v" +
-    "1.4.2-dev.2" +
+    "2.0.0" +
     "/icons/";
 export let adjustUrlQuery = () => { };
 export function focus() {
@@ -312,7 +313,8 @@ async function search(searchValue, { byId = false, exact = false, } = {}) {
             }
             sp.set("fuzzyMatch", String(fuzzyMatch));
         }
-        if (limit !== undefined) {
+        if (limit !== undefined &&
+            (exhaustiveReverseGeocoding || !isReverse || types?.length === 1)) {
             sp.set("limit", String(limit));
         }
         sp.set("key", apiKey);

package/svelte/GeocodingControl.svelte.d.ts

@@ -33,6 +33,7 @@ declare const __propDef: {
         flyToSelected?: boolean;
         markerOnSelected?: boolean;
         types?: string[] | undefined;
+        exhaustiveReverseGeocoding?: boolean;
         excludeTypes?: boolean;
         zoom?: number | Record<string, number>;
         maxZoom?: number | undefined;

package/svelte/MapLibreBasedGeocodingControl.d.ts

@@ -1,54 +1,89 @@
-import type * as maplibregl from "maplibre-gl";
-import type { FillLayerSpecification, FitBoundsOptions, FlyToOptions, LineLayerSpecification, Map, MarkerOptions } from "maplibre-gl";
+import type { Evented, FitBoundsOptions, FlyToOptions, Map, Marker, MarkerOptions } from "maplibre-gl";
 import type { SvelteComponent } from "svelte";
 import GeocodingControlComponent from "./GeocodingControl.svelte";
-import type { ControlOptions } from "./types";
-export { createMapLibreGlMapController } from "./maplibregl-controller";
+import { type FullGeometryStyle, type MapLibreGL } from "./maplibregl-controller";
+import type { ControlOptions, Feature } from "./types";
+export { createMapLibreGlMapController, type MapLibreGL, } from "./maplibregl-controller";
 export type MapLibreBaseControlOptions = Omit<ControlOptions, "apiKey"> & {
     /**
-     * If `true`, a [Marker](https://maplibre.org/maplibre-gl-js-docs/api/markers/#marker) will be added to the map at the location of the user-selected result using a default set of Marker options.
-     * If the value is an object, the marker will be constructed using these options.
-     * If `false`, no marker will be added to the map.
+     * Marker to be added to the map at the location of the user-selected result using a default set of Marker options.
+     *
+     * - If `true` or `undefined` then a default marker will be used.
+     * - If the value is a [MarkerOptions](https://maplibre.org/maplibre-gl-js/docs/API/type-aliases/MarkerOptions/) then the marker will be constructed using these options.
+     * - If the value is a function then it can return instance of the [Marker](https://maplibre.org/maplibre-gl-js/docs/API/classes/Marker/).
+     *   Function can accept `Feature` as a parameter which is `undefined` for the reverse location marker.
+     * - If `false` or `null` then no marker will be added to the map.
+     *
      * Requires that `options.maplibregl` also be set.
+     *
      * Default value is `true`.
      */
-    marker?: boolean | MarkerOptions;
+    marker?: null | boolean | MarkerOptions | ((map: Map, feature?: Feature) => undefined | null | Marker);
     /**
-     * If `true`, [Markers](https://maplibre.org/maplibre-gl-js-docs/api/markers/#marker) will be added to the map at the location the top results for the query.
-     * If the value is an object, the marker will be constructed using these options.
-     * If `false`, no marker will be added to the map.
+     * Marker be added to the map at the location the geocoding results.
+     *
+     * - If `true` or `undefined` then a default marker will be used.
+     * - If the value is a [MarkerOptions](https://maplibre.org/maplibre-gl-js/docs/API/type-aliases/MarkerOptions/) then the marker will be constructed using these options.
+     * - If the value is a function then it can return instance of the [Marker](https://maplibre.org/maplibre-gl-js/docs/API/classes/Marker/).
+     *   In this case the default pop-up won't be added to the marker.
+     *   Function can accept `Feature` as a parameter.
+     * - If `false` or `null` then no marker will be added to the map.
+     *
      * Requires that `options.maplibregl` also be set.
+     *
      * Default value is `true`.
      */
-    showResultMarkers?: boolean | MarkerOptions;
+    showResultMarkers?: null | boolean | MarkerOptions | ((map: Map, feature: Feature) => undefined | null | Marker);
     /**
-     * If `false`, animating the map to a selected result is disabled.
-     * If `true`, animating the map will use the default animation parameters.
-     * If an object, it will be passed as options to the map `flyTo` or `fitBounds` method providing control over the animation of the transition.
+     * Animation to selected feature on the map.
+     *
+     * - If `false` or `null` then animating the map to a selected result is disabled.
+     * - If `true` or `undefined` then animating the map will use the default animation parameters.
+     * - If an [FlyToOptions](https://maplibre.org/maplibre-gl-js/docs/API/type-aliases/FlyToOptions/)
+     *     ` & `[FitBoundsOptions](https://maplibre.org/maplibre-gl-js/docs/API/type-aliases/FitBoundsOptions/)
+     *     then it will be passed as options to the map [flyTo](https://maplibre.org/maplibre-gl-js/docs/API/classes/Map/#flyto)
+     *     or [fitBounds](https://maplibre.org/maplibre-gl-js/docs/API/classes/Map/#fitbounds) method providing control over the animation of the transition.
+     *
      * Default value is `true`.
      */
-    flyTo?: boolean | (FlyToOptions & FitBoundsOptions);
+    flyTo?: null | boolean | (FlyToOptions & FitBoundsOptions);
     /**
      * Style for full feature geometry GeoJSON.
+     *
+     * - If `false` or `null` then no full geometry is drawn.
+     * - If `true` or `undefined` then default-styled full geometry is drawn.
+     * - If an object then it must represent the style and will be used to style the full geometry.
+     *
+     * Default is the default style.
      */
-    fullGeometryStyle?: {
-        fill: Pick<FillLayerSpecification, "layout" | "paint" | "filter">;
-        line: Pick<LineLayerSpecification, "layout" | "paint" | "filter">;
-    };
+    fullGeometryStyle?: null | boolean | FullGeometryStyle;
 };
 export type Props<T> = T extends SvelteComponent<infer P> ? P : never;
-export declare abstract class MapLibreBasedGeocodingControl<T extends MapLibreBaseControlOptions> extends EventTarget {
-    #private;
-    constructor(options?: T);
-    abstract getExtraProps(map: Map, div: HTMLElement): Partial<Props<GeocodingControlComponent>>;
-    onAddInt(map: Map): HTMLElement;
-    abstract getMapLibreGl(): typeof maplibregl;
-    setOptions(options: T): void;
-    setQuery(value: string, submit?: boolean): void;
-    clearMap(): void;
-    clearList(): void;
-    setReverseMode(value: boolean): void;
-    focus(): void;
-    blur(): void;
-    onRemove(): void;
-}
+type EventedConstructor = new (...args: ConstructorParameters<typeof Evented>) => Evented;
+export declare function crateBaseClass(Evented: EventedConstructor, maplibreGl: MapLibreGL, getExtraProps?: (map: Map, div: HTMLElement) => Partial<Props<GeocodingControlComponent>>): {
+    new <T extends MapLibreBaseControlOptions>(options?: T): {
+        "__#1@#gc"?: GeocodingControlComponent;
+        "__#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: import("maplibre-gl").Listeners;
+        _oneTimeListeners: import("maplibre-gl").Listeners;
+        _eventedParent: Evented;
+        _eventedParentData: any | (() => any);
+        on(type: string, listener: import("maplibre-gl").Listener): any;
+        off(type: string, listener: import("maplibre-gl").Listener): any;
+        once(type: string, listener?: import("maplibre-gl").Listener): Promise<any> | any;
+        fire(event: {
+            readonly type: string;
+        } | string, properties?: any): any;
+        listens(type: string): boolean;
+        setEventedParent(parent?: Evented | null, data?: any | (() => any)): any;
+    };
+};

package/svelte/MapLibreBasedGeocodingControl.js

@@ -1,70 +1,73 @@
 import GeocodingControlComponent from "./GeocodingControl.svelte";
-import { createMapLibreGlMapController } from "./maplibregl-controller";
-export { createMapLibreGlMapController } from "./maplibregl-controller";
-export class MapLibreBasedGeocodingControl extends EventTarget {
-    #gc;
-    #options;
-    constructor(options = {}) {
-        super();
-        this.#options = options;
-    }
-    onAddInt(map) {
-        const div = document.createElement("div");
-        div.className =
-            "mapboxgl-ctrl-geocoder mapboxgl-ctrl maplibregl-ctrl-geocoder maplibregl-ctrl mapboxgl-ctrl-group";
-        const { marker, showResultMarkers, flyTo, fullGeometryStyle, ...restOptions } = this.#options;
-        const flyToOptions = typeof flyTo === "boolean" ? {} : flyTo;
-        const extraConfig = this.getExtraProps(map, div);
-        const mapController = createMapLibreGlMapController(map, this.getMapLibreGl(), marker, showResultMarkers, flyToOptions, flyToOptions, fullGeometryStyle);
-        const props = {
-            mapController,
-            flyTo: flyTo === undefined ? true : !!flyTo,
-            apiKey: "", // just to satisfy apiKey; TODO find a better solution
-            ...extraConfig,
-            ...restOptions,
-        };
-        if (!props.apiKey) {
-            throw new Error("no apiKey provided");
+import { createMapLibreGlMapController, } from "./maplibregl-controller";
+export { createMapLibreGlMapController, } from "./maplibregl-controller";
+export function crateBaseClass(Evented, maplibreGl, getExtraProps) {
+    return class MapLibreBasedGeocodingControl extends Evented {
+        #gc;
+        #options;
+        constructor(options = {}) {
+            super();
+            this.#options = options;
         }
-        this.#gc = new GeocodingControlComponent({ target: div, props });
-        for (const eventName of [
-            "select",
-            "pick",
-            "featuresListed",
-            "featuresMarked",
-            "response",
-            "optionsVisibilityChange",
-            "reverseToggle",
-            "queryChange",
-        ]) {
-            this.#gc.$on(eventName, (event) => this.dispatchEvent(event));
+        onAddInt(map) {
+            const div = document.createElement("div");
+            div.className =
+                "mapboxgl-ctrl-geocoder mapboxgl-ctrl maplibregl-ctrl-geocoder maplibregl-ctrl mapboxgl-ctrl-group";
+            const { marker, showResultMarkers, flyTo, fullGeometryStyle, ...restOptions } = this.#options;
+            const flyToOptions = typeof flyTo === "boolean" ? {} : flyTo;
+            const mapController = createMapLibreGlMapController(map, maplibreGl, marker, showResultMarkers, flyToOptions, flyToOptions, fullGeometryStyle);
+            const props = {
+                mapController,
+                flyTo: flyTo === undefined ? true : !!flyTo,
+                apiKey: "", // just to satisfy apiKey; TODO find a better solution
+                ...getExtraProps?.(map, div),
+                ...restOptions,
+            };
+            if (!props.apiKey) {
+                throw new Error("no apiKey provided");
+            }
+            this.#gc = new GeocodingControlComponent({ target: div, props });
+            for (const eventName of [
+                "select",
+                "pick",
+                "featuresListed",
+                "featuresMarked",
+                "response",
+                "optionsVisibilityChange",
+                "reverseToggle",
+                "queryChange",
+            ]) {
+                this.#gc.$on(eventName, (event) => {
+                    this.fire(eventName, event.detail);
+                });
+            }
+            return div;
         }
-        return div;
-    }
-    setOptions(options) {
-        this.#options = options;
-        const { marker, showResultMarkers, flyTo, fullGeometryStyle, ...restOptions } = this.#options;
-        this.#gc?.$set(restOptions);
-    }
-    setQuery(value, submit = true) {
-        this.#gc?.setQuery(value, submit);
-    }
-    clearMap() {
-        this.#gc?.clearMap();
-    }
-    clearList() {
-        this.#gc?.clearList();
-    }
-    setReverseMode(value) {
-        this.#gc?.$set({ reverseActive: value });
-    }
-    focus() {
-        this.#gc?.focus();
-    }
-    blur() {
-        this.#gc?.blur();
-    }
-    onRemove() {
-        this.#gc?.$destroy();
-    }
+        setOptions(options) {
+            this.#options = options;
+            const { marker, showResultMarkers, flyTo, fullGeometryStyle, ...restOptions } = this.#options;
+            this.#gc?.$set(restOptions);
+        }
+        setQuery(value, submit = true) {
+            this.#gc?.setQuery(value, submit);
+        }
+        clearMap() {
+            this.#gc?.clearMap();
+        }
+        clearList() {
+            this.#gc?.clearList();
+        }
+        setReverseMode(value) {
+            this.#gc?.$set({ reverseActive: value });
+        }
+        focus() {
+            this.#gc?.focus();
+        }
+        blur() {
+            this.#gc?.blur();
+        }
+        onRemove() {
+            this.#gc?.$destroy();
+        }
+    };
 }

package/svelte/leaflet-controller.d.ts

@@ -1,6 +1,6 @@
 import * as L from "leaflet";
 import type { BBox, Feature, MapEvent, Position } from "./types";
-export declare function createLeafletMapController(map: L.Map, marker?: boolean | L.MarkerOptions, showResultMarkers?: boolean | L.MarkerOptions, flyToOptions?: L.ZoomPanOptions, flyToBounds?: L.FitBoundsOptions, fullGeometryStyle?: L.PathOptions | L.StyleFunction): {
+export declare function createLeafletMapController(map: L.Map, marker?: boolean | null | L.MarkerOptions | ((map: L.Map, feature?: Feature) => L.Marker | undefined | null), showResultMarkers?: boolean | null | L.MarkerOptions | ((map: L.Map, feature: Feature) => L.Marker | undefined | null), flyToOptions?: L.ZoomPanOptions | null, flyToBounds?: L.FitBoundsOptions | null, fullGeometryStyle?: null | boolean | L.PathOptions | L.StyleFunction): {
     setEventHandler(handler: undefined | ((e: MapEvent) => void)): void;
     flyTo(center: Position, zoom?: number): void;
     fitBounds(bbox: BBox, padding: number, maxZoom?: number): void;

package/svelte/leaflet-controller.js

@@ -6,7 +6,7 @@ import * as L from "leaflet";
 import { unwrapBbox } from "./geoUtils";
 import MarkerIcon from "./MarkerIcon.svelte";
 import { setMask } from "./mask";
-export function createLeafletMapController(map, marker = true, showResultMarkers = true, flyToOptions = {}, flyToBounds = {}, fullGeometryStyle = (feature) => {
+const defaultFullGeometryStyle = (feature) => {
     const type = feature?.geometry?.type;
     const weight = feature?.properties?.isMask
         ? 0
@@ -21,13 +21,18 @@ export function createLeafletMapController(map, marker = true, showResultMarkers
         dashArray: [weight, weight],
         lineCap: "butt",
     };
-}) {
+};
+export function createLeafletMapController(map, marker = true, showResultMarkers = true, flyToOptions = {}, flyToBounds = {}, fullGeometryStyle = defaultFullGeometryStyle) {
     let eventHandler;
     const markers = [];
     let selectedMarker;
     let reverseMarker;
     const resultLayer = L.geoJSON(undefined, {
-        style: fullGeometryStyle,
+        style: fullGeometryStyle === true
+            ? defaultFullGeometryStyle
+            : fullGeometryStyle === false
+                ? undefined
+                : (fullGeometryStyle ?? undefined),
         interactive: false,
     }).addTo(map);
     const handleMapClick = (e) => {
@@ -93,16 +98,18 @@ export function createLeafletMapController(map, marker = true, showResultMarkers
                 }
             }
             else if (latLng) {
-                reverseMarker = (typeof marker === "object"
-                    ? new L.Marker(latLng, marker)
-                    : createMarker(latLng)).addTo(map);
-                reverseMarker.getElement()?.classList.add("marker-reverse");
+                if (marker instanceof Function) {
+                    reverseMarker = marker(map) ?? undefined;
+                }
+                else {
+                    reverseMarker = (typeof marker === "object"
+                        ? new L.Marker(latLng, marker)
+                        : createMarker(latLng)).addTo(map);
+                    reverseMarker.getElement()?.classList.add("marker-reverse");
+                }
             }
         },
         setMarkers(markedFeatures, picked) {
-            if (!marker) {
-                return;
-            }
             function setData(data) {
                 resultLayer.clearLayers();
                 if (data) {
@@ -170,10 +177,18 @@ export function createLeafletMapController(map, marker = true, showResultMarkers
                     setData(picked);
                     return; // no pin for (multi)linestrings
                 }
-                const pos = [picked.center[1], picked.center[0]];
-                markers.push((typeof marker === "object"
-                    ? new L.Marker(pos, marker)
-                    : createMarker(pos)).addTo(map));
+                if (marker instanceof Function) {
+                    const m = marker(map, picked);
+                    if (m) {
+                        markers.push(m.addTo(map));
+                    }
+                }
+                else if (marker) {
+                    const pos = [picked.center[1], picked.center[0]];
+                    markers.push(typeof marker === "object"
+                        ? new L.Marker(pos, marker)
+                        : createMarker(pos).addTo(map));
+                }
             }
             if (showResultMarkers) {
                 for (const feature of markedFeatures ?? []) {
@@ -184,16 +199,24 @@ export function createLeafletMapController(map, marker = true, showResultMarkers
                         feature.center[1],
                         feature.center[0],
                     ];
-                    const marker = typeof showResultMarkers === "object"
-                        ? new L.Marker(pos, showResultMarkers)
-                        : createMarker(pos, true);
-                    marker
-                        .addTo(map)
-                        .bindTooltip(feature.place_type[0] === "reverse"
-                        ? feature.place_name
-                        : feature.place_name.replace(/,.*/, ""), {
-                        direction: "top",
-                    });
+                    let marker;
+                    if (showResultMarkers instanceof Function) {
+                        marker = showResultMarkers(map, feature);
+                        if (!marker) {
+                            continue;
+                        }
+                    }
+                    else {
+                        marker = (typeof showResultMarkers === "object"
+                            ? new L.Marker(pos, showResultMarkers)
+                            : createMarker(pos, true))
+                            .addTo(map)
+                            .bindTooltip(feature.place_type[0] === "reverse"
+                            ? feature.place_name
+                            : feature.place_name.replace(/,.*/, ""), {
+                            direction: "top",
+                        });
+                    }
                     const element = marker.getElement();
                     if (element) {
                         element.addEventListener("click", (e) => {

package/svelte/leaflet.d.ts

@@ -1,34 +1,70 @@
 import * as L from "leaflet";
-import type { ControlOptions } from "./types";
+import type { ControlOptions, Feature } from "./types";
 export { createLeafletMapController } from "./leaflet-controller";
 type LeafletControlOptions = ControlOptions & L.ControlOptions & {
     /**
-     * If `true`, a [Marker](https://leafletjs.com/reference.html#marker) will be added to the map at the location of the user-selected result using a default set of Marker options.
-     * If the value is an object, the marker will be constructed using these options.
-     * If `false`, no marker will be added to the map.
+     * Marker to be added to the map at the location of the user-selected result using a default set of Marker options.
+     *
+     * - If `true` or `undefined` then a default marker will be used.\
+     * - If the value is [MarkerOptions](https://leafletjs.com/reference.html#marker-option) then the marker will be constructed using these options.
+     * - If the value is a function then it can create and configure custom [Marker](https://leafletjs.com/reference.html#marker),
+     *     add it to the [Map](https://leafletjs.com/reference.html#map) and return it.
+     *   Function accepts [Map](https://leafletjs.com/reference.html#map) and `Feature` as parameters.
+     *   Feature is `undefined` for the reverse location marker.
+     * - If `false` or `null` then no marker will be added to the map.
+     *
      * Default value is `true`.
      */
-    marker?: boolean | L.MarkerOptions;
+    marker?: null | boolean | L.MarkerOptions | ((map: L.Map, feature?: Feature) => L.Marker | undefined | null);
     /**
-     * If `true`, [Markers](https://leafletjs.com/reference.html#marker) will be added to the map at the location the top results for the query.
-     * If the value is an object, the marker will be constructed using these options.
-     * If `false`, no marker will be added to the map.
+     * Marker be added to the map at the location the geocoding results.
+     *
+     * - If `true` or `undefined` then a default marker will be used.
+     * - If the value is [MarkerOptions](https://leafletjs.com/reference.html#marker-option) then the marker will be constructed using these options.
+     * - If the value is a function then it can create and configure custom [Marker](https://leafletjs.com/reference.html#marker),
+     *     add it to the [Map](https://leafletjs.com/reference.html#map) and return it.
+     *   In this case the default pop-up won't be added to the marker.
+     *   Function accepts [Map](https://leafletjs.com/reference.html#map) and `Feature` as parameters.
+     * - If `false` or `null` then no marker will be added to the map.
+     *
      * Default value is `true`.
      */
-    showResultMarkers?: boolean | L.MarkerOptions;
+    showResultMarkers?: null | boolean | L.MarkerOptions | ((map: L.Map, feature: Feature) => L.Marker | undefined | null);
     /**
-     * If `false`, animating the map to a selected result is disabled.
-     * If `true`, animating the map will use the default animation parameters.
-     * If an object, it will be passed as options to the map `flyTo` or `fitBounds` method providing control over the animation of the transition.
+     * Animation to selected feature on the map.
+     *
+     * - If `false` or `null` then animating the map to a selected result is disabled.
+     * - If `true` or `undefined` then animating the map will use the default animation parameters.
+     * - If an [ZoomPanOptions](https://leafletjs.com/reference.html#zoom/pan-options)
+     *     ` & `[FitBoundsOptions](https://leafletjs.com/reference.html#fitbounds-options) then it will be passed as options
+     *     to the map [flyTo](https://leafletjs.com/reference.html#map-flyto)
+     *     or [fitBounds](https://leafletjs.com/reference.html#map-fitbounds) method providing control over the animation of the transition.
+     *
      * Default value is `true`.
      */
-    flyTo?: boolean | (L.ZoomPanOptions & L.FitBoundsOptions);
+    flyTo?: null | boolean | (L.ZoomPanOptions & L.FitBoundsOptions);
     /**
-     * Style for full feature geometry GeoJSON.
+     * Style for the full feature geometry.
+     *
+     * - If `false` or `null` then no full geometry is drawn.
+     * - If `true` or `undefined` then default-styled full geometry is drawn.
+     * - If an [PathOptions](https://leafletjs.com/reference.html#path-option) then it will be used to style the full geometry.
+     * - If a function accepting a `Feature` and returning [PathOptions](https://leafletjs.com/reference.html#path-option)
+     *     then it must teturn the style and will be used to style the full geometry.
      */
-    fullGeometryStyle?: L.PathOptions | L.StyleFunction;
+    fullGeometryStyle?: null | boolean | L.PathOptions | L.StyleFunction;
 };
-export declare class GeocodingControl extends L.Control {
+/**
+ * Leaflet mixins https://leafletjs.com/reference.html#class
+ * for TypeScript https://www.typescriptlang.org/docs/handbook/mixins.html
+ * @internal
+ */
+declare class EventedControl {
+    constructor(...args: unknown[]);
+}
+interface EventedControl extends L.Control, L.Evented {
+}
+export declare class GeocodingControl extends EventedControl {
     #private;
     constructor(options: LeafletControlOptions);
     onAdd(map: L.Map): HTMLDivElement;

package/svelte/leaflet.js

@@ -2,7 +2,19 @@ import * as L from "leaflet";
 import GeocodingControlComponent from "./GeocodingControl.svelte";
 import { createLeafletMapController } from "./leaflet-controller";
 export { createLeafletMapController } from "./leaflet-controller";
-export class GeocodingControl extends L.Control {
+/**
+ * Leaflet mixins https://leafletjs.com/reference.html#class
+ * for TypeScript https://www.typescriptlang.org/docs/handbook/mixins.html
+ * @internal
+ */
+// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging, @typescript-eslint/no-extraneous-class
+class EventedControl {
+    // eslint-disable-next-line @typescript-eslint/no-useless-constructor, @typescript-eslint/no-unused-vars
+    constructor(...args) { }
+}
+L.Util.extend(EventedControl.prototype, L.Control.prototype);
+L.Util.extend(EventedControl.prototype, L.Evented.prototype);
+export class GeocodingControl extends EventedControl {
     #gc;
     #options;
     constructor(options) {
@@ -35,7 +47,7 @@ export class GeocodingControl extends L.Control {
             "reverseToggle",
             "queryChange",
         ]) {
-            this.#gc.$on(eventName, (event) => map.fire(eventName.toLowerCase(), event.detail));
+            this.#gc.$on(eventName, (event) => this.fire(eventName.toLowerCase(), event.detail));
         }
         return div;
     }

package/svelte/maplibregl-controller.d.ts

@@ -1,12 +1,13 @@
 import type * as maplibregl from "maplibre-gl";
-import type { FillLayerSpecification, FitBoundsOptions, FlyToOptions, LineLayerSpecification, Map } from "maplibre-gl";
+import type { FillLayerSpecification, FitBoundsOptions, FlyToOptions, LineLayerSpecification, Map, Marker, MarkerOptions } from "maplibre-gl";
 import type { BBox, Position } from "./types";
 import type { Feature, MapEvent } from "./types.js";
-type MapLibreGL = Pick<typeof maplibregl, "Marker" | "Popup">;
-export declare function createMapLibreGlMapController(map: Map, maplibregl?: MapLibreGL | undefined, marker?: boolean | maplibregl.MarkerOptions, showResultMarkers?: boolean | maplibregl.MarkerOptions, flyToOptions?: FlyToOptions, fitBoundsOptions?: FitBoundsOptions, fullGeometryStyle?: undefined | {
-    fill?: Pick<FillLayerSpecification, "layout" | "paint" | "filter">;
-    line?: Pick<LineLayerSpecification, "layout" | "paint" | "filter">;
-}): {
+export type MapLibreGL = Pick<typeof maplibregl, "Marker" | "Popup">;
+export type FullGeometryStyle = {
+    fill: Pick<FillLayerSpecification, "layout" | "paint" | "filter">;
+    line: Pick<LineLayerSpecification, "layout" | "paint" | "filter">;
+};
+export declare function createMapLibreGlMapController(map: Map, maplibregl?: MapLibreGL | undefined, marker?: boolean | null | MarkerOptions | ((map: Map, feature?: Feature) => Marker | undefined | null), showResultMarkers?: boolean | null | MarkerOptions | ((map: Map, feature: Feature) => Marker | undefined | null), flyToOptions?: FlyToOptions | null, fitBoundsOptions?: FitBoundsOptions | null, fullGeometryStyle?: boolean | null | FullGeometryStyle): {
     setEventHandler(handler: undefined | ((e: MapEvent) => void)): void;
     flyTo(center: Position, zoom?: number): void;
     fitBounds(bbox: BBox, padding: number, maxZoom?: number): void;
@@ -16,4 +17,3 @@ export declare function createMapLibreGlMapController(map: Map, maplibregl?: Map
     setSelectedMarker(index: number): void;
     getCenterAndZoom(): [number, number, number];
 };
-export {};