[mapguide-commits] r5168 - in trunk/MgDev: Common/MapGuideCommon/MapLayer Common/MdfParser Common/PlatformBase/Exception Common/Schema Common/Stylization Server/src/Services/Rendering Web/src/schemareport/templatefiles Web/src/viewerfiles

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Tue Sep 21 04:21:54 EDT 2010


Author: hubu
Date: 2010-09-21 08:21:54 +0000 (Tue, 21 Sep 2010)
New Revision: 5168

Added:
   trunk/MgDev/Common/Schema/LayerDefinition-2.3.0.xsd
   trunk/MgDev/Common/Schema/MapDefinition-2.3.0.xsd
   trunk/MgDev/Common/Schema/WatermarkDefinition.xml
Removed:
   trunk/MgDev/Common/Schema/LayerDefinition-1.4.0.xsd
   trunk/MgDev/Common/Schema/MapDefinition-1.1.0.xsd
   trunk/MgDev/Common/Schema/WatermarkDefinition-1.0.0.xsd
Modified:
   trunk/MgDev/Common/MapGuideCommon/MapLayer/Map.h
   trunk/MgDev/Common/MdfParser/IODrawingLayerDefinition.cpp
   trunk/MgDev/Common/MdfParser/IOGridLayerDefinition.cpp
   trunk/MgDev/Common/MdfParser/IOMapDefinition.cpp
   trunk/MgDev/Common/MdfParser/IOSymbolInstance.cpp
   trunk/MgDev/Common/MdfParser/IOVectorLayerDefinition.cpp
   trunk/MgDev/Common/MdfParser/IOWatermarkDefinition.cpp
   trunk/MgDev/Common/MdfParser/SAX2Parser.cpp
   trunk/MgDev/Common/PlatformBase/Exception/InvalidWatermarkDefinitionException.cpp
   trunk/MgDev/Common/PlatformBase/Exception/InvalidWatermarkDefinitionException.h
   trunk/MgDev/Common/Stylization/StylizationEngine.cpp
   trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
   trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.h
   trunk/MgDev/Web/src/schemareport/templatefiles/layerdefinition.templ
   trunk/MgDev/Web/src/schemareport/templatefiles/mapdefinition.templ
   trunk/MgDev/Web/src/viewerfiles/arealayerdef.templ
   trunk/MgDev/Web/src/viewerfiles/layerdefinition.templ
   trunk/MgDev/Web/src/viewerfiles/linelayerdef.templ
Log:
Submit on behalf of Spark Liu.

This submission contains the following change:
1. Change LayerDefinition, MapDefinition and WatermarkDefinition to version 2.3.0 to keep consistence with release version.
2. Use correct copyright year (2010) for new-added watermark related source file.
3. Change the parameter name in MgServerRenderingService::RenderMap(Internal) from renderingWatermark to renderWatermark.

What needs to be done in the near future:
1. Unit test for new added watermark related API.
2. Unit test for new version of MdfModel and MdfParser.
3. Doc for new version of schema in Doc\external_topics and Doc\xml_schemas
4. Watermark definition template in schema report in web.

Modified: trunk/MgDev/Common/MapGuideCommon/MapLayer/Map.h
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/MapLayer/Map.h	2010-09-21 05:00:03 UTC (rev 5167)
+++ trunk/MgDev/Common/MapGuideCommon/MapLayer/Map.h	2010-09-21 08:21:54 UTC (rev 5168)
@@ -232,7 +232,7 @@
     /// \n
     /// \c Viewer - Use Viewer watermark.
     ///
-    enum
+    enum WatermarkUsageType
     {
         WMS = 1,
         Viewer = 2

Modified: trunk/MgDev/Common/MdfParser/IODrawingLayerDefinition.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IODrawingLayerDefinition.cpp	2010-09-21 05:00:03 UTC (rev 5167)
+++ trunk/MgDev/Common/MdfParser/IODrawingLayerDefinition.cpp	2010-09-21 08:21:54 UTC (rev 5168)
@@ -142,10 +142,10 @@
 
 // Determine which WatermarkDefinition schema version to use based
 // on the supplied LDF version:
-// * LDF version <= 1.4.0  =>  WD version 1.0.0
+// * LDF version <= 2.3.0  =>  WD version 2.3.0
 bool IODrawingLayerDefinition::GetWatermarkDefinitionVersion(Version* ldfVersion, Version& wdVersion)
 {
-    wdVersion = Version(1, 0, 0);
+    wdVersion = Version(2, 3, 0);
     return true;
 }
 
@@ -161,7 +161,7 @@
             // LDF in MapGuide 2006
             strVersion = L"1.0.0";
         }
