@aws-amplify/geo 2.1.5-v5-user-agent-for-ui.f058eee.7 → 2.2.0

package/lib/Geo.d.ts

@@ -1,12 +1,50 @@
-import { Place, Coordinates, SearchByTextOptions, SearchByCoordinatesOptions, GeofenceId, GeofenceInput, GeofenceOptions, SaveGeofencesResults, Geofence, ListGeofenceOptions, ListGeofenceResults, DeleteGeofencesResults, searchByPlaceIdOptions } from './types';
-import { InternalGeoClass } from './internals/InternalGeo';
-export declare class GeoClass extends InternalGeoClass {
+import { Place, GeoConfig, Coordinates, SearchByTextOptions, SearchByCoordinatesOptions, GeoProvider, MapStyle, GeofenceId, GeofenceInput, GeofenceOptions, SaveGeofencesResults, Geofence, ListGeofenceOptions, ListGeofenceResults, DeleteGeofencesResults, searchByPlaceIdOptions } from './types';
+export declare class GeoClass {
     static MODULE: string;
+    /**
+     * @private
+     */
+    private _config;
+    private _pluggables;
+    constructor();
     /**
      * get the name of the module category
      * @returns {string} name of the module category
      */
     getModuleName(): string;
+    /**
+     * add plugin into Geo category
+     * @param {Object} pluggable - an instance of the plugin
+     */
+    addPluggable(pluggable: GeoProvider): object;
+    /**
+     * Get the plugin object
+     * @param providerName - the name of the plugin
+     */
+    getPluggable(providerName: string): GeoProvider;
+    /**
+     * Remove the plugin object
+     * @param providerName - the name of the plugin
+     */
+    removePluggable(providerName: string): void;
+    /**
+     * Configure Geo
+     * @param {Object} config - Configuration object for Geo
+     * @return {Object} - Current configuration
+     */
+    configure(config?: any): GeoConfig;
+    /**
+     * Get the map resources that are currently available through the provider
+     * @param {string} provider
+     * @returns - Array of available map resources
+     */
+    getAvailableMaps(provider?: string): MapStyle[];
+    /**
+     * Get the map resource set as default in amplify config
+     * @param {string} provider
+     * @returns - Map resource set as the default in amplify config
+     */
+    getDefaultMap(provider?: string): MapStyle;
     /**
      * Search by text input with optional parameters
      * @param  {string} text - The text string that is to be searched for

package/lib/Geo.js

@@ -4,11 +4,15 @@ var tslib_1 = require("tslib");
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 var core_1 = require("@aws-amplify/core");
-var InternalGeo_1 = require("./internals/InternalGeo");
-var GeoClass = /** @class */ (function (_super) {
-    tslib_1.__extends(GeoClass, _super);
+var AmazonLocationServiceProvider_1 = require("./Providers/AmazonLocationServiceProvider");
+var util_1 = require("./util");
+var logger = new core_1.ConsoleLogger('Geo');
+var DEFAULT_PROVIDER = 'AmazonLocationService';
+var GeoClass = /** @class */ (function () {
     function GeoClass() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        this._config = {};
+        this._pluggables = [];
+        logger.debug('Geo Options', this._config);
     }
     /**
      * get the name of the module category
@@ -17,6 +21,78 @@ var GeoClass = /** @class */ (function (_super) {
     GeoClass.prototype.getModuleName = function () {
         return GeoClass.MODULE;
     };
+    /**
+     * add plugin into Geo category
+     * @param {Object} pluggable - an instance of the plugin
+     */
+    GeoClass.prototype.addPluggable = function (pluggable) {
+        if (pluggable && pluggable.getCategory() === 'Geo') {
+            this._pluggables.push(pluggable);
+            var config = pluggable.configure(this._config[pluggable.getProviderName()]);
+            return config;
+        }
+    };
+    /**
+     * Get the plugin object
+     * @param providerName - the name of the plugin
+     */
+    GeoClass.prototype.getPluggable = function (providerName) {
+        var pluggable = this._pluggables.find(function (pluggable) { return pluggable.getProviderName() === providerName; });
+        if (pluggable === undefined) {
+            logger.debug('No plugin found with providerName', providerName);
+            throw new Error('No plugin found in Geo for the provider');
+        }
+        else
+            return pluggable;
+    };
+    /**
+     * Remove the plugin object
+     * @param providerName - the name of the plugin
+     */
+    GeoClass.prototype.removePluggable = function (providerName) {
+        this._pluggables = this._pluggables.filter(function (pluggable) { return pluggable.getProviderName() !== providerName; });
+        return;
+    };
+    /**
+     * Configure Geo
+     * @param {Object} config - Configuration object for Geo
+     * @return {Object} - Current configuration
+     */
+    GeoClass.prototype.configure = function (config) {
+        var _this = this;
+        logger.debug('configure Geo');
+        if (!config)
+            return this._config;
+        var amplifyConfig = core_1.parseAWSExports(config);
+        this._config = Object.assign({}, this._config, amplifyConfig.Geo, config);
+        this._pluggables.forEach(function (pluggable) {
+            pluggable.configure(_this._config[pluggable.getProviderName()]);
+        });
+        if (this._pluggables.length === 0) {
+            this.addPluggable(new AmazonLocationServiceProvider_1.AmazonLocationServiceProvider());
+        }
+        return this._config;
+    };
+    /**
+     * Get the map resources that are currently available through the provider
+     * @param {string} provider
+     * @returns - Array of available map resources
+     */
+    GeoClass.prototype.getAvailableMaps = function (provider) {
+        if (provider === void 0) { provider = DEFAULT_PROVIDER; }
+        var prov = this.getPluggable(provider);
+        return prov.getAvailableMaps();
+    };
+    /**
+     * Get the map resource set as default in amplify config
+     * @param {string} provider
+     * @returns - Map resource set as the default in amplify config
+     */
+    GeoClass.prototype.getDefaultMap = function (provider) {
+        if (provider === void 0) { provider = DEFAULT_PROVIDER; }
+        var prov = this.getPluggable(provider);
+        return prov.getDefaultMap();
+    };
     /**
      * Search by text input with optional parameters
      * @param  {string} text - The text string that is to be searched for
@@ -25,8 +101,23 @@ var GeoClass = /** @class */ (function (_super) {
      */
     GeoClass.prototype.searchByText = function (text, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, _super.prototype.searchByText.call(this, text, options)];
+            var _a, providerName, prov, error_1;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = (options || {}).providerName, providerName = _a === void 0 ? DEFAULT_PROVIDER : _a;
+                        prov = this.getPluggable(providerName);
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, prov.searchByText(text, options)];
+                    case 2: return [2 /*return*/, _b.sent()];
+                    case 3:
+                        error_1 = _b.sent();
+                        logger.debug(error_1);
+                        throw error_1;
+                    case 4: return [2 /*return*/];
+                }
             });
         });
     };
@@ -38,8 +129,23 @@ var GeoClass = /** @class */ (function (_super) {
      */
     GeoClass.prototype.searchForSuggestions = function (text, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, _super.prototype.searchForSuggestions.call(this, text, options)];
+            var _a, providerName, prov, error_2;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = (options || {}).providerName, providerName = _a === void 0 ? DEFAULT_PROVIDER : _a;
+                        prov = this.getPluggable(providerName);
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, prov.searchForSuggestions(text, options)];
+                    case 2: return [2 /*return*/, _b.sent()];
+                    case 3:
+                        error_2 = _b.sent();
+                        logger.debug(error_2);
+                        throw error_2;
+                    case 4: return [2 /*return*/];
+                }
             });
         });
     };
