@maptiler/geocoding-control 2.0.0-rc.6 → 2.0.0-rc.8

package/svelte/maptilersdk.d.ts

@@ -7,7 +7,6 @@ declare const MapLibreBasedGeocodingControl: {
     new (options?: MapLibreBaseControlOptions): {
         "__#1@#gc"?: import("./GeocodingControl.svelte").default;
         "__#1@#options": MapLibreBaseControlOptions;
-        "__#1@#mapController"?: ReturnType<typeof import("./maplibregl-controller").createMapLibreGlMapController>;
         onAddInt(map: Map): HTMLElement;
         on<T extends "pick" | "response" | "select" | "featureslisted" | "featuresmarked" | "optionsvisibilitychange" | "querychange" | "reversetoggle">(type: T, listener: (ev: {
             select: {
@@ -164,7 +163,6 @@ export declare const SelectEvent: {
     new (target: {
         "__#1@#gc"?: import("./GeocodingControl.svelte").default;
         "__#1@#options": MapLibreBaseControlOptions;
-        "__#1@#mapController"?: ReturnType<typeof import("./maplibregl-controller").createMapLibreGlMapController>;
         onAddInt(map: Map): HTMLElement;
         on<T extends "pick" | "response" | "select" | "featureslisted" | "featuresmarked" | "optionsvisibilitychange" | "querychange" | "reversetoggle">(type: T, listener: (ev: {
             select: {
@@ -320,7 +318,6 @@ export declare const SelectEvent: {
         readonly target: {
             "__#1@#gc"?: import("./GeocodingControl.svelte").default;
             "__#1@#options": MapLibreBaseControlOptions;
-            "__#1@#mapController"?: ReturnType<typeof import("./maplibregl-controller").createMapLibreGlMapController>;
             onAddInt(map: Map): HTMLElement;
             on<T extends "pick" | "response" | "select" | "featureslisted" | "featuresmarked" | "optionsvisibilitychange" | "querychange" | "reversetoggle">(type: T, listener: (ev: {
                 select: {
@@ -475,7 +472,6 @@ export declare const FeaturesListedEvent: {
     new (target: {
         "__#1@#gc"?: import("./GeocodingControl.svelte").default;
         "__#1@#options": MapLibreBaseControlOptions;
-        "__#1@#mapController"?: ReturnType<typeof import("./maplibregl-controller").createMapLibreGlMapController>;
         onAddInt(map: Map): HTMLElement;
         on<T extends "pick" | "response" | "select" | "featureslisted" | "featuresmarked" | "optionsvisibilitychange" | "querychange" | "reversetoggle">(type: T, listener: (ev: {
             select: {
@@ -629,7 +625,6 @@ export declare const FeaturesListedEvent: {
         readonly target: {
             "__#1@#gc"?: import("./GeocodingControl.svelte").default;
             "__#1@#options": MapLibreBaseControlOptions;
-            "__#1@#mapController"?: ReturnType<typeof import("./maplibregl-controller").createMapLibreGlMapController>;
             onAddInt(map: Map): HTMLElement;
             on<T extends "pick" | "response" | "select" | "featureslisted" | "featuresmarked" | "optionsvisibilitychange" | "querychange" | "reversetoggle">(type: T, listener: (ev: {
                 select: {
@@ -784,7 +779,6 @@ export declare const FeaturesMarkedEvent: {
     new (target: {
         "__#1@#gc"?: import("./GeocodingControl.svelte").default;
         "__#1@#options": MapLibreBaseControlOptions;
-        "__#1@#mapController"?: ReturnType<typeof import("./maplibregl-controller").createMapLibreGlMapController>;
         onAddInt(map: Map): HTMLElement;
         on<T extends "pick" | "response" | "select" | "featureslisted" | "featuresmarked" | "optionsvisibilitychange" | "querychange" | "reversetoggle">(type: T, listener: (ev: {
             select: {
@@ -938,7 +932,6 @@ export declare const FeaturesMarkedEvent: {
         readonly target: {
             "__#1@#gc"?: import("./GeocodingControl.svelte").default;
             "__#1@#options": MapLibreBaseControlOptions;
-            "__#1@#mapController"?: ReturnType<typeof import("./maplibregl-controller").createMapLibreGlMapController>;
             onAddInt(map: Map): HTMLElement;
             on<T extends "pick" | "response" | "select" | "featureslisted" | "featuresmarked" | "optionsvisibilitychange" | "querychange" | "reversetoggle">(type: T, listener: (ev: {
                 select: {
@@ -1093,7 +1086,6 @@ export declare const OptionsVisibilityChangeEvent: {
     new (target: {
         "__#1@#gc"?: import("./GeocodingControl.svelte").default;
         "__#1@#options": MapLibreBaseControlOptions;
-        "__#1@#mapController"?: ReturnType<typeof import("./maplibregl-controller").createMapLibreGlMapController>;
         onAddInt(map: Map): HTMLElement;
         on<T extends "pick" | "response" | "select" | "featureslisted" | "featuresmarked" | "optionsvisibilitychange" | "querychange" | "reversetoggle">(type: T, listener: (ev: {
             select: {
@@ -1247,7 +1239,6 @@ export declare const OptionsVisibilityChangeEvent: {
         readonly target: {
             "__#1@#gc"?: import("./GeocodingControl.svelte").default;
             "__#1@#options": MapLibreBaseControlOptions;
-            "__#1@#mapController"?: ReturnType<typeof import("./maplibregl-controller").createMapLibreGlMapController>;
             onAddInt(map: Map): HTMLElement;
             on<T extends "pick" | "response" | "select" | "featureslisted" | "featuresmarked" | "optionsvisibilitychange" | "querychange" | "reversetoggle">(type: T, listener: (ev: {
                 select: {
@@ -1402,7 +1393,6 @@ export declare const PickEvent: {
     new (target: {
         "__#1@#gc"?: import("./GeocodingControl.svelte").default;
         "__#1@#options": MapLibreBaseControlOptions;
-        "__#1@#mapController"?: ReturnType<typeof import("./maplibregl-controller").createMapLibreGlMapController>;
         onAddInt(map: Map): HTMLElement;
         on<T extends "pick" | "response" | "select" | "featureslisted" | "featuresmarked" | "optionsvisibilitychange" | "querychange" | "reversetoggle">(type: T, listener: (ev: {
             select: {
@@ -1556,7 +1546,6 @@ export declare const PickEvent: {
         readonly target: {
             "__#1@#gc"?: import("./GeocodingControl.svelte").default;
             "__#1@#options": MapLibreBaseControlOptions;
-            "__#1@#mapController"?: ReturnType<typeof import("./maplibregl-controller").createMapLibreGlMapController>;
             onAddInt(map: Map): HTMLElement;
             on<T extends "pick" | "response" | "select" | "featureslisted" | "featuresmarked" | "optionsvisibilitychange" | "querychange" | "reversetoggle">(type: T, listener: (ev: {
                 select: {
@@ -1711,7 +1700,6 @@ export declare const QueryChangeEvent: {
     new (target: {
         "__#1@#gc"?: import("./GeocodingControl.svelte").default;
         "__#1@#options": MapLibreBaseControlOptions;
-        "__#1@#mapController"?: ReturnType<typeof import("./maplibregl-controller").createMapLibreGlMapController>;
         onAddInt(map: Map): HTMLElement;
         on<T extends "pick" | "response" | "select" | "featureslisted" | "featuresmarked" | "optionsvisibilitychange" | "querychange" | "reversetoggle">(type: T, listener: (ev: {
             select: {
@@ -1865,7 +1853,6 @@ export declare const QueryChangeEvent: {
         readonly target: {
             "__#1@#gc"?: import("./GeocodingControl.svelte").default;
             "__#1@#options": MapLibreBaseControlOptions;
-            "__#1@#mapController"?: ReturnType<typeof import("./maplibregl-controller").createMapLibreGlMapController>;
             onAddInt(map: Map): HTMLElement;
             on<T extends "pick" | "response" | "select" | "featureslisted" | "featuresmarked" | "optionsvisibilitychange" | "querychange" | "reversetoggle">(type: T, listener: (ev: {
                 select: {
@@ -2020,7 +2007,6 @@ export declare const ResponseEvent: {
     new (target: {
         "__#1@#gc"?: import("./GeocodingControl.svelte").default;
         "__#1@#options": MapLibreBaseControlOptions;
-        "__#1@#mapController"?: ReturnType<typeof import("./maplibregl-controller").createMapLibreGlMapController>;
         onAddInt(map: Map): HTMLElement;
         on<T extends "pick" | "response" | "select" | "featureslisted" | "featuresmarked" | "optionsvisibilitychange" | "querychange" | "reversetoggle">(type: T, listener: (ev: {
             select: {
@@ -2175,7 +2161,6 @@ export declare const ResponseEvent: {
         readonly target: {
             "__#1@#gc"?: import("./GeocodingControl.svelte").default;
             "__#1@#options": MapLibreBaseControlOptions;
-            "__#1@#mapController"?: ReturnType<typeof import("./maplibregl-controller").createMapLibreGlMapController>;
             onAddInt(map: Map): HTMLElement;
             on<T extends "pick" | "response" | "select" | "featureslisted" | "featuresmarked" | "optionsvisibilitychange" | "querychange" | "reversetoggle">(type: T, listener: (ev: {
                 select: {
@@ -2330,7 +2315,6 @@ export declare const ReverseToggleEvent: {
     new (target: {
         "__#1@#gc"?: import("./GeocodingControl.svelte").default;
         "__#1@#options": MapLibreBaseControlOptions;
-        "__#1@#mapController"?: ReturnType<typeof import("./maplibregl-controller").createMapLibreGlMapController>;
         onAddInt(map: Map): HTMLElement;
         on<T extends "pick" | "response" | "select" | "featureslisted" | "featuresmarked" | "optionsvisibilitychange" | "querychange" | "reversetoggle">(type: T, listener: (ev: {
             select: {
@@ -2484,7 +2468,6 @@ export declare const ReverseToggleEvent: {
         readonly target: {
             "__#1@#gc"?: import("./GeocodingControl.svelte").default;
             "__#1@#options": MapLibreBaseControlOptions;
-            "__#1@#mapController"?: ReturnType<typeof import("./maplibregl-controller").createMapLibreGlMapController>;
             onAddInt(map: Map): HTMLElement;
             on<T extends "pick" | "response" | "select" | "featureslisted" | "featuresmarked" | "optionsvisibilitychange" | "querychange" | "reversetoggle">(type: T, listener: (ev: {
                 select: {

package/svelte/openlayers-controller.d.ts

@@ -3,14 +3,13 @@ import type { AnimationOptions, FitOptions } from "ol/View";
 import { type StyleLike } from "ol/style/Style";
 import type { FlatStyleLike } from "ol/style/flat";
 import type { BBox, Feature as FeatureType, MapEvent, Position } from "./types";
-export declare function createOpenLayersMapController(map: Map, flyToOptions?: AnimationOptions, flyToBounds?: FitOptions, fullGeometryStyle?: StyleLike | FlatStyleLike, showPolygonMarker?: boolean): {
+export declare function createOpenLayersMapController(map: Map, flyToOptions?: AnimationOptions, flyToBounds?: FitOptions, fullGeometryStyle?: StyleLike | FlatStyleLike): {
     setEventHandler(handler: undefined | ((e: MapEvent) => void)): void;
     flyTo(center: Position, zoom: number): void;
     fitBounds(bbox: BBox, padding: number, maxZoom: number): void;
     indicateReverse(reverse: boolean): void;
     setReverseMarker(coordinates?: Position): void;
-    setMarkers(markedFeatures: FeatureType[] | undefined, picked: FeatureType | undefined): void;
+    setFeatures(markedFeatures: FeatureType[] | undefined, picked: FeatureType | undefined, showPolygonMarker: boolean): void;
     setSelectedMarker(index: number): void;
     getCenterAndZoom(): [number, x: number, y: number] | undefined;
-    setShowPolygonMarker(showPolygonMarker: boolean): void;
 };

package/svelte/openlayers-controller.js

@@ -57,13 +57,12 @@ function defaultStyle(feature) {
             : undefined,
     });
 }
-export function createOpenLayersMapController(map, flyToOptions = {}, flyToBounds = {}, fullGeometryStyle = defaultStyle, showPolygonMarker = false) {
+export function createOpenLayersMapController(map, flyToOptions = {}, flyToBounds = {}, fullGeometryStyle = defaultStyle) {
     let prevSelected = -1;
     let prevHovered;
     let eventHandler;
     let reverseMarker;
     let indicatingReverse = false;
-    let _showPolygonMarker = showPolygonMarker;
     const vectorLayer = new VectorLayer({
         updateWhileAnimating: true,
     });
@@ -168,7 +167,7 @@ export function createOpenLayersMapController(map, flyToOptions = {}, flyToBound
                 source.addFeature(reverseMarker);
             }
         },
-        setMarkers(markedFeatures, picked) {
+        setFeatures(markedFeatures, picked, showPolygonMarker) {
             function setData(data) {
                 if (!data) {
                     return;
@@ -236,7 +235,7 @@ export function createOpenLayersMapController(map, flyToOptions = {}, flyToBound
                     source.addFeature(new OlFeature(fromWgs84(new OlMultiLineString(picked.geometry.coordinates))));
                     return; // no pin for (multi)linestrings
                 }
-                if (!_showPolygonMarker && picked.geometry.type !== "Point") {
+                if (!showPolygonMarker && picked.geometry.type !== "Point") {
                     return;
                 }
                 source.addFeature(new OlFeature(fromWgs84(new OlPoint(picked.center))));
@@ -280,8 +279,5 @@ export function createOpenLayersMapController(map, flyToOptions = {}, flyToBound
             }
             return [zoom, ...toLonLat(center, getProjection())];
         },
-        setShowPolygonMarker(showPolygonMarker) {
-            _showPolygonMarker = showPolygonMarker;
-        },
     };
 }

package/svelte/openlayers.js

@@ -6,7 +6,6 @@ export { createOpenLayersMapController } from "./openlayers-controller";
 export class GeocodingControl extends Control {
     #gc;
     #options;
-    #mapController = undefined;
     constructor(options) {
         const div = document.createElement("div");
         div.className = "ol-search";
@@ -55,12 +54,11 @@ export class GeocodingControl extends Control {
             // marker,
             // showResultMarkers,
             flyTo, fullGeometryStyle, } = this.#options;
-            this.#mapController = createOpenLayersMapController(map, typeof flyTo === "boolean" ? undefined : flyTo, typeof flyTo === "boolean" ? undefined : flyTo, 
+            const mapController = createOpenLayersMapController(map, typeof flyTo === "boolean" ? undefined : flyTo, typeof flyTo === "boolean" ? undefined : flyTo, 
             // marker,
             // showResultMarkers,
-            fullGeometryStyle, this.#options.pickedResultStyle ===
-                "full-geometry-including-polygon-center-marker");
-            this.#gc?.$set({ mapController: this.#mapController });
+            fullGeometryStyle);
+            this.#gc?.$set({ mapController });
         }
     }
     setOptions(options) {
@@ -70,8 +68,6 @@ export class GeocodingControl extends Control {
             ...restOptions,
             flyTo: flyTo === undefined ? true : !!flyTo,
         });
-        this.#mapController?.setShowPolygonMarker(this.#options.pickedResultStyle ===
-            "full-geometry-including-polygon-center-marker");
     }
     setQuery(value, submit = true) {
         this.#gc?.setQuery(value, submit);

package/svelte/types.d.ts

@@ -33,11 +33,10 @@ export type MapController = {
     flyTo(center: Position, zoom?: number): void;
     fitBounds(bbox: BBox, padding: number, maxZoom?: number): void;
     indicateReverse(reverse: boolean): void;
-    setMarkers(features: Feature[] | undefined, picked: Feature | undefined): void;
+    setFeatures(features: Feature[] | undefined, picked: Feature | undefined, showPolygonMarker: boolean): void;
     setReverseMarker(coordinates?: Position): void;
     setSelectedMarker(index: number): void;
     getCenterAndZoom(): [zoom: number, lon: number, lat: number] | undefined;
-    setShowPolygonMarker(showPolygonMarker: boolean): void;
 };
 export type ProximityRule = {
     /** minimal map zoom for the rule to be used */
@@ -133,6 +132,7 @@ export type ControlOptions = {
      * Default value is `false`.
      */
     showResultsWhileTyping?: boolean;
+    autocompleteTimeout?: number;
     /**
      * Set to `false` to disable fuzzy search.
      *

package/types.d.ts

@@ -33,11 +33,10 @@ export type MapController = {
     flyTo(center: Position, zoom?: number): void;
     fitBounds(bbox: BBox, padding: number, maxZoom?: number): void;
     indicateReverse(reverse: boolean): void;
-    setMarkers(features: Feature[] | undefined, picked: Feature | undefined): void;
+    setFeatures(features: Feature[] | undefined, picked: Feature | undefined, showPolygonMarker: boolean): void;
     setReverseMarker(coordinates?: Position): void;
     setSelectedMarker(index: number): void;
     getCenterAndZoom(): [zoom: number, lon: number, lat: number] | undefined;
-    setShowPolygonMarker(showPolygonMarker: boolean): void;
 };
 export type ProximityRule = {
     /** minimal map zoom for the rule to be used */
@@ -133,6 +132,7 @@ export type ControlOptions = {
      * Default value is `false`.
      */
     showResultsWhileTyping?: boolean;
+    autocompleteTimeout?: number;
     /**
      * Set to `false` to disable fuzzy search.
      *