MinScale and MaxScale options added for relevant layers. Tiled Layer …

…displayLayers and webTileLayer subdomains are now comma delineated. Placeholder text added for some fields.
rrabb · Nov 4, 2015 · 576093c · 576093c
1 parent d6087ba
commit 576093c
Show file tree

Hide file tree

Showing 14 changed files with 294 additions and 12 deletions.
diff --git a/Widget.js b/Widget.js
@@ -107,6 +107,12 @@ define([
           if(layer.hasOwnProperty('hidelayers')){
             lOptions.hidelayers = layer.hidelayers.split(',');
           }
+          if(layer.hasOwnProperty('minScale')){
+            lOptions.minScale = layer.minScale
+          }
+          if(layer.hasOwnProperty('maxScale')){
+            lOptions.maxScale = layer.maxScale
+          }
           if(layer.type.toUpperCase() === 'DYNAMIC'){
             if(layer.imageformat){
               var ip = new ImageParameters();
@@ -144,6 +150,13 @@ define([
               lLayer.setDisableClientCaching(true);
             }
             lLayer.on('load',function(evt){
+              //set min/max scales if present
+              if(lOptions.minScale){
+                evt.layer.setMinScale(lOptions.minScale)
+              }
+              if(lOptions.maxScale){
+                evt.layer.setMaxScale(lOptions.maxScale)
+              }
               var removeLayers = []
               //set defaultvisibility for everything off by default
               array.forEach(evt.layer.layerInfos,function(layer){
@@ -197,6 +210,13 @@ define([
             }
             lLayer = new WebTiledLayer(layer.url,lOptions)
             lLayer.on('load',function(evt){
+              //set min/max scales if present
+              if(lOptions.minScale){
+                evt.layer.setMinScale(lOptions.minScale)
+              }
+              if(lOptions.maxScale){
+                evt.layer.setMaxScale(lOptions.maxScale)
+              }
               evt.layer.name = lOptions.id;
             });
             this._viewerMap.addLayer(lLayer);
@@ -254,17 +274,33 @@ define([
               lLayer.noservicename = true;
             }
             lLayer.on('load',function(evt){
+              //set min/max scales if present
+              if(lOptions.minScale){
+                evt.layer.setMinScale(lOptions.minScale)
+              }
+              if(lOptions.maxScale){
+                evt.layer.setMaxScale(lOptions.maxScale)
+              }
               evt.layer.name = lOptions.id;
             });
             this._viewerMap.addLayer(lLayer);
           }else if(layer.type.toUpperCase() === 'TILED'){
             if(layer.displayLevels){
-              lOptions.displayLevels = layer.displayLevels;
+              lOptions.displayLevels = layer.displayLevels.split(',');
             }
             if(layer.hasOwnProperty('autorefresh')){
               lOptions.refreshInterval = layer.autorefresh;
             }
             lLayer = new ArcGISTiledMapServiceLayer(layer.url, lOptions);
+            lLayer.on('load', function(evt){
+              //set min/max scales if present
+              if(lOptions.minScale){
+                evt.layer.setMinScale(lOptions.minScale)
+              }
+              if(lOptions.maxScale){
+                evt.layer.setMaxScale(lOptions.maxScale)
+              }
+            })
             if(layer.name){
               lLayer._titleForLegend = layer.name;
               lLayer.title = layer.name;
@@ -413,6 +449,15 @@ define([
                 lLayer.noservicename = true;
                 lLayer.name = lOptions.id;
               }
+              lLayer.on('load', function(evt){
+                //set min/max scales if present
+                if(lOptions.minScale){
+                  evt.layer.setMinScale(lOptions.minScale)
+                }
+                if(lOptions.maxScale){
+                  evt.layer.setMaxScale(lOptions.maxScale)
+                }
+              })
               this._viewerMap.addLayer(lLayer);
             }), lang.hitch(this, function(err){
               console.log('error')

diff --git a/images/Thumbs.db b/images/Thumbs.db
diff --git a/setting/DynamicLayerEdit.html b/setting/DynamicLayerEdit.html
@@ -144,6 +144,44 @@
           </table>
         </td>
       </tr>
+      <tr>
+        <td colspan="2">
+          <table style="width:100%;" cellspacing="0">
+            <tr>
+              <td style="width:50%;">
+                <table style="width:100%;" cellspacing="0">
+                  <tbody>
+                    <tr>
+                      <td style="width:200px;text-align:left;">
+                        <span>${nls.minScale}</span>
+                      </td>
+                      <td style="width:auto;">
+                        <input type="text" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-attach-point="minScale"
+                               required="false" data-dojo-props='style:{width:"100%"}'/></input>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </td>
+              <td style="width:50%;">
+                <table style="width:100%;" cellspacing="0">
+                  <tbody>
+                    <tr>
+                      <td style="width:200px;text-align:left;">
+                        <span>${nls.maxScale}</span>
+                      </td>
+                      <td style="width:auto;">
+                        <input type="text" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-attach-point="maxScale"
+                               required="false" data-dojo-props='style:{width:"100%"}'/></input>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
       <tr>
         <td colspan="2">
           <table style="width:100%;padding-top:8px;" cellspacing="0">

diff --git a/setting/DynamicLayerEdit.js b/setting/DynamicLayerEdit.js
@@ -89,6 +89,12 @@ define(
         if(config.imageformat){
           this.imgFormat.set('value', config.imageformat);
         }
+        if(config.hasOwnProperty('maxScale')){
+          this.maxScale.set('value', config.maxScale);
+        }
+        if(config.hasOwnProperty('minScale')){
+          this.minScale.set('value', config.minScale);
+        }
       },
 
       _bindEvents: function() {
@@ -234,6 +240,8 @@ define(
           popup: this.config.popup,
           imagedpi: this.imgDPI.get('value'),
           disableclientcaching: this.disableClientCachingCbx.getValue(),
+          minScale: this.minScale.get('value'),
+          maxScale: this.maxScale.get('value'),
           //hidelayers: allHiddenLayers.join()
           hidelayers: visibleLayers.join()
         };

diff --git a/setting/FeatureLayerEdit.html b/setting/FeatureLayerEdit.html
@@ -64,6 +64,44 @@
           </table>
         </td>
       </tr>
+      <tr>
+        <td colspan="2">
+          <table style="width:100%;" cellspacing="0">
+            <tr>
+              <td style="width:50%;">
+                <table style="width:100%;" cellspacing="0">
+                  <tbody>
+                    <tr>
+                      <td style="width:200px;text-align:left;">
+                        <span>${nls.minScale}</span>
+                      </td>
+                      <td style="width:auto;">
+                        <input type="text" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-attach-point="minScale"
+                               required="false" data-dojo-props='style:{width:"100%"}'/></input>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </td>
+              <td style="width:50%;">
+                <table style="width:100%;" cellspacing="0">
+                  <tbody>
+                    <tr>
+                      <td style="width:200px;text-align:left;">
+                        <span>${nls.maxScale}</span>
+                      </td>
+                      <td style="width:auto;">
+                        <input type="text" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-attach-point="maxScale"
+                               required="false" data-dojo-props='style:{width:"100%"}'/></input>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
       <tr>
         <td colspan="2">
           <table style="width:100%;" cellspacing="0">

diff --git a/setting/FeatureLayerEdit.js b/setting/FeatureLayerEdit.js
@@ -93,6 +93,12 @@ define(
         if(config.hasOwnProperty('autorefresh')){
           this.autoRefresh.set('value', config.autorefresh);
         }
+        if(config.hasOwnProperty('maxScale')){
+          this.maxScale.set('value', config.maxScale);
+        }
+        if(config.hasOwnProperty('minScale')){
+          this.minScale.set('value', config.minScale);
+        }
         if(config.showLabels === false){
           this.showLabelsCbx.setValue(false)
         }else{
@@ -167,6 +173,8 @@ define(
           showLabels: this.showLabelsCbx.getValue(),
           popup: this.config.popup,
           autorefresh: this.autoRefresh.get('value'),
+          minScale: this.minScale.get('value'),
+          maxScale: this.maxScale.get('value'),
           mode: this.flMode.get('value')
         };
         return [featurelayer, this.tr];

diff --git a/setting/Setting.js b/setting/Setting.js
@@ -107,7 +107,7 @@ define([
       _initLayersTable: function() {
         this.LayersTable.clear();
         var layers = this.config && this.config.layers.layer;
-        array.forEach(layers, lang.hitch(this, function(layerConfig, index) {
+        array.forEach(layers.reverse(), lang.hitch(this, function(layerConfig, index) {
           var args = {
             config: layerConfig,
             layerindex: index
@@ -137,7 +137,7 @@ define([
         var allLayers = array.map(trs, lang.hitch(this, function (item) {
           return item.singleLayer;
         }));
-        return allLayers;
+        return allLayers.reverse();
       },
 
       getNLSLayerType: function(type) {

diff --git a/setting/TiledLayerEdit.html b/setting/TiledLayerEdit.html
@@ -77,7 +77,7 @@
                       </td>
                       <td style="width:auto;padding-right:10px;">
                         <input type="text" data-dojo-type="dijit/form/TextBox" data-dojo-attach-point="displayLevels"
-                               data-dojo-props='style:{width:"100%"}'/></input>
+                               data-dojo-props='style:{width:"100%"},placeholder:"${nls.displayLevelsPlaceHolder}"'/></input>
                       </td>
                     </tr>
                   </tbody>
@@ -102,6 +102,44 @@
           </table>
         </td>
       </tr>
+      <tr>
+        <td colspan="2">
+          <table style="width:100%;" cellspacing="0">
+            <tr>
+              <td style="width:50%;">
+                <table style="width:100%;" cellspacing="0">
+                  <tbody>
+                    <tr>
+                      <td style="width:200px;text-align:left;">
+                        <span>${nls.minScale}</span>
+                      </td>
+                      <td style="width:auto;">
+                        <input type="text" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-attach-point="minScale"
+                               required="false" data-dojo-props='style:{width:"100%"}'/></input>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </td>
+              <td style="width:50%;">
+                <table style="width:100%;" cellspacing="0">
+                  <tbody>
+                    <tr>
+                      <td style="width:200px;text-align:left;">
+                        <span>${nls.maxScale}</span>
+                      </td>
+                      <td style="width:auto;">
+                        <input type="text" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-attach-point="maxScale"
+                               required="false" data-dojo-props='style:{width:"100%"}'/></input>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
       <tr>
         <td colspan="2">
           <table style="width:100%;padding-top:8px;" cellspacing="0">

diff --git a/setting/TiledLayerEdit.js b/setting/TiledLayerEdit.js
@@ -89,6 +89,12 @@ define(
         if(config.hasOwnProperty('autorefresh')){
           this.autoRefresh.set('value', config.autorefresh);
         }
+        if(config.hasOwnProperty('maxScale')){
+          this.maxScale.set('value', config.maxScale);
+        }
+        if(config.hasOwnProperty('minScale')){
+          this.minScale.set('value', config.minScale);
+        }
       },
 
       _bindEvents: function() {
@@ -198,18 +204,22 @@ define(
       },
 
       getConfig: function() {
-        var dls = [];
-        if(this.displayLevels.get('value') !== ''){
-          dls = this.displayLevels.get('value').split();
-        }
+        //var dls = [];
+        //if(this.displayLevels.get('value') !== ''){
+          //dls = this.displayLevels.get('value').split(',');
+
+        //}
         var tiledlayer = {
           type: 'Tiled',
           name: this.layerTitle.get('value'),
           url: this.layerUrl.get('value'),
           opacity: this.layerAlpha.getAlpha(),
-          displayLevels: (dls.length > 0)?dls:null,
+          //displayLevels: (dls.length > 0)?dls:null,
+          displayLevels: this.displayLevels.get('value'),
           autorefresh: this.autoRefresh.get('value'),
           visible: this.isVisible.getValue(),
+          minScale: this.minScale.get('value'),
+          maxScale: this.maxScale.get('value'),
           popup: this.config.popup
         };
         return [tiledlayer, this.tr];