From ff1cc0b2815d8b6564b03cbb997bd4496464b800 Mon Sep 17 00:00:00 2001
From: Matt Driscoll <MDriscoll@esri.com>
Date: Wed, 14 Sep 2016 11:40:01 -0700
Subject: [PATCH] 3.18 updates

---
 README.md                       |   2 +-
 config/defaults.js              |   4 +-
 index.html                      |   4 +-
 instagram-callback.html         |  45 +++++++++
 js/InstagramLayer.js            |  45 ++++-----
 js/SocialLayers.js              | 160 +++++++++++++++++++++++++-------
 js/WebcamsLayer.js              | 104 +++++++++++----------
 js/main.js                      |  12 +++
 js/nls/ar/resources.js          |   4 +-
 js/nls/cs/resources.js          |   4 +-
 js/nls/da/resources.js          |   4 +-
 js/nls/de/resources.js          |   4 +-
 js/nls/el/resources.js          |   4 +-
 js/nls/es/resources.js          |   4 +-
 js/nls/et/resources.js          |   4 +-
 js/nls/fi/resources.js          |   4 +-
 js/nls/fr/resources.js          |   4 +-
 js/nls/he/resources.js          |   4 +-
 js/nls/hr/resources.js          |   4 +-
 js/nls/it/resources.js          |   4 +-
 js/nls/ja/resources.js          |   4 +-
 js/nls/ko/resources.js          |   4 +-
 js/nls/lt/resources.js          |   4 +-
 js/nls/lv/resources.js          |   4 +-
 js/nls/nb/resources.js          |   4 +-
 js/nls/nl/resources.js          |   4 +-
 js/nls/pl/resources.js          |   4 +-
 js/nls/pt-br/resources.js       |   4 +-
 js/nls/pt-pt/resources.js       |   4 +-
 js/nls/resources.js             |   4 +-
 js/nls/ro/resources.js          |   4 +-
 js/nls/ru/resources.js          |   4 +-
 js/nls/sr/resources.js          |   4 +-
 js/nls/sv/resources.js          |   4 +-
 js/nls/th/resources.js          |   4 +-
 js/nls/tr/resources.js          |   4 +-
 js/nls/vi/resources.js          |   4 +-
 js/nls/zh-cn/resources.js       |   4 +-
 js/nls/zh-hk/resources.js       |   4 +-
 js/nls/zh-tw/resources.js       |   4 +-
 resources/configurationPanel.js |  50 ++--------
 twitter-callback.html           |  30 ++++++
 42 files changed, 402 insertions(+), 182 deletions(-)
 create mode 100644 instagram-callback.html
 create mode 100644 twitter-callback.html

diff --git a/README.md b/README.md
index e047e5f..f87bf5e 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ The template can be configured using the following options:
 3. Change the sharing host, found in defaults.js inside the config folder for the application, to the sharing URL for ArcGIS Online or Portal. For ArcGIS Online users, keep the default value of www.arcgis.com or specify the name of your organization.
   - ArcGIS Online Example:  `"sharinghost": location.protocol + "//" + “<your organization name>.maps.arcgis.com`
   - Portal Example where `arcgis` is the name of the Web Adaptor: `"sharinghost": location.protocol + "//" + "webadaptor.domain.com/arcgis"`
-4. If you are using Portal or a local install of the ArcGIS API for JavaScript, change all references to the ArcGIS API for JavaScript in index.html to refer to your local copy of the API. Search for the references containing `"//js.arcgis.com/3.17"` and replace this portion of the reference with the url to your local install.
+4. If you are using Portal or a local install of the ArcGIS API for JavaScript, change all references to the ArcGIS API for JavaScript in index.html to refer to your local copy of the API. Search for the references containing `"//js.arcgis.com/3.18"` and replace this portion of the reference with the url to your local install.
   - For example: `"//webadaptor.domain.com/arcgis/jsapi/jsapi"` where `arcgis` is the name of your Web Adaptor.
 5. Copy a map or group ID from Portal/ArcGIS Online and replace the default web map ID in the application’s index.html page. You can now run the application on your web server or customize the application further.
 
