[mapguide-commits] r5278 - trunk/MgDev/Server/src/Wms

[svn_mapguide at osgeo.org]

Author: liuar
Date: 2010-10-12 19:32:42 -0700 (Tue, 12 Oct 2010)
New Revision: 5278

Modified:
   trunk/MgDev/Server/src/Wms/1.1.1.xml.awd
   trunk/MgDev/Server/src/Wms/1.3.0.xml.awd
Log:
Ticket #1462 New CRSs cannot be supported in WMS service

All published layer headers use SRS to indicate the coordinate system which is a standard of WMS 1.1.0. But WMS 1.3.0 uses CRS to define the coordinate system. 

Because there's no CRS defined in the published layer header, parent layer's CRS will be used as all children layers' CRS, which is EPSG:4326. 

I update all the CRS to SRS in the template file Server/src/Wms/1.3.0.xml.awd for the backward compatibility issue. 

This submission also fixes a test failure for OGC CITE WMS 1.1.0. I update the refer of the DTD which is required by OGC. 

Modified: trunk/MgDev/Server/src/Wms/1.1.1.xml.awd
===================================================================
--- trunk/MgDev/Server/src/Wms/1.1.1.xml.awd	2010-10-13 02:09:06 UTC (rev 5277)
+++ trunk/MgDev/Server/src/Wms/1.1.1.xml.awd	2010-10-13 02:32:42 UTC (rev 5278)
@@ -132,7 +132,7 @@
 
  <Define item="GetCapabilities.xml">
   <!DOCTYPE WMT_MS_Capabilities SYSTEM
- "http://schemas.opengis.net/wms/1.1.1/capabilities_1_1_1.dtd"
+ "http://schemas.opengis.net/wms/1.1.1/WMS_MS_Capabilities.dtd"
   [
    <!ELEMENT VendorSpecificCapabilities EMPTY>
   ]>

Modified: trunk/MgDev/Server/src/Wms/1.3.0.xml.awd
===================================================================
--- trunk/MgDev/Server/src/Wms/1.3.0.xml.awd	2010-10-13 02:09:06 UTC (rev 5277)
+++ trunk/MgDev/Server/src/Wms/1.3.0.xml.awd	2010-10-13 02:32:42 UTC (rev 5278)
@@ -58,7 +58,7 @@
  <!-- This pair of definitions works around a current limitation that -->
  <!-- <?If...?><?Endif?> cannot be nested.                            -->
  <Define item="EX_GeographicBoundingBox.xml">
-    <?Translate text="&Enum.item.CRS;" with="&EX_GeographicBoundingBox.translate.xml;"?>
+    <?Translate text="&Enum.item.SRS;" with="&EX_GeographicBoundingBox.translate.xml;"?>
  </Define>
 
  <Define item="EX_GeographicBoundingBox.translate.xml">
@@ -74,11 +74,11 @@
 </Define>
 
  <Define item="BoundingBox.xml">
-  <BoundingBox CRS="&Enum.item.CRS;" minx="&Enum.item.west;" miny="&Enum.item.south;" maxx="&Enum.item.east;" maxy="&Enum.item.north;"/>
+  <BoundingBox CRS="&Enum.item.SRS;" minx="&Enum.item.west;" miny="&Enum.item.south;" maxx="&Enum.item.east;" maxy="&Enum.item.north;"/>
  </Define>
 
  <Define item="CRS.xml">
-  <CRS>&Enum.item.CRS;</CRS>
+  <CRS>&Enum.item.SRS;</CRS>
  </Define>
 
  <Define item="FeatureInfo.xml">