[Commits] r2883 - in sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux: data widgets/tree

[commits at geoext.org]

Author: adube
Date: 2012-07-05 15:21:10 +0200 (Thu, 05 Jul 2012)
New Revision: 2883

Modified:
   sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/data/WMSBrowserWMSCapabilitiesStore.js
   sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/widgets/tree/WMSBrowserTreePanel.js
Log:
WMSBrowser ux - Add support for EPSG:3857 as a synonym for EPSG:900913

Modified: sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/data/WMSBrowserWMSCapabilitiesStore.js
===================================================================
--- sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/data/WMSBrowserWMSCapabilitiesStore.js	2012-07-04 19:01:17 UTC (rev 2882)
+++ sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/data/WMSBrowserWMSCapabilitiesStore.js	2012-07-05 13:21:10 UTC (rev 2883)
@@ -94,7 +94,13 @@
                OpenLayers.Util.indexOf(record.get('srs'), srs) >= 0) {
                 record.set("srsCompatible", true);
             } else {
-                record.set("srsCompatible", false);
+                if(srs == 'EPSG:900913' && record.get('srs')['EPSG:3857'] === true) {
+                    srs = 'EPSG:3857';
+                    record.set("srsCompatible", true);
+                }
+                else {
+                    record.set("srsCompatible", false);
+                }
             }
 
             // Check if the llbbox 

Modified: sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/widgets/tree/WMSBrowserTreePanel.js
===================================================================
--- sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/widgets/tree/WMSBrowserTreePanel.js	2012-07-04 19:01:17 UTC (rev 2882)
+++ sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/widgets/tree/WMSBrowserTreePanel.js	2012-07-05 13:21:10 UTC (rev 2883)
@@ -255,11 +255,16 @@
         // validate srs
         if(!(layer.metadata.srs[srs] === true ||
             OpenLayers.Util.indexOf(layer.metadata.srs, srs) >= 0)) {
-            compatible = false;
-            reasons.push(
-                this.wmsbrowser.srsNotSupportedShortText +
-                " (" + this.map.getProjection() + ")"
-            );
+            if(srs == 'EPSG:900913' && layer.metadata.srs['EPSG:3857'] === true){
+                srs = 'EPSG:3857';
+            }
+            else {
+                compatible = false;
+                reasons.push(
+                    this.wmsbrowser.srsNotSupportedShortText +
+                    " (" + this.map.getProjection() + ")"
+                );
+            }
         }
 
         // validate extent