Add Geography to Indoor functionality (#48)

* Add Geograpy to Indoor settings * Changes based on comments * Add options to comment/doc for Geography * Changed options.ts andindoor.ts to assign default to geography * Write default value for Geography in IndoorManagerOptionsJsonConverter Read geography value in IndoorManagerOptionsJsonConverter * Fix failing test
arnaudleclerc · Jun 19, 2021 · 455093c · 455093c
1 parent 5cf6101
commit 455093c
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 7 deletions.
diff --git a/samples/AzureMapsControl.Sample/Pages/Indoor/Index.razor b/samples/AzureMapsControl.Sample/Pages/Indoor/Index.razor
@@ -25,6 +25,7 @@
 
         var options = new AzureMapsControl.Components.Indoor.IndoorManagerOptions
         {
+            Geography = Configuration["AzureMaps:Geography"],
             LevelControl = levelControl,
             StatesetId = statesetId,
             TilesetId = Configuration["Indoor:TilesetId"]

diff --git a/src/AzureMapsControl.Components/Indoor/IndoorManagerOptions.cs b/src/AzureMapsControl.Components/Indoor/IndoorManagerOptions.cs
@@ -19,6 +19,12 @@ public struct IndoorManagerOptions
         /// </summary>
         public string StatesetId { get; set; }
 
+        /// <summary>
+        /// The geography of the Creator resources.
+        /// Possible values: "us" or "eu"
+        /// </summary>
+        public string Geography { get; set; }
+
         /// <summary>
         /// The theme for indoor layer styles.
         /// </summary>
@@ -34,7 +40,7 @@ internal class IndoorManagerOptionsJsonConverter : JsonConverter<IndoorManagerOp
     {
         public override IndoorManagerOptions Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
-            string statesetId = null, tilesetId = null;
+            string statesetId = null, tilesetId = null, geography = null;
             IndoorLayerTheme theme = default;
 
             if (reader.TokenType == JsonTokenType.None)
@@ -63,13 +69,19 @@ public override IndoorManagerOptions Read(ref Utf8JsonReader reader, Type typeTo
                             reader.Read();
                             tilesetId = reader.GetString();
                         }
+                        else if (reader.GetString() == "geography")
+                        {
+                            reader.Read();
+                            geography = reader.GetString();
+                        }
                     }
                 }
 
                 return new IndoorManagerOptions {
                     StatesetId = statesetId,
                     Theme = theme,
-                    TilesetId = tilesetId
+                    TilesetId = tilesetId,
+                    Geography = geography
                 };
             }
 
@@ -89,6 +101,8 @@ public override void Write(Utf8JsonWriter writer, IndoorManagerOptions value, Js
             {
                 writer.WriteString("theme", value.Theme.ToString());
             }
+
+            writer.WriteString("geography", value.Geography ?? "us");
             writer.WriteString("tilesetId", value.TilesetId);
             writer.WriteEndObject();
         }

diff --git a/src/AzureMapsControl.Components/typescript/indoor/indoor.ts b/src/AzureMapsControl.Components/typescript/indoor/indoor.ts
@@ -17,13 +17,17 @@ export class Indoor {
         if (!options.theme) {
             options.theme = 'auto';
         }
+        if (!options.geography) {
+            options.geography = 'us';
+        }
 
         const map = Core.getMap();
         const indoorManager = new indoor.indoor.IndoorManager(map, {
             levelControl,
             statesetId: options.statesetId,
             theme: options.theme,
-            tilesetId: options.tilesetId
+            tilesetId: options.tilesetId,
+            geography: options.geography
         });
 
         if (events) {
@@ -66,7 +70,8 @@ export class Indoor {
         return {
             statesetId: options.statesetId,
             theme: options.theme,
-            tilesetId: options.tilesetId
+            tilesetId: options.tilesetId,
+            geography: options.geography
         };
     }
 

diff --git a/src/AzureMapsControl.Components/typescript/indoor/options.ts b/src/AzureMapsControl.Components/typescript/indoor/options.ts
@@ -7,4 +7,5 @@ export interface IndoorManagerOptions {
     statesetId: string;
     theme: 'auto' | 'dark' | 'light';
     tilesetId: string;
+    geography: 'us' | 'eu';
 }
diff --git a/src/AzureMapsControl.Components/typings/Indoor/index.d.ts b/src/AzureMapsControl.Components/typings/Indoor/index.d.ts
@@ -286,9 +286,9 @@ declare namespace atlas {
         export class IndoorManagerOptions {
             /**
              * The geography of the Creator resource.
-             * @default "United States";
+             * @default "us";
              */
-            public geography?: "United States";
+            public geography?: "us" | "eu";
 
             /**
              * A level picker to display as a control for the indoor manager.

diff --git a/tests/AzureMapsControl.Components.Tests/Indoor/IndoorManagerOptions.cs b/tests/AzureMapsControl.Components.Tests/Indoor/IndoorManagerOptions.cs
@@ -22,7 +22,8 @@ public void Should_Write()
                 LevelControl = levelControl,
                 StatesetId = "statesetId",
                 Theme = IndoorLayerTheme.Auto,
-                TilesetId = "tilesetId"
+                TilesetId = "tilesetId",
+                Geography = "us"
             };
 
             var expectedJson = "{"
@@ -35,6 +36,7 @@ public void Should_Write()
                 + ",\"statesetId\":\"statesetId\""
                 + ",\"theme\":\"auto\""
                 + ",\"tilesetId\":\"tilesetId\""
+                + ",\"geography\":\"us\""
                 + "}";
 
             TestAndAssertWrite(options, expectedJson);