Merge pull request #187 from dubiety/users/charlie/fix-runtime-error

Fix sample errors

Author: dubiety

Samples/REST Services/Fill Address Form with Autosuggest/Fill Address Form with Autosuggest.html

@@ -86,7 +86,8 @@
 
         function getExpiration(jwtToken) {
             // Decode the JWT token to get the expiration timestamp
-            const json = atob(jwtToken.split(".")[1]);                                                                                                                                                                                                                                 -            const decode = JSON.parse(json);
+            const json = atob(jwtToken.split(".")[1]);
+            const decode = JSON.parse(json);
 
             // Return the milliseconds until the token needs renewed
             // Reduce the time until renew by 2 minutes to avoid using an expired token
@@ -102,14 +103,16 @@
             // Create a repeating timeout that will renew the SAS token
             // This timeout must be cleared once the TokenCredential object is no longer needed
             // If the timeout is not cleared the memory used by the TokenCredential will never be reclaimed.
-            const renewToken = async () => {                                                                                                                                                                                                                                           -                try {
+            const renewToken = async () => {
+                try {
                     console.log("Renewing token");
                     token = await getSasToken();
                     tokenRenewalTimer = setTimeout(renewToken, getExpiration(token));
-                } catch (error) {                         
-                    console.log("Caught error when renewing token");                                                                                                                                                                                                                             -                    console.log("Caught error when renewing token");
+                } catch (error) {
+                    console.log("Caught error when renewing token");
                     clearTimeout(tokenRenewalTimer);
-                    throw error;                                                                                                                                                                                                                                                       -                }
+                    throw error;
+                }
             }
             tokenRenewalTimer = setTimeout(renewToken, getExpiration(token));
         }

Samples/REST Services/Simple REST Geocoding Request/Simple REST Geocoding Request.html

@@ -14,7 +14,7 @@
 
     <script>
         //Your Azure Maps Active Directory details for autheniticating the service.
-        var tokenService = 'https://samples.azuremaps.com/api/GetAzureMapsSASToken';
+        var tokenService = 'https://samples.azuremaps.com/api/GetAzureMapsSasToken';
 
         var token;
 

Samples/Services Module/Methods for geocoding multiple addresses/Methods for geocoding multiple addresses.html

@@ -17,6 +17,9 @@
     <link href="https://atlas.microsoft.com/sdk/javascript/mapcontrol/3/atlas.min.css" rel="stylesheet" />
     <script src="https://atlas.microsoft.com/sdk/javascript/mapcontrol/3/atlas.min.js"></script>
 
+    <!-- Add a reference to the Azure Maps Services Module JavaScript file. -->
+    <script src="https://atlas.microsoft.com/sdk/javascript/service/2/atlas-service.min.js"></script>
+
     <!-- Add a reference to the Azure Maps Rest Helper JavaScript file. -->
     <script src="https://samples.azuremaps.com/lib/azure-maps/azure-maps-helper.min.js"></script>
 
@@ -145,6 +148,12 @@
                 //Add a layer for rendering data.
                 map.layers.add(new atlas.layer.BubbleLayer(datasource));
             });
+
+            //Use MapControlCredential to share authentication between a map control and the service module.
+            var pipeline = atlas.service.MapsURL.newPipeline(new atlas.service.MapControlCredential(map));
+
+            //Create an instance of the SearchURL client.
+            searchURL = new atlas.service.SearchURL(pipeline);
         }
 
         var searchMethod;
@@ -207,10 +216,8 @@
             var requestUrl = 'https://{azMapsDomain}/search/address/batch/sync/json?api-version=1.0';
             var res = await processPostRequest(requestUrl, body);
 
-            var r = await res.json();
-
             //Process the response.
-            processBatchResponse(r);
+            processBatchResponse(res);
 
             //Done.
             endSearch();
@@ -222,12 +229,13 @@
             var requestUrl = 'https://{azMapsDomain}/search/address/batch/json?api-version=1.0';
             var res = await processPostRequest(requestUrl, body);
 
-            //Ge tthe batch status URL from the "location" response header.
+            //Get the batch status URL from the "location" response header.
             var batchStatusUrl = res.headers.get('location');
+            var signedRequest = await signRequest(requestUrl);
 
-            //Check the statuc of the batch job.
+            //Check the status of the batch job.
             var res2 = await fetch(batchStatusUrl, {
-                headers: new Headers(requestParams.headers)
+                headers: new Headers(signedRequest.headers)
             });
 
             //Check to see if batch process if complete.

Static/lib/azure-maps/azure-maps-helper.js

@@ -33,6 +33,13 @@ async function processPostRequest(url, body) {
         throw new Error(`Network response was not ok: ${response.status} ${response.statusText}`);
     }
 
+    // If the response body is empty, return the response directly to avoid JSON parsing errors.
+    // This can happen if the request was successful but there is no content to return.
+    // e.g., 204 No Content or 202 Accepted
+    if (response.status === 204 || response.status === 202) {
+        return response;
+    }
+
     return response.json();
 }