[fusion-commits] r3006 - in branches/fusion-mg26: . layers/Generic text widgets

[svn_fusion at osgeo.org]

Author: jng
Date: 2017-06-26 07:20:43 -0700 (Mon, 26 Jun 2017)
New Revision: 3006

Modified:
   branches/fusion-mg26/
   branches/fusion-mg26/layers/Generic/Generic.js
   branches/fusion-mg26/text/en.json
   branches/fusion-mg26/widgets/BasemapSwitcher.js
Log:
Merged revision(s) 3003 from trunk:
#658: Add missing support for AerialsWithLabels base layer type in the current version Bing Maps. This was formerly known as the "Hybrid" base layer type in older versions of Bing Maps.
........



Property changes on: branches/fusion-mg26
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/fusion-mg24:2560
/sandbox/adsk/2.6l:2911
/sandbox/adsk/3.1n:2925-2927
/sandbox/adsk/3.2o:2969-2972,2974,2978-2984
/sandbox/createruntimemap:2699-2708
/sandbox/jxlib-3.0:1957-2248
/sandbox/ol213:2801-2803
/sandbox/robust_error_handling:2818-2825
/trunk:2847,2850,2857,2859,2862-2863,2872,2877,2880,2882,2884,2893-2897,2899,2905-2908,2915,2920-2932,2936-2942,2946,2950,2956,2960,2964,2993-2995,2999
   + /branches/fusion-mg24:2560
/sandbox/adsk/2.6l:2911
/sandbox/adsk/3.1n:2925-2927
/sandbox/adsk/3.2o:2969-2972,2974,2978-2984
/sandbox/createruntimemap:2699-2708
/sandbox/jxlib-3.0:1957-2248
/sandbox/ol213:2801-2803
/sandbox/robust_error_handling:2818-2825
/trunk:2847,2850,2857,2859,2862-2863,2872,2877,2880,2882,2884,2893-2897,2899,2905-2908,2915,2920-2932,2936-2942,2946,2950,2956,2960,2964,2993-2995,2999,3003

Modified: branches/fusion-mg26/layers/Generic/Generic.js
===================================================================
--- branches/fusion-mg26/layers/Generic/Generic.js	2017-06-26 14:20:30 UTC (rev 3005)
+++ branches/fusion-mg26/layers/Generic/Generic.js	2017-06-26 14:20:43 UTC (rev 3006)
@@ -141,6 +141,9 @@
                case 'a':
                  this.mapTag.layerOptions.type = 'Aerial';
                  break;
+               case 'AerialWithLabels':
+                 this.mapTag.layerOptions.type = 'AerialWithLabels';
+                 break;
                default:
                  this.mapTag.layerOptions.type = 'Road';
                  break;

Modified: branches/fusion-mg26/text/en.json
===================================================================
--- branches/fusion-mg26/text/en.json	2017-06-26 14:20:30 UTC (rev 3005)
+++ branches/fusion-mg26/text/en.json	2017-06-26 14:20:43 UTC (rev 3006)
@@ -82,7 +82,7 @@
 'yahooHybrid':'Yahoo Hybrid',
 'bingStreet':'Bing Street',
 'bingSatellite':'Bing Satellite',
-'bingHybrid':'Bing Hybrid',
+'bingAerialsWithLabels':'Bing Satellite (with labels)',
 'openStreetMap':'Open Street Map',
 'openStreetMapTransportMap':'Open Street Map (TransportMap)',
 'openStreetMapCycleMap':'Open Street Map (CycleMap)',

Modified: branches/fusion-mg26/widgets/BasemapSwitcher.js
===================================================================
--- branches/fusion-mg26/widgets/BasemapSwitcher.js	2017-06-26 14:20:30 UTC (rev 3005)
+++ branches/fusion-mg26/widgets/BasemapSwitcher.js	2017-06-26 14:20:43 UTC (rev 3006)
@@ -25,8 +25,8 @@
  *  - OpenStreetMap CycleMap
  *  - OpenStreetMap Transport
  *  - Bing Street
- *  - Bing Satellite
- *  - Bing Hybrid
+ *  - Bing Aerials
+ *  - Bing Aerials (with labels)
  *  - Stamen Toner
  *  - Stamen Watercolor
  *  - Stamen Terrain
@@ -55,7 +55,7 @@
         'G_PHYSICAL_MAP': 0,
         'Road': -1,
         'Aerial': -1,
-        'Hybrid': -1,
+        'AerialWithLabels': -1,
         'Mapnik': 0,
         'TransportMap': 0,
         'CycleMap': 0,
@@ -78,7 +78,7 @@
             'G_PHYSICAL_MAP': null,
             'Road': null,
             'Aerial': null,
-            'Hybrid': null,
+            'AerialWithLabels': null,
             'Mapnik': null,
             'TransportMap': null,
             'CycleMap': null,
@@ -188,14 +188,14 @@
                                 }
                                 this.baseMaps['Aerial'] = map;
                                 break;
-                            case 'Hybrid':
+                            case 'AerialWithLabels':
                                 if (map.mapTag.extension.Options[0].name) {
-                                    this.options['Hybrid'] = map.mapTag.extension.Options[0].name[0];
+                                    this.options['AerialWithLabels'] = map.mapTag.extension.Options[0].name[0];
                                 }
                                 else {
-                                    this.options['Hybrid'] = OpenLayers.i18n('bingHybrid');
+                                    this.options['AerialWithLabels'] = OpenLayers.i18n('bingAerialsWithLabels');
                                 }
-                                this.baseMaps['Hybrid'] = map;
+                                this.baseMaps['AerialWithLabels'] = map;
                                 break;
                             default:
                                 break;


Property changes on: branches/fusion-mg26/widgets/BasemapSwitcher.js
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/fusion-mg24/widgets/BasemapSwitcher.js:2560
/sandbox/adsk/2.4j/widgets/BasemapSwitcher.js:2486-2526
/sandbox/createruntimemap/widgets/BasemapSwitcher.js:2699-2708
/sandbox/jxlib-3.0/widgets/BasemapSwitcher.js:1957-2248
/sandbox/ol213/widgets/BasemapSwitcher.js:2801-2803
/sandbox/robust_error_handling/widgets/BasemapSwitcher.js:2818-2825
/trunk/widgets/BasemapSwitcher.js:2469-2485,2880,2936-2942
   + /branches/fusion-mg24/widgets/BasemapSwitcher.js:2560
/sandbox/adsk/2.4j/widgets/BasemapSwitcher.js:2486-2526
/sandbox/createruntimemap/widgets/BasemapSwitcher.js:2699-2708
/sandbox/jxlib-3.0/widgets/BasemapSwitcher.js:1957-2248
/sandbox/ol213/widgets/BasemapSwitcher.js:2801-2803
/sandbox/robust_error_handling/widgets/BasemapSwitcher.js:2818-2825
/trunk/widgets/BasemapSwitcher.js:2469-2485,2880,2936-2942,3003