[fusion-commits] r2561 - in trunk: . layers/Generic lib text widgets widgets/QuickPlot
svn_fusion at osgeo.org
svn_fusion at osgeo.org
Tue Jul 31 05:56:32 PDT 2012
Author: jng
Date: 2012-07-31 05:56:31 -0700 (Tue, 31 Jul 2012)
New Revision: 2561
Modified:
trunk/
trunk/layers/Generic/Generic.js
trunk/lib/ApplicationDefinition.js
trunk/lib/MapMessage.js
trunk/text/en.json
trunk/widgets/BasemapSwitcher.js
trunk/widgets/QuickPlot/GeneratePicture.php
Log:
Merge r2560 to trunk
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /sandbox/jxlib-3.0:1957-2248
+ /branches/fusion-mg24:2560
/sandbox/jxlib-3.0:1957-2248
Modified: trunk/layers/Generic/Generic.js
===================================================================
--- trunk/layers/Generic/Generic.js 2012-07-31 12:43:11 UTC (rev 2560)
+++ trunk/layers/Generic/Generic.js 2012-07-31 12:56:31 UTC (rev 2561)
@@ -190,7 +190,12 @@
if (!this.oLayerOL) {
if(this.layerType == 'OpenStreetMap' || this.layerType == 'OSM') {
- this.oLayerOL = new OpenLayers.Layer.OSM(this.getMapName(), null, this.mapTag.layerOptions );
+ //Test OSM sub-type before falling back to OpenLayers.Layer.OSM
+ if (typeof(OpenLayers.Layer.OSM[this.mapTag.layerOptions.type]) != 'undefined') {
+ this.oLayerOL = new OpenLayers.Layer.OSM[this.mapTag.layerOptions.type](this.getMapName(), null, this.mapTag.layerOptions );
+ } else {
+ this.oLayerOL = new OpenLayers.Layer.OSM(this.getMapName(), null, this.mapTag.layerOptions );
+ }
}
else {
this.oLayerOL = new OpenLayers.Layer[this.layerType](this.getMapName(), this.mapTag.layerOptions );
Property changes on: trunk/lib/ApplicationDefinition.js
___________________________________________________________________
Modified: svn:mergeinfo
- /sandbox/adsk/2.4j/lib/ApplicationDefinition.js:2486-2514
/sandbox/jxlib-3.0/lib/ApplicationDefinition.js:1957-2248
/trunk/lib/ApplicationDefinition.js:2469-2485
+ /branches/fusion-mg24/lib/ApplicationDefinition.js:2560
/sandbox/adsk/2.4j/lib/ApplicationDefinition.js:2486-2514
/sandbox/jxlib-3.0/lib/ApplicationDefinition.js:1957-2248
/trunk/lib/ApplicationDefinition.js:2469-2485
Property changes on: trunk/lib/MapMessage.js
___________________________________________________________________
Modified: svn:mergeinfo
- /sandbox/adsk/2.4j/lib/MapMessage.js:2486-2514
/sandbox/jxlib-3.0/lib/MapMessage.js:1957-2248
/trunk/lib/MapMessage.js:2469-2485
+ /branches/fusion-mg24/lib/MapMessage.js:2560
/sandbox/adsk/2.4j/lib/MapMessage.js:2486-2514
/sandbox/jxlib-3.0/lib/MapMessage.js:1957-2248
/trunk/lib/MapMessage.js:2469-2485
Modified: trunk/text/en.json
===================================================================
--- trunk/text/en.json 2012-07-31 12:43:11 UTC (rev 2560)
+++ trunk/text/en.json 2012-07-31 12:56:31 UTC (rev 2561)
@@ -75,7 +75,7 @@
'bingSatellite':'Bing Satellite',
'bingHybrid':'Bing Hybrid',
'openStreetMap':'Open Street Map',
-'openStreetMapOsmarender':'Open Street Map (Osmarender)',
+'openStreetMapTransportMap':'Open Street Map (TransportMap)',
'openStreetMapCycleMap':'Open Street Map (CycleMap)',
'end': ''
};
Modified: trunk/widgets/BasemapSwitcher.js
===================================================================
--- trunk/widgets/BasemapSwitcher.js 2012-07-31 12:43:11 UTC (rev 2560)
+++ trunk/widgets/BasemapSwitcher.js 2012-07-31 12:56:31 UTC (rev 2561)
@@ -45,7 +45,7 @@
'Aerial': -1,
'Hybrid': -1,
'Mapnik': 0,
- 'Osmarender': 0,
+ 'TransportMap': 0,
'CycleMap': 0,
'None': 0
},
@@ -71,7 +71,7 @@
'Aerial': null,
'Hybrid': null,
'Mapnik': null,
- 'Osmarender': null,
+ 'TransportMap': null,
'CycleMap': null,
'None': null
};
@@ -260,35 +260,33 @@
else {
switch (map.mapTag.extension.Options[0].type[0]) {
- case 'Mapnik':
+ case 'TransportMap':
if (map.mapTag.extension.Options[0].name) {
- this.options['Mapnik'] = map.mapTag.extension.Options[0].name[0];
+ this.options['TransportMap'] = map.mapTag.extension.Options[0].name[0];
}
else {
- this.options['Mapnik'] = OpenLayers.i18n('openStreetMap');
+ this.options['TransportMap'] = OpenLayers.i18n('openStreetMapTransportMap');
}
- this.baseMaps['Mapnik'] = map;
+ this.baseMaps['TransportMap'] = map;
break;
- case 'Osmarender':
+ case 'CycleMap':
if (map.mapTag.extension.Options[0].name) {
- this.options['Osmarender'] = map.mapTag.extension.Options[0].name[0];
+ this.options['CycleMap'] = map.mapTag.extension.Options[0].name[0];
}
else {
- this.options['Osmarender'] = OpenLayers.i18n('openStreetMapOsmarender');
+ this.options['CycleMap'] = OpenLayers.i18n('openStreetMapCycleMap');
}
- this.baseMaps['Osmarender'] = map;
+ this.baseMaps['CycleMap'] = map;
break;
- case 'CycleMap':
+ default: //Default to Mapnik tileset
if (map.mapTag.extension.Options[0].name) {
- this.options['CycleMap'] = map.mapTag.extension.Options[0].name[0];
+ this.options['Mapnik'] = map.mapTag.extension.Options[0].name[0];
}
else {
- this.options['CycleMap'] = OpenLayers.i18n('openStreetMapCycleMap');
+ this.options['Mapnik'] = OpenLayers.i18n('openStreetMap');
}
- this.baseMaps['CycleMap'] = map;
+ this.baseMaps['Mapnik'] = map;
break;
- default:
- break;
}
// The first non-MapGuide basemap will be the default basemap
if (!this.defaultBasemap) {
Property changes on: trunk/widgets/BasemapSwitcher.js
___________________________________________________________________
Modified: svn:mergeinfo
- /sandbox/adsk/2.4j/widgets/BasemapSwitcher.js:2486-2526
/sandbox/jxlib-3.0/widgets/BasemapSwitcher.js:1957-2248
/trunk/widgets/BasemapSwitcher.js:2469-2485
+ /branches/fusion-mg24/widgets/BasemapSwitcher.js:2560
/sandbox/adsk/2.4j/widgets/BasemapSwitcher.js:2486-2526
/sandbox/jxlib-3.0/widgets/BasemapSwitcher.js:1957-2248
/trunk/widgets/BasemapSwitcher.js:2469-2485
Property changes on: trunk/widgets/QuickPlot/GeneratePicture.php
___________________________________________________________________
Modified: svn:mergeinfo
- /sandbox/adsk/2.4jbeta2/widgets/QuickPlot/GeneratePicture.php:2488-2498
/sandbox/jxlib-3.0/widgets/QuickPlot/GeneratePicture.php:1957-2248
/trunk/widgets/QuickPlot/GeneratePicture.php:2469-2487
+ /branches/fusion-mg24/widgets/QuickPlot/GeneratePicture.php:2560
/sandbox/adsk/2.4jbeta2/widgets/QuickPlot/GeneratePicture.php:2488-2498
/sandbox/jxlib-3.0/widgets/QuickPlot/GeneratePicture.php:1957-2248
/trunk/widgets/QuickPlot/GeneratePicture.php:2469-2487
More information about the fusion-commits
mailing list