diff --git a/config/defaults.js b/config/defaults.js
index c972a1a..f591537 100755
--- a/config/defaults.js
+++ b/config/defaults.js
@@ -51,7 +51,6 @@ define({
   "hideNotesLayerPopups": true,
   "enableInstagram": true,
   "instagramVisible": false,
-  "instagramTime": "",
   "enableFlickr": true,
   "flickrVisible": false,
   "flickrSearch": "",
@@ -71,7 +70,8 @@ define({
   "twitterSigninUrl": location.protocol + "//utility.arcgis.com/tproxy/signin",
   "flickr_key": "404ebea7d5bc27aa5251d1207620e99b",
   "webcams_key": "65939add1ebe8bc9cc4180763f5df2ca",
-  "instagram_key": "288c36a1a42c49de9a2480a05d054619",
+  "instagramClientId": "47ce2d7ea1494adb98708f4b47319227",
+  "instagramSigninUrl": "https://www.instagram.com/oauth/authorize",
   "youtube_key": "AIzaSyBvrlsx50mxX_W-Ra2cJ8PB0jKt0jACZfg",
   /*
     "bannedUsersService": location.protocol + "//services.arcgis.com/QJfoC7c7Z2icolha/ArcGIS/rest/services/fai/FeatureServer/2",
diff --git a/index.html b/index.html
index 40c101e..213d62d 100755
--- a/index.html
+++ b/index.html
@@ -24,7 +24,7 @@
     <meta property="og:site_name" content="esri" />
     <!-- End Facebook -->
     <!--Use protocol relative urls that way if the browser is viewing the page via HTTPS the js/css file will be requested using the HTTPS protocol-->
-    <link rel="stylesheet" type="text/css" href="//js.arcgis.com/3.17/esri/css/esri.css" />
+    <link rel="stylesheet" type="text/css" href="//js.arcgis.com/3.18/esri/css/esri.css" />
     <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Lato:300,400,700" />
     <!--Load any application specific styles-->
     <link rel="stylesheet" type="text/css" href="css/dijit.css" />
@@ -115,7 +115,7 @@
           dojoConfig.locale = RegExp.$1;
         }
     </script>
-    <script type="text/javascript" src="//js.arcgis.com/3.17"></script>
+    <script type="text/javascript" src="//js.arcgis.com/3.18"></script>
     <script type="text/javascript">
         require([
             "config/templateConfig",
diff --git a/instagram-callback.html b/instagram-callback.html
new file mode 100644
index 0000000..b3d097c
--- /dev/null
+++ b/instagram-callback.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<html>
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>OAuth Popup Callback</title>
+  <style type="text/css">
+    html,
+    body {
+      height: 100%;
+      width: 100%;
+      margin: 0px;
+      padding: 0px;
+      font-family: Lucida Sans, Lucida Grande, Arial !important;
+      font-size: 14px;
+    }
+
+  </style>
+  <script type="text/javascript" src="//js.arcgis.com/3.17"></script>
+  <script type="text/javascript">
+    require([
+      "esri/urlUtils",
+        "dojo/domReady!"
+    ], function (urlUtils) {
+      var url = document.location.href;
+      var urlObject = urlUtils.urlToObject(url);
+      urlObject.query = urlObject.query || {};
+      var redirect = urlObject.query.redirect;
+      if (redirect) {
+        location.href = redirect + location.hash;
+      }
+      else {
+        window.opener.instagramCallback(location.hash);
+        window.close();
+      }
+    });
+
+  </script>
+</head>
+
+<body>
+  <!--OAuth Popup Callback-->
+</body>
+
+</html>
diff --git a/js/InstagramLayer.js b/js/InstagramLayer.js
index b4e332a..785d478 100755
--- a/js/InstagramLayer.js
+++ b/js/InstagramLayer.js
@@ -37,7 +37,7 @@ function (
             filterWords: [],
             autopage: true,
             visible: true,
-            maxpage: 3,
+            maxpage: 10,
             limit: 100,
             title: 'Instagram',
             id: 'instagram',
@@ -47,9 +47,9 @@ function (
             maxScale: null,
             symbol: null,
             infoTemplate: null,
-            time: 5, // from the past days: 1, 2, 3, 4, 5, 6, 7 
-            key: '',
+            key: "",
             refreshTime: 4000,
+            token: "",
             url : 'https://api.instagram.com/v1/media/search/'
         },
         constructor: function (options) {
@@ -74,7 +74,6 @@ function (
             this.set("minScale", defaults.minScale);
             this.set("maxScale", defaults.maxScale);
             this.set("refreshTime", defaults.refreshTime);
-            this.set("time", defaults.time);
             this.set("graphics", []);
             this.set("noGeo", []);
             // listeners
@@ -269,24 +268,14 @@ function (
 				distance : radius
             };
         },
-        _getTimestamp: function(){
-            var days = parseInt(this.get("time"), 10) || 5;
-            var d = new Date();
-            d.setDate(d.getDate() - days);
-            return Math.round(d.getTime() / 1000);
-        },
         _constructQuery: function () {
-            var unix_timestamp = this._getTimestamp();
             var radius = this._getRadius();
             this.query = {
-                client_id: this.key,
                 count: this.limit,
-				lat: radius.lat,
-				lng: radius.lng,
-                min_timestamp: unix_timestamp,
-                max_timestamp: Math.round(new Date().getTime() / 1000),
-				distance: radius.distance,
-                page: 1,
+                lat: radius.lat,
+                lng: radius.lng,
+				        distance: radius.distance,
+                access_token: this.token,
                 format: "json"
             };
             // make the actual API call
@@ -304,12 +293,18 @@ function (
                 preventCache: true,
                 load: lang.hitch(this, function (data) {
                     if (data.meta && data.meta.code === 200) {
+                      if(!this.get("authorized")){
+                        this.set("authorized", true);
+                        this.emit("authorize", {
+                            authorized: true
+                        });
+                      }
                         if (data.data.length > 0) {
                             this._mapResults(data);
                             // display results for multiple pages
-                            if ((this.autopage) && (this.maxpage > this.pageCount) && (data.data.length === this.limit) && (this.query)) {
+                            if ((this.autopage) && (!this.maxpage || this.maxpage > this.pageCount) && data.pagination && data.pagination.next_max_id) {
                                 this.pageCount++;
-                                this.query.page++;
+                                this.query.max_id = data.pagination.next_max_id;
                                 this._sendRequest(this.url, this.query);
                             } else {
                                 this._updateEnd();
@@ -320,6 +315,12 @@ function (
                         }
                     } else {
                         if(data.meta){
+                            if(data.meta.code === 400){
+                              this.set("authorized", false);
+                              this.emit("authorize", {
+                                  authorized: false
+                              });
+                            }
                             console.log('Instagram::' + data.meta.code + ' - ' + this.title + ': ' + data.meta.error_message);
                         }
                         // No results found, try another search term
@@ -377,7 +378,9 @@ function (
                 result.height = result.images.thumbnail.height;
                 result.username = result.user.username;
                 result.full_name = result.user.full_name;
-                result.location_name = result.location.name;
+                if(result.location){
+                  result.location_name = result.location.name;
+                }
                 // eliminate geo photos which we already have on the map
                 if (this._dataIds[result.id]) {
                     return;
diff --git a/js/SocialLayers.js b/js/SocialLayers.js
index 8a3f015..10dffc6 100644
--- a/js/SocialLayers.js
+++ b/js/SocialLayers.js
@@ -38,6 +38,34 @@ define([
     Dialog,
     keys
   ) {
+  
+  var INSTAGRAM_ACCESS_TOKEN = "instagram_access_token";
+  
+    function parseParms(str) {
+        var pieces = str.replace("#", "").split("&"), data = {}, i, parts;
+        // process each query pair
+        for (i = 0; i < pieces.length; i++) {
+            parts = pieces[i].split("=");
+            if (parts.length < 2) {
+                parts.push("");
+            }
+            data[decodeURIComponent(parts[0])] = decodeURIComponent(parts[1]);
+        }
+        return data;
+    }
+  
+  // Feature test
+  function lsTest(){
+      var test = 'test';
+      try {
+          localStorage.setItem(test, test);
+          localStorage.removeItem(test);
+          return true;
+      } catch(e) {
+          return false;
+      }
+  }
+  
     return declare("", null, {
       initSocial: function () {
         // css classes for social layers
@@ -161,11 +189,16 @@ define([
         }
         // instagram enabled
         if (this.config.enableInstagram) {
+          var token = "";
+          if(lsTest()){
+            token = localStorage.getItem(INSTAGRAM_ACCESS_TOKEN) || "";
+          }
           // Instagram
           this._instagramLayer = new InstagramLayer({
             map: this.map,
-            visible: this.config.instagramVisible,
-            key: this.config.instagram_key
+            token: token,
+            key: this.config.instagramClientId,
+            visible: this.config.instagramVisible
           });
           // legend info
           this.socialLayers.push({
@@ -174,6 +207,9 @@ define([
               id: 'instagram_cog',
               className: "esri-icon-settings layerListIcon"
             }),
+            content: domConstruct.create("div", {
+              id: 'instagram_auth_status'
+            }),
             id: this._instagramLayer.featureLayer.id,
             visibility: this._instagramLayer.featureLayer.visible,
             layer: this._instagramLayer.featureLayer
@@ -208,23 +244,12 @@ define([
       configureSocial: function () {
         // instagram enabled
         if (this.config.enableInstagram) {
-          if (!this.config.instagramTime) {
-            this.config.instagramTime = 5;
-          }
           // Instagram Dialog
           var igContent = '';
           igContent += '<div class="' + this.socialCSS.dialogContent + '">';
           igContent += '<div class="' + this.socialCSS.layerSettingsDescription + '">' + this.config.i18n.social.igSettingsInfo + '</div>';
-          igContent += '<div class="' + this.socialCSS.layerSettingsHeader + '">' + this.config.i18n.social.igTime + '</div>';
-          igContent += '<div class="' + this.socialCSS.layerSettingsSelect + '"><select id="instagram_search_time">';
-          igContent += this._createInstagramOption(1);
-          igContent += this._createInstagramOption(2);
-          igContent += this._createInstagramOption(3);
-          igContent += this._createInstagramOption(4);
-          igContent += this._createInstagramOption(5);
-          igContent += this._createInstagramOption(6);
-          igContent += this._createInstagramOption(7);
-          igContent += '</select></div>';
+          igContent += '<div class="' + this.socialCSS.layerSettingsHeader + '">' + this.config.i18n.social.instagramUser + '</div>';
+          igContent += '<div id="instagram_settings_auth">' + this.config.i18n.social.instagramAccountStatus + '</div>';
           igContent += '<div id="instagram_search_submit" class="' + this.socialCSS.layerSettingsSubmit + '">' + this.config.i18n.social.search + '</div>';
           igContent += '</div>';
           var instagramDialogNode = domConstruct.create('div', {
@@ -254,6 +279,57 @@ define([
               this._updateInstagramSearch();
             }));
           }
+          // sign in/switch instagram node
+          this._instagramStatusNode = dom.byId('instagram_auth_status');
+          this._instagramStatus2Node = dom.byId('instagram_settings_auth');
+          this._instagramStatus3Node = dom.byId('instagram_legend_auth');
+          if (this._instagramStatusNode) {
+            // sign in click
+            on(this._instagramStatusNode, 'a:click', lang.hitch(this, function (evt) {
+              this._instagramSignIn(evt);
+            }));
+          }
+          if (this._instagramStatus2Node) {
+            // sign in click
+            on(this._instagramStatus2Node, 'a:click', lang.hitch(this, function (evt) {
+              this._instagramSignIn(evt);
+            }));
+          }
+          if (this._instagramStatus3Node) {
+            // sign in click
+            on(this._instagramStatus3Node, 'a:click', lang.hitch(this, function (evt) {
+              this._twitterSignIn(evt);
+            }));
+          }
+          // authorize check
+          on(this._instagramLayer, 'authorize', lang.hitch(this, function (evt) {
+            var status, longStatus;
+            // user signed in
+            if (evt.authorized) {
+              status = '<a class="' + this.socialCSS.authStatus + '">' + this.config.i18n.general.switchAccount + '</a>';
+              if (this._instagramStatusNode) {
+                this._instagramStatusNode.innerHTML = '';
+              }
+              if (this._instagramStatus2Node) {
+                this._instagramStatus2Node.innerHTML = status;
+              }
+              if (this._instagramStatus3Node) {
+                this._instagramStatus3Node.innerHTML = '';
+              }
+            } else {
+              status = '<a class="' + this.socialCSS.authStatus + '"><span class="' + this.socialCSS.iconAttention + '"></span>' + this.config.i18n.general.signIn + '</a>';
+              longStatus = '<a class="' + this.socialCSS.authStatus + '"><span class="' + this.socialCSS.iconAttention + '"></span>' + this.config.i18n.social.instagramSignIn + '</a>';
+              if (this._instagramStatusNode) {
+                this._instagramStatusNode.innerHTML = status;
+              }
+              if (this._instagramStatus2Node) {
+                this._instagramStatus2Node.innerHTML = status;
+              }
+              if (this._instagramStatus3Node) {
+                this._instagramStatus3Node.innerHTML = longStatus;
+              }
+            }
+          }));
         }
         // flickr enabled
         if (this.config.enableFlickr) {
@@ -482,17 +558,6 @@ define([
           this._updateYouTubeFilter();
         }
       },
-      _createInstagramOption: function (value) {
-        var html = '<option ';
-        html += 'value = "' + value + '"';
-        if (parseInt(value, 10) === parseInt(this.config.instagramTime)) {
-          html += ' selected';
-        }
-        html += '>';
-        html += value;
-        html += '</option>';
-        return html;
-      },
       _createFlickrOption: function (value, text) {
         var html = '<option ';
         html += 'value = "' + value + '"';
@@ -560,10 +625,6 @@ define([
       _updateInstagramSearch: function (inputNode) {
         this._instagramLayer.clear();
         this._instagramLayer.show();
-        var igSearchTime = dom.byId('instagram_search_time');
-        if (igSearchTime) {
-          this._instagramLayer.set('time', igSearchTime.value);
-        }
         this._instagramLayer.update(0);
         this._instagramDialog.hide();
       },
@@ -649,9 +710,41 @@ define([
         }
         event.stop(evt);
       },
+      _instagramSignIn: function(evt){
+        if(lsTest()){
+          localStorage.removeItem(INSTAGRAM_ACCESS_TOKEN);
+        }
+        this._instagramWindow();
+        event.stop(evt);
+      },
+      _instagramWindow: function () {
+        var package_path = window.location.pathname.substring(0, window.location.pathname.lastIndexOf('/'));
+        
+        var redirect_uri = encodeURIComponent(location.protocol + "//www.arcgis.com/apps/PublicInformation/instagram-callback.html?redirect=" + location.protocol + "//" + location.host + package_path + "/instagram-callback.html");
+        
+        var page = this.config.instagramSigninUrl + "/?client_id=" + this.config.instagramClientId + "&redirect_uri=" + redirect_uri + "&response_type=token&scope=public_content";
+        
+        var w = screen.width / 2;
+        var h = screen.height / 1.5;
+        var left = (screen.width / 2) - (w / 2);
+        var top = (screen.height / 2) - (h / 2);
+        if (page) {
+          window.open(page, "twoAuth", 'scrollbars=yes, resizable=yes, width=' + w + ', height=' + h + ', top=' + top + ', left=' + left, true);
+          var _instagramLayer = this._instagramLayer;
+          window.instagramCallback = function (hash) {
+            var params = parseParms(hash);
+            var access_token = params.access_token;
+            if(lsTest()){
+              localStorage.setItem(INSTAGRAM_ACCESS_TOKEN, access_token);
+            }
+            _instagramLayer.set("token", access_token);
+            _instagramLayer.update(0);
+          };
+        }
+      },
       _twitterWindow: function (page, forceLogin) {
         var package_path = window.location.pathname.substring(0, window.location.pathname.lastIndexOf('/'));
-        var redirect_uri = encodeURIComponent(location.protocol + '//' + location.host + package_path + '/oauth-callback.html');
+        var redirect_uri = encodeURIComponent(location.protocol + '//' + location.host + package_path + '/twitter-callback.html');
         var w = screen.width / 2;
         var h = screen.height / 1.5;
         var left = (screen.width / 2) - (w / 2);
@@ -668,8 +761,9 @@ define([
             page += 'redirect_uri=' + redirect_uri;
           }
           window.open(page, "twoAuth", 'scrollbars=yes, resizable=yes, width=' + w + ', height=' + h + ', top=' + top + ', left=' + left, true);
-          window.oAuthCallback = function () {
-            window.location.reload();
+          var twitterLayer = this._twitterLayer;
+          window.twitterCallback = function () {
+            twitterLayer.update(0);
           };
         }
       },
diff --git a/js/WebcamsLayer.js b/js/WebcamsLayer.js
index 54e6a4c..3ea9561 100755
--- a/js/WebcamsLayer.js
+++ b/js/WebcamsLayer.js
@@ -46,7 +46,7 @@ define([
         symbol: null,
         infoTemplate: null,
         key: null,
-        url: 'http://api.webcams.travel/rest',
+        url: "https://webcamstravel.p.mashape.com",
         refreshTime: 4000
       },
       constructor: function (options) {
@@ -99,7 +99,7 @@ define([
         }
         // default infoTemplate
         if (!this.infoTemplate) {
-          this.set("infoTemplate", new InfoTemplate('Webcam', '<div class="' + this._css.container + '"><div class="' + this._css.title + '">${title}</div><a tabindex="0" class="' + this._css.imageAnchor + '" href="${url}" target="_blank"><img width="128" height="96" class="' + this._css.image + '" src="${thumbnail_url}" /></a><div class="' + this._css.location + '">${city}, ${country}</div><div class="' + this._css.date + '">${dateformatted}</div><div class="' + this._css.logo + '"><a href="http://www.webcams.travel" target="_blank"><img src="http://www.webcams.travel/img/linking/logo_125x30.jpg" border="0" alt="Webcams worldwide - Webcams.travel"/></a></div><div class="' + this._css.credits + '">Webcams provided by <a href="http://www.webcams.travel/" target="_blank">webcams.travel</a></div></div>'));
+          this.set("infoTemplate", new InfoTemplate('Webcam', '<div class="' + this._css.container + '"><div class="' + this._css.title + '">${title}</div><a tabindex="0" class="' + this._css.imageAnchor + '" href="${url}" target="_blank"><img width="${thumbnail_width}" height="${thumbnail_height}" class="' + this._css.image + '" src="${thumbnail_url}" /></a><div class="' + this._css.location + '">${city}, ${region} ${country}</div><div class="' + this._css.date + '">${dateformatted}</div><div class="' + this._css.logo + '"><a href="http://www.webcams.travel" target="_blank"><img src="http://www.webcams.travel/img/linking/logo_125x30.jpg" border="0" alt="Webcams worldwide - Webcams.travel"/></a></div><div class="' + this._css.credits + '">Webcams provided by <a href="http://www.webcams.travel/" target="_blank">webcams.travel</a></div></div>'));
         }
         // layer
         this.featureCollection = {
@@ -140,7 +140,8 @@ define([
           // query when map loads
           if (this.map.loaded) {
             this._init();
-          } else {
+          }
+          else {
             var onLoad = on.once(this.map, "load", lang.hitch(this, function () {
               this._init();
             }));
@@ -186,7 +187,7 @@ define([
             refresh = ms;
           }
           this._refreshTimer = setTimeout(lang.hitch(this, function () {
-            this._constructQuery();
+            this._sendRequest();
           }), refresh);
         }
       },
@@ -196,7 +197,6 @@ define([
           clearTimeout(this._refreshTimer);
         }
         // cancel any outstanding requests
-        this.query = null;
         array.forEach(this._deferreds, function (def) {
           def.cancel();
         });
@@ -217,7 +217,8 @@ define([
       setVisibility: function (val) {
         if (val) {
           this.show();
-        } else {
+        }
+        else {
           this.hide();
         }
       },
@@ -249,55 +250,48 @@ define([
           });
         }
       },
-      _constructQuery: function () {
+      _constructUrl: function () {
         var extent = this.map.geographicExtent;
+        var url = "";
         if (extent) {
-          this.query = {
-            devid: this.key,
-            sw_lat: extent.ymin,
-            sw_lng: extent.xmin,
-            ne_lat: extent.ymax,
-            ne_lng: extent.xmax,
-            zoom: this.map.getLevel(),
-            per_page: this.limit,
-            format: "json",
-            method: "wct.map.bbox",
-            page: 1
-          };
-          // make the actual API call
-          this.pageCount = 1;
-          this._sendRequest(this.url, this.query);
+          url += this.url + "/webcams/map/";
+          url += extent.ymax; // ne_lat
+          url += ",";
+          url += extent.xmax; // ne_lng
+          url += ",";
+          url += extent.ymin; // sw_lat
+          url += ",";
+          url += extent.xmin; // sw_lng
+          url += ",";
+          url += this.map.getLevel(); // zoom
         }
+        return url;
       },
-      _sendRequest: function (url, content) {
+      _sendRequest: function () {
         // get the results for each page
         var deferred = esriRequest({
-          url: url,
+          url: this._constructUrl(),
           handleAs: "json",
           timeout: 10000,
-          content: content,
+          content: {
+            "show": "webcams:basic,image,location,url",
+            "lang": "en",
+            "mashape-key": this.key
+          },
           callbackParamName: "callback",
           preventCache: true,
           load: lang.hitch(this, function (data) {
-            if (data.status === 'ok') {
-              if (data.webcams.webcam.length > 0) {
+            if (data.status === "OK") {
+              if (data.result.total > 0) {
                 this._mapResults(data);
-                // display results for multiple pages
-                if ((this.autopage) && (this.maxpage > this.pageCount) && (data.webcams.length === this.limit) && (this.query)) {
-                  this.pageCount++;
-                  this.query.page++;
-                  this._sendRequest(this.url, this.query);
-                } else {
-                  this._updateEnd();
-                }
-              } else {
-                // No results found, try another search term
                 this._updateEnd();
               }
-            } else {
-              if (data.code === 100) {
-                console.log('Webcams::' + data.code + ' - ' + this.title + ': ' + data.message);
+              else {
+                // No results found, try another search term
+                this._updateEnd();
               }
+            }
+            else {
               // No results found, try another search term
               this._updateEnd();
             }
@@ -305,7 +299,8 @@ define([
           error: lang.hitch(this, function (e) {
             if (deferred.canceled) {
               console.log('Webcams::Search Cancelled');
-            } else {
+            }
+            else {
               console.log('Webcams::Search error' + ": " + e.message.toString());
             }
             this._error(e);
@@ -321,23 +316,30 @@ define([
         }
         var b = [];
         var ng = [];
-        var k = j.webcams.webcam;
+        var k = j.result.webcams;
         array.forEach(k, lang.hitch(this, function (result) {
           // add date to result
-          var date = new Date(parseInt(result.last_update * 1000, 10));
+          var date = new Date(parseInt(result.image.update * 1000, 10));
           result.dateformatted = this._formatDate(date);
           // eliminate geo photos which we already have on the map
-          if (this._dataIds[result.webcamid]) {
+          if (this._dataIds[result.id]) {
             return;
           }
-          this._dataIds[result.webcamid] = true;
+          this._dataIds[result.id] = true;
           var geoPoint = null;
-          if (result.latitude) {
-            var g = [result.latitude, result.longitude];
+          if (result.location.latitude) {
+            var g = [result.location.latitude, result.location.longitude];
             geoPoint = Point(parseFloat(g[1]), parseFloat(g[0]));
           }
+          result.thumbnail_url = result.image.current.thumbnail;
+          result.thumbnail_width = result.image.sizes.thumbnail.width;
+          result.thumbnail_height = result.image.sizes.thumbnail.height;
+          result.city = result.location.city;
+          result.region = result.location.region;
+          result.country = result.location.country_code;
+          result.url = result.url.current.desktop;
           // webcam icon
-          var symbol = new PictureMarkerSymbol(result.daylight_icon_url, 32, 32);
+          var symbol = new PictureMarkerSymbol(result.image.daylight.icon, 32, 32);
           // if point is set
           if (geoPoint && geoPoint.hasOwnProperty('x') && geoPoint.hasOwnProperty('y')) {
             // convert the Point to WebMercator projection
@@ -345,7 +347,8 @@ define([
             // make the Point into a Graphic
             var graphic = new Graphic(a, symbol, result, this.infoTemplate);
             b.push(graphic);
-          } else {
+          }
+          else {
             ng.push(result);
           }
         }));
@@ -373,8 +376,7 @@ define([
         this.emit("error", e);
       },
       _updateEnd: function () {
-        this.query = null;
         this.emit("update-end", {});
       }
     });
-  });
\ No newline at end of file
+  });
diff --git a/js/main.js b/js/main.js
index a8f1da6..b42162e 100755
--- a/js/main.js
+++ b/js/main.js
@@ -259,6 +259,7 @@ define([
           content += '<div class="' + this.css.panelContainer + '">';
           content += '<div class="' + this.css.panelPadding + '">';
           content += '<div id="twitter_legend_auth"></div>';
+          content += '<div id="instagram_legend_auth"></div>';
           content += '<div id="LegendDiv"></div>';
           content += '</div>';
           content += '</div>';
@@ -395,6 +396,17 @@ define([
             this._resizeOverviewMap();
           }));
         }
+        // Scalebar
+        if (this.config.enableScalebar) {
+          require([
+            "esri/dijit/Scalebar",
+          ], lang.hitch(this, function(Scalebar) {
+            var scalebar = new Scalebar({
+              map: this.map,
+              attachTo: "bottom-left"
+            });
+          }));
+        }
         // geocoders
         this._createGeocoders();
         // startup social
diff --git a/js/nls/ar/resources.js b/js/nls/ar/resources.js
index 090662d..204d91f 100755
--- a/js/nls/ar/resources.js
+++ b/js/nls/ar/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "إعدادات Instagram",
-    "igTime": "التحميل داخل عدد الايام السابقة",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "إعدادات YouTube",
     "ytSettingsInfo": "يتضمن عرض مقاطع الفيديو الشبكة والمحتويات الاحترافية.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "يتم تنقية التغريدات بواسطة:",
     "photosFilteredBy": "يتم تنقية الصور بواسطة:",
     "videosFilteredBy": "تتم تصفية مقاطع الفيديو بواسطة:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "قم بتمكين طبقة Twitter لرؤية حالتك."
   },
   "general": {
diff --git a/js/nls/cs/resources.js b/js/nls/cs/resources.js
index 788b080..1ad156b 100644
--- a/js/nls/cs/resources.js
+++ b/js/nls/cs/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "Nastavení Instagramu",
-    "igTime": "Nahráno během několika posledních dnů",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "Nastavení YouTube",
     "ytSettingsInfo": "Umožňuje zobrazovat uživatelsky vytvářená videa včetně televizního a profesionálního obsahu.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "tweety se filtrují podle:",
     "photosFilteredBy": "fotografie se filtrují podle:",
     "videosFilteredBy": "videa se filtovaná podle:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Chcete-li vidět váš stav, aktivujte vrstvu Twitter."
   },
   "general": {
diff --git a/js/nls/da/resources.js b/js/nls/da/resources.js
index c259fb3..875104f 100644
--- a/js/nls/da/resources.js
+++ b/js/nls/da/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams",
     "instagram": "Instagram",
     "instagramSettings": "Instagram-indstillinger",
-    "igTime": "Overført inden for de seneste dage",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "YouTube-indstillinger",
     "ytSettingsInfo": "Vis brugergenererede videoer inkl. netværks- og professionelt indhold.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "tweets filtreret af:",
     "photosFilteredBy": "fotos filtreret af:",
     "videosFilteredBy": "videoer filtreret af:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Aktivér Twitter-laget til at se din status."
   },
   "general": {
diff --git a/js/nls/de/resources.js b/js/nls/de/resources.js
index 337c937..c84ab44 100644
--- a/js/nls/de/resources.js
+++ b/js/nls/de/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "Instagram-Einstellungen",
-    "igTime": "In den vergangenen Tagen hochgeladen",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "YouTube-Einstellungen",
     "ytSettingsInfo": "Von Benutzern erstellte Videos mit Netzwerk- und professionellen Inhalten anzeigen.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "Tweets gefiltert nach:",
     "photosFilteredBy": "Fotos gefiltert nach:",
     "videosFilteredBy": "Videos gefiltert nach:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Dem Twitter-Layer die Anzeige des Status ermöglichen."
   },
   "general": {
diff --git a/js/nls/el/resources.js b/js/nls/el/resources.js
index 28e0022..f9f13cd 100644
--- a/js/nls/el/resources.js
+++ b/js/nls/el/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "Ρυθμίσεις Instagram",
-    "igTime": "Μεταφόρτωση τις τελευταίες ... ημέρες",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "Ρυθμίσεις YouTube",
     "ytSettingsInfo": "Προβάλετε βίντεο δημιουργημένα από χρήστες που περιλαμβάνουν περιεχόμενο δικτύου και επαγγελματικό περιεχόμενο.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "φιλτράρισμα tweet κατά:",
     "photosFilteredBy": "φιλτράρισμα φωτογραφιών κατά:",
     "videosFilteredBy": "φιλτράρισμα βίντεο κατά:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Ενεργοποιήστε το επίπεδο του Twitter για να δείτε την κατάστασή σας."
   },
   "general": {
diff --git a/js/nls/es/resources.js b/js/nls/es/resources.js
index 25c7050..f962551 100644
--- a/js/nls/es/resources.js
+++ b/js/nls/es/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "Configuración de Instagram",
-    "igTime": "Cargados en los últimos días",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "Configuración de YouTube",
     "ytSettingsInfo": "Ve vídeos generados por el usuario, incluido el contenido profesional y de la red.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "tweets filtrados por:",
     "photosFilteredBy": "fotos filtradas por:",
     "videosFilteredBy": "vídeos filtrados por:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Habilita la capa de Twitter para ver tu estado."
   },
   "general": {
diff --git a/js/nls/et/resources.js b/js/nls/et/resources.js
index 425b7cb..1ace810 100644
--- a/js/nls/et/resources.js
+++ b/js/nls/et/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "Instagrami sätted",
-    "igTime": "Üles laaditud viimaste päevade jooksul",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "YouTube seaded",
     "ytSettingsInfo": "Kuva kasutaja loodud videod, sh professionaalne ja võrgusisu.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "säutsud on filtreeritud:",
     "photosFilteredBy": "fotod on filtreeritud:",
     "videosFilteredBy": "videomaterjali filtreerimine:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Luba Twitteri kihti, et näha enda staatust."
   },
   "general": {
diff --git a/js/nls/fi/resources.js b/js/nls/fi/resources.js
index 8b163ea..3d4c5e0 100644
--- a/js/nls/fi/resources.js
+++ b/js/nls/fi/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "Instagram-asetukset",
-    "igTime": "Lähetetty edellisen päivien määrän kuluessa",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "YouTube-asetukset",
     "ytSettingsInfo": "Näytä käyttäjän luomat videot, mukaan lukien verkko- ja ammattikäyttösisältö.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "twiittien suodatusperuste:",
     "photosFilteredBy": "valokuvien suodatusperuste:",
     "videosFilteredBy": "videoiden suodatusperuste:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Ota Twitter-karttataso käyttöön, jotta näet tilasi."
   },
   "general": {
diff --git a/js/nls/fr/resources.js b/js/nls/fr/resources.js
index 6d44bf6..a37efc3 100644
--- a/js/nls/fr/resources.js
+++ b/js/nls/fr/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "Paramètres Instagram",
-    "igTime": "Ajoutés au cours des derniers jours",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "Paramètres YouTube",
     "ytSettingsInfo": "Consultez les vidéos générées par les utilisateurs, notamment le contenu professionnel et du réseau.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "tweets filtrés par :",
     "photosFilteredBy": "photos filtrées par :",
     "videosFilteredBy": "vidéos filtrées par :",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Activez la couche Twitter pour voir votre statut."
   },
   "general": {
diff --git a/js/nls/he/resources.js b/js/nls/he/resources.js
index c0d0382..b28bfb2 100644
--- a/js/nls/he/resources.js
+++ b/js/nls/he/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "מצלמות רשת.נסיעה",
     "instagram": "אינסטגרם",
     "instagramSettings": "הגדרות אינסטגרם",
-    "igTime": "הועלה לפני מספר ימים",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "יוטיוב",
     "youtubeSettings": "הגדרות יוטיוב",
     "ytSettingsInfo": "סרטונים שנוצרו על ידי משתמשים וכוללים רשת ותוכן מקצועי.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "סינון ציוצים על ידי:",
     "photosFilteredBy": "סינון תמונות על ידי:",
     "videosFilteredBy": "קטעי וידאו מסוננים על ידי:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "אפשר את שכבת הציוצים כדי לראות את הסטטוס שלך."
   },
   "general": {
diff --git a/js/nls/hr/resources.js b/js/nls/hr/resources.js
index 76b6548..03216c7 100755
--- a/js/nls/hr/resources.js
+++ b/js/nls/hr/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "Postavke Instagrama",
-    "igTime": "Poslano u prethodnih nekoliko dana",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "Postavke YouTubea",
     "ytSettingsInfo": "Prikaz videozapisa korisnika uključujući mrežni i profesionalni sadržaj.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "tweetovi filtrirani prema:",
     "photosFilteredBy": "fotografije filtrirane prema:",
     "videosFilteredBy": "videozapisi filtrirani prema:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Omogućite Twitter sloj da vidite svoj status."
   },
   "general": {
diff --git a/js/nls/it/resources.js b/js/nls/it/resources.js
index 8434432..4add38a 100644
--- a/js/nls/it/resources.js
+++ b/js/nls/it/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "Impostazioni Instagram",
-    "igTime": "Caricamenti effettuati entro il numero di giorni passati",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "Impostazioni YouTube",
     "ytSettingsInfo": "Consente di visualizzare video generati dagli utenti, inclusi contenuti professionali e disponibili in rete.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "tweet filtrati in base a:",
     "photosFilteredBy": "foto filtrate in base a:",
     "videosFilteredBy": "video filtrati in base a:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Abilitare il layer Twitter per visualizzare lo stato."
   },
   "general": {
diff --git a/js/nls/ja/resources.js b/js/nls/ja/resources.js
index b3132bb..38c0834 100644
--- a/js/nls/ja/resources.js
+++ b/js/nls/ja/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "観光用 Web カメラ",
     "instagram": "Instagram",
     "instagramSettings": "Instagram の設定",
-    "igTime": "過去の次の日数以内にアップロードされました",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "YouTube の設定",
     "ytSettingsInfo": "ネットワーク コンテンツおよび商用コンテンツを含む、ユーザによって作成されたビデオを表示します。",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "ツイートのフィルタ:",
     "photosFilteredBy": "写真のフィルタ:",
     "videosFilteredBy": "ビデオのフィルタ:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Twitter レイヤでステータスを表示できるようにします。"
   },
   "general": {
diff --git a/js/nls/ko/resources.js b/js/nls/ko/resources.js
index ca80d68..6142e46 100644
--- a/js/nls/ko/resources.js
+++ b/js/nls/ko/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "인스타그램 설정",
-    "igTime": "최근 몇 일 이내에 업로드됨",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "YouTube 설정",
     "ytSettingsInfo": "네트워크 및 전문 콘텐츠를 비롯한 사용자 생성 동영상을 봅니다.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "트윗 필터링 기준:",
     "photosFilteredBy": "사진 필터링 기준:",
     "videosFilteredBy": "동영상 필터링 기준:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "상태를 보려면 Twitter 레이어를 활성화하세요."
   },
   "general": {
diff --git a/js/nls/lt/resources.js b/js/nls/lt/resources.js
index 23e8611..58a5c0e 100644
--- a/js/nls/lt/resources.js
+++ b/js/nls/lt/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "Instagram nustatymai",
-    "igTime": "Nusiųsta per paskutinių dienų skaičių",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "YouTube nustatymai",
     "ytSettingsInfo": "Peržiūrėkite vartotojų sukurtus vaizdo įrašus, įskaitant tinklo ir profesionalų turinį.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "tweet žinutės filtruojamos pagal:",
     "photosFilteredBy": "fotografijos filtruojamos pagal:",
     "videosFilteredBy": "vaizdo įrašai, filtruoti pagal:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Įjunkite Twitter sluoksnį savo būsenos matymui."
   },
   "general": {
diff --git a/js/nls/lv/resources.js b/js/nls/lv/resources.js
index f97dbe7..0788d63 100644
--- a/js/nls/lv/resources.js
+++ b/js/nls/lv/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Tīmekļa kameras, ceļošana",
     "instagram": "Instagram",
     "instagramSettings": "Instagram iestatījumi",
-    "igTime": "Augšupielādēts pēdējo dienu laikā",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "YouTube iestatījumi",
     "ytSettingsInfo": "Skatieties lietotāja izveidotus video, tostarp tīkla un profesionāla līmeņa saturu.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "īsziņas filtrētas pēc:",
     "photosFilteredBy": "fotogrāfijas filtrētas pēc:",
     "videosFilteredBy": "video filtrēti pēc:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Iespējot Twitter slāni redzēt jūsu statusu."
   },
   "general": {
diff --git a/js/nls/nb/resources.js b/js/nls/nb/resources.js
index d5b653e..90e180c 100644
--- a/js/nls/nb/resources.js
+++ b/js/nls/nb/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "Instagram-innstillinger",
-    "igTime": "Lastet opp i løpet av de siste dagene",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "YouTube-innstillinger",
     "ytSettingsInfo": "Se på brukergenererte videoer, inkludert nettverksinnhold og profesjonelt innhold.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "tweets filtrert etter::",
     "photosFilteredBy": "bilder filtrert etter:",
     "videosFilteredBy": "videoer filtrert etter:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "La Twitter-laget få se statusen din."
   },
   "general": {
diff --git a/js/nls/nl/resources.js b/js/nls/nl/resources.js
index ddd4244..29bf543 100644
--- a/js/nls/nl/resources.js
+++ b/js/nls/nl/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "Instagram-instellingen",
-    "igTime": "Geüpload binnen de afgelopen dagen",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "YouTube-instellingen",
     "ytSettingsInfo": "Bekijk door gebruikers gegenereerde video's inclusief netwerk- en professionele inhoud.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "tweets gefilterd op:",
     "photosFilteredBy": "foto's gefilterd op:",
     "videosFilteredBy": "video's gefilterd op:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Schakel de Twitter-kaartlaag in om uw status te zien."
   },
   "general": {
diff --git a/js/nls/pl/resources.js b/js/nls/pl/resources.js
index 4504d4a..b7e70d8 100644
--- a/js/nls/pl/resources.js
+++ b/js/nls/pl/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "Ustawienia serwisu Instagram",
-    "igTime": "Przesłane w ciągu ostatnich dni",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "Ustawienia serwisu YouTube",
     "ytSettingsInfo": "Zapoznaj się z materiałami wideo utworzonymi przez użytkowników, które zawierają zasoby sieciowe oraz profesjonalne.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "Filtrowanie wpisów w serwisie Twitter według:",
     "photosFilteredBy": "Filtrowanie zdjęć według:",
     "videosFilteredBy": "Filtrowanie filmów wideo:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Zezwól na wyświetlanie Twojego statusu w warstwie Twitter."
   },
   "general": {
diff --git a/js/nls/pt-br/resources.js b/js/nls/pt-br/resources.js
index 304af97..25b31f1 100644
--- a/js/nls/pt-br/resources.js
+++ b/js/nls/pt-br/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams",
     "instagram": "Instagram",
     "instagramSettings": "Configurações do Instagram",
-    "igTime": "Carregado dentro do número de dias passados",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "Configurações do YouTube",
     "ytSettingsInfo": "Veja os vídeos gerados por usuários, incluindo conteúdo da rede e profissional.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "tweets filtrados por:",
     "photosFilteredBy": "fotos filtradas por:",
     "videosFilteredBy": "vídeos filtrados por:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Habilite a camada do Twitter para visualizar seu status."
   },
   "general": {
diff --git a/js/nls/pt-pt/resources.js b/js/nls/pt-pt/resources.js
index 4605706..c078e5a 100644
--- a/js/nls/pt-pt/resources.js
+++ b/js/nls/pt-pt/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Câmaras web",
     "instagram": "Instagram",
     "instagramSettings": "Definições do Instagram",
-    "igTime": "Carregado no passado número de dias",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "Configurações do YouTube",
     "ytSettingsInfo": "Visualizar vídeos gerados pelos utilizadores, incluindo conteúdo de rede e profissional.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "tweets filtrados por:",
     "photosFilteredBy": "fotos filtradas por:",
     "videosFilteredBy": "vídeos filtrados por:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Ative a camada do Twitter para visualizar o seu estado."
   },
   "general": {
diff --git a/js/nls/resources.js b/js/nls/resources.js
index 6aa8a29..bfcd80e 100755
--- a/js/nls/resources.js
+++ b/js/nls/resources.js
@@ -28,7 +28,8 @@ define({
             webcams: "Webcams.travel",
             instagram: "Instagram",
             instagramSettings: "Instagram Settings",
-            igTime: "Uploaded within the past number of days",
+            instagramUser: "Instagram Account",
+            instagramSignIn: "Sign in to Instagram",
             youtube: "YouTube",
             youtubeSettings: "YouTube Settings",
             ytSettingsInfo: "View user-generated videos including network and professional content.",
@@ -47,6 +48,7 @@ define({
             tweetsFilteredBy: "tweets filtered by:",
             photosFilteredBy: "photos filtered by:",
             videosFilteredBy: "videos filtered by:",
+            instagramAccountStatus: "Enable the Instagram layer to see your status.",
             twitterAccountStatus: "Enable the Twitter layer to see your status."
         },
         general: {
diff --git a/js/nls/ro/resources.js b/js/nls/ro/resources.js
index 055e70e..d68ba66 100644
--- a/js/nls/ro/resources.js
+++ b/js/nls/ro/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Camere web. Călătorii",
     "instagram": "Instagram",
     "instagramSettings": "Setări Instagram",
-    "igTime": "Încărcat în intervalul numărului de zile",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "Setări YouTube",
     "ytSettingsInfo": "Vizualizaţi clipuri video generate de utilizatori, inclusiv conţinut din reţea şi profesional.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "tweeturi filtrate după:",
     "photosFilteredBy": "Fotografii filtrate după:",
     "videosFilteredBy": "clipuri video filtrate după:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Activaţi stratul tematic Twitter pentru a vă vedea starea."
   },
   "general": {
diff --git a/js/nls/ru/resources.js b/js/nls/ru/resources.js
index dab72dd..edbbd36 100644
--- a/js/nls/ru/resources.js
+++ b/js/nls/ru/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "Настройки Instagram",
-    "igTime": "Загружены в течение последних нескольких дней",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "Настройки YouTube",
     "ytSettingsInfo": "Просмотр созданных пользователем видео, включая сетевые и профессиональные ресурсы.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "твиты отфильтрованы по:",
     "photosFilteredBy": "фотографии отфильтрованы по",
     "videosFilteredBy": "видео отобраны по:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Включить слой Twitter для просмотра статусов."
   },
   "general": {
diff --git a/js/nls/sr/resources.js b/js/nls/sr/resources.js
index 0e0d9bc..1d0c738 100755
--- a/js/nls/sr/resources.js
+++ b/js/nls/sr/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "Instagram postavke",
-    "igTime": "Otpremljeno u toku proteklih nekoliko dana",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "YouTube postavke",
     "ytSettingsInfo": "Prikažite video zapise generisane od strane korisnika uključujući mrežni i profesionalni sadržaj.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "filtriraj tvitove po:",
     "photosFilteredBy": "filtriraj fotografije po:",
     "videosFilteredBy": "filtriraj video zapise po:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Omogućite da Twitter sloj može da vidi vaš status."
   },
   "general": {
diff --git a/js/nls/sv/resources.js b/js/nls/sv/resources.js
index 8340b1f..99826b4 100644
--- a/js/nls/sv/resources.js
+++ b/js/nls/sv/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "Instagram-inställningar",
-    "igTime": "Överfört inom de senaste dagarna",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "YouTube-inställningar",
     "ytSettingsInfo": "Visa användarskapade videoklipp inklusive nätverksinnehåll och professionellt innehåll.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "tweets filtrerade enligt:",
     "photosFilteredBy": "foton filtrerade enligt:",
     "videosFilteredBy": "videoklipp filtrerade enligt:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Aktivera Twitter-lagret för att visa din status."
   },
   "general": {
diff --git a/js/nls/th/resources.js b/js/nls/th/resources.js
index a4d2892..705409a 100644
--- a/js/nls/th/resources.js
+++ b/js/nls/th/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "เว็บแคม.ท่องเที่ยว",
     "instagram": "Instagram",
     "instagramSettings": "การตั้งค่าอินสตาแกรม",
-    "igTime": "อัพโหลดภายในจำนวนวันที่ผ่านมา",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "ยูทูบ",
     "youtubeSettings": "การตั้งค่ายูทูบ",
     "ytSettingsInfo": "ดูวิดีโอที่ผู้ใช้สร้างขึ้น รวมทั้งเน็ตเวิร์กและเนื้อหาที่เชื่อถือได้",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "กรองทวีตโดย:",
     "photosFilteredBy": "กรองรูปภาพโดย:",
     "videosFilteredBy": "วิดีโอที่กรองด้วย:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "กำหนดให้ชั้นข้อมูลทวิตเตอร์มองเห็นสถานะของคุณ"
   },
   "general": {
diff --git a/js/nls/tr/resources.js b/js/nls/tr/resources.js
index 26b080a..1a284aa 100644
--- a/js/nls/tr/resources.js
+++ b/js/nls/tr/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "Instagram Ayarları",
-    "igTime": "Geçmiş gün sayısı dahilinde yüklenen",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "YouTube Ayarları",
     "ytSettingsInfo": "Kullanıcı tarafından üretilen videoları ağ ve profesyonel içerik de dahil görüntüleyin.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "tweet filtreleme ölçütü:",
     "photosFilteredBy": "fotoğraf filtreleme ölçütü:",
     "videosFilteredBy": "Video filtreleme kriteri:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Durumunuzu görmek için Twitter katmanını etkinleştirin."
   },
   "general": {
diff --git a/js/nls/vi/resources.js b/js/nls/vi/resources.js
index 4b987a2..4c117a9 100644
--- a/js/nls/vi/resources.js
+++ b/js/nls/vi/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "Thiết lập Instagram",
-    "igTime": "Tải lên trong số ngày qua",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "Thiết lập YouTube",
     "ytSettingsInfo": "Xem video do người dùng tạo bao gồm nội dung trên mạng và nội dung chuyên nghiệp.",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "lọc bài đăng theo:",
     "photosFilteredBy": "lọc ảnh theo:",
     "videosFilteredBy": "lọc video theo:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "Bật lớp Twitter để xem trạng thái của bạn."
   },
   "general": {
diff --git a/js/nls/zh-cn/resources.js b/js/nls/zh-cn/resources.js
index 4ad6c3d..ba11496 100644
--- a/js/nls/zh-cn/resources.js
+++ b/js/nls/zh-cn/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "Instagram 设置",
-    "igTime": "在过去几天中上传的内容",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "YouTube 设置",
     "ytSettingsInfo": "查看用户生成的视频，其中包括网络和专业内容。",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "推文过滤依据:",
     "photosFilteredBy": "照片过滤依据:",
     "videosFilteredBy": "视频过滤条件:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "启用 Twitter 图层查看状态。"
   },
   "general": {
diff --git a/js/nls/zh-hk/resources.js b/js/nls/zh-hk/resources.js
index 8afbf43..e495178 100644
--- a/js/nls/zh-hk/resources.js
+++ b/js/nls/zh-hk/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "Instagram 設定",
-    "igTime": "在過去幾天內上傳的內容",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "YouTube 設定",
     "ytSettingsInfo": "查看使用者生成的影片，其中包括網路和專業內容。",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "推文篩選依據:",
     "photosFilteredBy": "照片篩選依據:",
     "videosFilteredBy": "影片篩選條件:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "啟用 Twitter 圖層以查看您的狀態。"
   },
   "general": {
diff --git a/js/nls/zh-tw/resources.js b/js/nls/zh-tw/resources.js
index 8afbf43..e495178 100644
--- a/js/nls/zh-tw/resources.js
+++ b/js/nls/zh-tw/resources.js
@@ -27,7 +27,8 @@ define({
     "webcams": "Webcams.travel",
     "instagram": "Instagram",
     "instagramSettings": "Instagram 設定",
-    "igTime": "在過去幾天內上傳的內容",
+    "instagramUser": "Instagram Account",
+    "instagramSignIn": "Sign in to Instagram",
     "youtube": "YouTube",
     "youtubeSettings": "YouTube 設定",
     "ytSettingsInfo": "查看使用者生成的影片，其中包括網路和專業內容。",
@@ -46,6 +47,7 @@ define({
     "tweetsFilteredBy": "推文篩選依據:",
     "photosFilteredBy": "照片篩選依據:",
     "videosFilteredBy": "影片篩選條件:",
+    "instagramAccountStatus": "Enable the Instagram layer to see your status.",
     "twitterAccountStatus": "啟用 Twitter 圖層以查看您的狀態。"
   },
   "general": {
diff --git a/resources/configurationPanel.js b/resources/configurationPanel.js
index c9ccdd0..f2825e8 100755
--- a/resources/configurationPanel.js
+++ b/resources/configurationPanel.js
@@ -89,7 +89,7 @@
       "fields":[  
         {  
           "type":"paragraph",
-          "value":"Provide general information about your application with a title nad description."
+          "value":"Provide general information about your application with a title and description."
         },
         {  
           "type":"string",
@@ -159,6 +159,12 @@
           "label":"Enable More Information link",
           "tooltip":"Enable More Information link"
         },
+        {  
+          "type":"boolean",
+          "fieldName":"enableScalebar",
+          "label":"Enable Scalebar on the map",
+          "tooltip":"Enable Scalebar on the map"
+        },
         {  
           "type":"boolean",
           "fieldName":"enableLegendPanel",
@@ -380,42 +386,6 @@
           "fieldName":"instagramVisible",
           "label":"Visible",
           "tooltip":"Check this box to make the layer visible by default."
-        },
-        {  
-          "type":"string",
-          "fieldName":"instagramTime",
-          "tooltip":"Photos uploaded within the past",
-          "label":"Photos uploaded within the past",
-          "options":[  
-            {  
-              "label":"Day",
-              "value":1
-            },
-            {  
-              "label":"2 Days",
-              "value":2
-            },
-            {  
-              "label":"3 Days",
-              "value":3
-            },
-            {  
-              "label":"4 Days",
-              "value":4
-            },
-            {  
-              "label":"5 Days",
-              "value":5
-            },
-            {  
-              "label":"6 Days",
-              "value":6
-            },
-            {  
-              "label":"Week",
-              "value":7
-            }
-          ]
         }
       ]
     },
@@ -508,7 +478,7 @@
         },
         {  
           "type":"paragraph",
-          "value":"Use the following twitter search query. See <a href=\"http://support.twitter.com/articles/71577-how-to-use-advanced-twitter-search\" target=\"_blank\">Advanced search</a> for more information."
+          "value": "Use the following twitter search query. See <a href=\"http://support.twitter.com/articles/71577-how-to-use-advanced-twitter-search\" target=\"_blank\">Advanced search</a> and the query operators section of <a href=\"https://dev.twitter.com/rest/public/search\" target=\"_blank\">this topic</a> for more information."
         },
         {  
           "type":"string",
@@ -641,6 +611,7 @@
     "enableBookmarks":true,
     "enableOverviewMap":true,
     "openOverviewMap":false,
+    "enableScalebar": false,
     "enablePrintButton":false,
     "nextBasemap":"hybrid",
     "defaultBasemap":"topo",
@@ -648,7 +619,6 @@
     "swipeInvertPlacement":false,
     "enableInstagram":true,
     "instagramVisible":false,
-    "instagramTime":5,
     "enableFlickr":true,
     "flickrVisible":false,
     "flickrSearch":"",
@@ -664,4 +634,4 @@
     "youtubeSearch":"",
     "locationSearch":true
   }
-}
\ No newline at end of file
+}
diff --git a/twitter-callback.html b/twitter-callback.html
new file mode 100644
index 0000000..47e2555
--- /dev/null
+++ b/twitter-callback.html
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>OAuth Popup Callback</title>
+    <style type="text/css">
+        html,
+        body {
+            height: 100%;
+            width: 100%;
+            margin: 0px;
+            padding: 0px;
+            font-family: Lucida Sans, Lucida Grande, Arial !important;
+            font-size: 14px;
+        }
+    </style>
+    <script type="text/javascript" src="//js.arcgis.com/3.18"></script>
+    <script type="text/javascript">
+        require([
+            "dojo/domReady!"
+        ], function () {
+            window.opener.twitterCallback();
+            window.close();
+        });
+    </script>
+</head>
+<body>
+    <!--OAuth Popup Callback-->
+</body>
+</html>
\ No newline at end of file