feat(category-geo): add two new map styles 2022.10 (#11262)

* Map Style Add * Map Style Add
aws-amplify · Nov 10, 2022 · 77a473e · 77a473e
1 parent cf81078
commit 77a473e
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/packages/amplify-category-geo/src/__tests__/service-utils/mapParams.test.ts b/packages/amplify-category-geo/src/__tests__/service-utils/mapParams.test.ts
@@ -10,7 +10,9 @@ describe('map style construction works as expected', () => {
         "RasterEsriImagery",
         "VectorHereBerlin",
         "VectorHereExplore",
-        "VectorHereExploreTruck"
+        "VectorHereExploreTruck",
+        "RasterHereExploreSatellite",
+        "HybridHereExploreSatellite"
     ];
 
     it('parses various supported map styles', () => {

diff --git a/packages/amplify-category-geo/src/service-utils/mapParams.ts b/packages/amplify-category-geo/src/service-utils/mapParams.ts
@@ -27,7 +27,9 @@ export enum EsriMapStyleType {
  export enum HereMapStyleType {
    Berlin = "Berlin",
    Explore = "Explore",
-   ExploreTruck = "ExploreTruck"
+   ExploreTruck = "ExploreTruck",
+   RasterSatellite = "RasterSatellite",
+   HybridSatellite = "HybridSatellite"
  }
 
 export type MapStyleType = EsriMapStyleType | HereMapStyleType;
@@ -44,7 +46,9 @@ export enum MapStyle {
     RasterEsriImagery = "RasterEsriImagery",
     VectorHereBerlin = "VectorHereBerlin",
     VectorHereExplore = "VectorHereExplore",
-    VectorHereExploreTruck = "VectorHereExploreTruck"
+    VectorHereExploreTruck = "VectorHereExploreTruck",
+    RasterHereExploreSatellite = "RasterHereExploreSatellite",
+    HybridHereExploreSatellite = "HybridHereExploreSatellite"
 }
 
 /**
@@ -67,7 +71,13 @@ export const convertToCompleteMapParams = (partial: Partial<MapParameters>): Map
  * Constructs the Amazon Location Map Style from available map parameters
  */
 export const getGeoMapStyle = (dataProvider: DataProvider, mapStyleType: MapStyleType) => {
-    if (dataProvider === DataProvider.Here) {
+    if (dataProvider === DataProvider.Here && mapStyleType === HereMapStyleType.RasterSatellite) {
+      return MapStyle.RasterHereExploreSatellite;
+    }
+    else if (dataProvider === DataProvider.Here && mapStyleType === HereMapStyleType.HybridSatellite) {
+      return MapStyle.HybridHereExploreSatellite;
+    }
+    else if (dataProvider === DataProvider.Here) {
       return `VectorHere${mapStyleType}`;
     }
     else if (dataProvider === DataProvider.Esri && mapStyleType === EsriMapStyleType.Imagery) {
@@ -99,6 +109,10 @@ export const getMapStyleComponents = (mapStyle: string): Pick<MapParameters, 'da
             return { dataProvider: DataProvider.Here, mapStyleType: HereMapStyleType.Explore };
         case MapStyle.VectorHereExploreTruck:
             return { dataProvider: DataProvider.Here, mapStyleType: HereMapStyleType.ExploreTruck };
+        case MapStyle.RasterHereExploreSatellite:
+            return { dataProvider: DataProvider.Here, mapStyleType: HereMapStyleType.RasterSatellite };
+        case MapStyle.HybridHereExploreSatellite:
+            return { dataProvider: DataProvider.Here, mapStyleType: HereMapStyleType.HybridSatellite };
         default:
             throw new Error(`Invalid map style ${mapStyle}`);
     }

diff --git a/packages/amplify-category-geo/src/service-walkthroughs/mapWalkthrough.ts b/packages/amplify-category-geo/src/service-walkthroughs/mapWalkthrough.ts
@@ -86,6 +86,8 @@ export const mapStyleWalkthrough = async (parameters: Partial<MapParameters>): P
         { name: 'Berlin (data provided by HERE)', value: MapStyle.VectorHereBerlin },
         { name: 'Explore (data provided by HERE)', value: MapStyle.VectorHereExplore },
         { name: 'ExploreTruck (data provided by HERE)', value: MapStyle.VectorHereExploreTruck },
+        { name: 'RasterSatellite (data provided by HERE)', value: MapStyle.RasterHereExploreSatellite },
+        { name: 'HybridSatellite (data provided by HERE)', value: MapStyle.HybridHereExploreSatellite },
         { name: 'Topographic (data provided by Esri)', value: MapStyle.VectorEsriTopographic },
         { name: 'Navigation (data provided by Esri)', value: MapStyle.VectorEsriNavigation },
         { name: 'LightGrayCanvas (data provided by Esri)', value: MapStyle.VectorEsriLightGrayCanvas },

diff --git a/packages/amplify-headless-interface/schemas/geo/1/AddGeoRequest.schema.json b/packages/amplify-headless-interface/schemas/geo/1/AddGeoRequest.schema.json
@@ -94,7 +94,9 @@
                 "RasterEsriImagery",
                 "VectorHereBerlin",
                 "VectorHereExplore",
-                "VectorHereExploreTruck"
+                "VectorHereExploreTruck",
+                "RasterHereExploreSatellite",
+                "HybridHereExploreSatellite"
             ],
             "type": "string"
         }

diff --git a/packages/amplify-headless-interface/src/interface/geo/add.ts b/packages/amplify-headless-interface/src/interface/geo/add.ts
@@ -72,5 +72,7 @@ export enum AccessType {
   RasterEsriImagery = "RasterEsriImagery",
   VectorHereBerlin = "VectorHereBerlin",
   VectorHereExplore = "VectorHereExplore",
-  VectorHereExploreTruck = "VectorHereExploreTruck"
+  VectorHereExploreTruck = "VectorHereExploreTruck",
+  RasterHereExploreSatellite = "RasterHereExploreSatellite",
+  HybridHereExploreSatellite = "HybridHereExploreSatellite"
 }