@@ -51,8 +157,23 @@ var GeoClass = /** @class */ (function (_super) {
      */
     GeoClass.prototype.searchByPlaceId = function (placeId, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var providerName, prov, error_3;
             return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, _super.prototype.searchByPlaceId.call(this, placeId, options)];
+                switch (_a.label) {
+                    case 0:
+                        providerName = DEFAULT_PROVIDER;
+                        prov = this.getPluggable(providerName);
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, prov.searchByPlaceId(placeId, options)];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3:
+                        error_3 = _a.sent();
+                        logger.debug(error_3);
+                        throw error_3;
+                    case 4: return [2 /*return*/];
+                }
             });
         });
     };
@@ -64,8 +185,25 @@ var GeoClass = /** @class */ (function (_super) {
      */
     GeoClass.prototype.searchByCoordinates = function (coordinates, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, _super.prototype.searchByCoordinates.call(this, coordinates, options)];
+            var _a, providerName, prov, _b, lng, lat, error_4;
+            return tslib_1.__generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        _a = (options || {}).providerName, providerName = _a === void 0 ? DEFAULT_PROVIDER : _a;
+                        prov = this.getPluggable(providerName);
+                        _b = tslib_1.__read(coordinates, 2), lng = _b[0], lat = _b[1];
+                        _c.label = 1;
+                    case 1:
+                        _c.trys.push([1, 3, , 4]);
+                        util_1.validateCoordinates(lng, lat);
+                        return [4 /*yield*/, prov.searchByCoordinates(coordinates, options)];
+                    case 2: return [2 /*return*/, _c.sent()];
+                    case 3:
+                        error_4 = _c.sent();
+                        logger.debug(error_4);
+                        throw error_4;
+                    case 4: return [2 /*return*/];
+                }
             });
         });
     };
