feat(geo): add region to Amazon Location Service MapStyle (#8736) (#8745

)
aws-amplify · Sep 23, 2021 · 21c95b2 · 21c95b2
1 parent 8a4f885
commit 21c95b2
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 13 deletions.
diff --git a/packages/geo/__tests__/Geo.test.ts b/packages/geo/__tests__/Geo.test.ts
@@ -140,9 +140,11 @@ describe('Geo', () => {
 
 			const maps = [];
 			const availableMaps = awsConfig.geo.amazon_location_services.maps.items;
+			const region = awsConfig.geo.amazon_location_services.region;
+
 			for (const mapName in availableMaps) {
 				const style = availableMaps[mapName].style;
-				maps.push({ mapName, style });
+				maps.push({ mapName, style, region });
 			}
 
 			expect(geo.getAvailableMaps()).toEqual(maps);
@@ -179,7 +181,8 @@ describe('Geo', () => {
 			const mapName = awsConfig.geo.amazon_location_services.maps.default;
 			const style =
 				awsConfig.geo.amazon_location_services.maps.items[mapName].style;
-			const testMap = { mapName, style };
+			const region = awsConfig.geo.amazon_location_services.region;
+			const testMap = { mapName, style, region };
 
 			const defaultMapsResource = geo.getDefaultMap();
 			expect(defaultMapsResource).toEqual(testMap);

diff --git a/packages/geo/__tests__/Providers/AmazonLocationServicesProvider.test.ts b/packages/geo/__tests__/Providers/AmazonLocationServicesProvider.test.ts
@@ -101,9 +101,10 @@ describe('AmazonLocationServicesProvider', () => {
 
 			const maps = [];
 			const availableMaps = awsConfig.geo.amazon_location_services.maps.items;
+			const region = awsConfig.geo.amazon_location_services.region;
 			for (const mapName in availableMaps) {
 				const style = availableMaps[mapName].style;
-				maps.push({ mapName, style });
+				maps.push({ mapName, style, region });
 			}
 
 			expect(provider.getAvailableMaps()).toEqual(maps);
@@ -136,7 +137,9 @@ describe('AmazonLocationServicesProvider', () => {
 			const mapName = awsConfig.geo.amazon_location_services.maps.default;
 			const style =
 				awsConfig.geo.amazon_location_services.maps.items[mapName].style;
-			const testMap = { mapName, style };
+			const region = awsConfig.geo.amazon_location_services.region;
+
+			const testMap = { mapName, style, region };
 
 			const defaultMapsResource = provider.getDefaultMap();
 			expect(defaultMapsResource).toEqual(testMap);

diff --git a/packages/geo/src/Providers/AmazonLocationServicesProvider.ts b/packages/geo/src/Providers/AmazonLocationServicesProvider.ts
@@ -11,7 +11,11 @@
  * and limitations under the License.
  */
 import camelcaseKeys from 'camelcase-keys';
-import { ConsoleLogger as Logger, Credentials, getAmplifyUserAgent } from '@aws-amplify/core';
+import {
+	ConsoleLogger as Logger,
+	Credentials,
+	getAmplifyUserAgent,
+} from '@aws-amplify/core';
 import {
 	Place as PlaceResult,
 	SearchPlaceIndexForTextCommandInput,
@@ -27,7 +31,7 @@ import {
 	SearchByCoordinatesOptions,
 	GeoProvider,
 	Place,
-	MapStyle,
+	AmazonLocationServiceMapStyle,
 	Coordinates,
 } from '../types';
 
@@ -81,31 +85,32 @@ export class AmazonLocationServicesProvider implements GeoProvider {
 
 	/**
 	 * Get the map resources that are currently available through the provider
-	 * @returns {MapStyle[]}- Array of available map resources
+	 * @returns {AmazonLocationServiceMapStyle[]}- Array of available map resources
 	 */
-	public getAvailableMaps(): MapStyle[] {
+	public getAvailableMaps(): AmazonLocationServiceMapStyle[] {
 		if (!this._config.maps) {
 			throw new Error(
 				"No map resources found in amplify config, run 'amplify add geo' to create them and ensure to run `amplify push` after"
 			);
 		}
 
-		const mapStyles: MapStyle[] = [];
+		const mapStyles: AmazonLocationServiceMapStyle[] = [];
 		const availableMaps = this._config.maps.items;
+		const region = this._config.region;
 
 		for (const mapName in availableMaps) {
 			const style = availableMaps[mapName].style;
-			mapStyles.push({ mapName, style });
+			mapStyles.push({ mapName, style, region });
 		}
 
 		return mapStyles;
 	}
 
 	/**
 	 * Get the map resource set as default in amplify config
-	 * @returns {MapStyle} - Map resource set as the default in amplify config
+	 * @returns {AmazonLocationServiceMapStyle} - Map resource set as the default in amplify config
 	 */
-	public getDefaultMap(): MapStyle {
+	public getDefaultMap(): AmazonLocationServiceMapStyle {
 		if (!this._config.maps) {
 			throw new Error(
 				"No map resources found in amplify config, run 'amplify add geo' to create them and ensure to run `amplify push` after"
@@ -119,8 +124,9 @@ export class AmazonLocationServicesProvider implements GeoProvider {
 
 		const mapName = this._config.maps.default;
 		const style = this._config.maps.items[mapName].style;
+		const region = this._config.region;
 
-		return { mapName, style };
+		return { mapName, style, region };
 	}
 
 	/**

diff --git a/packages/geo/src/types/AmazonLocationServicesProvider.ts b/packages/geo/src/types/AmazonLocationServicesProvider.ts
@@ -0,0 +1,5 @@
+import { MapStyle } from './Geo';
+
+export interface AmazonLocationServiceMapStyle extends MapStyle {
+	region: string;
+}
diff --git a/packages/geo/src/types/index.ts b/packages/geo/src/types/index.ts
@@ -1,2 +1,3 @@
 export * from './Geo';
 export * from './Provider';
+export * from './AmazonLocationServicesProvider';