gtfs-to-html 2.12.3 → 2.12.4

package/dist/frontend_libraries/maplibre-gl-geocoder.js

@@ -85,7 +85,7 @@
     function requireFuzzy () {
     	if (hasRequiredFuzzy) return fuzzy.exports;
     	hasRequiredFuzzy = 1;
-    	(function (module, exports) {
+    	(function (module, exports$1) {
     		(function() {
 
     		var fuzzy = {};
@@ -1711,7 +1711,8 @@
      * A geocoder component that works with maplibre
      */
     class MaplibreGeocoder {
-        constructor(geocoderApi, options) {
+        constructor(geocoderApi, options, typeaheadFactory = (input, data, options) => new Typeahead(input, data, options)) {
+            // Fill with default values
             this.options = {
                 zoom: 16,
                 flyTo: true,
@@ -1729,16 +1730,16 @@
                 clearOnBlur: false,
                 proximityMinZoom: 9,
                 getItemValue: (item) => {
-                    return item.text !== undefined ? item.text : item.place_name;
+                    return item.text != undefined ? item.text : item.place_name;
                 },
-                render: function (item) {
+                render: (item) => {
                     // Render as a suggestion
-                    if (!item.geometry) {
+                    if (!('geometry' in item)) {
                         const suggestionString = item.text;
                         const indexOfMatch = suggestionString
                             .toLowerCase()
-                            .indexOf(this.query.toLowerCase());
-                        const lengthOfMatch = this.query.length;
+                            .indexOf(this._typeahead.query.toLowerCase());
+                        const lengthOfMatch = this._typeahead.query.length;
                         const beforeMatch = suggestionString.substring(0, indexOfMatch);
                         const match = suggestionString.substring(indexOfMatch, indexOfMatch + lengthOfMatch);
                         const afterMatch = suggestionString.substring(indexOfMatch + lengthOfMatch);
@@ -1785,6 +1786,7 @@
             this.fresh = true;
             this.lastSelected = null;
             this.geocoderApi = geocoderApi;
+            this.typeaheadFactory = typeaheadFactory;
         }
         /**
          * Add the geocoder to a container. The container can be either a `Map`, an `HTMLElement` or a CSS selector string.
@@ -1899,7 +1901,7 @@
             el.appendChild(searchIcon);
             el.appendChild(this._inputEl);
             el.appendChild(actions);
-            this._typeahead = new Typeahead(this._inputEl, [], {
+            this._typeahead = this.typeaheadFactory(this._inputEl, [], {
                 filter: false,
                 minLength: this.options.minLength,
                 limit: this.options.limit,
@@ -1964,27 +1966,29 @@
             }
         }
         _onKeyDown(e) {
-            const ESC_KEY_CODE = 27;
-            const TAB_KEY_CODE = 9;
-            const ENTER_KEY_CODE = 13;
-            if (e.keyCode === ESC_KEY_CODE && this.options.clearAndBlurOnEsc) {
+            if (e.key === 'Escape' && this.options.clearAndBlurOnEsc) {
                 this._clear(e);
-                return this._inputEl.blur();
+                this._inputEl.blur();
+                return;
             }
             const value = this._inputEl.value;
             if (!value) {
                 this.fresh = true;
                 // the user has removed all the text
-                if (e.keyCode !== TAB_KEY_CODE)
+                if (e.key !== 'Tab')
                     this.clear(e);
-                return (this._clearEl.style.display = "none");
+                this._clearEl.style.display = "none";
+                return;
             }
-            // TAB, ESC, LEFT, RIGHT, UP, DOWN
             if (e.metaKey ||
-                [TAB_KEY_CODE, ESC_KEY_CODE, 37, 39, 38, 40].indexOf(e.keyCode) !== -1)
+                e.key === 'Tab' ||
+                e.key === 'Escape' ||
+                e.key === 'ArrowLeft' ||
+                e.key === 'ArrowRight' ||
+                e.key === 'ArrowUp' ||
+                e.key === 'ArrowDown')
                 return;
-            // ENTER
-            if (e.keyCode === ENTER_KEY_CODE) {
+            if (e.key === 'Enter') {
                 if (!this.options.showResultsWhileTyping) {
                     if (!this._typeahead.selected) {
                         this._geocode(value);
@@ -2032,73 +2036,76 @@
         //  we cannot depend on some internal values of the suggestion state like `selected` as those will change or before
         //  our onKeyDown handler.
         _onChange() {
+            var _a;
             const selected = this._typeahead.selected;
             // If a suggestion was selected
-            if (selected && !selected.geometry) {
+            if (!selected)
+                return;
+            if (!('geometry' in selected)) {
                 if (selected.placeId)
                     this._geocode(selected.placeId, true, true);
                 else
                     this._geocode(selected.text, true);
+                return;
             }
-            else if (selected && JSON.stringify(selected) !== this.lastSelected) {
-                this._clearEl.style.display = "none";
-                if (this.options.flyTo) {
-                    let flyOptions;
-                    this._removeResultMarkers();
-                    if (selected.properties && exceptions[selected.properties.short_code]) {
-                        // Certain geocoder search results return (and therefore zoom to fit)
-                        // an unexpectedly large bounding box: for example, both Russia and the
-                        // USA span both sides of -180/180, or France includes the island of
-                        // Reunion in the Indian Ocean. An incomplete list of these exceptions
-                        // at ./exceptions.json provides "reasonable" bounding boxes as a
-                        // short-term solution; this may be amended as necessary.
-                        flyOptions = extend({}, this.options.flyTo);
-                        if (this._map) {
-                            this._map.fitBounds(exceptions[selected.properties.short_code].bbox, flyOptions);
-                        }
-                    }
-                    else if (selected.bbox) {
-                        const bbox = selected.bbox;
-                        flyOptions = extend({}, this.options.flyTo);
-                        if (this._map) {
-                            this._map.fitBounds([
-                                [bbox[0], bbox[1]],
-                                [bbox[2], bbox[3]],
-                            ], flyOptions);
-                        }
+            if (JSON.stringify(selected) === this.lastSelected) {
+                return;
+            }
+            this._clearEl.style.display = "none";
+            if (this.options.flyTo) {
+                let flyOptions;
+                this._removeResultMarkers();
+                if (selected.properties && exceptions[selected.properties.short_code]) {
+                    // Certain geocoder search results return (and therefore zoom to fit)
+                    // an unexpectedly large bounding box: for example, both Russia and the
+                    // USA span both sides of -180/180, or France includes the island of
+                    // Reunion in the Indian Ocean. An incomplete list of these exceptions
+                    // at ./exceptions.json provides "reasonable" bounding boxes as a
+                    // short-term solution; this may be amended as necessary.
+                    flyOptions = extend({}, this.options.flyTo);
+                    if (this._map) {
+                        this._map.fitBounds(exceptions[selected.properties.short_code].bbox, flyOptions);
                     }
-                    else {
-                        const defaultFlyOptions = {
-                            zoom: this.options.zoom,
-                        };
-                        flyOptions = extend({}, defaultFlyOptions, this.options.flyTo);
-                        //  ensure that center is not overriden by custom options
-                        if (selected.center) {
-                            flyOptions.center = selected.center;
-                        }
-                        else if (selected.geometry &&
-                            selected.geometry.type &&
-                            selected.geometry.type === "Point" &&
-                            selected.geometry.coordinates) {
-                            flyOptions.center = selected.geometry.coordinates;
-                        }
-                        if (this._map) {
-                            this._map.flyTo(flyOptions);
-                        }
+                }
+                else if (selected.bbox) {
+                    const bbox = selected.bbox;
+                    flyOptions = extend({}, this.options.flyTo);
+                    if (this._map) {
+                        this._map.fitBounds([
+                            [bbox[0], bbox[1]],
+                            [bbox[2], bbox[3]],
+                        ], flyOptions);
                     }
                 }
-                if (this.options.marker && this._maplibregl) {
-                    this._handleMarker(selected);
+                else {
+                    const defaultFlyOptions = {
+                        zoom: this.options.zoom,
+                    };
+                    flyOptions = extend({}, defaultFlyOptions, this.options.flyTo);
+                    //  ensure that center is not overriden by custom options
+                    if (selected.center) {
+                        flyOptions.center = selected.center;
+                    }
+                    else if (((_a = selected.geometry) === null || _a === void 0 ? void 0 : _a.type) === "Point" &&
+                        selected.geometry.coordinates) {
+                        flyOptions.center = selected.geometry.coordinates;
+                    }
+                    if (this._map) {
+                        this._map.flyTo(flyOptions);
+                    }
                 }
-                // After selecting a feature, re-focus the textarea and set
-                // cursor at start, and reset the selected feature.
-                this._inputEl.focus();
-                this._inputEl.scrollLeft = 0;
-                this._inputEl.setSelectionRange(0, 0);
-                this.lastSelected = JSON.stringify(selected);
-                this._typeahead.selected = null; // reset selection current selection value and set it to last selected
-                this._eventEmitter.emit("result", { result: selected });
             }
+            if (this.options.marker && this._maplibregl) {
+                this._handleMarker(selected);
+            }
+            // After selecting a feature, re-focus the textarea and set
+            // cursor at start, and reset the selected feature.
+            this._inputEl.focus();
+            this._inputEl.scrollLeft = 0;
+            this._inputEl.setSelectionRange(0, 0);
+            this.lastSelected = JSON.stringify(selected);
+            this._typeahead.selected = null; // reset selection current selection value and set it to last selected
+            this._eventEmitter.emit("result", { result: selected });
         }
         _getConfigForRequest() {
             // Possible config proprerties to pass to client
@@ -2230,19 +2237,19 @@
                 if (this.options.filter && res.features.length) {
                     res.features = res.features.filter(this.options.filter);
                 }
-                let results = [];
+                let typeaheadData = [];
                 if ('suggestions' in res) {
-                    results = res.suggestions;
+                    typeaheadData = res.suggestions;
                 }
                 else if ('place' in res) {
-                    results = [res.place];
+                    typeaheadData = Array.isArray(res.place) ? res.place : [res.place];
                 }
                 else {
-                    results = res.features;
+                    typeaheadData = res.features;
                 }
-                if (results.length) {
+                if (typeaheadData.length) {
                     this._clearEl.style.display = "block";
-                    this._typeahead.update(results);
+                    this._typeahead.update(typeaheadData);
                     if ((!this.options.showResultsWhileTyping || isSuggestion) &&
                         this.options.showResultMarkers &&
                         (res.features.length > 0 || 'place' in res)) {
@@ -2392,6 +2399,7 @@
          * Fits the map to the current bounds for the searched results
          */
         _fitBoundsForMarkers() {
+            var _a;
             if (this._typeahead.data.length < 1)
                 return;
             // Filter out suggestions and restrict to limit
@@ -2407,7 +2415,9 @@
                     const flyOptions = extend({}, defaultFlyOptions, this.options.flyTo);
                     const bounds = new this._maplibregl.LngLatBounds();
                     for (const feature of results) {
-                        bounds.extend(feature.geometry.coordinates);
+                        if (('geometry' in feature) && (((_a = feature.geometry) === null || _a === void 0 ? void 0 : _a.type) === "Point")) {
+                            bounds.extend(feature.geometry.coordinates);
+                        }
                     }
                     this._map.fitBounds(bounds, flyOptions);
                 }
@@ -2525,9 +2535,9 @@
          * @param placeholder - the text to use as the input element's placeholder
          */
         setPlaceholder(placeholder) {
-            this.placeholder = placeholder ? placeholder : this.options.placeholder || this._localize("placeholder");
-            this._inputEl.placeholder = this.placeholder;
-            this._inputEl.setAttribute("aria-label", this.placeholder);
+            this.options.placeholder = placeholder ? placeholder : this.options.placeholder || this._localize("placeholder");
+            this._inputEl.placeholder = this.options.placeholder;
+            this._inputEl.setAttribute("aria-label", this.options.placeholder);
             return this;
         }
         /**
@@ -2643,6 +2653,7 @@
          * @param selected - the selected geojson feature
          */
         _handleMarker(selected) {
+            var _a;
             // clean up any old marker that might be present
             if (!this._map) {
                 return;
@@ -2653,7 +2664,7 @@
             };
             const markerOptions = extend({}, defaultMarkerOptions, this.options.marker);
             this.mapMarker = new this._maplibregl.Marker(markerOptions);
-            let popup;
+            let popup = null;
             if (this.options.popup) {
                 const defaultPopupOptions = {};
                 const popupOptions = extend({}, defaultPopupOptions, this.options.popup);
@@ -2664,9 +2675,7 @@
                 if (this.options.popup)
                     this.mapMarker.setPopup(popup);
             }
-            else if (selected.geometry &&
-                selected.geometry.type &&
-                selected.geometry.type === "Point" &&
+            else if (((_a = selected.geometry) === null || _a === void 0 ? void 0 : _a.type) === "Point" &&
                 selected.geometry.coordinates) {
                 this.mapMarker.setLngLat(selected.geometry.coordinates).addTo(this._map);
                 if (this.options.popup)
@@ -2743,13 +2752,7 @@
         }
         /**
          * Subscribe to events that happen within the plugin.
-         * @param type - name of event. Available events and the data passed into their respective event objects are:
-         *
-         * - __clear__ `Emitted when the input is cleared`
-         * - __loading__ `{ query } Emitted when the geocoder is looking up a query`
-         * - __results__ `{ results } Fired when the geocoder returns a response`
-         * - __result__ `{ result } Fired when input is set`
-         * - __error__ `{ error } Error as string`
+         * @param type - name of event. Check out the {@link MaplibreGeocoderEventTypeMap} for a list of available events.
          * @param fn - function that's called when the event is emitted.
          */
         on(type, fn) {
@@ -2758,14 +2761,7 @@
         }
         /**
          * Subscribe to events that happen within the plugin only once.
-         * @param type - Event name.
-         * Available events and the data passed into their respective event objects are:
-         *
-         * - __clear__ `Emitted when the input is cleared`
-         * - __loading__ `{ query } Emitted when the geocoder is looking up a query`
-         * - __results__ `{ results } Fired when the geocoder returns a response`
-         * - __result__ `{ result } Fired when input is set`
-         * - __error__ `{ error } Error as string`
+         * @param type - Event name. Check out the {@link MaplibreGeocoderEventTypeMap} for a list of available events.
          * @returns a Promise that resolves when the event is emitted.
          */
         once(type) {