@@ -79,8 +217,29 @@ var GeoClass = /** @class */ (function (_super) {
      */
     GeoClass.prototype.saveGeofences = function (geofences, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, _super.prototype.saveGeofences.call(this, geofences, options)];
+            var _a, providerName, prov, geofenceInputArray, error_5;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = (options || {}).providerName, providerName = _a === void 0 ? DEFAULT_PROVIDER : _a;
+                        prov = this.getPluggable(providerName);
+                        if (!Array.isArray(geofences)) {
+                            geofenceInputArray = [geofences];
+                        }
+                        else {
+                            geofenceInputArray = geofences;
+                        }
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, prov.saveGeofences(geofenceInputArray, options)];
+                    case 2: return [2 /*return*/, _b.sent()];
+                    case 3:
+                        error_5 = _b.sent();
+                        logger.debug(error_5);
+                        throw error_5;
+                    case 4: return [2 /*return*/];
+                }
             });
         });
     };
@@ -92,8 +251,23 @@ var GeoClass = /** @class */ (function (_super) {
      */
     GeoClass.prototype.getGeofence = function (geofenceId, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, _super.prototype.getGeofence.call(this, geofenceId, options)];
+            var _a, providerName, prov, error_6;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = (options || {}).providerName, providerName = _a === void 0 ? DEFAULT_PROVIDER : _a;
+                        prov = this.getPluggable(providerName);
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, prov.getGeofence(geofenceId, options)];
+                    case 2: return [2 /*return*/, _b.sent()];
+                    case 3:
+                        error_6 = _b.sent();
+                        logger.debug(error_6);
+                        throw error_6;
+                    case 4: return [2 /*return*/];
+                }
             });
         });
     };
@@ -106,8 +280,23 @@ var GeoClass = /** @class */ (function (_super) {
      */
     GeoClass.prototype.listGeofences = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, _super.prototype.listGeofences.call(this, options)];
+            var _a, providerName, prov, error_7;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = (options || {}).providerName, providerName = _a === void 0 ? DEFAULT_PROVIDER : _a;
+                        prov = this.getPluggable(providerName);
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, prov.listGeofences(options)];
+                    case 2: return [2 /*return*/, _b.sent()];
+                    case 3:
+                        error_7 = _b.sent();
+                        logger.debug(error_7);
+                        throw error_7;
+                    case 4: return [2 /*return*/];
+                }
             });
         });
     };
