[fusion-commits] r2196 - in branches/fusion-2.0: layers/MapGuide templates/mapguide/standard

[svn_fusion at osgeo.org]

Author: madair
Date: 2010-07-29 17:55:37 +0000 (Thu, 29 Jul 2010)
New Revision: 2196

Modified:
   branches/fusion-2.0/layers/MapGuide/MapGuide.js
   branches/fusion-2.0/templates/mapguide/standard/ApplicationDefinition.xml
Log:
re #395: reverting to the old way of setting projection code in AppDef for the 2.0 release; parsing of WKT will be handled in 2.2 release

Modified: branches/fusion-2.0/layers/MapGuide/MapGuide.js
===================================================================
--- branches/fusion-2.0/layers/MapGuide/MapGuide.js	2010-07-29 09:23:22 UTC (rev 2195)
+++ branches/fusion-2.0/layers/MapGuide/MapGuide.js	2010-07-29 17:55:37 UTC (rev 2196)
@@ -303,16 +303,6 @@
             //set projection units and code if supplied
             if (o.epsg != 0) {
               this.mapTag.layerOptions.projection = "EPSG:" + o.epsg;
-            } else {
-              if (o.wkt.length > 0) {
-                  var wkt = o.wkt;
-                  var wktContentRE = /(\w+)\[(.*)\]/;
-                  var wktContent = wkt.match(wktContentRE);
-                  var wktName = wktContent[2].split(",")[0];
-                  wktName = wktName.toUpperCase();
-                  this.mapTag.layerOptions.projection = wktName;
-                  Proj4js.defs[wktName] = "+proj=identity +"+wkt;
-              }  
             }
             //TODO: consider passing the metersPerUnit value into the framework
             //to allow for scaling that doesn't match any of the pre-canned units

Modified: branches/fusion-2.0/templates/mapguide/standard/ApplicationDefinition.xml
===================================================================
--- branches/fusion-2.0/templates/mapguide/standard/ApplicationDefinition.xml	2010-07-29 09:23:22 UTC (rev 2195)
+++ branches/fusion-2.0/templates/mapguide/standard/ApplicationDefinition.xml	2010-07-29 17:55:37 UTC (rev 2196)
@@ -15,6 +15,7 @@
         <SingleTile>true</SingleTile>
         <Extension>
           <ResourceId>Library://Samples/Sheboygan/Maps/Sheboygan.MapDefinition</ResourceId>
+          <ProjectionCode>EPSG:4326</ProjectionCode>
           <ImageFormat>PNG8</ImageFormat>
           <SelectionAsOverlay>true</SelectionAsOverlay>
           <SelectionFormat>PNG</SelectionFormat>
@@ -44,6 +45,7 @@
         <SingleTile>true</SingleTile>
         <Extension>
           <ResourceId>Library://Samples/Sheboygan/Maps/Sheboygan.MapDefinition</ResourceId>
+          <ProjectionCode>EPSG:4326</ProjectionCode>
           <SelectionAsOverlay>true</SelectionAsOverlay>
           <SelectionFormat>PNG</SelectionFormat>
           <SelectionColor>0xFF0000FF</SelectionColor>
@@ -56,6 +58,7 @@
         <SingleTile>false</SingleTile>
         <Extension>
           <ResourceId>Library://Samples/Sheboygan/MapsTiled/Sheboygan.MapDefinition</ResourceId>
+          <ProjectionCode>EPSG:4326</ProjectionCode>
         </Extension>
       </Map>
     </MapGroup>