-        else if ((*version >= Version(1, 0, 0)) && (*version <= Version(1, 4, 0)))
+        else if ((*version >= Version(1, 0, 0)) && (*version <= Version(2, 3, 0)))
         {
             // LDF in MapGuide 2007 - current
             strVersion = version->ToString();
@@ -177,7 +177,7 @@
     else
     {
         // use the current highest version
-        strVersion = L"1.4.0";
+        strVersion = L"2.3.0";
     }
 
     fd << tab() << "<LayerDefinition xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"LayerDefinition-" << EncodeString(strVersion) << ".xsd\" version=\"" << EncodeString(strVersion) << "\">" << std::endl; // NOXLATE
@@ -205,9 +205,9 @@
     int watermarkCount = drawingLayer->GetWatermarks()->GetCount();
     if (watermarkCount != 0)
     {
-        if (!version || (*version >= Version(1, 4, 0)))
+        if (!version || (*version >= Version(2, 3, 0)))
         {
-            // only write Watermarks if the LDF version is 1.4.0 or greater
+            // only write Watermarks if the LDF version is 2.3.0 or greater
             fd << tab() << startStr(sWatermarks) << std::endl;
             inctab();
             for (int i=0; i<watermarkCount; ++i)
@@ -217,7 +217,7 @@
         }
         else if (*version >= Version(1, 0, 0))
         {
-            // save Watermarks as extended data for LDF versions 1.0.0, 1.1.0, and 1.2.0
+            // save Watermarks as extended data for LDF versions 1.0.0 - 1.3.0
             inctab();
 
             fdExtData << tab() << startStr(sWatermarks) << std::endl;

Modified: trunk/MgDev/Common/MdfParser/IOGridLayerDefinition.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOGridLayerDefinition.cpp	2010-09-21 05:00:03 UTC (rev 5167)
+++ trunk/MgDev/Common/MdfParser/IOGridLayerDefinition.cpp	2010-09-21 08:21:54 UTC (rev 5168)
@@ -146,10 +146,10 @@
 
 // Determine which WatermarkDefinition schema version to use based
 // on the supplied LDF version:
-// * LDF version <= 1.4.0  =>  WD version 1.0.0
+// * LDF version <= 2.3.0  =>  WD version 2.3.0
 bool IOGridLayerDefinition::GetWatermarkDefinitionVersion(Version* ldfVersion, Version& wdVersion)
 {
-    wdVersion = Version(1, 0, 0);
+    wdVersion = Version(2, 3, 0);
     return true;
 }
 
@@ -165,7 +165,7 @@
             // LDF in MapGuide 2006
             strVersion = L"1.0.0";
         }
-        else if ((*version >= Version(1, 0, 0)) && (*version <= Version(1, 4, 0)))
+        else if ((*version >= Version(1, 0, 0)) && (*version <= Version(2, 3, 0)))
         {
             // LDF in MapGuide 2007 - current
             strVersion = version->ToString();
@@ -181,7 +181,7 @@
     else
     {
         // use the current highest version
-        strVersion = L"1.4.0";
+        strVersion = L"2.3.0";
     }
 
     fd << tab() << "<LayerDefinition xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"LayerDefinition-" << EncodeString(strVersion) << ".xsd\" version=\"" << EncodeString(strVersion) << "\">" << std::endl; // NOXLATE
@@ -209,9 +209,9 @@
     int watermarkCount = gridLayer->GetWatermarks()->GetCount();
     if (watermarkCount != 0)
     {
-        if (!version || (*version >= Version(1, 4, 0)))
+        if (!version || (*version >= Version(2, 3, 0)))
         {
-            // only write Watermarks if the LDF version is 1.4.0 or greater
+            // only write Watermarks if the LDF version is 2.3.0 or greater
             fd << tab() << startStr(sWatermarks) << std::endl;
             inctab();
             for (int i=0; i<watermarkCount; ++i)
@@ -221,7 +221,7 @@
         }
         else if (*version >= Version(1, 0, 0))
         {
-            // save Watermarks as extended data for LDF versions 1.0.0, 1.1.0, and 1.2.0
+            // save Watermarks as extended data for LDF versions 1.0.0 - 1.3.0
             inctab();
 
             fdExtData << tab() << startStr(sWatermarks) << std::endl;

Modified: trunk/MgDev/Common/MdfParser/IOMapDefinition.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOMapDefinition.cpp	2010-09-21 05:00:03 UTC (rev 5167)
+++ trunk/MgDev/Common/MdfParser/IOMapDefinition.cpp	2010-09-21 08:21:54 UTC (rev 5168)
@@ -123,10 +123,10 @@
 
 // Determine which WatermarkDefinition schema version to use based
 // on the supplied MDF version:
-// * MDF version <= 1.1.0  =>  WD version 1.0.0
+// * MDF version <= 2.3.0  =>  WD version 2.3.0
 bool IOMapDefinition::GetWatermarkDefinitionVersion(Version* mdfVersion, Version& wdVersion)
 {
-    wdVersion = Version(1, 0, 0);
+    wdVersion = Version(2, 3, 0);
     return true;
 }
 
@@ -137,7 +137,7 @@
     MdfString strVersion;
     if (version)
     {
-        if ((*version >= Version(1, 0, 0)) && (*version <= Version(1, 1, 0)))
+        if ((*version >= Version(1, 0, 0)) && (*version <= Version(2, 3, 0)))
         {
             // MDF in MapGuide 2006 - current
             strVersion = version->ToString();
@@ -153,10 +153,10 @@
     else
     {
         // use the current highest version
-        strVersion = L"1.1.0";
+        strVersion = L"2.3.0";
     }
 
-    if (!version || (*version >= Version(1, 1, 0)))
+    if (!version || (*version > Version(1, 0, 0)))
         fd << tab() << "<MapDefinition xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"MapDefinition-" << EncodeString(strVersion) << ".xsd\" version=\"" << EncodeString(strVersion) << "\">" << std::endl; // NOXLATE
     else
         fd << tab() << "<MapDefinition xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"MapDefinition-1.0.0.xsd\">" << std::endl; // NOXLATE
@@ -204,8 +204,8 @@
     int watermarkCount = map->GetWatermarks()->GetCount();
     if (watermarkCount != 0)
     {
-        // only write Watermarks if the MDF version is 1.1.0 or greater
-        if (*version >= Version(1, 1, 0))
+        // only write Watermarks if the MDF version is 2.3.0 or greater
+        if (!version || (*version >= Version(2, 3, 0)))
         {
             fd << tab() << startStr("Watermarks") << std::endl; // NOXLATE
             inctab();

Modified: trunk/MgDev/Common/MdfParser/IOSymbolInstance.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOSymbolInstance.cpp	2010-09-21 05:00:03 UTC (rev 5167)
+++ trunk/MgDev/Common/MdfParser/IOSymbolInstance.cpp	2010-09-21 08:21:54 UTC (rev 5168)
@@ -154,7 +154,7 @@
 
 // Determine which SymbolDefinition schema version to use based
 // on the supplied LDF version:
-// * LDF version == 1.4.0  =>  SD version 1.1.0
+// * LDF version == 2.3.0  =>  SD version 1.1.0
 // * LDF version == 1.3.0  =>  SD version 1.1.0
 // * LDF version == 1.2.0  =>  SD version 1.1.0
 // * LDF version <= 1.1.0  =>  SD version 1.0.0

Modified: trunk/MgDev/Common/MdfParser/IOVectorLayerDefinition.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOVectorLayerDefinition.cpp	2010-09-21 05:00:03 UTC (rev 5167)
+++ trunk/MgDev/Common/MdfParser/IOVectorLayerDefinition.cpp	2010-09-21 08:21:54 UTC (rev 5168)
@@ -174,10 +174,10 @@
 
 // Determine which WatermarkDefinition schema version to use based
 // on the supplied LDF version:
-// * LDF version <= 1.4.0  =>  WD version 1.0.0
+// * LDF version <= 2.3.0  =>  WD version 2.3.0
 bool IOVectorLayerDefinition::GetWatermarkDefinitionVersion(Version* ldfVersion, Version& wdVersion)
 {
-    wdVersion = Version(1, 0, 0);
+    wdVersion = Version(2, 3, 0);
     return true;
 }
 
@@ -193,7 +193,7 @@
             // LDF in MapGuide 2006
             strVersion = L"1.0.0";
         }
-        else if ((*version >= Version(1, 0, 0)) && (*version <= Version(1, 4, 0)))
+        else if ((*version >= Version(1, 0, 0)) && (*version <= Version(2, 3, 0)))
         {
             // LDF in MapGuide 2007 - current
             strVersion = version->ToString();
@@ -209,7 +209,7 @@
     else
     {
         // use the current highest version
-        strVersion = L"1.4.0";
+        strVersion = L"2.3.0";
     }
 
     fd << tab() << "<LayerDefinition xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"LayerDefinition-" << EncodeString(strVersion) << ".xsd\" version=\"" << EncodeString(strVersion) << "\">" << std::endl; // NOXLATE
@@ -237,9 +237,9 @@
     int watermarkCount = vectorLayer->GetWatermarks()->GetCount();
     if (watermarkCount != 0)
     {
-        if (!version || (*version >= Version(1, 4, 0)))
+        if (!version || (*version >= Version(2, 3, 0)))
         {
-            // only write Watermarks if the LDF version is 1.4.0 or greater
+            // only write Watermarks if the LDF version is 2.3.0 or greater
             fd << tab() << startStr(sWatermarks) << std::endl;
             inctab();
             for (int i=0; i<watermarkCount; ++i)
@@ -249,7 +249,7 @@
         }
         else if (*version >= Version(1, 0, 0))
         {
-            // save Watermarks as extended data for LDF versions 1.0.0, 1.1.0, and 1.2.0
+            // save Watermarks as extended data for LDF versions 1.0.0 - 1.3.0
             inctab();
 
             fdExtData << tab() << startStr(sWatermarks) << std::endl;

Modified: trunk/MgDev/Common/MdfParser/IOWatermarkDefinition.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOWatermarkDefinition.cpp	2010-09-21 05:00:03 UTC (rev 5167)
+++ trunk/MgDev/Common/MdfParser/IOWatermarkDefinition.cpp	2010-09-21 08:21:54 UTC (rev 5168)
@@ -162,7 +162,7 @@
 
 // Determine which SymbolDefinition schema version to use based
 // on the supplied WaterDefinition version:
-// * WD version <= 1.0.0  =>  SD version 1.1.0
+// * WD version <= 2.3.0  =>  SD version 1.1.0
 bool IOWatermarkDefinition::GetSymbolDefinitionVersion(Version* wdVersion, Version& sdVersion)
 {
     sdVersion = Version(1, 1, 0);
@@ -176,9 +176,9 @@
     MdfString strVersion;
     if (version)
     {
-        if (*version == Version(1, 0, 0))
+        if ((*version >= Version(1, 0, 0)) && (*version <= Version(2, 3, 0)))
         {
-            // WatermarkDefinition in MapGuide 2012
+            // WDF in MapGuide 2012 - current
             strVersion = version->ToString();
         }
         else
@@ -192,7 +192,7 @@
     else
     {
         // use the current highest version
-        strVersion = L"1.0.0";
+        strVersion = L"2.3.0";
     }
 
     fd << tab() << "<WatermarkDefinition xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"WatermarkDefinition-" << EncodeString(strVersion) << ".xsd\" version=\"" << EncodeString(strVersion) << "\">" << std::endl; // NOXLATE

Modified: trunk/MgDev/Common/MdfParser/SAX2Parser.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/SAX2Parser.cpp	2010-09-21 05:00:03 UTC (rev 5167)
+++ trunk/MgDev/Common/MdfParser/SAX2Parser.cpp	2010-09-21 08:21:54 UTC (rev 5168)
@@ -679,13 +679,13 @@
 
         if (_wcsicmp(version.c_str(), L"1.0.0") == 0)
             m_version = MdfModel::Version(1, 0, 0);
-        else if (_wcsicmp(version.c_str(), L"1.1.0") == 0)
-            m_version = MdfModel::Version(1, 1, 0);
+        else if (_wcsicmp(version.c_str(), L"2.3.0") == 0)
+            m_version = MdfModel::Version(2, 3, 0);
     }
     else
     {
         // assume the latest version if the attribute is missing
-        m_version = MdfModel::Version(1, 1, 0);
+        m_version = MdfModel::Version(2, 3, 0);
     }
 }
 
@@ -710,13 +710,13 @@
             m_version = MdfModel::Version(1, 2, 0);
         else if (_wcsicmp(version.c_str(), L"1.3.0") == 0)
             m_version = MdfModel::Version(1, 3, 0);
-        else if (_wcsicmp(version.c_str(), L"1.4.0") == 0)
-            m_version = MdfModel::Version(1, 4, 0);
+        else if (_wcsicmp(version.c_str(), L"2.3.0") == 0)
+            m_version = MdfModel::Version(2, 3, 0);
     }
     else
     {
         // assume the latest version if the attribute is missing
-        m_version = MdfModel::Version(1, 4, 0);
+        m_version = MdfModel::Version(2, 3, 0);
     }
 }
 
@@ -801,13 +801,13 @@
     {
         std::wstring version = X2W(verValue);
 
-        if (_wcsicmp(version.c_str(), L"1.0.0") == 0)
-            m_version = MdfModel::Version(1, 0, 0);
+        if (_wcsicmp(version.c_str(), L"2.3.0") == 0)
+            m_version = MdfModel::Version(2, 3, 0);
     }
     else
     {
         // assume the latest version if the attribute is missing
-        m_version = MdfModel::Version(1, 0, 0);
+        m_version = MdfModel::Version(2, 3, 0);
     }
 }
 

Modified: trunk/MgDev/Common/PlatformBase/Exception/InvalidWatermarkDefinitionException.cpp
===================================================================
--- trunk/MgDev/Common/PlatformBase/Exception/InvalidWatermarkDefinitionException.cpp	2010-09-21 05:00:03 UTC (rev 5167)
+++ trunk/MgDev/Common/PlatformBase/Exception/InvalidWatermarkDefinitionException.cpp	2010-09-21 08:21:54 UTC (rev 5168)
@@ -1,5 +1,5 @@
 //
-//  Copyright (C) 2004-2010 by Autodesk, Inc.
+//  Copyright (C) 2010 by Autodesk, Inc.
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of version 2.1 of the GNU Lesser

Modified: trunk/MgDev/Common/PlatformBase/Exception/InvalidWatermarkDefinitionException.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/Exception/InvalidWatermarkDefinitionException.h	2010-09-21 05:00:03 UTC (rev 5167)
+++ trunk/MgDev/Common/PlatformBase/Exception/InvalidWatermarkDefinitionException.h	2010-09-21 08:21:54 UTC (rev 5168)
@@ -1,5 +1,5 @@
 //
-//  Copyright (C) 2004-2010 by Autodesk, Inc.
+//  Copyright (C) 2010 by Autodesk, Inc.
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of version 2.1 of the GNU Lesser

Deleted: trunk/MgDev/Common/Schema/LayerDefinition-1.4.0.xsd
===================================================================
--- trunk/MgDev/Common/Schema/LayerDefinition-1.4.0.xsd	2010-09-21 05:00:03 UTC (rev 5167)
+++ trunk/MgDev/Common/Schema/LayerDefinition-1.4.0.xsd	2010-09-21 08:21:54 UTC (rev 5168)
@@ -1,1242 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.4.0">
-  <xs:include schemaLocation="SymbolDefinition-1.1.0.xsd"/>
-  <xs:include schemaLocation="PlatformCommon-1.0.0.xsd"/>
-  <xs:include schemaLocation="WatermarkDefinition-1.0.0.xsd"/>
-  <xs:element name="LayerDefinition">
-    <xs:annotation>
-      <xs:documentation>The specification of the data source and stylization for a layer.</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:complexContent>
-        <xs:extension base="LayerDefinitionType">
-          <xs:attribute name="version" type="xs:string" use="required" fixed="1.4.0"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-  <xs:complexType name="LayerDefinitionType">
-    <xs:annotation>
-      <xs:documentation>Encapsulates the definition of a map layer.</xs:documentation>
-    </xs:annotation>
-    <xs:choice>
-      <xs:element name="DrawingLayerDefinition" type="DrawingLayerDefinitionType">
-        <xs:annotation>
-          <xs:documentation>A layer with a drawing (i.e., DWF) data source.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="VectorLayerDefinition" type="VectorLayerDefinitionType">
-        <xs:annotation>
-          <xs:documentation>A layer with a vector data source; and stylization specification for the datum's geometry types.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="GridLayerDefinition" type="GridLayerDefinitionType">
-        <xs:annotation>
-          <xs:documentation>A layer with a raster or grid data source.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-    </xs:choice>
-  </xs:complexType>
-  <xs:annotation>
-    <xs:documentation>******************** Common types for all layer types ********************</xs:documentation>
-  </xs:annotation>
-  <xs:complexType name="BaseLayerDefinitionType">
-    <xs:annotation>
-      <xs:documentation>Specifies common properties for all layer types.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="ResourceId" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>Link to the drawing data source.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Opacity" default="1.0" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Opacity at which to display the rendered data.</xs:documentation>
-        </xs:annotation>
-        <xs:simpleType>
-          <xs:restriction base="xs:double">
-            <xs:minInclusive value="0.0"/>
-            <xs:maxInclusive value="1.0"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:element>
-      <xs:element name="Watermarks" type="WatermarkInstanceCollectionType" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>The collection of watermarks used in the layer.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:annotation>
-    <xs:documentation>******************** Drawing layer ********************</xs:documentation>
-  </xs:annotation>
-  <xs:complexType name="DrawingLayerDefinitionType">
-    <xs:annotation>
-      <xs:documentation>A layer with a drawing (i.e., DWF) data source.</xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="BaseLayerDefinitionType">
-        <xs:sequence>
-          <xs:element name="Sheet" type="xs:string">
-            <xs:annotation>
-              <xs:documentation>The sheet of the DWF to use.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="LayerFilter" type="xs:string" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>The layers to show from the specified sheet.  Show all layers if this is not specified.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="MinScale" type="xs:double" default="0.0" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>The zoomed in part of the scale range.  Defaults to 0 if not specified.  Inclusive.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="MaxScale" type="xs:double" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>The zoomed out part of the scale range.  Defaults to the application's maximum value if not specified.  Exclusive.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:annotation>
-    <xs:documentation>******************** Vector layer ********************</xs:documentation>
-  </xs:annotation>
-  <xs:complexType name="VectorLayerDefinitionType">
-    <xs:annotation>
-      <xs:documentation>A layer with a vector data source; and stylization specification for the datum's geometry types.</xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="BaseLayerDefinitionType">
-        <xs:sequence>
-          <xs:element name="FeatureName" type="xs:string">
-            <xs:annotation>
-              <xs:documentation>Either a feature class or named extension.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="FeatureNameType" type="FeatureNameType"/>
-          <xs:element name="Filter" type="xs:string" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>A boolean FDO expression that specifies which features to return.  No filter means pass all features through.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="PropertyMapping" type="NameStringPairType" minOccurs="0" maxOccurs="unbounded">
-            <xs:annotation>
-              <xs:documentation>Specifies which properties to expose to the user and its corresponding friendly name.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="Geometry" type="xs:string">
-            <xs:annotation>
-              <xs:documentation>Specifies the geometry property that should be used to get the geometries.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="Url" type="xs:string" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>An optional URL associated with each feature.  This is a string FDO expression.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="ToolTip" type="xs:string" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>The text to put into the tooltip for displayed features.  This is a string FDO expression.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="VectorScaleRange" type="VectorScaleRangeType" maxOccurs="unbounded">
-            <xs:annotation>
-              <xs:documentation>The stylization to be applied to the features for a given scale range.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:simpleType name="FeatureNameType">
-    <xs:annotation>
-      <xs:documentation>Enumeration describing whether the features are coming from a feature class or named extension</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="FeatureClass"/>
-      <xs:enumeration value="NamedExtension"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="VectorScaleRangeType">
-    <xs:annotation>
-      <xs:documentation>The stylization to be applied to the vector features for a given scale range.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="MinScale" type="xs:double" default="0.0" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>The zoomed in part of the scale range.  Defaults to 0 if not specified.  Inclusive.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="MaxScale" type="xs:double" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>The zoomed out part of the scale range.  Defaults to the application's maximum value if not specified.  Exclusive.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:annotation>
-          <xs:documentation>Note that where there is no style specified for a particular geometry type a default styling should be used.</xs:documentation>
-        </xs:annotation>
-        <xs:element name="AreaTypeStyle" type="AreaTypeStyleType">
-          <xs:annotation>
-            <xs:documentation>Style specification of a polygon geometry type.</xs:documentation>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="LineTypeStyle" type="LineTypeStyleType">
-          <xs:annotation>
-            <xs:documentation>Style specification of a line geometry type.</xs:documentation>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="PointTypeStyle" type="PointTypeStyleType">
-          <xs:annotation>
-            <xs:documentation>Style specification of a point geometry type.</xs:documentation>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="CompositeTypeStyle" type="CompositeTypeStyle">
-          <xs:annotation>
-            <xs:documentation>A composite style definition.</xs:documentation>
-          </xs:annotation>
-        </xs:element>
-      </xs:choice>
-      <xs:element name="ElevationSettings" type="ElevationSettingsType" minOccurs="0"/>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="ElevationSettingsType">
-    <xs:sequence>
-      <xs:element name="ZOffset" type="xs:string" minOccurs="0"/>
-      <xs:element name="ZExtrusion" type="xs:string" minOccurs="0"/>
-      <xs:element name="ZOffsetType" type="ElevationTypeType" default="RelativeToGround" minOccurs="0"/>
-      <xs:element name="Unit" type="LengthUnitType" default="Centimeters" minOccurs="0"/>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:simpleType name="ElevationTypeType">
-    <xs:annotation>
-      <xs:documentation>The possible interpretations of a z offset value.</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="RelativeToGround"/>
-      <xs:enumeration value="Absolute"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="PointTypeStyleType">
-    <xs:annotation>
-      <xs:documentation>Style specification of a point geometry type.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="DisplayAsText" type="xs:boolean">
-        <xs:annotation>
-          <xs:documentation>Create a text layer.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="AllowOverpost" type="xs:boolean">
-        <xs:annotation>
-          <xs:documentation>Allows labels from any map layer (including the current layer) to obscure features on the current layer.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="PointRule" type="PointRuleType" maxOccurs="unbounded">
-        <xs:annotation>
-          <xs:documentation>One or more PointRules defining the PointTypeStyle.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ShowInLegend" type="xs:boolean" default="true" minOccurs="0"/>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="PointRuleType">
-    <xs:annotation>
-      <xs:documentation>Style rule for a point geometry type.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="LegendLabel" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>The label for the Rule to be displayed in the legend.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Filter" type="xs:string" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>A filter for the Rule.  This is a boolean FDO expression.  Any features that pass this filter are styled using this rule's stylization.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Label" type="TextSymbolType" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>A label for the Rule.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:choice minOccurs="0">
-        <xs:element name="PointSymbolization2D" type="PointSymbolization2DType"/>
-      </xs:choice>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="PointSymbolizationType">
-    <xs:annotation>
-      <xs:documentation>Base point symbolization type.</xs:documentation>
-    </xs:annotation>
-  </xs:complexType>
-  <xs:complexType name="PointSymbolization2DType">
-    <xs:annotation>
-      <xs:documentation>The different types of point geometries.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:choice>
-        <xs:element name="Mark" type="MarkSymbolType">
-          <xs:annotation>
-            <xs:documentation>A predefined shape such as a square or circle.</xs:documentation>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="Image" type="ImageSymbolType">
-          <xs:annotation>
-            <xs:documentation>A raster or image symbol.  Note that these do not scale well, but sometimes this is all that you have.  Supported formats are application specific.</xs:documentation>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="Font" type="FontSymbolType">
-          <xs:annotation>
-            <xs:documentation>A symbol specified using a font character.</xs:documentation>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="W2D" type="W2DSymbolType">
-          <xs:annotation>
-            <xs:documentation>A vector symbol defined using a W2D stream.</xs:documentation>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="Block" type="BlockSymbolType">
-          <xs:annotation>
-            <xs:documentation>A vector symbol specifed from a block.</xs:documentation>
-          </xs:annotation>
-        </xs:element>
-      </xs:choice>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="LineTypeStyleType">
-    <xs:annotation>
-      <xs:documentation>Style specification of a line geometry type.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="LineRule" type="LineRuleType" maxOccurs="unbounded">
-        <xs:annotation>
-          <xs:documentation>Rules to define a theme.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ShowInLegend" type="xs:boolean" default="true" minOccurs="0"/>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="LineRuleType">
-    <xs:annotation>
-      <xs:documentation>Style rule for a line geometry type.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="LegendLabel" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>The label for the Rule to be displayed in the legend.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Filter" type="xs:string" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>A filter for the Rule.  This is a boolean FDO expression.  Any features that pass this filter are styled using this rule's stylization.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Label" type="TextSymbolType" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>A label for the Rule.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="LineSymbolization2D" type="StrokeType"/>
-      </xs:choice>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="AreaSymbolizationType">
-    <xs:annotation>
-      <xs:documentation>Symbolization characteristics for areas.</xs:documentation>
-    </xs:annotation>
-  </xs:complexType>
-  <xs:complexType name="AreaSymbolizationFillType">
-    <xs:annotation>
-      <xs:documentation>Describes the style of a polygon.</xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="AreaSymbolizationType">
-        <xs:sequence>
-          <xs:element name="Fill" type="FillType" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>The style of the polygon fill.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="Stroke" type="StrokeType" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>The style of the polygon edge.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="AreaTypeStyleType">
-    <xs:annotation>
-      <xs:documentation>Style specification of a polygon geometry type.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="AreaRule" type="AreaRuleType" maxOccurs="unbounded">
-        <xs:annotation>
-          <xs:documentation>Rules to define a theme.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ShowInLegend" type="xs:boolean" default="true" minOccurs="0"/>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="AreaRuleType">
-    <xs:annotation>
-      <xs:documentation>Style rule for an area geometry type.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="LegendLabel" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>The label for the Rule to be displayed in the legend.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Filter" type="xs:string" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>A filter for the Rule.  This is a boolean FDO expression.  Any features that pass this filter are styled using this rule's stylization.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Label" type="TextSymbolType" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>A label for the Rule.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:choice>
-        <xs:element name="AreaSymbolization2D" type="AreaSymbolizationFillType">
-          <xs:annotation>
-            <xs:documentation>The stylization of the polygon geometry.</xs:documentation>
-          </xs:annotation>
-        </xs:element>
-      </xs:choice>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="StrokeType">
-    <xs:annotation>
-      <xs:documentation>Encapsulates the stylization of a line.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="LineStyle" type="xs:string"/>
-      <xs:element name="Thickness" type="xs:string"/>
-      <xs:element name="Color" type="xs:string"/>
-      <xs:element name="Unit" type="LengthUnitType">
-        <xs:annotation>
-          <xs:documentation>Unit of measurement that the thickness is specified in</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="SizeContext" type="SizeContextType">
-        <xs:annotation>
-          <xs:documentation>Whether the sizes are with respect to the earth or the user's display device.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="FillType">
-    <xs:annotation>
-      <xs:documentation>Encapsulates the stylization of a polygon's fill.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="FillPattern" type="xs:string"/>
-      <xs:element name="ForegroundColor" type="xs:string"/>
-      <xs:element name="BackgroundColor" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>The background color.  Not applicable to solid fills.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:simpleType name="BackgroundStyleType">
-    <xs:annotation>
-      <xs:documentation>The possible background styles of a TextSymbol.</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Transparent"/>
-      <xs:enumeration value="Opaque"/>
-      <xs:enumeration value="Ghosted"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="SizeContextType">
-    <xs:annotation>
-      <xs:documentation>Whether the sizes are specified as sizes on the earth or on the user's display device.</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="MappingUnits"/>
-      <xs:enumeration value="DeviceUnits"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="LengthUnitType">
-    <xs:annotation>
-      <xs:documentation>The measurement units that linear sizes are specified in.</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Millimeters"/>
-      <xs:enumeration value="Centimeters"/>
-      <xs:enumeration value="Meters"/>
-      <xs:enumeration value="Kilometers"/>
-      <xs:enumeration value="Inches"/>
-      <xs:enumeration value="Feet"/>
-      <xs:enumeration value="Yards"/>
-      <xs:enumeration value="Miles"/>
-      <xs:enumeration value="Points"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="TextSymbolType">
-    <xs:annotation>
-      <xs:documentation>Encapsulates the text label stylization used to label features, and for FontSymbols.</xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="SymbolType">
-        <xs:sequence>
-          <xs:element name="Text" type="xs:string">
-            <xs:annotation>
-              <xs:documentation>The text of the TextSymbol.  This is a string FDO expression.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="FontName" type="xs:string">
-            <xs:annotation>
-              <xs:documentation>The font to use.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="ForegroundColor" type="xs:string">
-            <xs:annotation>
-              <xs:documentation>The color of the text.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="BackgroundColor" type="xs:string">
-            <xs:annotation>
-              <xs:documentation>The text background color.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="BackgroundStyle" type="BackgroundStyleType">
-            <xs:annotation>
-              <xs:documentation>The background style</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="HorizontalAlignment" type="xs:string" default="'Center'" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>A string FDO expression for the horizontal alignment.  Must evaluate to one of the HorizontalAlignmentType enums.  Only applicable to text styles.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="VerticalAlignment" type="xs:string" default="'Baseline'" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>A string FDO expression for the vertical alignment.  Must evaluate to one of the VerticalAlignmentType enums.  Only applicable to text and line styles.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="Bold" type="xs:string" default="false" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>Specifies if the label should be in a bold font.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="Italic" type="xs:string" default="false" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>Specifies if the font should be italicized.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="Underlined" type="xs:string" default="false" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>Specifies if the text should be underlined.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="AdvancedPlacement" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>Optional element which specifies that a more advanced labeling algorithm should be used with the AJAX viewer.</xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element name="ScaleLimit" type="xs:double" minOccurs="0">
-                  <xs:annotation>
-                    <xs:documentation>The maximum amount any label is allowed to shrink in order to fit into the feature.  For example, 0.8 means that the label can shrink until it is 80% of the original size.  1.0 means that the label cannot shrink.  If not specified, the application should assume 1.0.  If set to 0.0 or less then the advanced placement option is disabled.</xs:documentation>
-                  </xs:annotation>
-                </xs:element>
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-          <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="SymbolType">
-    <xs:annotation>
-      <xs:documentation>Defines common properties for all symbols.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="Unit" type="LengthUnitType">
-        <xs:annotation>
-          <xs:documentation>The units that the sizes are specified in.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="SizeContext" type="SizeContextType">
-        <xs:annotation>
-          <xs:documentation>Whether the sizes are with respect to the earth or the user's display device.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="SizeX" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>Width of the symbol.  This is a double FDO expression.  Does not apply to font symbols.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="SizeY" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>Height of the symbol.  This is a double FDO expression.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Rotation" type="xs:string" default="0.0" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Amount to rotate the symbol in degrees.  This is a double FDO expression.  Does not apply to line labels.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="MaintainAspect" type="xs:boolean" default="true" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Hint for the UI only.  When the user enters a constant size for the width or height, the other dimension should be adjusted accordingly.  Does not apply to font symbols or labels.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="InsertionPointX" type="xs:string" default="0.5" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>X offset for the symbol specified in symbol space.  Does not apply to labels.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="InsertionPointY" type="xs:double" default="0.5" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Y offset for the symbol specified in symbol space.  Does not apply to labels.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="MarkSymbolType">
-    <xs:annotation>
-      <xs:documentation>Stylization of a predefined shape (ShapeType).</xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="SymbolType">
-        <xs:sequence>
-          <xs:element name="Shape" type="ShapeType"/>
-          <xs:element name="Fill" type="FillType" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>No fill is drawn if not specified.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="Edge" type="StrokeType" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>No edge is drawn if not specified.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="NameStringPairType">
-    <xs:annotation>
-      <xs:documentation>Used by vector layer definition to hold properties that can be displayed to the end user, and the friendly name to display it as.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="Name" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>The name of the property to expose.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Value" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>The name to show the end user.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:simpleType name="ShapeType">
-    <xs:annotation>
-      <xs:documentation>SLD supports square, circle, triangle, star, cross, and X.</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Square"/>
-      <xs:enumeration value="Circle"/>
-      <xs:enumeration value="Triangle"/>
-      <xs:enumeration value="Star"/>
-      <xs:enumeration value="Cross"/>
-      <xs:enumeration value="X"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="ImageSymbolType">
-    <xs:annotation>
-      <xs:documentation>Symbols that are comprised of a raster.</xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="SymbolType">
-        <xs:sequence>
-          <xs:choice>
-            <xs:element name="Image">
-              <xs:annotation>
-                <xs:documentation>Reference to the image.</xs:documentation>
-              </xs:annotation>
-              <xs:complexType>
-                <xs:sequence>
-                  <xs:element name="ResourceId">
-                    <xs:annotation>
-                      <xs:documentation>The reference to the resource.</xs:documentation>
-                    </xs:annotation>
-                  </xs:element>
-                  <xs:element name="LibraryItemName" minOccurs="0">
-                    <xs:annotation>
-                      <xs:documentation>If ResourceId specifies a library, this identifies the name of a library item.</xs:documentation>
-                    </xs:annotation>
-                  </xs:element>
-                </xs:sequence>
-              </xs:complexType>
-            </xs:element>
-            <xs:element name="Content" type="xs:hexBinary">
-              <xs:annotation>
-                <xs:documentation>BinHex data for image.</xs:documentation>
-              </xs:annotation>
-            </xs:element>
-          </xs:choice>
-          <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="FontSymbolType">
-    <xs:annotation>
-      <xs:documentation>Symbols that are specified by a font and character.</xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="SymbolType">
-        <xs:sequence>
-          <xs:element name="FontName" type="xs:string">
-            <xs:annotation>
-              <xs:documentation>If the font is not installed, the actual font used is application dependent.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="Character" type="xs:string"/>
-          <xs:element name="Bold" type="xs:boolean" minOccurs="0"/>
-          <xs:element name="Italic" type="xs:boolean" minOccurs="0"/>
-          <xs:element name="Underlined" type="xs:boolean" minOccurs="0"/>
-          <xs:element name="ForegroundColor" type="xs:string"/>
-          <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="W2DSymbolType">
-    <xs:annotation>
-      <xs:documentation>A symbol using a W2D stream.</xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="SymbolType">
-        <xs:sequence>
-          <xs:element name="W2DSymbol">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element name="ResourceId">
-                  <xs:annotation>
-                    <xs:documentation>The reference to the symbol library.</xs:documentation>
-                  </xs:annotation>
-                </xs:element>
-                <xs:element name="LibraryItemName">
-                  <xs:annotation>
-                    <xs:documentation>The W2D stream in the symbol library.</xs:documentation>
-                  </xs:annotation>
-                </xs:element>
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-          <xs:element name="FillColor" type="xs:string" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>If specified all polygon fills in the symbol are drawn in this color.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="LineColor" type="xs:string" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>If specified all lines in the symbol are drawn in this color.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="TextColor" type="xs:string" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>If specified all text in the symbol is drawn in this color.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="BlockSymbolType">
-    <xs:annotation>
-      <xs:documentation>A block symbol.</xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="SymbolType">
-        <xs:sequence>
-          <xs:element name="DrawingName" type="xs:string"/>
-          <xs:element name="BlockName" type="xs:string"/>
-          <xs:element name="BlockColor" type="xs:string" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>Static color.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="LayerColor" type="xs:string" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>Static color.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="CompositeTypeStyle">
-    <xs:annotation>
-      <xs:documentation>A style specification consisting of composite rules.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="CompositeRule" type="CompositeRule" maxOccurs="unbounded">
-        <xs:annotation>
-          <xs:documentation>One or more CompositeRules defining the CompositeTypeStyle.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ShowInLegend" type="xs:boolean" default="true" minOccurs="0"/>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="CompositeRule">
-    <xs:annotation>
-      <xs:documentation>A style rule containing a composite symbolization.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="LegendLabel" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>The label for the Rule to be displayed in the legend.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Filter" type="xs:string" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>A filter for the Rule.  This is a boolean FDO expression.  Any features that pass this filter are styled using this rule's stylization.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="CompositeSymbolization" type="CompositeSymbolization">
-        <xs:annotation>
-          <xs:documentation>The symbolization for the Rule.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="CompositeSymbolization">
-    <xs:annotation>
-      <xs:documentation>Stylization attributes of a point, line, or area feature.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="SymbolInstance" type="SymbolInstance" minOccurs="0" maxOccurs="unbounded">
-        <xs:annotation>
-          <xs:documentation>The symbol instances used for stylization.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="ThemeLabel">
-    <xs:annotation>
-      <xs:documentation>Provides legend labeling information for a theme.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="Description" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>The legend description for the theme.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="CategoryFormat" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>The default legend format to use for each category in the theme.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="Override">
-    <xs:annotation>
-      <xs:documentation>A parameter override.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="SymbolName" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>The name of the symbol definition containing the parameter being overridden.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ParameterIdentifier" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>The identifier of the parameter being overridden.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ParameterValue" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>The override value for the parameter.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ThemeLabel" type="ThemeLabel" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>An optional theme label for this override.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="ParameterOverrides">
-    <xs:annotation>
-      <xs:documentation>A collection of parameter overrides.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="Override" type="Override" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:simpleType name="UsageContextType">
-    <xs:annotation>
-      <xs:documentation>Enumerates the allowed UsageContext values.</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Unspecified"/>
-      <xs:enumeration value="Point"/>
-      <xs:enumeration value="Line"/>
-      <xs:enumeration value="Area"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="GeometryContextType">
-    <xs:annotation>
-      <xs:documentation>Enumerates the allowed GeometryContext values.</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Unspecified"/>
-      <xs:enumeration value="Point"/>
-      <xs:enumeration value="LineString"/>
-      <xs:enumeration value="Polygon"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="SymbolInstance">
-    <xs:annotation>
-      <xs:documentation>An instance of a symbol.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:choice>
-        <xs:element name="ResourceId" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>A library reference to an existing SymbolDefinition, either simple or compound.</xs:documentation>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="SimpleSymbolDefinition" type="SimpleSymbolDefinition">
-          <xs:annotation>
-            <xs:documentation>An inlined SimpleSymbolDefinition.</xs:documentation>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="CompoundSymbolDefinition" type="CompoundSymbolDefinition">
-          <xs:annotation>
-            <xs:documentation>An inlined CompoundSymbolDefinition.</xs:documentation>
-          </xs:annotation>
-        </xs:element>
-      </xs:choice>
-      <xs:element name="ParameterOverrides" type="ParameterOverrides">
-        <xs:annotation>
-          <xs:documentation>Specifies all parameter overrides for this symbol instance.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ScaleX" type="xs:string" default="1.0" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>The additional amount to scale the symbol horizontally in symbol space.  Defaults to 1 if not specified.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ScaleY" type="xs:string" default="1.0" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>The additional amount to scale the symbol vertically in symbol space.  Defaults to 1 if not specified.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="InsertionOffsetX" type="xs:string" default="0.0" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Specifies the additional amount to offset the symbol horizontally, in mm in device units, after scaling and rotation have been applied.  Applies only to point symbols.  Defaults to 0 if not specified.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="InsertionOffsetY" type="xs:string" default="0.0" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Specifies the additional amount to offset the symbol vertically, in mm in device units, after scaling and rotation have been applied.  Applies only to point symbols.  Defaults to 0 if not specified.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="SizeContext" type="SizeContextType" default="DeviceUnits" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Specifies whether the symbol sizes are with respect to the map or the user's display device.  Defaults to device units.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="DrawLast" type="xs:string" default="false" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Boolean value which specifies whether the symbol is drawn as part of a final rendering pass (e.g. for labeling).  This must evaluate to True or False (default).</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="CheckExclusionRegion" type="xs:string" default="false" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Boolean value which specifies whether to render this symbol only if its graphical extent does not overlap the exclusion region.  If the positioning algorithm generates multiple candidate symbol positions and this setting is True, then only the first non-overlapping candidate is rendered.  This must evaluate to True or False (default).</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="AddToExclusionRegion" type="xs:string" default="false" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Boolean value which specifies whether the graphical extent for this symbol instance is added to the exclusion region (if it is rendered).  Symbols which check the exclusion region will not draw on top of this symbol.  This must evaluate to True or False (default).</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="PositioningAlgorithm" type="xs:string" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Specifies the algorithm used to generate candidate positions for the symbol.  If specified this must evaluate to one of: Default, EightSurrounding, or PathLabels.  Default means generate one position using the feature geometry (used for normal rendering).  EightSurrounding means generate eight candidate labels surrounding the feature geometry (used when labeling point features).  PathLabels means generate periodic labels which follow the feature geometry (used when labeling linestring features).</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="RenderingPass" type="xs:string" default="0" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>The optional rendering pass in which this symbol instance draws.  If specified this must be greater than or equal to zero.  Defaults to 0.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="UsageContext" type="UsageContextType" default="Unspecified" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Specifies which usage in the symbol should be the active one.  Defaults to Unspecified.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="GeometryContext" type="GeometryContextType" default="Unspecified" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Specifies which geometry type this symbol instance applies to.  Defaults to Unspecified.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:annotation>
-    <xs:documentation>******************** Grid layer ********************</xs:documentation>
-  </xs:annotation>
-  <xs:complexType name="GridLayerDefinitionType">
-    <xs:annotation>
-      <xs:documentation>A layer for raster or grid data.</xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="BaseLayerDefinitionType">
-        <xs:sequence>
-          <xs:element name="FeatureName" type="xs:string"/>
-          <xs:element name="Geometry" type="xs:string">
-            <xs:annotation>
-              <xs:documentation>Specifies the geometry property that should be used to get the geometries.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="Filter" type="xs:string" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>A boolean FDO expression that specifies which features to return.  No filter means pass all features through.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="GridScaleRange" type="GridScaleRangeType" maxOccurs="unbounded"/>
-          <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="ChannelBandType">
-    <xs:annotation>
-      <xs:documentation>Defines how to scale numbers into a color channel.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="Band" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>Name of the band.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="LowBand" type="xs:double" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Default is low value found in band.  Band values less than this are snapped to this number.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="HighBand" type="xs:double" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Default is high value found in band.  Band values greater than this are snapped to this number.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="LowChannel" type="xs:unsignedByte" default="0" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Default is 0.  Range is 0:255.  LowBand is mapped to this number.  LowChannel can be greater than HighChannel.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="HighChannel" type="xs:unsignedByte" default="255" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Default is 255.  Range is 0:255.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="GridColorBandsType">
-    <xs:annotation>
-      <xs:documentation>Specifies a color using distinct RGB values.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="RedBand" type="ChannelBandType"/>
-      <xs:element name="GreenBand" type="ChannelBandType"/>
-      <xs:element name="BlueBand" type="ChannelBandType"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="GridColorType">
-    <xs:annotation>
-      <xs:documentation>The color to use for a grid rule.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:choice minOccurs="0">
-        <xs:element name="ExplicitColor" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Explicit ARGB color.</xs:documentation>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="Band" type="xs:string"/>
-        <xs:element name="Bands" type="GridColorBandsType"/>
-      </xs:choice>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="GridColorRuleType">
-    <xs:annotation>
-      <xs:documentation>Encapsulate a style for a grid source.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="LegendLabel" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>The label for the Rule to be displayed in the legend.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Filter" type="xs:string" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>A filter for the Rule.  This is a boolean FDO expression.  Any features that pass this filter are styled using this rule's stylization.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Label" type="TextSymbolType" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>A label for the Rule.  Does not apply to GridColorRule.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Color" type="GridColorType"/>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="HillShadeType">
-    <xs:annotation>
-      <xs:documentation>Specifies how to shade given a band and a light source.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="Band" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>Name of the band used for the computation.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Azimuth" type="xs:double">
-        <xs:annotation>
-          <xs:documentation>Azimuth of the sun in degrees.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Altitude" type="xs:double">
-        <xs:annotation>
-          <xs:documentation>Altitude of the sun in degrees.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ScaleFactor" type="xs:double" default="1.0" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>The scale factor applied to the band prior to computing hillshade.  Defaults to 1 if not specified.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="GridColorStyleType">
-    <xs:annotation>
-      <xs:documentation>Specifies how to style each pixel.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="HillShade" type="HillShadeType" minOccurs="0"/>
-      <xs:element name="TransparencyColor" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>If a pixel color prior to factoring in HillShade is this value then the pixel is transparent.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="BrightnessFactor" type="xs:double" default="0.0" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Default is 0.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ContrastFactor" type="xs:double" default="0.0" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Default is 0.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ColorRule" type="GridColorRuleType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="GridSurfaceStyleType">
-    <xs:annotation>
-      <xs:documentation>Specifies how to calculate pixel elevations.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="Band" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>Band to use for 3D data.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ZeroValue" type="xs:double" default="0.0" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Determines which input value is mapped to zero elevation.  Defaults to 0 if not specified.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ScaleFactor" type="xs:double" default="1.0" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Determines how to scale the inputs into a consistent elevation.  Defaults to 1 if not specified.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="DefaultColor" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>The default color to use if no ColorStyle is defined at a pixel.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="GridScaleRangeType">
-    <xs:annotation>
-      <xs:documentation>The stylization for a specified scale range.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="MinScale" type="xs:double" default="0.0" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>The zoomed in part of the scale range.  Defaults to 0 if not specified.  Inclusive.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="MaxScale" type="xs:double" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>The zoomed out part of the scale range.  Defaults to the application's maximum value if not specified.  Exclusive.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="SurfaceStyle" type="GridSurfaceStyleType" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Defines the height field of the grid.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ColorStyle" type="GridColorStyleType" minOccurs="0"/>
-      <xs:element name="RebuildFactor" type="xs:double">
-        <xs:annotation>
-          <xs:documentation>When the user has zoomed in by this amount, a request for more detailed raster data is made.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:schema>

Added: trunk/MgDev/Common/Schema/LayerDefinition-2.3.0.xsd
===================================================================
--- trunk/MgDev/Common/Schema/LayerDefinition-2.3.0.xsd	                        (rev 0)
+++ trunk/MgDev/Common/Schema/LayerDefinition-2.3.0.xsd	2010-09-21 08:21:54 UTC (rev 5168)
@@ -0,0 +1,1242 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.3.0">
+  <xs:include schemaLocation="SymbolDefinition-1.1.0.xsd"/>
+  <xs:include schemaLocation="PlatformCommon-1.0.0.xsd"/>
+  <xs:include schemaLocation="WatermarkDefinition-2.3.0.xsd"/>
+  <xs:element name="LayerDefinition">
+    <xs:annotation>
+      <xs:documentation>The specification of the data source and stylization for a layer.</xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:complexContent>
+        <xs:extension base="LayerDefinitionType">
+          <xs:attribute name="version" type="xs:string" use="required" fixed="2.3.0"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+  <xs:complexType name="LayerDefinitionType">
+    <xs:annotation>
+      <xs:documentation>Encapsulates the definition of a map layer.</xs:documentation>
+    </xs:annotation>
+    <xs:choice>
+      <xs:element name="DrawingLayerDefinition" type="DrawingLayerDefinitionType">
+        <xs:annotation>
+          <xs:documentation>A layer with a drawing (i.e., DWF) data source.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="VectorLayerDefinition" type="VectorLayerDefinitionType">
+        <xs:annotation>
+          <xs:documentation>A layer with a vector data source; and stylization specification for the datum's geometry types.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="GridLayerDefinition" type="GridLayerDefinitionType">
+        <xs:annotation>
+          <xs:documentation>A layer with a raster or grid data source.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:choice>
+  </xs:complexType>
+  <xs:annotation>
+    <xs:documentation>******************** Common types for all layer types ********************</xs:documentation>
+  </xs:annotation>
+  <xs:complexType name="BaseLayerDefinitionType">
+    <xs:annotation>
+      <xs:documentation>Specifies common properties for all layer types.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="ResourceId" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>Link to the drawing data source.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="Opacity" default="1.0" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Opacity at which to display the rendered data.</xs:documentation>
+        </xs:annotation>
+        <xs:simpleType>
+          <xs:restriction base="xs:double">
+            <xs:minInclusive value="0.0"/>
+            <xs:maxInclusive value="1.0"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:element>
+      <xs:element name="Watermarks" type="WatermarkInstanceCollectionType" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>The collection of watermarks used in the layer.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:annotation>
+    <xs:documentation>******************** Drawing layer ********************</xs:documentation>
+  </xs:annotation>
+  <xs:complexType name="DrawingLayerDefinitionType">
+    <xs:annotation>
+      <xs:documentation>A layer with a drawing (i.e., DWF) data source.</xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="BaseLayerDefinitionType">
+        <xs:sequence>
+          <xs:element name="Sheet" type="xs:string">
+            <xs:annotation>
+              <xs:documentation>The sheet of the DWF to use.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="LayerFilter" type="xs:string" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>The layers to show from the specified sheet.  Show all layers if this is not specified.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="MinScale" type="xs:double" default="0.0" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>The zoomed in part of the scale range.  Defaults to 0 if not specified.  Inclusive.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="MaxScale" type="xs:double" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>The zoomed out part of the scale range.  Defaults to the application's maximum value if not specified.  Exclusive.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:annotation>
+    <xs:documentation>******************** Vector layer ********************</xs:documentation>
+  </xs:annotation>
+  <xs:complexType name="VectorLayerDefinitionType">
+    <xs:annotation>
+      <xs:documentation>A layer with a vector data source; and stylization specification for the datum's geometry types.</xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="BaseLayerDefinitionType">
+        <xs:sequence>
+          <xs:element name="FeatureName" type="xs:string">
+            <xs:annotation>
+              <xs:documentation>Either a feature class or named extension.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="FeatureNameType" type="FeatureNameType"/>
+          <xs:element name="Filter" type="xs:string" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>A boolean FDO expression that specifies which features to return.  No filter means pass all features through.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="PropertyMapping" type="NameStringPairType" minOccurs="0" maxOccurs="unbounded">
+            <xs:annotation>
+              <xs:documentation>Specifies which properties to expose to the user and its corresponding friendly name.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="Geometry" type="xs:string">
+            <xs:annotation>
+              <xs:documentation>Specifies the geometry property that should be used to get the geometries.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="Url" type="xs:string" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>An optional URL associated with each feature.  This is a string FDO expression.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="ToolTip" type="xs:string" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>The text to put into the tooltip for displayed features.  This is a string FDO expression.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="VectorScaleRange" type="VectorScaleRangeType" maxOccurs="unbounded">
+            <xs:annotation>
+              <xs:documentation>The stylization to be applied to the features for a given scale range.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:simpleType name="FeatureNameType">
+    <xs:annotation>
+      <xs:documentation>Enumeration describing whether the features are coming from a feature class or named extension</xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="FeatureClass"/>
+      <xs:enumeration value="NamedExtension"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="VectorScaleRangeType">
+    <xs:annotation>
+      <xs:documentation>The stylization to be applied to the vector features for a given scale range.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="MinScale" type="xs:double" default="0.0" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>The zoomed in part of the scale range.  Defaults to 0 if not specified.  Inclusive.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="MaxScale" type="xs:double" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>The zoomed out part of the scale range.  Defaults to the application's maximum value if not specified.  Exclusive.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:annotation>
+          <xs:documentation>Note that where there is no style specified for a particular geometry type a default styling should be used.</xs:documentation>
+        </xs:annotation>
+        <xs:element name="AreaTypeStyle" type="AreaTypeStyleType">
+          <xs:annotation>
+            <xs:documentation>Style specification of a polygon geometry type.</xs:documentation>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="LineTypeStyle" type="LineTypeStyleType">
+          <xs:annotation>
+            <xs:documentation>Style specification of a line geometry type.</xs:documentation>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="PointTypeStyle" type="PointTypeStyleType">
+          <xs:annotation>
+            <xs:documentation>Style specification of a point geometry type.</xs:documentation>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="CompositeTypeStyle" type="CompositeTypeStyle">
+          <xs:annotation>
+            <xs:documentation>A composite style definition.</xs:documentation>
+          </xs:annotation>
+        </xs:element>
+      </xs:choice>
+      <xs:element name="ElevationSettings" type="ElevationSettingsType" minOccurs="0"/>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="ElevationSettingsType">
+    <xs:sequence>
+      <xs:element name="ZOffset" type="xs:string" minOccurs="0"/>
+      <xs:element name="ZExtrusion" type="xs:string" minOccurs="0"/>
+      <xs:element name="ZOffsetType" type="ElevationTypeType" default="RelativeToGround" minOccurs="0"/>
+      <xs:element name="Unit" type="LengthUnitType" default="Centimeters" minOccurs="0"/>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:simpleType name="ElevationTypeType">
+    <xs:annotation>
+      <xs:documentation>The possible interpretations of a z offset value.</xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="RelativeToGround"/>
+      <xs:enumeration value="Absolute"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="PointTypeStyleType">
+    <xs:annotation>
+      <xs:documentation>Style specification of a point geometry type.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="DisplayAsText" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>Create a text layer.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="AllowOverpost" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>Allows labels from any map layer (including the current layer) to obscure features on the current layer.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="PointRule" type="PointRuleType" maxOccurs="unbounded">
+        <xs:annotation>
+          <xs:documentation>One or more PointRules defining the PointTypeStyle.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ShowInLegend" type="xs:boolean" default="true" minOccurs="0"/>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="PointRuleType">
+    <xs:annotation>
+      <xs:documentation>Style rule for a point geometry type.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="LegendLabel" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>The label for the Rule to be displayed in the legend.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="Filter" type="xs:string" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>A filter for the Rule.  This is a boolean FDO expression.  Any features that pass this filter are styled using this rule's stylization.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="Label" type="TextSymbolType" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>A label for the Rule.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:choice minOccurs="0">
+        <xs:element name="PointSymbolization2D" type="PointSymbolization2DType"/>
+      </xs:choice>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="PointSymbolizationType">
+    <xs:annotation>
+      <xs:documentation>Base point symbolization type.</xs:documentation>
+    </xs:annotation>
+  </xs:complexType>
+  <xs:complexType name="PointSymbolization2DType">
+    <xs:annotation>
+      <xs:documentation>The different types of point geometries.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:choice>
+        <xs:element name="Mark" type="MarkSymbolType">
+          <xs:annotation>
+            <xs:documentation>A predefined shape such as a square or circle.</xs:documentation>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="Image" type="ImageSymbolType">
+          <xs:annotation>
+            <xs:documentation>A raster or image symbol.  Note that these do not scale well, but sometimes this is all that you have.  Supported formats are application specific.</xs:documentation>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="Font" type="FontSymbolType">
+          <xs:annotation>
+            <xs:documentation>A symbol specified using a font character.</xs:documentation>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="W2D" type="W2DSymbolType">
+          <xs:annotation>
+            <xs:documentation>A vector symbol defined using a W2D stream.</xs:documentation>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="Block" type="BlockSymbolType">
+          <xs:annotation>
+            <xs:documentation>A vector symbol specifed from a block.</xs:documentation>
+          </xs:annotation>
+        </xs:element>
+      </xs:choice>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="LineTypeStyleType">
+    <xs:annotation>
+      <xs:documentation>Style specification of a line geometry type.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="LineRule" type="LineRuleType" maxOccurs="unbounded">
+        <xs:annotation>
+          <xs:documentation>Rules to define a theme.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ShowInLegend" type="xs:boolean" default="true" minOccurs="0"/>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="LineRuleType">
+    <xs:annotation>
+      <xs:documentation>Style rule for a line geometry type.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="LegendLabel" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>The label for the Rule to be displayed in the legend.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="Filter" type="xs:string" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>A filter for the Rule.  This is a boolean FDO expression.  Any features that pass this filter are styled using this rule's stylization.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="Label" type="TextSymbolType" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>A label for the Rule.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element name="LineSymbolization2D" type="StrokeType"/>
+      </xs:choice>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="AreaSymbolizationType">
+    <xs:annotation>
+      <xs:documentation>Symbolization characteristics for areas.</xs:documentation>
+    </xs:annotation>
+  </xs:complexType>
+  <xs:complexType name="AreaSymbolizationFillType">
+    <xs:annotation>
+      <xs:documentation>Describes the style of a polygon.</xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="AreaSymbolizationType">
+        <xs:sequence>
+          <xs:element name="Fill" type="FillType" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>The style of the polygon fill.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="Stroke" type="StrokeType" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>The style of the polygon edge.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="AreaTypeStyleType">
+    <xs:annotation>
+      <xs:documentation>Style specification of a polygon geometry type.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="AreaRule" type="AreaRuleType" maxOccurs="unbounded">
+        <xs:annotation>
+          <xs:documentation>Rules to define a theme.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ShowInLegend" type="xs:boolean" default="true" minOccurs="0"/>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="AreaRuleType">
+    <xs:annotation>
+      <xs:documentation>Style rule for an area geometry type.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="LegendLabel" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>The label for the Rule to be displayed in the legend.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="Filter" type="xs:string" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>A filter for the Rule.  This is a boolean FDO expression.  Any features that pass this filter are styled using this rule's stylization.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="Label" type="TextSymbolType" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>A label for the Rule.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:choice>
+        <xs:element name="AreaSymbolization2D" type="AreaSymbolizationFillType">
+          <xs:annotation>
+            <xs:documentation>The stylization of the polygon geometry.</xs:documentation>
+          </xs:annotation>
+        </xs:element>
+      </xs:choice>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="StrokeType">
+    <xs:annotation>
+      <xs:documentation>Encapsulates the stylization of a line.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="LineStyle" type="xs:string"/>
+      <xs:element name="Thickness" type="xs:string"/>
+      <xs:element name="Color" type="xs:string"/>
+      <xs:element name="Unit" type="LengthUnitType">
+        <xs:annotation>
+          <xs:documentation>Unit of measurement that the thickness is specified in</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="SizeContext" type="SizeContextType">
+        <xs:annotation>
+          <xs:documentation>Whether the sizes are with respect to the earth or the user's display device.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="FillType">
+    <xs:annotation>
+      <xs:documentation>Encapsulates the stylization of a polygon's fill.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="FillPattern" type="xs:string"/>
+      <xs:element name="ForegroundColor" type="xs:string"/>
+      <xs:element name="BackgroundColor" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>The background color.  Not applicable to solid fills.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:simpleType name="BackgroundStyleType">
+    <xs:annotation>
+      <xs:documentation>The possible background styles of a TextSymbol.</xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Transparent"/>
+      <xs:enumeration value="Opaque"/>
+      <xs:enumeration value="Ghosted"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="SizeContextType">
+    <xs:annotation>
+      <xs:documentation>Whether the sizes are specified as sizes on the earth or on the user's display device.</xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="MappingUnits"/>
+      <xs:enumeration value="DeviceUnits"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="LengthUnitType">
+    <xs:annotation>
+      <xs:documentation>The measurement units that linear sizes are specified in.</xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Millimeters"/>
+      <xs:enumeration value="Centimeters"/>
+      <xs:enumeration value="Meters"/>
+      <xs:enumeration value="Kilometers"/>
+      <xs:enumeration value="Inches"/>
+      <xs:enumeration value="Feet"/>
+      <xs:enumeration value="Yards"/>
+      <xs:enumeration value="Miles"/>
+      <xs:enumeration value="Points"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="TextSymbolType">
+    <xs:annotation>
+      <xs:documentation>Encapsulates the text label stylization used to label features, and for FontSymbols.</xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="SymbolType">
+        <xs:sequence>
+          <xs:element name="Text" type="xs:string">
+            <xs:annotation>
+              <xs:documentation>The text of the TextSymbol.  This is a string FDO expression.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="FontName" type="xs:string">
+            <xs:annotation>
+              <xs:documentation>The font to use.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="ForegroundColor" type="xs:string">
+            <xs:annotation>
+              <xs:documentation>The color of the text.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="BackgroundColor" type="xs:string">
+            <xs:annotation>
+              <xs:documentation>The text background color.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="BackgroundStyle" type="BackgroundStyleType">
+            <xs:annotation>
+              <xs:documentation>The background style</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="HorizontalAlignment" type="xs:string" default="'Center'" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>A string FDO expression for the horizontal alignment.  Must evaluate to one of the HorizontalAlignmentType enums.  Only applicable to text styles.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="VerticalAlignment" type="xs:string" default="'Baseline'" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>A string FDO expression for the vertical alignment.  Must evaluate to one of the VerticalAlignmentType enums.  Only applicable to text and line styles.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="Bold" type="xs:string" default="false" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Specifies if the label should be in a bold font.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="Italic" type="xs:string" default="false" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Specifies if the font should be italicized.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="Underlined" type="xs:string" default="false" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Specifies if the text should be underlined.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="AdvancedPlacement" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Optional element which specifies that a more advanced labeling algorithm should be used with the AJAX viewer.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+              <xs:sequence>
+                <xs:element name="ScaleLimit" type="xs:double" minOccurs="0">
+                  <xs:annotation>
+                    <xs:documentation>The maximum amount any label is allowed to shrink in order to fit into the feature.  For example, 0.8 means that the label can shrink until it is 80% of the original size.  1.0 means that the label cannot shrink.  If not specified, the application should assume 1.0.  If set to 0.0 or less then the advanced placement option is disabled.</xs:documentation>
+                  </xs:annotation>
+                </xs:element>
+              </xs:sequence>
+            </xs:complexType>
+          </xs:element>
+          <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="SymbolType">
+    <xs:annotation>
+      <xs:documentation>Defines common properties for all symbols.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="Unit" type="LengthUnitType">
+        <xs:annotation>
+          <xs:documentation>The units that the sizes are specified in.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="SizeContext" type="SizeContextType">
+        <xs:annotation>
+          <xs:documentation>Whether the sizes are with respect to the earth or the user's display device.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="SizeX" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>Width of the symbol.  This is a double FDO expression.  Does not apply to font symbols.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="SizeY" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>Height of the symbol.  This is a double FDO expression.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="Rotation" type="xs:string" default="0.0" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Amount to rotate the symbol in degrees.  This is a double FDO expression.  Does not apply to line labels.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="MaintainAspect" type="xs:boolean" default="true" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Hint for the UI only.  When the user enters a constant size for the width or height, the other dimension should be adjusted accordingly.  Does not apply to font symbols or labels.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="InsertionPointX" type="xs:string" default="0.5" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>X offset for the symbol specified in symbol space.  Does not apply to labels.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="InsertionPointY" type="xs:double" default="0.5" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Y offset for the symbol specified in symbol space.  Does not apply to labels.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="MarkSymbolType">
+    <xs:annotation>
+      <xs:documentation>Stylization of a predefined shape (ShapeType).</xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="SymbolType">
+        <xs:sequence>
+          <xs:element name="Shape" type="ShapeType"/>
+          <xs:element name="Fill" type="FillType" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>No fill is drawn if not specified.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="Edge" type="StrokeType" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>No edge is drawn if not specified.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="NameStringPairType">
+    <xs:annotation>
+      <xs:documentation>Used by vector layer definition to hold properties that can be displayed to the end user, and the friendly name to display it as.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="Name" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>The name of the property to expose.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="Value" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>The name to show the end user.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:simpleType name="ShapeType">
+    <xs:annotation>
+      <xs:documentation>SLD supports square, circle, triangle, star, cross, and X.</xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Square"/>
+      <xs:enumeration value="Circle"/>
+      <xs:enumeration value="Triangle"/>
+      <xs:enumeration value="Star"/>
+      <xs:enumeration value="Cross"/>
+      <xs:enumeration value="X"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="ImageSymbolType">
+    <xs:annotation>
+      <xs:documentation>Symbols that are comprised of a raster.</xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="SymbolType">
+        <xs:sequence>
+          <xs:choice>
+            <xs:element name="Image">
+              <xs:annotation>
+                <xs:documentation>Reference to the image.</xs:documentation>
+              </xs:annotation>
+              <xs:complexType>
+                <xs:sequence>
+                  <xs:element name="ResourceId">
+                    <xs:annotation>
+                      <xs:documentation>The reference to the resource.</xs:documentation>
+                    </xs:annotation>
+                  </xs:element>
+                  <xs:element name="LibraryItemName" minOccurs="0">
+                    <xs:annotation>
+                      <xs:documentation>If ResourceId specifies a library, this identifies the name of a library item.</xs:documentation>
+                    </xs:annotation>
+                  </xs:element>
+                </xs:sequence>
+              </xs:complexType>
+            </xs:element>
+            <xs:element name="Content" type="xs:hexBinary">
+              <xs:annotation>
+                <xs:documentation>BinHex data for image.</xs:documentation>
+              </xs:annotation>
+            </xs:element>
+          </xs:choice>
+          <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="FontSymbolType">
+    <xs:annotation>
+      <xs:documentation>Symbols that are specified by a font and character.</xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="SymbolType">
+        <xs:sequence>
+          <xs:element name="FontName" type="xs:string">
+            <xs:annotation>
+              <xs:documentation>If the font is not installed, the actual font used is application dependent.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="Character" type="xs:string"/>
+          <xs:element name="Bold" type="xs:boolean" minOccurs="0"/>
+          <xs:element name="Italic" type="xs:boolean" minOccurs="0"/>
+          <xs:element name="Underlined" type="xs:boolean" minOccurs="0"/>
+          <xs:element name="ForegroundColor" type="xs:string"/>
+          <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="W2DSymbolType">
+    <xs:annotation>
+      <xs:documentation>A symbol using a W2D stream.</xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="SymbolType">
+        <xs:sequence>
+          <xs:element name="W2DSymbol">
+            <xs:complexType>
+              <xs:sequence>
+                <xs:element name="ResourceId">
+                  <xs:annotation>
+                    <xs:documentation>The reference to the symbol library.</xs:documentation>
+                  </xs:annotation>
+                </xs:element>
+                <xs:element name="LibraryItemName">
+                  <xs:annotation>
+                    <xs:documentation>The W2D stream in the symbol library.</xs:documentation>
+                  </xs:annotation>
+                </xs:element>
+              </xs:sequence>
+            </xs:complexType>
+          </xs:element>
+          <xs:element name="FillColor" type="xs:string" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>If specified all polygon fills in the symbol are drawn in this color.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="LineColor" type="xs:string" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>If specified all lines in the symbol are drawn in this color.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="TextColor" type="xs:string" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>If specified all text in the symbol is drawn in this color.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="BlockSymbolType">
+    <xs:annotation>
+      <xs:documentation>A block symbol.</xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="SymbolType">
+        <xs:sequence>
+          <xs:element name="DrawingName" type="xs:string"/>
+          <xs:element name="BlockName" type="xs:string"/>
+          <xs:element name="BlockColor" type="xs:string" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Static color.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="LayerColor" type="xs:string" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Static color.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="CompositeTypeStyle">
+    <xs:annotation>
+      <xs:documentation>A style specification consisting of composite rules.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="CompositeRule" type="CompositeRule" maxOccurs="unbounded">
+        <xs:annotation>
+          <xs:documentation>One or more CompositeRules defining the CompositeTypeStyle.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ShowInLegend" type="xs:boolean" default="true" minOccurs="0"/>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="CompositeRule">
+    <xs:annotation>
+      <xs:documentation>A style rule containing a composite symbolization.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="LegendLabel" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>The label for the Rule to be displayed in the legend.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="Filter" type="xs:string" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>A filter for the Rule.  This is a boolean FDO expression.  Any features that pass this filter are styled using this rule's stylization.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="CompositeSymbolization" type="CompositeSymbolization">
+        <xs:annotation>
+          <xs:documentation>The symbolization for the Rule.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="CompositeSymbolization">
+    <xs:annotation>
+      <xs:documentation>Stylization attributes of a point, line, or area feature.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="SymbolInstance" type="SymbolInstance" minOccurs="0" maxOccurs="unbounded">
+        <xs:annotation>
+          <xs:documentation>The symbol instances used for stylization.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="ThemeLabel">
+    <xs:annotation>
+      <xs:documentation>Provides legend labeling information for a theme.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="Description" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>The legend description for the theme.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="CategoryFormat" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>The default legend format to use for each category in the theme.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="Override">
+    <xs:annotation>
+      <xs:documentation>A parameter override.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="SymbolName" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>The name of the symbol definition containing the parameter being overridden.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ParameterIdentifier" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>The identifier of the parameter being overridden.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ParameterValue" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>The override value for the parameter.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ThemeLabel" type="ThemeLabel" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>An optional theme label for this override.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="ParameterOverrides">
+    <xs:annotation>
+      <xs:documentation>A collection of parameter overrides.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="Override" type="Override" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:simpleType name="UsageContextType">
+    <xs:annotation>
+      <xs:documentation>Enumerates the allowed UsageContext values.</xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Unspecified"/>
+      <xs:enumeration value="Point"/>
+      <xs:enumeration value="Line"/>
+      <xs:enumeration value="Area"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="GeometryContextType">
+    <xs:annotation>
+      <xs:documentation>Enumerates the allowed GeometryContext values.</xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Unspecified"/>
+      <xs:enumeration value="Point"/>
+      <xs:enumeration value="LineString"/>
+      <xs:enumeration value="Polygon"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="SymbolInstance">
+    <xs:annotation>
+      <xs:documentation>An instance of a symbol.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:choice>
+        <xs:element name="ResourceId" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>A library reference to an existing SymbolDefinition, either simple or compound.</xs:documentation>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="SimpleSymbolDefinition" type="SimpleSymbolDefinition">
+          <xs:annotation>
+            <xs:documentation>An inlined SimpleSymbolDefinition.</xs:documentation>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="CompoundSymbolDefinition" type="CompoundSymbolDefinition">
+          <xs:annotation>
+            <xs:documentation>An inlined CompoundSymbolDefinition.</xs:documentation>
+          </xs:annotation>
+        </xs:element>
+      </xs:choice>
+      <xs:element name="ParameterOverrides" type="ParameterOverrides">
+        <xs:annotation>
+          <xs:documentation>Specifies all parameter overrides for this symbol instance.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ScaleX" type="xs:string" default="1.0" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>The additional amount to scale the symbol horizontally in symbol space.  Defaults to 1 if not specified.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ScaleY" type="xs:string" default="1.0" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>The additional amount to scale the symbol vertically in symbol space.  Defaults to 1 if not specified.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="InsertionOffsetX" type="xs:string" default="0.0" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Specifies the additional amount to offset the symbol horizontally, in mm in device units, after scaling and rotation have been applied.  Applies only to point symbols.  Defaults to 0 if not specified.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="InsertionOffsetY" type="xs:string" default="0.0" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Specifies the additional amount to offset the symbol vertically, in mm in device units, after scaling and rotation have been applied.  Applies only to point symbols.  Defaults to 0 if not specified.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="SizeContext" type="SizeContextType" default="DeviceUnits" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Specifies whether the symbol sizes are with respect to the map or the user's display device.  Defaults to device units.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="DrawLast" type="xs:string" default="false" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Boolean value which specifies whether the symbol is drawn as part of a final rendering pass (e.g. for labeling).  This must evaluate to True or False (default).</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="CheckExclusionRegion" type="xs:string" default="false" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Boolean value which specifies whether to render this symbol only if its graphical extent does not overlap the exclusion region.  If the positioning algorithm generates multiple candidate symbol positions and this setting is True, then only the first non-overlapping candidate is rendered.  This must evaluate to True or False (default).</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="AddToExclusionRegion" type="xs:string" default="false" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Boolean value which specifies whether the graphical extent for this symbol instance is added to the exclusion region (if it is rendered).  Symbols which check the exclusion region will not draw on top of this symbol.  This must evaluate to True or False (default).</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="PositioningAlgorithm" type="xs:string" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Specifies the algorithm used to generate candidate positions for the symbol.  If specified this must evaluate to one of: Default, EightSurrounding, or PathLabels.  Default means generate one position using the feature geometry (used for normal rendering).  EightSurrounding means generate eight candidate labels surrounding the feature geometry (used when labeling point features).  PathLabels means generate periodic labels which follow the feature geometry (used when labeling linestring features).</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="RenderingPass" type="xs:string" default="0" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>The optional rendering pass in which this symbol instance draws.  If specified this must be greater than or equal to zero.  Defaults to 0.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="UsageContext" type="UsageContextType" default="Unspecified" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Specifies which usage in the symbol should be the active one.  Defaults to Unspecified.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="GeometryContext" type="GeometryContextType" default="Unspecified" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Specifies which geometry type this symbol instance applies to.  Defaults to Unspecified.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:annotation>
+    <xs:documentation>******************** Grid layer ********************</xs:documentation>
+  </xs:annotation>
+  <xs:complexType name="GridLayerDefinitionType">
+    <xs:annotation>
+      <xs:documentation>A layer for raster or grid data.</xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="BaseLayerDefinitionType">
+        <xs:sequence>
+          <xs:element name="FeatureName" type="xs:string"/>
+          <xs:element name="Geometry" type="xs:string">
+            <xs:annotation>
+              <xs:documentation>Specifies the geometry property that should be used to get the geometries.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="Filter" type="xs:string" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>A boolean FDO expression that specifies which features to return.  No filter means pass all features through.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="GridScaleRange" type="GridScaleRangeType" maxOccurs="unbounded"/>
+          <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="ChannelBandType">
+    <xs:annotation>
+      <xs:documentation>Defines how to scale numbers into a color channel.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="Band" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>Name of the band.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="LowBand" type="xs:double" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Default is low value found in band.  Band values less than this are snapped to this number.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="HighBand" type="xs:double" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Default is high value found in band.  Band values greater than this are snapped to this number.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="LowChannel" type="xs:unsignedByte" default="0" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Default is 0.  Range is 0:255.  LowBand is mapped to this number.  LowChannel can be greater than HighChannel.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="HighChannel" type="xs:unsignedByte" default="255" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Default is 255.  Range is 0:255.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="GridColorBandsType">
+    <xs:annotation>
+      <xs:documentation>Specifies a color using distinct RGB values.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="RedBand" type="ChannelBandType"/>
+      <xs:element name="GreenBand" type="ChannelBandType"/>
+      <xs:element name="BlueBand" type="ChannelBandType"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="GridColorType">
+    <xs:annotation>
+      <xs:documentation>The color to use for a grid rule.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:choice minOccurs="0">
+        <xs:element name="ExplicitColor" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Explicit ARGB color.</xs:documentation>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="Band" type="xs:string"/>
+        <xs:element name="Bands" type="GridColorBandsType"/>
+      </xs:choice>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="GridColorRuleType">
+    <xs:annotation>
+      <xs:documentation>Encapsulate a style for a grid source.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="LegendLabel" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>The label for the Rule to be displayed in the legend.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="Filter" type="xs:string" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>A filter for the Rule.  This is a boolean FDO expression.  Any features that pass this filter are styled using this rule's stylization.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="Label" type="TextSymbolType" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>A label for the Rule.  Does not apply to GridColorRule.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="Color" type="GridColorType"/>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="HillShadeType">
+    <xs:annotation>
+      <xs:documentation>Specifies how to shade given a band and a light source.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="Band" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>Name of the band used for the computation.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="Azimuth" type="xs:double">
+        <xs:annotation>
+          <xs:documentation>Azimuth of the sun in degrees.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="Altitude" type="xs:double">
+        <xs:annotation>
+          <xs:documentation>Altitude of the sun in degrees.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ScaleFactor" type="xs:double" default="1.0" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>The scale factor applied to the band prior to computing hillshade.  Defaults to 1 if not specified.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="GridColorStyleType">
+    <xs:annotation>
+      <xs:documentation>Specifies how to style each pixel.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="HillShade" type="HillShadeType" minOccurs="0"/>
+      <xs:element name="TransparencyColor" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>If a pixel color prior to factoring in HillShade is this value then the pixel is transparent.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="BrightnessFactor" type="xs:double" default="0.0" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Default is 0.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ContrastFactor" type="xs:double" default="0.0" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Default is 0.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ColorRule" type="GridColorRuleType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="GridSurfaceStyleType">
+    <xs:annotation>
+      <xs:documentation>Specifies how to calculate pixel elevations.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="Band" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>Band to use for 3D data.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ZeroValue" type="xs:double" default="0.0" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Determines which input value is mapped to zero elevation.  Defaults to 0 if not specified.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ScaleFactor" type="xs:double" default="1.0" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Determines how to scale the inputs into a consistent elevation.  Defaults to 1 if not specified.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="DefaultColor" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>The default color to use if no ColorStyle is defined at a pixel.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="GridScaleRangeType">
+    <xs:annotation>
+      <xs:documentation>The stylization for a specified scale range.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="MinScale" type="xs:double" default="0.0" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>The zoomed in part of the scale range.  Defaults to 0 if not specified.  Inclusive.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="MaxScale" type="xs:double" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>The zoomed out part of the scale range.  Defaults to the application's maximum value if not specified.  Exclusive.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="SurfaceStyle" type="GridSurfaceStyleType" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Defines the height field of the grid.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ColorStyle" type="GridColorStyleType" minOccurs="0"/>
+      <xs:element name="RebuildFactor" type="xs:double">
+        <xs:annotation>
+          <xs:documentation>When the user has zoomed in by this amount, a request for more detailed raster data is made.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>


Property changes on: trunk/MgDev/Common/Schema/LayerDefinition-2.3.0.xsd
___________________________________________________________________
Added: svn:eol-style
   + native

Deleted: trunk/MgDev/Common/Schema/MapDefinition-1.1.0.xsd
===================================================================
--- trunk/MgDev/Common/Schema/MapDefinition-1.1.0.xsd	2010-09-21 05:00:03 UTC (rev 5167)
+++ trunk/MgDev/Common/Schema/MapDefinition-1.1.0.xsd	2010-09-21 08:21:54 UTC (rev 5168)
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1.0">
-  <xs:include schemaLocation="WatermarkDefinition-1.0.0.xsd"/>
-  <xs:complexType name="Box2DType">
-    <xs:annotation>
-      <xs:documentation>Box2D encapsulates the the coordinates of a box in 2-D space</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="MinX" type="xs:double">
-        <xs:annotation>
-          <xs:documentation>Minimum x-coordinate</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="MaxX" type="xs:double">
-        <xs:annotation>
-          <xs:documentation>Maximum x-coordinate</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="MinY" type="xs:double">
-        <xs:annotation>
-          <xs:documentation>Minimum y-coordinate</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="MaxY" type="xs:double">
-        <xs:annotation>
-          <xs:documentation>Maximum y-coordinate</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="BaseMapLayerType">
-    <xs:annotation>
-      <xs:documentation>BaseMapLayerType encapsulates the properties of a BaseMapLayer.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="Name" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>Name of the MapLayer</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ResourceId" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>ResourceId of the MapLayer</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Selectable" type="xs:boolean">
-        <xs:annotation>
-          <xs:documentation>Whether or not the Layer can be selected</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ShowInLegend" type="xs:boolean">
-        <xs:annotation>
-          <xs:documentation>Whether or not the Layer should be shown in the legend</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="LegendLabel" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>Label to be shown for the Layer in the legend</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ExpandInLegend" type="xs:boolean">
-        <xs:annotation>
-          <xs:documentation>Whether or not the Layer should be expanded in the legend.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="MapLayerType">
-    <xs:annotation>
-      <xs:documentation>MapLayerType encapsulates the properties of a map layer, including its group and options about how it should be displayed.</xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="BaseMapLayerType">
-        <xs:sequence>
-          <xs:element name="Visible" type="xs:boolean">
-            <xs:annotation>
-              <xs:documentation>Whether this layer's visiblity should be visible or not when it first comes into range</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="Group" type="xs:string">
-            <xs:annotation>
-              <xs:documentation>Group of which the MapLayer is a member of</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="MapLayerGroupCommonType">
-    <xs:annotation>
-      <xs:documentation>MapLayerGroupCommonType is a common subclass of MapLayerGroupCommonType and BaseMapLayerGroupCommonType</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="Name" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>The name of this LayerGroup</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Visible" type="xs:boolean">
-        <xs:annotation>
-          <xs:documentation>Whether this group's visiblity should be visible or not when it first comes into range</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ShowInLegend" type="xs:boolean">
-        <xs:annotation>
-          <xs:documentation>Whether or not the LayerGroup should be shown in the legend</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ExpandInLegend" type="xs:boolean">
-        <xs:annotation>
-          <xs:documentation>Whether or not the LayerGroup should be initially expanded in the legend</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="LegendLabel" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>Label to be shown for the LayerGroup in the legend</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="MapLayerGroupType">
-    <xs:annotation>
-      <xs:documentation>MapLayerGroupType encapsulates the properties of a MapLayerGroup.  Its extension to MapLayerGroupCommonType is that the MapLayerGroup itself can also be in a MapLayerGroup.</xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="MapLayerGroupCommonType">
-        <xs:sequence>
-          <xs:element name="Group" type="xs:string">
-            <xs:annotation>
-              <xs:documentation>The group that contains the MapLayerGroup</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="BaseMapLayerGroupCommonType">
-    <xs:annotation>
-      <xs:documentation>BaseMapLayerGroupCommonType encapsulates the properties of a BaseMapLayerGroup. It extends MapLayerGroupCommonType by holding the layers in the group.  The base map layer groups defines what layers are used to render a tile set in the HTML viewer.</xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="MapLayerGroupCommonType">
-        <xs:sequence>
-          <xs:element name="BaseMapLayer" type="BaseMapLayerType" minOccurs="0" maxOccurs="unbounded">
-            <xs:annotation>
-              <xs:documentation>The layers that are part of this group. The order of the layers represents the draw order, layers first is the list are drawn over top of layers later in the list.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="MapDefinitionType">
-    <xs:annotation>
-      <xs:documentation>MapDefinitionType encapsulates a MapDefinition, which houses a collection of MapLayers and their groups.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="Name" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>The name of the MapDefinition</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="CoordinateSystem" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>The coordinate system as WKT used by the MapDefinition</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Extents" type="Box2DType">
-        <xs:annotation>
-          <xs:documentation>A bounding box around the area of the MapDefinition</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="BackgroundColor" type="xs:hexBinary">
-        <xs:annotation>
-          <xs:documentation>The background color to be used with the MapDefinition</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Metadata" type="xs:string" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>Metadata regarding the MapDefinition</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="MapLayer" type="MapLayerType" minOccurs="0" maxOccurs="unbounded">
-        <xs:annotation>
-          <xs:documentation>Zero or more MapLayers that make up the MapDefinition. The order of the layers represents the draw order, layers first is the list are drawn over top of layers later in the list.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="MapLayerGroup" type="MapLayerGroupType" minOccurs="0" maxOccurs="unbounded">
-        <xs:annotation>
-          <xs:documentation>Zero or more MapLayerGroups that make up the MapDefinition</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="BaseMapDefinition" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>The base map.</xs:documentation>
-        </xs:annotation>
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="FiniteDisplayScale" type="xs:double" maxOccurs="unbounded">
-              <xs:annotation>
-                <xs:documentation>The display scales that the base map layers will have tiles available. Applies to the HTML viewer.</xs:documentation>
-              </xs:annotation>
-            </xs:element>
-            <xs:element name="BaseMapLayerGroup" type="BaseMapLayerGroupCommonType" minOccurs="0" maxOccurs="unbounded">
-              <xs:annotation>
-                <xs:documentation>A group of layers that is used to compose a tiled layer in the HTML viewer</xs:documentation>
-              </xs:annotation>
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="Watermarks" type="WatermarkInstanceCollectionType" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>The collection of watermarks used in the map.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:element name="MapDefinition">
-    <xs:annotation>
-      <xs:documentation>A MapDefinition defines the collection of layers, groupings of layers, and base map</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:complexContent>
-        <xs:extension base="MapDefinitionType">
-          <xs:attribute name="version" type="xs:string" use="required" fixed="1.1.0"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>

Added: trunk/MgDev/Common/Schema/MapDefinition-2.3.0.xsd
===================================================================
--- trunk/MgDev/Common/Schema/MapDefinition-2.3.0.xsd	                        (rev 0)
+++ trunk/MgDev/Common/Schema/MapDefinition-2.3.0.xsd	2010-09-21 08:21:54 UTC (rev 5168)
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.3.0">
+  <xs:include schemaLocation="WatermarkDefinition-2.3.0.xsd"/>
+  <xs:complexType name="Box2DType">
+    <xs:annotation>
+      <xs:documentation>Box2D encapsulates the the coordinates of a box in 2-D space</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="MinX" type="xs:double">
+        <xs:annotation>
+          <xs:documentation>Minimum x-coordinate</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="MaxX" type="xs:double">
+        <xs:annotation>
+          <xs:documentation>Maximum x-coordinate</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="MinY" type="xs:double">
+        <xs:annotation>
+          <xs:documentation>Minimum y-coordinate</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="MaxY" type="xs:double">
+        <xs:annotation>
+          <xs:documentation>Maximum y-coordinate</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="BaseMapLayerType">
+    <xs:annotation>
+      <xs:documentation>BaseMapLayerType encapsulates the properties of a BaseMapLayer.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="Name" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>Name of the MapLayer</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ResourceId" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>ResourceId of the MapLayer</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="Selectable" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>Whether or not the Layer can be selected</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ShowInLegend" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>Whether or not the Layer should be shown in the legend</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="LegendLabel" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>Label to be shown for the Layer in the legend</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ExpandInLegend" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>Whether or not the Layer should be expanded in the legend.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="MapLayerType">
+    <xs:annotation>
+      <xs:documentation>MapLayerType encapsulates the properties of a map layer, including its group and options about how it should be displayed.</xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="BaseMapLayerType">
+        <xs:sequence>
+          <xs:element name="Visible" type="xs:boolean">
+            <xs:annotation>
+              <xs:documentation>Whether this layer's visiblity should be visible or not when it first comes into range</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="Group" type="xs:string">
+            <xs:annotation>
+              <xs:documentation>Group of which the MapLayer is a member of</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="MapLayerGroupCommonType">
+    <xs:annotation>
+      <xs:documentation>MapLayerGroupCommonType is a common subclass of MapLayerGroupCommonType and BaseMapLayerGroupCommonType</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="Name" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>The name of this LayerGroup</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="Visible" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>Whether this group's visiblity should be visible or not when it first comes into range</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ShowInLegend" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>Whether or not the LayerGroup should be shown in the legend</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ExpandInLegend" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>Whether or not the LayerGroup should be initially expanded in the legend</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="LegendLabel" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>Label to be shown for the LayerGroup in the legend</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="MapLayerGroupType">
+    <xs:annotation>
+      <xs:documentation>MapLayerGroupType encapsulates the properties of a MapLayerGroup.  Its extension to MapLayerGroupCommonType is that the MapLayerGroup itself can also be in a MapLayerGroup.</xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="MapLayerGroupCommonType">
+        <xs:sequence>
+          <xs:element name="Group" type="xs:string">
+            <xs:annotation>
+              <xs:documentation>The group that contains the MapLayerGroup</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="BaseMapLayerGroupCommonType">
+    <xs:annotation>
+      <xs:documentation>BaseMapLayerGroupCommonType encapsulates the properties of a BaseMapLayerGroup. It extends MapLayerGroupCommonType by holding the layers in the group.  The base map layer groups defines what layers are used to render a tile set in the HTML viewer.</xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="MapLayerGroupCommonType">
+        <xs:sequence>
+          <xs:element name="BaseMapLayer" type="BaseMapLayerType" minOccurs="0" maxOccurs="unbounded">
+            <xs:annotation>
+              <xs:documentation>The layers that are part of this group. The order of the layers represents the draw order, layers first is the list are drawn over top of layers later in the list.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="MapDefinitionType">
+    <xs:annotation>
+      <xs:documentation>MapDefinitionType encapsulates a MapDefinition, which houses a collection of MapLayers and their groups.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="Name" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>The name of the MapDefinition</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="CoordinateSystem" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>The coordinate system as WKT used by the MapDefinition</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="Extents" type="Box2DType">
+        <xs:annotation>
+          <xs:documentation>A bounding box around the area of the MapDefinition</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="BackgroundColor" type="xs:hexBinary">
+        <xs:annotation>
+          <xs:documentation>The background color to be used with the MapDefinition</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="Metadata" type="xs:string" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>Metadata regarding the MapDefinition</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="MapLayer" type="MapLayerType" minOccurs="0" maxOccurs="unbounded">
+        <xs:annotation>
+          <xs:documentation>Zero or more MapLayers that make up the MapDefinition. The order of the layers represents the draw order, layers first is the list are drawn over top of layers later in the list.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="MapLayerGroup" type="MapLayerGroupType" minOccurs="0" maxOccurs="unbounded">
+        <xs:annotation>
+          <xs:documentation>Zero or more MapLayerGroups that make up the MapDefinition</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="BaseMapDefinition" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>The base map.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="FiniteDisplayScale" type="xs:double" maxOccurs="unbounded">
+              <xs:annotation>
+                <xs:documentation>The display scales that the base map layers will have tiles available. Applies to the HTML viewer.</xs:documentation>
+              </xs:annotation>
+            </xs:element>
+            <xs:element name="BaseMapLayerGroup" type="BaseMapLayerGroupCommonType" minOccurs="0" maxOccurs="unbounded">
+              <xs:annotation>
+                <xs:documentation>A group of layers that is used to compose a tiled layer in the HTML viewer</xs:documentation>
+              </xs:annotation>
+            </xs:element>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="Watermarks" type="WatermarkInstanceCollectionType" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>The collection of watermarks used in the map.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:element name="MapDefinition">
+    <xs:annotation>
+      <xs:documentation>A MapDefinition defines the collection of layers, groupings of layers, and base map</xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:complexContent>
+        <xs:extension base="MapDefinitionType">
+          <xs:attribute name="version" type="xs:string" use="required" fixed="2.3.0"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>


Property changes on: trunk/MgDev/Common/Schema/MapDefinition-2.3.0.xsd
___________________________________________________________________
Added: svn:eol-style
   + native

Deleted: trunk/MgDev/Common/Schema/WatermarkDefinition-1.0.0.xsd
===================================================================
--- trunk/MgDev/Common/Schema/WatermarkDefinition-1.0.0.xsd	2010-09-21 05:00:03 UTC (rev 5167)
+++ trunk/MgDev/Common/Schema/WatermarkDefinition-1.0.0.xsd	2010-09-21 08:21:54 UTC (rev 5168)
@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.0">
-  <xs:include schemaLocation="SymbolDefinition-1.1.0.xsd"/>
-  <xs:element name="WatermarkDefinition">
-    <xs:annotation>
-      <xs:documentation>The specification of a watermark.</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:complexContent>
-        <xs:extension base="WatermarkDefinitionType">
-          <xs:attribute name="version" type="xs:string" use="required" fixed="1.0.0"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-  <xs:simpleType name="UnitType">
-    <xs:annotation>
-      <xs:documentation>Enumerates the allowed length units for a watermark position.</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Inches"/>
-      <xs:enumeration value="Centimeters"/>
-      <xs:enumeration value="Millimeters"/>
-      <xs:enumeration value="Pixels"/>
-      <xs:enumeration value="Points"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="HorizontalAlignmentType">
-    <xs:annotation>
-      <xs:documentation>Enumerates the allowed horizontal alignment values for a watermark position.</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Left"/>
-      <xs:enumeration value="Center"/>
-      <xs:enumeration value="Right"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="HorizontalPositionType">
-    <xs:annotation>
-      <xs:documentation>Defines the horizontal position of a watermark.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="Offset" type="xs:double" default="0.0">
-        <xs:annotation>
-          <xs:documentation>The horizontal offset for the position.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Unit" type="UnitType" default="Points">
-        <xs:annotation>
-          <xs:documentation>The unit for the offset.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Alignment" type="HorizontalAlignmentType" default="Center">
-        <xs:annotation>
-          <xs:documentation>The horizontal alignment for the position.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:simpleType name="VerticalAlignmentType">
-    <xs:annotation>
-      <xs:documentation>Enumerates the allowed vertical alignments for a watermark position.</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Top"/>
-      <xs:enumeration value="Center"/>
-      <xs:enumeration value="Bottom"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="VerticalPositionType">
-    <xs:annotation>
-      <xs:documentation>Defines the vertical position of a watermark.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="Offset" type="xs:double" default="0.0">
-        <xs:annotation>
-          <xs:documentation>The vertical offset for the position.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Unit" type="UnitType" default="Points">
-        <xs:annotation>
-          <xs:documentation>The unit for the offset.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Alignment" type="VerticalAlignmentType"  default="Center">
-        <xs:annotation>
-          <xs:documentation>The vertical alignment for the position.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="PositionType" abstract="true">
-    <xs:annotation>
-      <xs:documentation>Abstract base type used with all watermark positions.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="XYPositionType">
-    <xs:annotation>
-      <xs:documentation>Positions a watermark at a single X/Y location.</xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="PositionType">
-        <xs:sequence>
-          <xs:element name="XPosition" type="HorizontalPositionType">
-            <xs:annotation>
-              <xs:documentation>The position along the X-axis.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="YPosition" type="VerticalPositionType">
-            <xs:annotation>
-              <xs:documentation>The position along the Y-axis.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="TilePositionType">
-    <xs:annotation>
-      <xs:documentation>Positions a watermark according to a regular grid.</xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="PositionType">
-        <xs:sequence>
-          <xs:element name="TileWidth" type="xs:double" default="150.0">
-            <xs:annotation>
-              <xs:documentation>The width of each tile in the grid.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="TileHeight" type="xs:double" default="150.0">
-            <xs:annotation>
-              <xs:documentation>The height of each tile in the grid.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="HorizontalPosition" type="HorizontalPositionType">
-            <xs:annotation>
-              <xs:documentation>The horizontal position of the watermark within a tile.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="VerticalPosition" type="VerticalPositionType">
-            <xs:annotation>
-              <xs:documentation>The vertical position of the watermark within a tile.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="WatermarkAppearanceType">
-    <xs:annotation>
-      <xs:documentation>Defines the appearance of a watermark.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="Transparency" minOccurs="0" default="0.0">
-        <xs:annotation>
-          <xs:documentation>The transparency of the watermark in the range 0-100.  The default value is 0 (opaque).</xs:documentation>
-        </xs:annotation>
-        <xs:simpleType>
-          <xs:restriction base="xs:double">
-            <xs:minInclusive value="0.0"/>
-            <xs:maxInclusive value="100.0"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:element>
-      <xs:element name="Rotation" minOccurs="0" default="0.0">
-        <xs:annotation>
-          <xs:documentation>The rotation of the watermark, in degrees, in the range 0-360.  The default value is 0.</xs:documentation>
-        </xs:annotation>
-        <xs:simpleType>
-          <xs:restriction base="xs:double">
-            <xs:minInclusive value="0.0"/>
-            <xs:maxInclusive value="360.0"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="WatermarkDefinitionType">
-    <xs:annotation>
-      <xs:documentation>A watermark definition containing content, appearance, and position information.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="Content">
-        <xs:annotation>
-          <xs:documentation>A symbol definition defining the content of the watermark.</xs:documentation>
-        </xs:annotation>
-        <xs:complexType>
-          <xs:choice>
-            <xs:element name="SimpleSymbolDefinition" type="SimpleSymbolDefinition" />
-            <xs:element name="CompoundSymbolDefinition" type="CompoundSymbolDefinition" />
-          </xs:choice>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="Appearance" type="WatermarkAppearanceType">
-        <xs:annotation>
-          <xs:documentation>The appearance of the watermark.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Position">
-        <xs:annotation>
-          <xs:documentation>The position of the watermark.</xs:documentation>
-        </xs:annotation>
-        <xs:complexType>
-          <xs:choice>
-            <xs:element name="XYPosition" type="XYPositionType" />
-            <xs:element name="TilePosition" type="TilePositionType" />
-          </xs:choice>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:simpleType name="UsageType">
-    <xs:annotation>
-      <xs:documentation>Specifies the context in which the watermark is displayed.</xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="WMS">
-        <xs:annotation>
-          <xs:documentation>Watermark is displayed in WMS.</xs:documentation>
-        </xs:annotation>
-      </xs:enumeration>
-      <xs:enumeration value="Viewer">
-        <xs:annotation>
-          <xs:documentation>Watermark is displayed in AJAX or Fusion viewers.</xs:documentation>
-        </xs:annotation>
-      </xs:enumeration>
-      <xs:enumeration value="All">
-        <xs:annotation>
-          <xs:documentation>Watermark is displayed in all contexts.</xs:documentation>
-        </xs:annotation>
-      </xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="WatermarkType">
-    <xs:annotation>
-      <xs:documentation>A watermark instance used in a map definition or layer definition.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="Name" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>The name of the watermark.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="ResourceId" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>A library reference to an existing WatermarkDefinition.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="Usage" type="UsageType" minOccurs="0" default="All">
-        <xs:annotation>
-          <xs:documentation>The context in which the watermark is displayed.  Defaults to All.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="AppearanceOverride" type="WatermarkAppearanceType" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>If specified, overrides the appearance of the watermark definition.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="PositionOverride" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>If specified, overrides the position of the watermark definition.</xs:documentation>
-        </xs:annotation>
-        <xs:complexType>
-          <xs:choice>
-            <xs:element name="XYPosition" type="XYPositionType" />
-            <xs:element name="TilePosition" type="TilePositionType" />
-          </xs:choice>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="WatermarkInstanceCollectionType">
-    <xs:annotation>
-      <xs:documentation>A collection of watermarks used by a map definition or layer definition.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="Watermark" type="WatermarkType" minOccurs="0" maxOccurs="unbounded" />
-    </xs:sequence>
-  </xs:complexType>
-</xs:schema>

Added: trunk/MgDev/Common/Schema/WatermarkDefinition.xml
===================================================================
--- trunk/MgDev/Common/Schema/WatermarkDefinition.xml	                        (rev 0)
+++ trunk/MgDev/Common/Schema/WatermarkDefinition.xml	2010-09-21 08:21:54 UTC (rev 5168)
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WatermarkDefinition version="2.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="WatermarkDefinition-2.3.0.xsd">
+  <Content>
+    <CompoundSymbolDefinition>
+      <Name>Symbol</Name>
+      <Description></Description>
+      <SimpleSymbol>
+		  <SimpleSymbolDefinition>
+			  <Name>Circle</Name>
+			  <Description>Default Point Symbol</Description>
+			  <Graphics>
+				  <Path>
+					  <Geometry>M -1,0 A 1,1 0 1 1 1,0 A 1,1 0 1 1 -1,0</Geometry>
+					  <FillColor>%FILLCOLOR%</FillColor>
+					  <LineColor>%LINECOLOR%</LineColor>
+					  <LineWeight>%LINEWEIGHT%</LineWeight>
+				  </Path>
+			  </Graphics>
+			  <PointUsage>
+				  <Angle>%ROTATION%</Angle>
+			  </PointUsage>
+			  <ParameterDefinition>
+				  <Parameter>
+					  <Identifier>FILLCOLOR</Identifier>
+					  <DefaultValue>FFACD372</DefaultValue>
+					  <DisplayName>&amp;Fill Color</DisplayName>
+					  <Description>Fill Color</Description>
+					  <DataType>FillColor</DataType>
+				  </Parameter>
+				  <Parameter>
+					  <Identifier>LINECOLOR</Identifier>
+					  <DefaultValue>ff000000</DefaultValue>
+					  <DisplayName>Line &amp;Color</DisplayName>
+					  <Description>Line Color</Description>
+					  <DataType>LineColor</DataType>
+				  </Parameter>
+				  <Parameter>
+					  <Identifier>LINEWEIGHT</Identifier>
+					  <DefaultValue>0.0</DefaultValue>
+					  <DisplayName>Line &amp;Thickness</DisplayName>
+					  <Description>Line Thickness</Description>
+					  <DataType>LineWeight</DataType>
+				  </Parameter>
+				  <Parameter>
+					  <Identifier>ROTATION</Identifier>
+					  <DefaultValue>0.0</DefaultValue>
+					  <DisplayName>&amp;Rotation</DisplayName>
+					  <Description>Rotation</Description>
+					  <DataType>Angle</DataType>
+				  </Parameter>
+			  </ParameterDefinition>
+		  </SimpleSymbolDefinition>
+      </SimpleSymbol>
+      <SimpleSymbol>
+		  <SimpleSymbolDefinition>
+			  <Name>Square</Name>
+			  <Description>Default Point Symbol</Description>
+			  <Graphics>
+				  <Path>
+					  <Geometry>M -1.0,-1.0 L 1.0,-1.0 L 1.0,1.0 L -1.0,1.0 L -1.0,-1.0</Geometry>
+					  <FillColor>%FILLCOLOR%</FillColor>
+					  <LineColor>%LINECOLOR%</LineColor>
+					  <LineWeight>%LINEWEIGHT%</LineWeight>
+				  </Path>
+			  </Graphics>
+			  <PointUsage>
+				  <Angle>%ROTATION%</Angle>
+			  </PointUsage>
+			  <ParameterDefinition>
+				  <Parameter>
+					  <Identifier>FILLCOLOR</Identifier>
+					  <DefaultValue>0xffffffff</DefaultValue>
+					  <DisplayName>&amp;Fill Color</DisplayName>
+					  <Description>Fill Color</Description>
+					  <DataType>FillColor</DataType>
+				  </Parameter>
+				  <Parameter>
+					  <Identifier>LINECOLOR</Identifier>
+					  <DefaultValue>0xff000000</DefaultValue>
+					  <DisplayName>Line &amp;Color</DisplayName>
+					  <Description>Line Color</Description>
+					  <DataType>LineColor</DataType>
+				  </Parameter>
+				  <Parameter>
+					  <Identifier>LINEWEIGHT</Identifier>
+					  <DefaultValue>0.0</DefaultValue>
+					  <DisplayName>Line &amp;Thickness</DisplayName>
+					  <Description>Line Thickness</Description>
+					  <DataType>LineWeight</DataType>
+				  </Parameter>
+				  <Parameter>
+					  <Identifier>ROTATION</Identifier>
+					  <DefaultValue>45</DefaultValue>
+					  <DisplayName>&amp;Rotation</DisplayName>
+					  <Description>Rotation</Description>
+					  <DataType>Angle</DataType>
+				  </Parameter>
+			  </ParameterDefinition>
+		  </SimpleSymbolDefinition>
+      </SimpleSymbol>
+      <SimpleSymbol>
+		  <SimpleSymbolDefinition>
+			  <Name>Plain Text</Name>
+			  <Description>Default Plain Text Symbol</Description>
+			  <Graphics>
+				  <Text>
+					  <Content>%CONTENT%</Content>
+					  <FontName>%FONTNAME%</FontName>
+					  <Bold>%BOLD%</Bold>
+					  <Italic>%ITALIC%</Italic>
+					  <Underlined>%UNDERLINED%</Underlined>
+					  <Height>%FONTHEIGHT%</Height>
+					  <HorizontalAlignment>%HORIZONTALALIGNMENT%</HorizontalAlignment>
+					  <VerticalAlignment>%VERTICALALIGNMENT%</VerticalAlignment>
+					  <Justification>%JUSTIFICATION%</Justification>
+					  <LineSpacing>%LINESPACING%</LineSpacing>
+					  <TextColor>%TEXTCOLOR%</TextColor>
+					  <GhostColor>%GHOSTCOLOR%</GhostColor>
+					  <Frame>
+						  <LineColor>%FRAMELINECOLOR%</LineColor>
+						  <FillColor>%FRAMEFILLCOLOR%</FillColor>
+					  </Frame>
+				  </Text>
+			  </Graphics>
+			  <PointUsage>
+				  <Angle>%ROTATION%</Angle>
+			  </PointUsage>
+			  <ParameterDefinition>
+				  <Parameter>
+					  <Identifier>CONTENT</Identifier>
+					  <DefaultValue>'Haha'</DefaultValue>
+					  <DataType>Content</DataType>
+				  </Parameter>
+				  <Parameter>
+					  <Identifier>FONTNAME</Identifier>
+					  <DefaultValue>'Arial'</DefaultValue>
+					  <DataType>FontName</DataType>
+				  </Parameter>
+				  <Parameter>
+					  <Identifier>FONTHEIGHT</Identifier>
+					  <DefaultValue>4.0</DefaultValue>
+					  <DataType>FontHeight</DataType>
+				  </Parameter>
+				  <Parameter>
+					  <Identifier>BOLD</Identifier>
+					  <DefaultValue>false</DefaultValue>
+					  <DataType>Bold</DataType>
+				  </Parameter>
+				  <Parameter>
+					  <Identifier>ITALIC</Identifier>
+					  <DefaultValue>false</DefaultValue>
+					  <DataType>Italic</DataType>
+				  </Parameter>
+				  <Parameter>
+					  <Identifier>UNDERLINED</Identifier>
+					  <DefaultValue>false</DefaultValue>
+					  <DataType>Underlined</DataType>
+				  </Parameter>
+				  <Parameter>
+					  <Identifier>OVERLINED</Identifier>
+					  <DefaultValue>false</DefaultValue>
+					  <DataType>Overlined</DataType>
+				  </Parameter>
+				  <Parameter>
+					  <Identifier>JUSTIFICATION</Identifier>
+					  <DefaultValue>'FromAlignment'</DefaultValue>
+					  <DataType>Justification</DataType>
+				  </Parameter>
+				  <Parameter>
+					  <Identifier>LINESPACING</Identifier>
+					  <DefaultValue>1.05</DefaultValue>
+					  <DataType>LineSpacing</DataType>
+				  </Parameter>
+				  <Parameter>
+					  <Identifier>GHOSTCOLOR</Identifier>
+					  <DefaultValue/>
+					  <DataType>GhostColor</DataType>
+				  </Parameter>
+				  <Parameter>
+					  <Identifier>FRAMELINECOLOR</Identifier>
+					  <DefaultValue/>
+					  <DataType>FrameLineColor</DataType>
+				  </Parameter>
+				  <Parameter>
+					  <Identifier>FRAMEFILLCOLOR</Identifier>
+					  <DefaultValue/>
+					  <DataType>FrameFillColor</DataType>
+				  </Parameter>
+				  <Parameter>
+					  <Identifier>TEXTCOLOR</Identifier>
+					  <DefaultValue>0xff000000</DefaultValue>
+					  <DataType>TextColor</DataType>
+				  </Parameter>
+				  <Parameter>
+					  <Identifier>HORIZONTALALIGNMENT</Identifier>
+					  <DefaultValue>'Left'</DefaultValue>
+					  <DataType>HorizontalAlignment</DataType>
+				  </Parameter>
+				  <Parameter>
+					  <Identifier>VERTICALALIGNMENT</Identifier>
+					  <DefaultValue>'Bottom'</DefaultValue>
+					  <DataType>VerticalAlignment</DataType>
+				  </Parameter>
+				  <Parameter>
+					  <Identifier>ROTATION</Identifier>
+					  <DefaultValue>30</DefaultValue>
+					  <DisplayName>&amp;Rotation</DisplayName>
+					  <Description>Rotation</Description>
+					  <DataType>Angle</DataType>
+				  </Parameter>
+			  </ParameterDefinition>
+		  </SimpleSymbolDefinition>
+      </SimpleSymbol>
+	  <SimpleSymbol>
+		  <SimpleSymbolDefinition>
+			  <Name>Watermark image</Name>
+			  <Description>Default watermark image Symbol</Description>
+			  <Graphics>
+				  <Image>
+					  <Reference>
+						<ResourceId>Library://A.WatermarkDefinition</ResourceId>
+						<LibraryItemName>ImageSymbol</LibraryItemName>
+					  </Reference>
+					  <SizeX>20</SizeX>
+					  <SizeY>20</SizeY>
+				  </Image>
+			  </Graphics>
+			  <PointUsage>
+				  <Angle>%ROTATION%</Angle>
+			  </PointUsage>
+			  <ParameterDefinition>
+				  <Parameter>
+					  <Identifier>ROTATION</Identifier>
+					  <DefaultValue>30</DefaultValue>
+					  <DisplayName>&amp;Rotation</DisplayName>
+					  <Description>Rotation</Description>
+					  <DataType>Angle</DataType>
+				  </Parameter>
+			  </ParameterDefinition>
+		  </SimpleSymbolDefinition>
+      </SimpleSymbol>
+    </CompoundSymbolDefinition>
+  </Content>
+  <Appearance>
+    <Transparency>50</Transparency>
+    <Rotation>90</Rotation>
+  </Appearance>
+  <Position>
+    <TilePosition>
+	  <TileWidth>150</TileWidth>
+	  <TileHeight>150</TileHeight>
+      <HorizontalPosition>
+        <Offset>0</Offset>
+        <Unit>Points</Unit>
+        <Alignment>Left</Alignment>
+      </HorizontalPosition>
+      <VerticalPosition>
+        <Offset>0</Offset>
+        <Unit>Points</Unit>
+        <Alignment>Top</Alignment>
+      </VerticalPosition>
+    </TilePosition>
+  </Position>
+</WatermarkDefinition>
\ No newline at end of file


Property changes on: trunk/MgDev/Common/Schema/WatermarkDefinition.xml
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/MgDev/Common/Stylization/StylizationEngine.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/StylizationEngine.cpp	2010-09-21 05:00:03 UTC (rev 5167)
+++ trunk/MgDev/Common/Stylization/StylizationEngine.cpp	2010-09-21 08:21:54 UTC (rev 5168)
@@ -259,7 +259,7 @@
     if (se_renderer->SupportsHyperlinks())
         m_visitor->ParseStringExpression(L"", seUrl, L"");
     
-    std::auto_ptr<SE_Rule> rule(new SE_Rule());
+    SE_Rule rule;
 
     // Translate watermark source into SE_SymbolInstance list.
     // As the source is adopted into symbol, we need to detach them after the rendering is done.
@@ -270,8 +270,8 @@
     instance->SetUsageContext(SymbolInstance::ucPoint);
     symbols.GetSymbolCollection()->Adopt(instance.release());
 
-    m_visitor->Convert(rule->symbolInstances, &symbols);
-    _ASSERT(rule->symbolInstances.size() == 1u);
+    m_visitor->Convert(rule.symbolInstances, &symbols);
+    _ASSERT(rule.symbolInstances.size() == 1u);
     
     // Translate appearance (transparency / rotation) into symbol instance
     // Prepare values
@@ -281,7 +281,7 @@
     double rotation = watermark->GetAppearance()->GetRotation();
     rotation = (rotation < 0) ? 0 : ((rotation > 360) ? 360 : rotation);
 
-    SE_SymbolInstance* sym = rule->symbolInstances[0];
+    SE_SymbolInstance* sym = rule.symbolInstances[0];
     size_t nStyles = sym->styles.size();
     for (size_t styleIx=0; styleIx<nStyles; ++styleIx)
     {

Modified: trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp	2010-09-21 05:00:03 UTC (rev 5167)
+++ trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp	2010-09-21 08:21:54 UTC (rev 5168)
@@ -790,11 +790,11 @@
                                                           RS_Bounds& b,
                                                           bool expandExtents,
                                                           bool bKeepSelection,
-                                                          bool renderingWatermark)
+                                                          bool renderWatermark)
 {
     MgRenderingOptions options(format, MgRenderingOptions::RenderSelection |
         MgRenderingOptions::RenderLayers | (bKeepSelection? MgRenderingOptions::KeepSelection : 0), NULL);
-    return RenderMapInternal(map, selection, roLayers, dr, drawWidth, drawHeight, saveWidth, saveHeight, scale, b, expandExtents, &options, renderingWatermark);
+    return RenderMapInternal(map, selection, roLayers, dr, drawWidth, drawHeight, saveWidth, saveHeight, scale, b, expandExtents, &options, renderWatermark);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -817,7 +817,7 @@
                                                           RS_Bounds& b,
                                                           bool expandExtents,
                                                           MgRenderingOptions* options,
-                                                          bool renderingWatermark)
+                                                          bool renderWatermark)
 {
     // set the map scale to the requested scale
     map->SetViewScale(scale);
@@ -940,16 +940,13 @@
             }
         }
 
-        if (renderingWatermark)
+        if (renderWatermark)
         {
             // Rendering watermark
 
-            // TODO: Don't allocate objects on heap if unnecessary!!!!!!!!!!!!!!
-            Ptr<MgStringCollection> watermarkIds = new MgStringCollection(); //ID list to load watermark definition
-            auto_ptr<WatermarkInstanceCollection> watermarkInstances(
-                new WatermarkInstanceCollection());     //Watermark list to render
-            auto_ptr<WatermarkInstanceCollection> tempWatermarkInstances(
-                new WatermarkInstanceCollection());    //Used to reverse list
+            MgStringCollection watermarkIds;      //ID list to load watermark definition
+            WatermarkInstanceCollection watermarkInstances;   //Watermark list to render
+            WatermarkInstanceCollection tempWatermarkInstances;    //Used to reverse list
             auto_ptr<WatermarkInstance> tempInstance;
 
             // Get watermark instance in map
@@ -959,10 +956,10 @@
                 auto_ptr<MapDefinition> mdef(MgMapBase::GetMapDefinition(m_svcResource, mapId));
                 WatermarkInstanceCollection* mapWatermarks = mdef->GetWatermarks();
                 for (int i=mapWatermarks->GetCount()-1; i>=0; i--)
-                    tempWatermarkInstances->Adopt(mapWatermarks->OrphanAt(i));
-                for (int i=tempWatermarkInstances->GetCount()-1; i>=0; i--)
+                    tempWatermarkInstances.Adopt(mapWatermarks->OrphanAt(i));
+                for (int i=tempWatermarkInstances.GetCount()-1; i>=0; i--)
                 {
-                    tempInstance.reset(tempWatermarkInstances->OrphanAt(i));
+                    tempInstance.reset(tempWatermarkInstances.OrphanAt(i));
                     if (!tempInstance.get())
                         continue;
                     if (((map->GetWatermarkUsage() & MgMap::Viewer) != 0
@@ -972,9 +969,9 @@
                         continue;
 
                     bool alreadyInList = false;
-                    for (int j=watermarkInstances->GetCount()-1; j >=0; j--)
+                    for (int j=watermarkInstances.GetCount()-1; j >=0; j--)
                     {
-                        if (tempInstance->Equals(watermarkInstances->GetAt(j)))
+                        if (tempInstance->Equals(watermarkInstances.GetAt(j)))
                         {
                             alreadyInList = true;
                             break;
@@ -983,8 +980,8 @@
 
                     if (!alreadyInList)
                     {
-                        watermarkIds->Add(tempInstance->GetResourceId().c_str());
-                        watermarkInstances->Adopt(tempInstance.release());
+                        watermarkIds.Add(tempInstance->GetResourceId().c_str());
+                        watermarkInstances.Adopt(tempInstance.release());
                     }
                 }
             }
@@ -1004,10 +1001,10 @@
                 
                 WatermarkInstanceCollection* layerWatermarks = ldf->GetWatermarks();
                 for (int j=layerWatermarks->GetCount()-1; j>=0; j--)
-                    tempWatermarkInstances->Adopt(layerWatermarks->OrphanAt(j));
-                for (int j=tempWatermarkInstances->GetCount()-1; j>=0; j--)
+                    tempWatermarkInstances.Adopt(layerWatermarks->OrphanAt(j));
+                for (int j=tempWatermarkInstances.GetCount()-1; j>=0; j--)
                 {
-                    tempInstance.reset(tempWatermarkInstances->OrphanAt(j));
+                    tempInstance.reset(tempWatermarkInstances.OrphanAt(j));
                     if (!tempInstance.get())
                         continue;
                     if (((map->GetWatermarkUsage() & MgMap::Viewer) != 0
@@ -1017,9 +1014,9 @@
                         continue;
 
                     bool alreadyInList = false;
-                    for (int k=watermarkInstances->GetCount()-1; k>=0; k--)
+                    for (int k=watermarkInstances.GetCount()-1; k>=0; k--)
                     {
-                        if (tempInstance->Equals(watermarkInstances->GetAt(k)))
+                        if (tempInstance->Equals(watermarkInstances.GetAt(k)))
                         {
                             alreadyInList = true;
                             break;
@@ -1028,23 +1025,23 @@
 
                     if (!alreadyInList)
                     {
-                        watermarkIds->Add(tempInstance->GetResourceId().c_str());
-                        watermarkInstances->Adopt(tempInstance.release());
+                        watermarkIds.Add(tempInstance->GetResourceId().c_str());
+                        watermarkInstances.Adopt(tempInstance.release());
                     }
                 }
             }
-            assert(tempWatermarkInstances->GetCount() == 0);
+            assert(tempWatermarkInstances.GetCount() == 0);
 
             // load watermark source
-            if (watermarkIds->GetCount() != 0)
+            if (watermarkIds.GetCount() != 0)
             {
-                Ptr<MgStringCollection> wdefs = m_svcResource->GetResourceContents(watermarkIds, NULL);
-                for (int i=watermarkIds->GetCount()-1; i>=0; i--)
+                Ptr<MgStringCollection> wdefs = m_svcResource->GetResourceContents(&watermarkIds, NULL);
+                for (int i=watermarkIds.GetCount()-1; i>=0; i--)
                 {
-                    for (int j=watermarkInstances->GetCount()-1; j>=0; j--)
+                    for (int j=watermarkInstances.GetCount()-1; j>=0; j--)
                     {
-                        WatermarkInstance* instance = watermarkInstances->GetAt(j);
-                        if (instance->GetResourceId() == watermarkIds->GetItem(i))
+                        WatermarkInstance* instance = watermarkInstances.GetAt(j);
+                        if (instance->GetResourceId() == watermarkIds.GetItem(i))
                         {
                             instance->AdoptWatermarkDefinition(MgWatermark::GetWatermarkDefinition(wdefs->GetItem(i)));
                         }
@@ -1052,9 +1049,9 @@
                 }
             }
 
-            for (int i=watermarkInstances->GetCount()-1; i>=0; i--)
+            for (int i=watermarkInstances.GetCount()-1; i>=0; i--)
             {
-                WatermarkInstance* instance = watermarkInstances->GetAt(i);
+                WatermarkInstance* instance = watermarkInstances.GetAt(i);
                 WatermarkDefinition* wdef = instance->GetWatermarkDefinition();
                 if (instance->GetPositionOverride())
                 {

Modified: trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.h
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.h	2010-09-21 05:00:03 UTC (rev 5167)
+++ trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.h	2010-09-21 08:21:54 UTC (rev 5168)
@@ -178,7 +178,7 @@
                                     RS_Bounds& b,
                                     bool expandExtents,
                                     bool bKeepSelection,
-                                    bool renderingWatermark);
+                                    bool renderWatermark);
 
     MgByteReader* RenderMapInternal(MgMap* map,
                                     MgSelection* selection,
@@ -192,7 +192,7 @@
                                     RS_Bounds& b,
                                     bool expandExtents,
                                     MgRenderingOptions* options,
-                                    bool renderingWatermark);
+                                    bool renderWatermark);
 
     void RenderForSelection(MgMap* map,
                          MgStringCollection* layerNames,

Modified: trunk/MgDev/Web/src/schemareport/templatefiles/layerdefinition.templ
===================================================================
--- trunk/MgDev/Web/src/schemareport/templatefiles/layerdefinition.templ	2010-09-21 05:00:03 UTC (rev 5167)
+++ trunk/MgDev/Web/src/schemareport/templatefiles/layerdefinition.templ	2010-09-21 08:21:54 UTC (rev 5168)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LayerDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="LayerDefinition-1.4.0.xsd" version="1.4.0">
+<LayerDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="LayerDefinition-2.3.0.xsd" version="2.3.0">
   <VectorLayerDefinition>
     <ResourceId>%s</ResourceId>
     <FeatureName>%s</FeatureName>

Modified: trunk/MgDev/Web/src/schemareport/templatefiles/mapdefinition.templ
===================================================================
--- trunk/MgDev/Web/src/schemareport/templatefiles/mapdefinition.templ	2010-09-21 05:00:03 UTC (rev 5167)
+++ trunk/MgDev/Web/src/schemareport/templatefiles/mapdefinition.templ	2010-09-21 08:21:54 UTC (rev 5168)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<MapDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="MapDefinition-1.0.0.xsd">
+<MapDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="MapDefinition-2.3.0.xsd" version="2.3.0">
   <Name>%s</Name>
   <CoordinateSystem>%s</CoordinateSystem>
   %s

Modified: trunk/MgDev/Web/src/viewerfiles/arealayerdef.templ
===================================================================
--- trunk/MgDev/Web/src/viewerfiles/arealayerdef.templ	2010-09-21 05:00:03 UTC (rev 5167)
+++ trunk/MgDev/Web/src/viewerfiles/arealayerdef.templ	2010-09-21 08:21:54 UTC (rev 5168)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LayerDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="LayerDefinition-1.4.0.xsd" version="1.4.0">
+<LayerDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="LayerDefinition-2.3.0.xsd" version="2.3.0">
   <VectorLayerDefinition>
     <ResourceId>%s</ResourceId>
     <FeatureName>%s</FeatureName>

Modified: trunk/MgDev/Web/src/viewerfiles/layerdefinition.templ
===================================================================
--- trunk/MgDev/Web/src/viewerfiles/layerdefinition.templ	2010-09-21 05:00:03 UTC (rev 5167)
+++ trunk/MgDev/Web/src/viewerfiles/layerdefinition.templ	2010-09-21 08:21:54 UTC (rev 5168)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LayerDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="LayerDefinition-1.4.0.xsd" version="1.4.0">
+<LayerDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="LayerDefinition-2.3.0.xsd" version="2.3.0">
   <VectorLayerDefinition>
     <ResourceId>%s</ResourceId>
     <FeatureName>%s</FeatureName>

Modified: trunk/MgDev/Web/src/viewerfiles/linelayerdef.templ
===================================================================
--- trunk/MgDev/Web/src/viewerfiles/linelayerdef.templ	2010-09-21 05:00:03 UTC (rev 5167)
+++ trunk/MgDev/Web/src/viewerfiles/linelayerdef.templ	2010-09-21 08:21:54 UTC (rev 5168)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LayerDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="LayerDefinition-1.4.0.xsd" version="1.4.0">
+<LayerDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="LayerDefinition-2.3.0.xsd" version="2.3.0">
   <VectorLayerDefinition>
     <ResourceId>%s</ResourceId>
     <FeatureName>%s</FeatureName>



More information about the mapguide-commits mailing list