@@ -121,14 +310,35 @@ var GeoClass = /** @class */ (function (_super) {
      */
     GeoClass.prototype.deleteGeofences = function (geofenceIds, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, _super.prototype.deleteGeofences.call(this, geofenceIds, options)];
+            var _a, providerName, prov, geofenceIdsInputArray, error_8;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = (options || {}).providerName, providerName = _a === void 0 ? DEFAULT_PROVIDER : _a;
+                        prov = this.getPluggable(providerName);
+                        if (!Array.isArray(geofenceIds)) {
+                            geofenceIdsInputArray = [geofenceIds];
+                        }
+                        else {
+                            geofenceIdsInputArray = geofenceIds;
+                        }
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, prov.deleteGeofences(geofenceIdsInputArray, options)];
+                    case 2: return [2 /*return*/, _b.sent()];
+                    case 3:
+                        error_8 = _b.sent();
+                        logger.debug(error_8);
+                        throw error_8;
+                    case 4: return [2 /*return*/];
+                }
             });
         });
     };
     GeoClass.MODULE = 'Geo';
     return GeoClass;
-}(InternalGeo_1.InternalGeoClass));
+}());
 exports.GeoClass = GeoClass;
 exports.Geo = new GeoClass();
 core_1.Amplify.register(exports.Geo);

package/lib/Geo.js.map

@@ -1 +1 @@
-{"version":3,"file":"Geo.js","sourceRoot":"","sources":["../src/Geo.ts"],"names":[],"mappings":";;;AAAA,qEAAqE;AACrE,sCAAsC;AACtC,0CAAqE;AAgBrE,uDAA2D;AAE3D;IAA8B,oCAAgB;IAA9C;;IAsHA,CAAC;IAnHA;;;OAGG;IACI,gCAAa,GAApB;QACC,OAAO,QAAQ,CAAC,MAAM,CAAC;IACxB,CAAC;IAED;;;;;OAKG;IACU,+BAAY,GAAzB,UACC,IAAY,EACZ,OAA6B;;;gBAE7B,sBAAO,iBAAM,YAAY,YAAC,IAAI,EAAE,OAAO,CAAC,EAAC;;;KACzC;IAED;;;;;OAKG;IACU,uCAAoB,GAAjC,UACC,IAAY,EACZ,OAA6B;;;gBAE7B,sBAAO,iBAAM,oBAAoB,YAAC,IAAI,EAAE,OAAO,CAAC,EAAC;;;KACjD;IAED;;;;;OAKG;IACU,kCAAe,GAA5B,UACC,OAAe,EACf,OAAgC;;;gBAEhC,sBAAO,iBAAM,eAAe,YAAC,OAAO,EAAE,OAAO,CAAC,EAAC;;;KAC/C;IAED;;;;;OAKG;IACU,sCAAmB,GAAhC,UACC,WAAwB,EACxB,OAAoC;;;gBAEpC,sBAAO,iBAAM,mBAAmB,YAAC,WAAW,EAAE,OAAO,CAAC,EAAC;;;KACvD;IAED;;;;;;;OAOG;IACU,gCAAa,GAA1B,UACC,SAA0C,EAC1C,OAAyB;;;gBAEzB,sBAAO,iBAAM,aAAa,YAAC,SAAS,EAAE,OAAO,CAAC,EAAC;;;KAC/C;IAED;;;;;OAKG;IACU,8BAAW,GAAxB,UACC,UAAsB,EACtB,OAAyB;;;gBAEzB,sBAAO,iBAAM,WAAW,YAAC,UAAU,EAAE,OAAO,CAAC,EAAC;;;KAC9C;IAED;;;;;;OAMG;IACU,gCAAa,GAA1B,UACC,OAA6B;;;gBAE7B,sBAAO,iBAAM,aAAa,YAAC,OAAO,CAAC,EAAC;;;KACpC;IAED;;;;;;;OAOG;IACU,kCAAe,GAA5B,UACC,WAA8B,EAC9B,OAAyB;;;gBAEzB,sBAAO,iBAAM,eAAe,YAAC,WAAW,EAAE,OAAO,CAAC,EAAC;;;KACnD;IApHM,eAAM,GAAG,KAAK,CAAC;IAqHvB,eAAC;CAAA,AAtHD,CAA8B,8BAAgB,GAsH7C;AAtHY,4BAAQ;AAwHR,QAAA,GAAG,GAAG,IAAI,QAAQ,EAAE,CAAC;AAClC,cAAO,CAAC,QAAQ,CAAC,WAAG,CAAC,CAAC"}
+{"version":3,"file":"Geo.js","sourceRoot":"","sources":["../src/Geo.ts"],"names":[],"mappings":"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"}

