[fusion-commits] r1847 - trunk/layers/Generic

[svn_fusion at osgeo.org]

Author: zjames
Date: 2009-05-01 10:23:51 -0400 (Fri, 01 May 2009)
New Revision: 1847

Modified:
   trunk/layers/Generic/Generic.js
Log:
support Virtual Earth and Yahoo base maps

Modified: trunk/layers/Generic/Generic.js
===================================================================
--- trunk/layers/Generic/Generic.js	2009-05-01 13:23:21 UTC (rev 1846)
+++ trunk/layers/Generic/Generic.js	2009-05-01 14:23:51 UTC (rev 1847)
@@ -107,6 +107,8 @@
                 this.mapTag.layerOptions.type = G_NORMAL_MAP;
                 break;
             }
+         case 'VirtualEarth':
+         case 'Yahoo':
             if (!this.mapTag.layerOptions.maxExtent) {
                 this.mapTag.layerOptions.maxExtent = new OpenLayers.Bounds(-20037508.3427892, -20037508.3427892, 20037508.3427892, 20037508.3427892);
             }
@@ -116,7 +118,7 @@
             if (typeof this.mapTag.layerOptions.numZoomLevels == 'undefined') {
                 this.mapTag.layerOptions.numZoomLevels = 20;
             }
-            this.oLayerOL = new OpenLayers.Layer.Google(this.getMapName(), this.mapTag.layerOptions );
+            this.oLayerOL = new OpenLayers.Layer[this.layerType](this.getMapName(), this.mapTag.layerOptions );
             this.mapWidget.fractionalZoom = false;        //fractionalZoom not permitted with Google layers
             this.mapWidget.oMapOL.setOptions({fractionalZoom: false});
            break;
@@ -126,6 +128,7 @@
                                   this.sMapResourceId, 
                                   this.mapTag.layerParams, 
                                   this.mapTag.layerOptions );
+            
             break;
         }
         this.oLayerOL.events.register("loadstart", this, this.loadStart);