update sample map

Esri · Aug 17, 2016 · 880f1b5 · 880f1b5
1 parent 10a56b5
commit 880f1b5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/sample/map.js b/sample/map.js
@@ -89,7 +89,12 @@ var app = {
                 var satellites = "<br /><span style='font-weight:bold;'>Satellite Data:</span> " + date.toUTCString() + "<br /><br />";
 
                 for( var key in json){
-                    if(json.hasOwnProperty(key) && key.toLowerCase() != "provider" && key.toLowerCase() != "timestamp"){
+
+                    if(json.hasOwnProperty(key)
+                        && key.toLowerCase() != "provider"
+                        && key.toLowerCase() != "timestamp"
+                        && key.toLowerCase() != "error"){
+
                         satellites +=
                             "PRN: " + json[key].PRN +
                             ", fix: " + json[key].usedInFix +
@@ -101,15 +106,6 @@ var app = {
                 satDiv.innerHTML = satellites;
             }
 
-            function addLocationData(lat, lon, provider){
-                locationDiv.innerHTML =
-                    lat
-                    + ", "
-                    + lon
-                    + ": "
-                    + provider;
-            }
-
             // Initialize the geolocation plugin
             function init(){
                 synchronizeMap();
@@ -132,18 +128,21 @@ var app = {
                             switch(jsonObject.provider){
                                 case "gps":
                                     if(jsonObject.latitude != "0.0"){
-                                        var point = new Point(jsonObject.longitude, jsonObject.latitude, "GPS");
+                                        console.log("GPS location detected - lat:" +
+                                            jsonObject.latitude + ", lon: " + jsonObject.longitude);
+                                        var point = new Point(jsonObject.longitude, jsonObject.latitude);
                                         map.centerAt(point);
                                         addGraphic( greenGPSSymbol, point);
                                     }
                                     break;
 
                                 case "network":
                                     if(jsonObject.latitude != "0.0"){
+                                        console.log("Network location detected - lat:" +
+                                            jsonObject.latitude + ", lon: " + jsonObject.longitude);
                                         var point = new Point(jsonObject.longitude, jsonObject.latitude);
                                         map.centerAt(point);
                                         addGraphic( blueNetworkSymbol, point);
-                                        addLocationData(jsonObject.longitude, jsonObject.latitude, "NETWORK");
                                     }
                                     break;
 
@@ -168,9 +167,9 @@ var app = {
                     }
                 },
                 function(error){
-                    console.log("ERROR! " + JSON.stringify(error));
+                    console.log("Error JSON: " + JSON.stringify(error));
                     var e = JSON.parse(error);
-                    console.log("Error: " + e.msg);
+                    console.log("Error no.: " + e.error + ", Message: " + e.msg + ", Provider: " + e.provider);
                 },
                 /////////////////////////////////////////
                 //

diff --git a/sample/sample-map.html b/sample/sample-map.html
@@ -40,7 +40,7 @@
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
         <meta name="viewport" content="width=device-width, user-scalable=no"/>
         <title>Hello World Map</title>
-        <link rel="stylesheet" href="https://js.arcgis.com/3.16/esri/css/esri.css">
+        <link rel="stylesheet" href="https://js.arcgis.com/3.17/esri/css/esri.css">
         <style>
             html, body, #map {
                 height: 75%;
@@ -54,14 +54,14 @@
                 font-family: "Trebuchet MS";
             }
         </style>
-        <script src="https://js.arcgis.com/3.16/"></script>
+        <script src="https://js.arcgis.com/3.17/"></script>
     </head>
     <body>
         <div id="map"></div>
         <hr>
         <div>
-            GPS&nbsp; <img src="img/blue-pin.png">
-            &nbsp;NETWORK&nbsp; <img src="img/green-pin.png">
+            GPS&nbsp; <img src="img/green-pin.png">
+            &nbsp;NETWORK&nbsp; <img src="img/blue-pin.png">
         </div>
         <hr>
         <div id='locationData'></div>