package/lib/Providers/AmazonLocationServiceProvider.d.ts

@@ -1,4 +1,3 @@
-import { CustomUserAgentDetails } from '@aws-amplify/core';
 import { GeoConfig, SearchByTextOptions, SearchByCoordinatesOptions, GeoProvider, Place, AmazonLocationServiceMapStyle, Coordinates, SearchForSuggestionsResults, GeofenceId, GeofenceInput, AmazonLocationServiceGeofenceOptions, AmazonLocationServiceListGeofenceOptions, ListGeofenceResults, SaveGeofencesResults, AmazonLocationServiceGeofence, AmazonLocationServiceDeleteGeofencesResults, searchByPlaceIdOptions } from '../types';
 export declare class AmazonLocationServiceProvider implements GeoProvider {
     static CATEGORY: string;
@@ -44,23 +43,23 @@ export declare class AmazonLocationServiceProvider implements GeoProvider {
      * @param  {SearchByTextOptions} options? - Optional parameters to the search
      * @returns {Promise<Place[]>} - Promise resolves to a list of Places that match search parameters
      */
-    searchByText(text: string, options?: SearchByTextOptions, customUserAgentDetails?: CustomUserAgentDetails): Promise<Place[]>;
+    searchByText(text: string, options?: SearchByTextOptions): Promise<Place[]>;
     /**
      * Search for suggestions based on the input text
      * @param  {string} text - The text string that is to be searched for
      * @param  {SearchByTextOptions} options? - Optional parameters to the search
      * @returns {Promise<SearchForSuggestionsResults>} - Resolves to an array of search suggestion strings
      */
-    searchForSuggestions(text: string, options?: SearchByTextOptions, customUserAgentDetails?: CustomUserAgentDetails): Promise<SearchForSuggestionsResults>;
+    searchForSuggestions(text: string, options?: SearchByTextOptions): Promise<SearchForSuggestionsResults>;
     private _verifyPlaceId;
-    searchByPlaceId(placeId: string, options?: searchByPlaceIdOptions, customUserAgentDetails?: CustomUserAgentDetails): Promise<Place | undefined>;
+    searchByPlaceId(placeId: string, options?: searchByPlaceIdOptions): Promise<Place | undefined>;
     /**
      * Reverse geocoding search via a coordinate point on the map
      * @param coordinates - Coordinates array for the search input
      * @param options - Options parameters for the search
      * @returns {Promise<Place>} - Promise that resolves to a place matching search coordinates
      */
-    searchByCoordinates(coordinates: Coordinates, options?: SearchByCoordinatesOptions, customUserAgentDetails?: CustomUserAgentDetails): Promise<Place>;
+    searchByCoordinates(coordinates: Coordinates, options?: SearchByCoordinatesOptions): Promise<Place>;
     /**
      * Create geofences inside of a geofence collection
      * @param geofences - Array of geofence objects to create
@@ -69,14 +68,14 @@ export declare class AmazonLocationServiceProvider implements GeoProvider {
      *   successes: list of geofences successfully created
      *   errors: list of geofences that failed to create
      */
-    saveGeofences(geofences: GeofenceInput[], options?: AmazonLocationServiceGeofenceOptions, customUserAgentDetails?: CustomUserAgentDetails): Promise<SaveGeofencesResults>;
+    saveGeofences(geofences: GeofenceInput[], options?: AmazonLocationServiceGeofenceOptions): Promise<SaveGeofencesResults>;
     /**
      * Get geofence from a geofence collection
      * @param geofenceId:string
      * @param options?: Optional parameters for getGeofence
      * @returns {Promise<AmazonLocationServiceGeofence>} - Promise that resolves to a geofence object
      */
-    getGeofence(geofenceId: GeofenceId, options?: AmazonLocationServiceGeofenceOptions, customUserAgentDetails?: CustomUserAgentDetails): Promise<AmazonLocationServiceGeofence>;
+    getGeofence(geofenceId: GeofenceId, options?: AmazonLocationServiceGeofenceOptions): Promise<AmazonLocationServiceGeofence>;
     /**
      * List geofences from a geofence collection
      * @param  options?: ListGeofenceOptions
@@ -84,7 +83,7 @@ export declare class AmazonLocationServiceProvider implements GeoProvider {
      *   entries: list of geofences - 100 geofences are listed per page
      *   nextToken: token for next page of geofences
      */
-    listGeofences(options?: AmazonLocationServiceListGeofenceOptions, customUserAgentDetails?: CustomUserAgentDetails): Promise<ListGeofenceResults>;
+    listGeofences(options?: AmazonLocationServiceListGeofenceOptions): Promise<ListGeofenceResults>;
     /**
      * Delete geofences from a geofence collection
      * @param geofenceIds: string|string[]
@@ -93,7 +92,7 @@ export declare class AmazonLocationServiceProvider implements GeoProvider {
      *  successes: list of geofences successfully deleted
      *  errors: list of geofences that failed to delete
      */
-    deleteGeofences(geofenceIds: string[], options?: AmazonLocationServiceGeofenceOptions, customUserAgentDetails?: CustomUserAgentDetails): Promise<AmazonLocationServiceDeleteGeofencesResults>;
+    deleteGeofences(geofenceIds: string[], options?: AmazonLocationServiceGeofenceOptions): Promise<AmazonLocationServiceDeleteGeofencesResults>;
     /**
      * @private
      */

package/lib/Providers/AmazonLocationServiceProvider.js

@@ -75,7 +75,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
      * @param  {SearchByTextOptions} options? - Optional parameters to the search
      * @returns {Promise<Place[]>} - Promise resolves to a list of Places that match search parameters
      */
-    AmazonLocationServiceProvider.prototype.searchByText = function (text, options, customUserAgentDetails) {
+    AmazonLocationServiceProvider.prototype.searchByText = function (text, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var credentialsOK, locationServiceInput, client, command, response, error_1, PascalResults, results;
             return tslib_1.__generator(this, function (_a) {
@@ -100,7 +100,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                         client = new client_location_1.LocationClient({
                             credentials: this._config.credentials,
                             region: this._config.region,
-                            customUserAgent: core_1.getAmplifyUserAgentObject(customUserAgentDetails),
+                            customUserAgent: core_1.getAmplifyUserAgentObject(),
                         });
                         command = new client_location_1.SearchPlaceIndexForTextCommand(locationServiceInput);
                         _a.label = 2;
@@ -130,7 +130,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
      * @param  {SearchByTextOptions} options? - Optional parameters to the search
      * @returns {Promise<SearchForSuggestionsResults>} - Resolves to an array of search suggestion strings
      */
-    AmazonLocationServiceProvider.prototype.searchForSuggestions = function (text, options, customUserAgentDetails) {
+    AmazonLocationServiceProvider.prototype.searchForSuggestions = function (text, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var credentialsOK, locationServiceInput, client, command, response, error_2, results;
             return tslib_1.__generator(this, function (_a) {
@@ -155,7 +155,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                         client = new client_location_1.LocationClient({
                             credentials: this._config.credentials,
                             region: this._config.region,
-                            customUserAgent: core_1.getAmplifyUserAgentObject(customUserAgentDetails),
+                            customUserAgent: core_1.getAmplifyUserAgentObject(),
                         });
                         command = new client_location_1.SearchPlaceIndexForSuggestionsCommand(locationServiceInput);
                         _a.label = 2;
@@ -186,7 +186,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
             throw new Error(errorString);
         }
     };
-    AmazonLocationServiceProvider.prototype.searchByPlaceId = function (placeId, options, customUserAgentDetails) {
+    AmazonLocationServiceProvider.prototype.searchByPlaceId = function (placeId, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var credentialsOK, client, searchByPlaceIdInput, command, response, error_3, place;
             return tslib_1.__generator(this, function (_a) {
@@ -202,7 +202,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                         client = new client_location_1.LocationClient({
                             credentials: this._config.credentials,
                             region: this._config.region,
-                            customUserAgent: core_1.getAmplifyUserAgentObject(customUserAgentDetails),
+                            customUserAgent: core_1.getAmplifyUserAgentObject(),
                         });
                         searchByPlaceIdInput = {
                             PlaceId: placeId,
@@ -236,7 +236,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
      * @param options - Options parameters for the search
      * @returns {Promise<Place>} - Promise that resolves to a place matching search coordinates
      */
-    AmazonLocationServiceProvider.prototype.searchByCoordinates = function (coordinates, options, customUserAgentDetails) {
+    AmazonLocationServiceProvider.prototype.searchByCoordinates = function (coordinates, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var credentialsOK, locationServiceInput, client, command, response, error_4, PascalResults, results;
             return tslib_1.__generator(this, function (_a) {
@@ -261,7 +261,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                         client = new client_location_1.LocationClient({
                             credentials: this._config.credentials,
                             region: this._config.region,
-                            customUserAgent: core_1.getAmplifyUserAgentObject(customUserAgentDetails),
+                            customUserAgent: core_1.getAmplifyUserAgentObject(),
                         });
                         command = new client_location_1.SearchPlaceIndexForPositionCommand(locationServiceInput);
                         _a.label = 2;
@@ -293,7 +293,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
      *   successes: list of geofences successfully created
      *   errors: list of geofences that failed to create
      */
-    AmazonLocationServiceProvider.prototype.saveGeofences = function (geofences, options, customUserAgentDetails) {
+    AmazonLocationServiceProvider.prototype.saveGeofences = function (geofences, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var credentialsOK, PascalGeofences, results, geofenceBatches, apiLimit;
             var _this = this;
@@ -342,7 +342,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                                     switch (_a.label) {
                                         case 0:
                                             _a.trys.push([0, 2, , 3]);
-                                            return [4 /*yield*/, this._AmazonLocationServiceBatchPutGeofenceCall(batch, (options === null || options === void 0 ? void 0 : options.collectionName) || this._config.geofenceCollections.default, customUserAgentDetails)];
+                                            return [4 /*yield*/, this._AmazonLocationServiceBatchPutGeofenceCall(batch, (options === null || options === void 0 ? void 0 : options.collectionName) || this._config.geofenceCollections.default)];
                                         case 1:
                                             response = _a.sent();
                                             return [3 /*break*/, 3];
@@ -397,7 +397,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
      * @param options?: Optional parameters for getGeofence
      * @returns {Promise<AmazonLocationServiceGeofence>} - Promise that resolves to a geofence object
      */
-    AmazonLocationServiceProvider.prototype.getGeofence = function (geofenceId, options, customUserAgentDetails) {
+    AmazonLocationServiceProvider.prototype.getGeofence = function (geofenceId, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var credentialsOK, client, commandInput, command, response, error_6, GeofenceId, CreateTime, UpdateTime, Status, Geometry, geofence;
             return tslib_1.__generator(this, function (_a) {
@@ -420,7 +420,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                         client = new client_location_1.LocationClient({
                             credentials: this._config.credentials,
                             region: this._config.region,
-                            customUserAgent: core_1.getAmplifyUserAgentObject(customUserAgentDetails),
+                            customUserAgent: core_1.getAmplifyUserAgentObject(),
                         });
                         commandInput = {
                             GeofenceId: geofenceId,
@@ -461,7 +461,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
      *   entries: list of geofences - 100 geofences are listed per page
      *   nextToken: token for next page of geofences
      */
-    AmazonLocationServiceProvider.prototype.listGeofences = function (options, customUserAgentDetails) {
+    AmazonLocationServiceProvider.prototype.listGeofences = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var credentialsOK, client, listGeofencesInput, command, response, error_7, NextToken, Entries, results;
             return tslib_1.__generator(this, function (_a) {
@@ -483,7 +483,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                         client = new client_location_1.LocationClient({
                             credentials: this._config.credentials,
                             region: this._config.region,
-                            customUserAgent: core_1.getAmplifyUserAgentObject(customUserAgentDetails),
+                            customUserAgent: core_1.getAmplifyUserAgentObject(),
                         });
                         listGeofencesInput = {
                             NextToken: options === null || options === void 0 ? void 0 : options.nextToken,
@@ -531,7 +531,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
      *  successes: list of geofences successfully deleted
      *  errors: list of geofences that failed to delete
      */
-    AmazonLocationServiceProvider.prototype.deleteGeofences = function (geofenceIds, options, customUserAgentDetails) {
+    AmazonLocationServiceProvider.prototype.deleteGeofences = function (geofenceIds, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var credentialsOK, badGeofenceIds, results, geofenceIdBatches, count;
             var _this = this;
@@ -575,7 +575,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                                     switch (_b.label) {
                                         case 0:
                                             _b.trys.push([0, 2, , 3]);
-                                            return [4 /*yield*/, this._AmazonLocationServiceBatchDeleteGeofenceCall(batch, (options === null || options === void 0 ? void 0 : options.collectionName) || this._config.geofenceCollections.default, customUserAgentDetails)];
+                                            return [4 /*yield*/, this._AmazonLocationServiceBatchDeleteGeofenceCall(batch, (options === null || options === void 0 ? void 0 : options.collectionName) || this._config.geofenceCollections.default)];
                                         case 1:
                                             response = _b.sent();
                                             return [3 /*break*/, 3];
@@ -667,7 +667,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
             throw new Error(errorString);
         }
     };
-    AmazonLocationServiceProvider.prototype._AmazonLocationServiceBatchPutGeofenceCall = function (PascalGeofences, collectionName, customUserAgentDetails) {
+    AmazonLocationServiceProvider.prototype._AmazonLocationServiceBatchPutGeofenceCall = function (PascalGeofences, collectionName) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var geofenceInput, client, command, response, error_10;
             return tslib_1.__generator(this, function (_a) {
@@ -680,7 +680,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                         client = new client_location_1.LocationClient({
                             credentials: this._config.credentials,
                             region: this._config.region,
-                            customUserAgent: core_1.getAmplifyUserAgentObject(customUserAgentDetails),
+                            customUserAgent: core_1.getAmplifyUserAgentObject(),
                         });
                         command = new client_location_1.BatchPutGeofenceCommand(geofenceInput);
                         _a.label = 1;
@@ -698,7 +698,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
             });
         });
     };
-    AmazonLocationServiceProvider.prototype._AmazonLocationServiceBatchDeleteGeofenceCall = function (geofenceIds, collectionName, customUserAgentDetails) {
+    AmazonLocationServiceProvider.prototype._AmazonLocationServiceBatchDeleteGeofenceCall = function (geofenceIds, collectionName) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var deleteGeofencesInput, client, command, response, error_11;
             return tslib_1.__generator(this, function (_a) {
@@ -711,7 +711,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                         client = new client_location_1.LocationClient({
                             credentials: this._config.credentials,
                             region: this._config.region,
-                            customUserAgent: core_1.getAmplifyUserAgentObject(customUserAgentDetails),
+                            customUserAgent: core_1.getAmplifyUserAgentObject(),
                         });
                         command = new client_location_1.BatchDeleteGeofenceCommand(deleteGeofencesInput);
                         _a.label = 1;