[mapguide-commits] r9513 - in sandbox/jng/v4: Common/PlatformBase/Services Common/Schema Server/src/Services/Feature Server/src/Services/Rendering Server/src/UnitTesting Web/src/HttpHandler Web/src/mapadmin Web/src/mapviewerjava Web/src/mapviewernet Web/src/mapviewerphp
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon May 27 08:14:08 PDT 2019
Author: jng
Date: 2019-05-27 08:14:08 -0700 (Mon, 27 May 2019)
New Revision: 9513
Added:
sandbox/jng/v4/Common/Schema/ClassDefinition-4.0.0.xsd
sandbox/jng/v4/Common/Schema/FeatureSchemaCollection-4.0.0.xsd
sandbox/jng/v4/Common/Schema/GeometryInfo-4.0.0.xsd
sandbox/jng/v4/Common/Schema/TransformedCoordinateCollection-4.0.0.xsd
sandbox/jng/v4/Common/Schema/UnitOfMeasure-4.0.0.xsd
Removed:
sandbox/jng/v4/Common/Schema/ClassDefinition-3.3.0.xsd
sandbox/jng/v4/Common/Schema/FeatureSchemaCollection-3.3.0.xsd
sandbox/jng/v4/Common/Schema/GeometryInfo-3.3.0.xsd
sandbox/jng/v4/Common/Schema/TransformedCoordinateCollection-3.3.0.xsd
sandbox/jng/v4/Common/Schema/UnitOfMeasure-3.3.0.xsd
Modified:
sandbox/jng/v4/Common/PlatformBase/Services/ClassDefinition.cpp
sandbox/jng/v4/Common/PlatformBase/Services/FeatureSchemaCollection.cpp
sandbox/jng/v4/Server/src/Services/Feature/FeatureOperationFactory.cpp
sandbox/jng/v4/Server/src/Services/Feature/ServerFeatureService.cpp
sandbox/jng/v4/Server/src/Services/Rendering/RenderingOperationFactory.cpp
sandbox/jng/v4/Server/src/UnitTesting/TestMisc.cpp
sandbox/jng/v4/Web/src/HttpHandler/HttpCreateRuntimeMap.cpp
sandbox/jng/v4/Web/src/HttpHandler/HttpCsTransformCoordinates.cpp
sandbox/jng/v4/Web/src/HttpHandler/HttpDescribeRuntimeMap.cpp
sandbox/jng/v4/Web/src/HttpHandler/HttpDescribeSchema.cpp
sandbox/jng/v4/Web/src/HttpHandler/HttpGeoBinaryOperation.cpp
sandbox/jng/v4/Web/src/HttpHandler/HttpGeoBoundary.cpp
sandbox/jng/v4/Web/src/HttpHandler/HttpGeoBuffer.cpp
sandbox/jng/v4/Web/src/HttpHandler/HttpGeoConvexHull.cpp
sandbox/jng/v4/Web/src/HttpHandler/HttpGeoDistance.cpp
sandbox/jng/v4/Web/src/HttpHandler/HttpGeoSimplify.cpp
sandbox/jng/v4/Web/src/HttpHandler/HttpGeoSpatialPredicate.cpp
sandbox/jng/v4/Web/src/HttpHandler/HttpGeoTessellate.cpp
sandbox/jng/v4/Web/src/HttpHandler/HttpGeometryInfo.cpp
sandbox/jng/v4/Web/src/HttpHandler/HttpGetClassDefinition.cpp
sandbox/jng/v4/Web/src/HttpHandler/HttpGetTileProviders.cpp
sandbox/jng/v4/Web/src/HttpHandler/HttpQueryMapFeatures.cpp
sandbox/jng/v4/Web/src/HttpHandler/HttpRequestResponseHandler.cpp
sandbox/jng/v4/Web/src/HttpHandler/HttpSelectFeatures.cpp
sandbox/jng/v4/Web/src/HttpHandler/HttpSelectFeaturesSpatially.cpp
sandbox/jng/v4/Web/src/HttpHandler/XmlJsonConvert.cpp
sandbox/jng/v4/Web/src/mapadmin/resizableadmin.php
sandbox/jng/v4/Web/src/mapviewerjava/ajaxviewerabout.jsp
sandbox/jng/v4/Web/src/mapviewernet/ajaxviewerabout.aspx
sandbox/jng/v4/Web/src/mapviewerphp/ajaxviewerabout.php
Log:
Second round of 3.3 -> 4.0 find/replace.
Also update XML schemas introduced in this dev cycle.
Modified: sandbox/jng/v4/Common/PlatformBase/Services/ClassDefinition.cpp
===================================================================
--- sandbox/jng/v4/Common/PlatformBase/Services/ClassDefinition.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Common/PlatformBase/Services/ClassDefinition.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -249,7 +249,7 @@
if (includeProlog)
{
xml = L"<?xml version=\"1.0\" encoding=\"utf-8\"?>";
- xml.append(L"<ClassDefinition xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"ClassDefinition-3.3.0.xsd\">");
+ xml.append(L"<ClassDefinition xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"ClassDefinition-4.0.0.xsd\">");
}
else
{
Modified: sandbox/jng/v4/Common/PlatformBase/Services/FeatureSchemaCollection.cpp
===================================================================
--- sandbox/jng/v4/Common/PlatformBase/Services/FeatureSchemaCollection.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Common/PlatformBase/Services/FeatureSchemaCollection.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -203,7 +203,7 @@
void MgFeatureSchemaCollection::ToSimpleXml(std::string & str)
{
str = "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
- str.append("<FeatureSchemaCollection xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"FeatureSchemaCollection-3.3.0.xsd\">");
+ str.append("<FeatureSchemaCollection xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"FeatureSchemaCollection-4.0.0.xsd\">");
INT32 fcount = GetCount();
for (INT32 i = 0; i < fcount; i++)
Deleted: sandbox/jng/v4/Common/Schema/ClassDefinition-3.3.0.xsd
===================================================================
--- sandbox/jng/v4/Common/Schema/ClassDefinition-3.3.0.xsd 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Common/Schema/ClassDefinition-3.3.0.xsd 2019-05-27 15:14:08 UTC (rev 9513)
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="ClassDefinition" type="ClassDefinition">
- <xs:annotation>
- <xs:documentation>A FDO Class Definition.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:complexType name="ClassDefinition">
- <xs:annotation>
- <xs:documentation>A FDO Class Definition.</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="Name" type="xs:string">
- <xs:annotation>
- <xs:documentation>The name of this class definition</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Description" type="xs:string">
- <xs:annotation>
- <xs:documentation>The description of this class definition</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="IsAbstract" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>Indicates if this class definition is abstract</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="IsComputed" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>Indicates if this class definition is computed</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="DefaultGeometryPropertyName" type="xs:string">
- <xs:annotation>
- <xs:documentation>The name of the designated geometry property of this class definition</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Properties" type="PropertyDefinitionCollection">
- <xs:annotation>
- <xs:documentation>The collection of properties in this class definition</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="PropertyDefinitionCollection">
- <xs:annotation>
- <xs:documentation>A collection of property definitions</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="Property" type="PropertyDefinition" minOccurs="0" maxOccurs="unbounded" />
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="PropertyDefinition">
- <xs:annotation>
- <xs:documentation>A FDO property definition</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="Name" type="xs:string">
- <xs:annotation>
- <xs:documentation>The name of this property definition</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Description" type="xs:string">
- <xs:annotation>
- <xs:documentation>The description of this property definition</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="PropertyType" type="xs:integer">
- <xs:annotation>
- <xs:documentation>The type of this property definition. The value here is within the same set of values from MgFeaturePropertyType</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="IsIdentity" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>Indicates if this property is an identity property</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="DataType" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>The data type of this data property. The value here is within the same set of values from MgPropertyType. Only applicable if this is a data property</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="DefaultValue" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>The default value for this data property. Only applicable if this is a data property and the data type is string</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Length" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>The maximum length for this data property. Only applicable if this is a data property and the data type is string</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Nullable" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Indicates if this property is nullable. Only applicable if this is a raster or data property.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="ReadOnly" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Indicates if this property is read-only. Only applicable if this is a raster, geometry or data property.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="IsAutoGenerated" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Indicates if this property is auto-generated. Only applicable if this is a data property and the data type is int.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Precision" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>The precision (total number of digits) of this property. Only applicable if this is a data property and the data type is decimal.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Scale" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>The scale (number of digits to the right of the decimal point) of this property. Only applicable if this is a data property and the data type is decimal.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="SpatialContextAssociation" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>The spatial context name associated with this geometric property. Only applicable if this is a raster or geometry property.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="GeometryTypes" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>A bitmask that indicates the types which specify the categories of the geometries (point, line, surface, solid) that can be stored in this geometric property. Values here come from MgFeatureGeometricType.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="SpecificGeometryTypes" type="GeometryTypeInfo" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Indicates the specific geometry types that can be stored in this geometric property. Values here come from MgGeometryType.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="HasElevation" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Indicates if this property has elevation. Only applicable if this is a geometry property.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="HasMeasure" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Indicates if this property has measure. Only applicable if this is a geometry property.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="DefaultImageXSize" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>The default size of the image file in the horizontal direction, in pixels (number of columns)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="DefaultImageYSize" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>The default size of the image file in the vertical direction, in pixels (number of rows).</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="GeometryTypeInfo">
- <xs:annotation>
- <xs:documentation>Defines a list of geometric types</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="Type" type="xs:integer" minOccurs="0" maxOccurs="unbounded" />
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
\ No newline at end of file
Copied: sandbox/jng/v4/Common/Schema/ClassDefinition-4.0.0.xsd (from rev 9512, sandbox/jng/v4/Common/Schema/ClassDefinition-3.3.0.xsd)
===================================================================
--- sandbox/jng/v4/Common/Schema/ClassDefinition-4.0.0.xsd (rev 0)
+++ sandbox/jng/v4/Common/Schema/ClassDefinition-4.0.0.xsd 2019-05-27 15:14:08 UTC (rev 9513)
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <xs:element name="ClassDefinition" type="ClassDefinition">
+ <xs:annotation>
+ <xs:documentation>A FDO Class Definition.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:complexType name="ClassDefinition">
+ <xs:annotation>
+ <xs:documentation>A FDO Class Definition.</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="Name" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>The name of this class definition</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Description" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>The description of this class definition</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="IsAbstract" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>Indicates if this class definition is abstract</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="IsComputed" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>Indicates if this class definition is computed</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="DefaultGeometryPropertyName" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>The name of the designated geometry property of this class definition</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Properties" type="PropertyDefinitionCollection">
+ <xs:annotation>
+ <xs:documentation>The collection of properties in this class definition</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="PropertyDefinitionCollection">
+ <xs:annotation>
+ <xs:documentation>A collection of property definitions</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="Property" type="PropertyDefinition" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="PropertyDefinition">
+ <xs:annotation>
+ <xs:documentation>A FDO property definition</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="Name" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>The name of this property definition</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Description" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>The description of this property definition</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="PropertyType" type="xs:integer">
+ <xs:annotation>
+ <xs:documentation>The type of this property definition. The value here is within the same set of values from MgFeaturePropertyType</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="IsIdentity" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>Indicates if this property is an identity property</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="DataType" type="xs:integer" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>The data type of this data property. The value here is within the same set of values from MgPropertyType. Only applicable if this is a data property</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="DefaultValue" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>The default value for this data property. Only applicable if this is a data property and the data type is string</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Length" type="xs:integer" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>The maximum length for this data property. Only applicable if this is a data property and the data type is string</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Nullable" type="xs:boolean" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>Indicates if this property is nullable. Only applicable if this is a raster or data property.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ReadOnly" type="xs:boolean" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>Indicates if this property is read-only. Only applicable if this is a raster, geometry or data property.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="IsAutoGenerated" type="xs:boolean" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>Indicates if this property is auto-generated. Only applicable if this is a data property and the data type is int.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Precision" type="xs:boolean" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>The precision (total number of digits) of this property. Only applicable if this is a data property and the data type is decimal.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Scale" type="xs:boolean" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>The scale (number of digits to the right of the decimal point) of this property. Only applicable if this is a data property and the data type is decimal.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="SpatialContextAssociation" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>The spatial context name associated with this geometric property. Only applicable if this is a raster or geometry property.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="GeometryTypes" type="xs:integer" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>A bitmask that indicates the types which specify the categories of the geometries (point, line, surface, solid) that can be stored in this geometric property. Values here come from MgFeatureGeometricType.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="SpecificGeometryTypes" type="GeometryTypeInfo" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>Indicates the specific geometry types that can be stored in this geometric property. Values here come from MgGeometryType.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="HasElevation" type="xs:boolean" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>Indicates if this property has elevation. Only applicable if this is a geometry property.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="HasMeasure" type="xs:boolean" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>Indicates if this property has measure. Only applicable if this is a geometry property.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="DefaultImageXSize" type="xs:integer" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>The default size of the image file in the horizontal direction, in pixels (number of columns)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="DefaultImageYSize" type="xs:integer" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>The default size of the image file in the vertical direction, in pixels (number of rows).</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="GeometryTypeInfo">
+ <xs:annotation>
+ <xs:documentation>Defines a list of geometric types</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="Type" type="xs:integer" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
\ No newline at end of file
Deleted: sandbox/jng/v4/Common/Schema/FeatureSchemaCollection-3.3.0.xsd
===================================================================
--- sandbox/jng/v4/Common/Schema/FeatureSchemaCollection-3.3.0.xsd 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Common/Schema/FeatureSchemaCollection-3.3.0.xsd 2019-05-27 15:14:08 UTC (rev 9513)
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:include schemaLocation="ClassDefinition-3.3.0.xsd"/>
- <xs:element name="FeatureSchemaCollection" type="FeatureSchemaCollection">
- <xs:annotation>
- <xs:documentation>A FDO Feature Schema Definition.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:complexType name="FeatureSchemaCollection">
- <xs:sequence>
- <xs:element name="FeatureSchema" type="FeatureSchema" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>The feature schemas in this collection</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="FeatureSchema">
- <xs:annotation>
- <xs:documentation>A FDO Feature Schema.</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="Name" type="xs:string">
- <xs:annotation>
- <xs:documentation>The name of this feature schema</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Description" type="xs:string">
- <xs:annotation>
- <xs:documentation>The description of this feature schema</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Classes" type="ClassDefinitionCollection">
- <xs:annotation>
- <xs:documentation>The collection of classes in this schema</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="ClassDefinitionCollection">
- <xs:annotation>
- <xs:documentation>A collection of FDO class definitions</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="ClassDefinition" type="ClassDefinition" />
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
\ No newline at end of file
Copied: sandbox/jng/v4/Common/Schema/FeatureSchemaCollection-4.0.0.xsd (from rev 9512, sandbox/jng/v4/Common/Schema/FeatureSchemaCollection-3.3.0.xsd)
===================================================================
--- sandbox/jng/v4/Common/Schema/FeatureSchemaCollection-4.0.0.xsd (rev 0)
+++ sandbox/jng/v4/Common/Schema/FeatureSchemaCollection-4.0.0.xsd 2019-05-27 15:14:08 UTC (rev 9513)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <xs:include schemaLocation="ClassDefinition-4.0.0.xsd"/>
+ <xs:element name="FeatureSchemaCollection" type="FeatureSchemaCollection">
+ <xs:annotation>
+ <xs:documentation>A FDO Feature Schema Definition.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:complexType name="FeatureSchemaCollection">
+ <xs:sequence>
+ <xs:element name="FeatureSchema" type="FeatureSchema" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>The feature schemas in this collection</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="FeatureSchema">
+ <xs:annotation>
+ <xs:documentation>A FDO Feature Schema.</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="Name" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>The name of this feature schema</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Description" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>The description of this feature schema</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Classes" type="ClassDefinitionCollection">
+ <xs:annotation>
+ <xs:documentation>The collection of classes in this schema</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="ClassDefinitionCollection">
+ <xs:annotation>
+ <xs:documentation>A collection of FDO class definitions</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="ClassDefinition" type="ClassDefinition" />
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
\ No newline at end of file
Deleted: sandbox/jng/v4/Common/Schema/GeometryInfo-3.3.0.xsd
===================================================================
--- sandbox/jng/v4/Common/Schema/GeometryInfo-3.3.0.xsd 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Common/Schema/GeometryInfo-3.3.0.xsd 2019-05-27 15:14:08 UTC (rev 9513)
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="GeometryInfo">
- <xs:annotation>
- <xs:documentation>Geometry Information</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Area" type="xs:double" />
- <xs:element name="Dimension" type="xs:int" />
- <xs:element name="Length" type="xs:double" />
- <xs:element name="IsClosed" type="xs:boolean" />
- <xs:element name="IsEmpty" type="xs:boolean" />
- <xs:element name="IsSimple" type="xs:boolean" />
- <xs:element name="IsValid" type="xs:boolean" />
- <xs:element name="Envelope" type="Envelope" />
- <xs:element name="Centroid" type="Coordinate" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:complexType name="Coordinate">
- <xs:annotation>
- <xs:documentation>Represents a coordinate</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="X" type="xs:double">
- <xs:annotation>
- <xs:documentation>x-coordinate</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Y" type="xs:double">
- <xs:annotation>
- <xs:documentation>y-coordinate</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="Envelope">
- <xs:annotation>
- <xs:documentation>Represents a bounding box defined in terms of a lower left coordinate and an upper right coordinate</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="LowerLeft" type="Coordinate">
- <xs:annotation>
- <xs:documentation>Lower-left coordinate</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="UpperRight" type="Coordinate">
- <xs:annotation>
- <xs:documentation>Upper-right coordinate</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
Copied: sandbox/jng/v4/Common/Schema/GeometryInfo-4.0.0.xsd (from rev 9512, sandbox/jng/v4/Common/Schema/GeometryInfo-3.3.0.xsd)
===================================================================
--- sandbox/jng/v4/Common/Schema/GeometryInfo-4.0.0.xsd (rev 0)
+++ sandbox/jng/v4/Common/Schema/GeometryInfo-4.0.0.xsd 2019-05-27 15:14:08 UTC (rev 9513)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <xs:element name="GeometryInfo">
+ <xs:annotation>
+ <xs:documentation>Geometry Information</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Area" type="xs:double" />
+ <xs:element name="Dimension" type="xs:int" />
+ <xs:element name="Length" type="xs:double" />
+ <xs:element name="IsClosed" type="xs:boolean" />
+ <xs:element name="IsEmpty" type="xs:boolean" />
+ <xs:element name="IsSimple" type="xs:boolean" />
+ <xs:element name="IsValid" type="xs:boolean" />
+ <xs:element name="Envelope" type="Envelope" />
+ <xs:element name="Centroid" type="Coordinate" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:complexType name="Coordinate">
+ <xs:annotation>
+ <xs:documentation>Represents a coordinate</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="X" type="xs:double">
+ <xs:annotation>
+ <xs:documentation>x-coordinate</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Y" type="xs:double">
+ <xs:annotation>
+ <xs:documentation>y-coordinate</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="Envelope">
+ <xs:annotation>
+ <xs:documentation>Represents a bounding box defined in terms of a lower left coordinate and an upper right coordinate</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="LowerLeft" type="Coordinate">
+ <xs:annotation>
+ <xs:documentation>Lower-left coordinate</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="UpperRight" type="Coordinate">
+ <xs:annotation>
+ <xs:documentation>Upper-right coordinate</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
Deleted: sandbox/jng/v4/Common/Schema/TransformedCoordinateCollection-3.3.0.xsd
===================================================================
--- sandbox/jng/v4/Common/Schema/TransformedCoordinateCollection-3.3.0.xsd 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Common/Schema/TransformedCoordinateCollection-3.3.0.xsd 2019-05-27 15:14:08 UTC (rev 9513)
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="TransformedCoordinateCollection">
- <xs:annotation>
- <xs:documentation>A collection of transformed coordinates</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="CoordinateSystem" type="CoordinateSystemInfo" />
- <xs:element name="TransformedCoordinate" type="TransformedCoordinate" minOccurs="0" maxOccurs="unbounded" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:complexType name="CoordinateSystemInfo">
- <xs:annotation>
- <xs:documentation>Information about the coordinate system</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="MentorCode" type="xs:string">
- <xs:annotation>
- <xs:documentation>Mentor (CS-Map) coordinate system code</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="EpsgCode" type="xs:integer">
- <xs:annotation>
- <xs:documentation>EPSG code</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Wkt" type="xs:string">
- <xs:annotation>
- <xs:documentation>The well-known text of the coordinate system</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="TransformedCoordinate">
- <xs:annotation>
- <xs:documentation>Represents a transformed coordinate</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="X" type="xs:double" minOccurs="0" maxOccurs="1">
- <xs:annotation>
- <xs:documentation>x-coordinate</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Y" type="xs:double" minOccurs="0" maxOccurs="1">
- <xs:annotation>
- <xs:documentation>y-coordinate</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Error" type="xs:string" minOccurs="0" maxOccurs="1">
- <xs:annotation>
- <xs:documentation>The string token that failed to parse into a coordinate pair</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
Copied: sandbox/jng/v4/Common/Schema/TransformedCoordinateCollection-4.0.0.xsd (from rev 9512, sandbox/jng/v4/Common/Schema/TransformedCoordinateCollection-3.3.0.xsd)
===================================================================
--- sandbox/jng/v4/Common/Schema/TransformedCoordinateCollection-4.0.0.xsd (rev 0)
+++ sandbox/jng/v4/Common/Schema/TransformedCoordinateCollection-4.0.0.xsd 2019-05-27 15:14:08 UTC (rev 9513)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <xs:element name="TransformedCoordinateCollection">
+ <xs:annotation>
+ <xs:documentation>A collection of transformed coordinates</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="CoordinateSystem" type="CoordinateSystemInfo" />
+ <xs:element name="TransformedCoordinate" type="TransformedCoordinate" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:complexType name="CoordinateSystemInfo">
+ <xs:annotation>
+ <xs:documentation>Information about the coordinate system</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="MentorCode" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Mentor (CS-Map) coordinate system code</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="EpsgCode" type="xs:integer">
+ <xs:annotation>
+ <xs:documentation>EPSG code</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Wkt" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>The well-known text of the coordinate system</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="TransformedCoordinate">
+ <xs:annotation>
+ <xs:documentation>Represents a transformed coordinate</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="X" type="xs:double" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>x-coordinate</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Y" type="xs:double" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>y-coordinate</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Error" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The string token that failed to parse into a coordinate pair</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
Deleted: sandbox/jng/v4/Common/Schema/UnitOfMeasure-3.3.0.xsd
===================================================================
--- sandbox/jng/v4/Common/Schema/UnitOfMeasure-3.3.0.xsd 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Common/Schema/UnitOfMeasure-3.3.0.xsd 2019-05-27 15:14:08 UTC (rev 9513)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="UnitOfMeasure">
- <xs:annotation>
- <xs:documentation>Unit of measure</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Value" type="xs:double" />
- <xs:element name="Unit" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-</xs:schema>
Copied: sandbox/jng/v4/Common/Schema/UnitOfMeasure-4.0.0.xsd (from rev 9512, sandbox/jng/v4/Common/Schema/UnitOfMeasure-3.3.0.xsd)
===================================================================
--- sandbox/jng/v4/Common/Schema/UnitOfMeasure-4.0.0.xsd (rev 0)
+++ sandbox/jng/v4/Common/Schema/UnitOfMeasure-4.0.0.xsd 2019-05-27 15:14:08 UTC (rev 9513)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <xs:element name="UnitOfMeasure">
+ <xs:annotation>
+ <xs:documentation>Unit of measure</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Value" type="xs:double" />
+ <xs:element name="Unit" type="xs:string" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
Modified: sandbox/jng/v4/Server/src/Services/Feature/FeatureOperationFactory.cpp
===================================================================
--- sandbox/jng/v4/Server/src/Services/Feature/FeatureOperationFactory.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Server/src/Services/Feature/FeatureOperationFactory.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -161,7 +161,7 @@
{
case VERSION_SUPPORTED(1,0):
case VERSION_SUPPORTED(2,0):
- case VERSION_SUPPORTED(3,3): //This is 2.0 with optional clean JSON output
+ case VERSION_SUPPORTED(4,0): //This is 2.0 with optional clean JSON output
handler.reset(new MgOpGetCapabilities());
break;
default:
@@ -583,7 +583,7 @@
case MgFeatureServiceOpId::GetWfsReader_Id:
switch (VERSION_NO_PHASE(operationVersion))
{
- case VERSION_SUPPORTED(3, 3):
+ case VERSION_SUPPORTED(4,0):
handler.reset(new MgOpGetWfsReader());
break;
default:
Modified: sandbox/jng/v4/Server/src/Services/Feature/ServerFeatureService.cpp
===================================================================
--- sandbox/jng/v4/Server/src/Services/Feature/ServerFeatureService.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Server/src/Services/Feature/ServerFeatureService.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -280,7 +280,7 @@
Ptr<MgUserInformation> userInfo = MgUserInformation::GetCurrentUserInfo();
if (userInfo->GetApiVersion() != MG_API_VERSION(1,0,0) &&
userInfo->GetApiVersion() != MG_API_VERSION(2,0,0) &&
- userInfo->GetApiVersion() != MG_API_VERSION(3,3,0)) //This is 2.0.0 with optional clean JSON output
+ userInfo->GetApiVersion() != MG_API_VERSION(4,0,0)) //This is 2.0.0 with optional clean JSON output
{
throw new MgInvalidOperationVersionException(
L"MgServerFeatureService.GetCapabilities", __LINE__, __WFILE__, NULL, L"", NULL);
Modified: sandbox/jng/v4/Server/src/Services/Rendering/RenderingOperationFactory.cpp
===================================================================
--- sandbox/jng/v4/Server/src/Services/Rendering/RenderingOperationFactory.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Server/src/Services/Rendering/RenderingOperationFactory.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -111,7 +111,7 @@
case MgRenderingServiceOpId::RenderMetatile:
switch (VERSION_NO_PHASE(operationVersion))
{
- case VERSION_SUPPORTED(3, 3):
+ case VERSION_SUPPORTED(4,0):
handler.reset(new MgOpRenderMetatile());
break;
default:
@@ -122,7 +122,7 @@
case MgRenderingServiceOpId::RenderTileFromMetaTile:
switch (VERSION_NO_PHASE(operationVersion))
{
- case VERSION_SUPPORTED(3, 3):
+ case VERSION_SUPPORTED(4,0):
handler.reset(new MgOpRenderTileFromMetatile());
break;
default:
@@ -133,7 +133,7 @@
case MgRenderingServiceOpId::RenderTileUTFGrid:
switch (VERSION_NO_PHASE(operationVersion))
{
- case VERSION_SUPPORTED(3, 3):
+ case VERSION_SUPPORTED(4,0):
handler.reset(new MgOpRenderTileUTFGrid());
break;
default:
@@ -285,7 +285,7 @@
case MgRenderingServiceOpId::QueryFeatureProperties3:
switch (VERSION_NO_PHASE(operationVersion))
{
- case VERSION_SUPPORTED(3, 3):
+ case VERSION_SUPPORTED(4,0):
handler.reset(new MgOpQueryFeatureProperties());
break;
default:
Modified: sandbox/jng/v4/Server/src/UnitTesting/TestMisc.cpp
===================================================================
--- sandbox/jng/v4/Server/src/UnitTesting/TestMisc.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Server/src/UnitTesting/TestMisc.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -598,8 +598,8 @@
try
{
//Just making sure this macro behaves as we expect
- CPPUNIT_ASSERT_MESSAGE("Expected 3.4.0 >= 3.3.0", MG_API_VERSION(3, 4, 0) >= MG_API_VERSION(3, 3, 0));
- CPPUNIT_ASSERT_MESSAGE("Expected 3.3.0 >= 3.3.0", MG_API_VERSION(3, 3, 0) >= MG_API_VERSION(3, 3, 0));
+ CPPUNIT_ASSERT_MESSAGE("Expected 4.1.0 >= 4.0.0", MG_API_VERSION(4, 1, 0) >= MG_API_VERSION(4, 0, 0));
+ CPPUNIT_ASSERT_MESSAGE("Expected 4.0.0 >= 4.0.0", MG_API_VERSION(4, 0, 0) >= MG_API_VERSION(4, 0, 0));
}
catch (MgException* e)
{
Modified: sandbox/jng/v4/Web/src/HttpHandler/HttpCreateRuntimeMap.cpp
===================================================================
--- sandbox/jng/v4/Web/src/HttpHandler/HttpCreateRuntimeMap.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/HttpHandler/HttpCreateRuntimeMap.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -140,7 +140,7 @@
INT32 version = m_userInfo->GetApiVersion();
if (version != MG_API_VERSION(2,6,0) &&
version != MG_API_VERSION(3,0,0) &&
- version != MG_API_VERSION(3,3,0))
+ version != MG_API_VERSION(4,0,0))
{
throw new MgInvalidOperationVersionException(
L"MgHttpCreateRuntimeMap.ValidateOperationVersion", __LINE__, __WFILE__, NULL, L"", NULL);
Modified: sandbox/jng/v4/Web/src/HttpHandler/HttpCsTransformCoordinates.cpp
===================================================================
--- sandbox/jng/v4/Web/src/HttpHandler/HttpCsTransformCoordinates.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/HttpHandler/HttpCsTransformCoordinates.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -63,7 +63,7 @@
Ptr<MgTransform> xform = factory->GetTransform(source, target);
std::string xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
- xml += "<TransformedCoordinateCollection xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"TransformedCoordinateCollection-3.3.0.xsd\">";
+ xml += "<TransformedCoordinateCollection xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"TransformedCoordinateCollection-4.0.0.xsd\">";
// Output information about the target coordinate system
@@ -146,7 +146,7 @@
MG_HTTP_HANDLER_TRY()
INT32 version = m_userInfo->GetApiVersion();
- if (version != MG_API_VERSION(3, 3, 0))
+ if (version != MG_API_VERSION(4, 0, 0))
{
throw new MgInvalidOperationVersionException(
L"MgHttpCsTransformCoordinates.ValidateOperationVersion", __LINE__, __WFILE__, NULL, L"", NULL);
Modified: sandbox/jng/v4/Web/src/HttpHandler/HttpDescribeRuntimeMap.cpp
===================================================================
--- sandbox/jng/v4/Web/src/HttpHandler/HttpDescribeRuntimeMap.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/HttpHandler/HttpDescribeRuntimeMap.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -120,7 +120,7 @@
INT32 version = m_userInfo->GetApiVersion();
if (version != MG_API_VERSION(2,6,0) &&
version != MG_API_VERSION(3,0,0) &&
- version != MG_API_VERSION(3,3,0))
+ version != MG_API_VERSION(4,0,0))
{
throw new MgInvalidOperationVersionException(
L"MgHttpDescribeRuntimeMap.ValidateOperationVersion", __LINE__, __WFILE__, NULL, L"", NULL);
Modified: sandbox/jng/v4/Web/src/HttpHandler/HttpDescribeSchema.cpp
===================================================================
--- sandbox/jng/v4/Web/src/HttpHandler/HttpDescribeSchema.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/HttpHandler/HttpDescribeSchema.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -43,8 +43,8 @@
params->GetParameterValue(MgHttpResourceStrings::reqFeatClassNames), L".");
m_bSimple = false;
- // Get simple flag (SIMPLE). Only recognize this flag for 3.3.0 and above
- if (m_userInfo->GetApiVersion() >= MG_API_VERSION(3, 3, 0))
+ // Get simple flag (SIMPLE). Only recognize this flag for 4.0.0 and above
+ if (m_userInfo->GetApiVersion() >= MG_API_VERSION(4, 0, 0))
{
STRING simple = params->GetParameterValue(MgHttpResourceStrings::reqFeatSimple);
if (simple.length() > 0)
Modified: sandbox/jng/v4/Web/src/HttpHandler/HttpGeoBinaryOperation.cpp
===================================================================
--- sandbox/jng/v4/Web/src/HttpHandler/HttpGeoBinaryOperation.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/HttpHandler/HttpGeoBinaryOperation.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -121,7 +121,7 @@
// There are multiple supported versions
INT32 version = m_userInfo->GetApiVersion();
- if (version != MG_API_VERSION(3, 3, 0))
+ if (version != MG_API_VERSION(4, 0, 0))
{
throw new MgInvalidOperationVersionException(
L"MgHttpGeoBinaryOperation.ValidateOperationVersion", __LINE__, __WFILE__, NULL, L"", NULL);
Modified: sandbox/jng/v4/Web/src/HttpHandler/HttpGeoBoundary.cpp
===================================================================
--- sandbox/jng/v4/Web/src/HttpHandler/HttpGeoBoundary.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/HttpHandler/HttpGeoBoundary.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -108,7 +108,7 @@
// There are multiple supported versions
INT32 version = m_userInfo->GetApiVersion();
- if (version != MG_API_VERSION(3, 3, 0))
+ if (version != MG_API_VERSION(4, 0, 0))
{
throw new MgInvalidOperationVersionException(
L"MgHttpGeoBoundary.ValidateOperationVersion", __LINE__, __WFILE__, NULL, L"", NULL);
Modified: sandbox/jng/v4/Web/src/HttpHandler/HttpGeoBuffer.cpp
===================================================================
--- sandbox/jng/v4/Web/src/HttpHandler/HttpGeoBuffer.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/HttpHandler/HttpGeoBuffer.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -143,7 +143,7 @@
// There are multiple supported versions
INT32 version = m_userInfo->GetApiVersion();
- if (version != MG_API_VERSION(3, 3, 0))
+ if (version != MG_API_VERSION(4, 0, 0))
{
throw new MgInvalidOperationVersionException(
L"MgHttpGeoBuffer.ValidateOperationVersion", __LINE__, __WFILE__, NULL, L"", NULL);
Modified: sandbox/jng/v4/Web/src/HttpHandler/HttpGeoConvexHull.cpp
===================================================================
--- sandbox/jng/v4/Web/src/HttpHandler/HttpGeoConvexHull.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/HttpHandler/HttpGeoConvexHull.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -108,7 +108,7 @@
// There are multiple supported versions
INT32 version = m_userInfo->GetApiVersion();
- if (version != MG_API_VERSION(3, 3, 0))
+ if (version != MG_API_VERSION(4, 0, 0))
{
throw new MgInvalidOperationVersionException(
L"MgHttpGeoConvexHull.ValidateOperationVersion", __LINE__, __WFILE__, NULL, L"", NULL);
Modified: sandbox/jng/v4/Web/src/HttpHandler/HttpGeoDistance.cpp
===================================================================
--- sandbox/jng/v4/Web/src/HttpHandler/HttpGeoDistance.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/HttpHandler/HttpGeoDistance.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -80,7 +80,7 @@
std::string mbXml;
mbXml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
- mbXml += "<UnitOfMeasure xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"UnitOfMeasure-3.3.0.xsd\">";
+ mbXml += "<UnitOfMeasure xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"UnitOfMeasure-4.0.0.xsd\">";
mbXml += "<Value>";
std::string sDistance;
MgUtil::DoubleToString(distance, sDistance);
@@ -115,7 +115,7 @@
// There are multiple supported versions
INT32 version = m_userInfo->GetApiVersion();
- if (version != MG_API_VERSION(3, 3, 0))
+ if (version != MG_API_VERSION(4, 0, 0))
{
throw new MgInvalidOperationVersionException(
L"MgHttpGeoDistance.ValidateOperationVersion", __LINE__, __WFILE__, NULL, L"", NULL);
Modified: sandbox/jng/v4/Web/src/HttpHandler/HttpGeoSimplify.cpp
===================================================================
--- sandbox/jng/v4/Web/src/HttpHandler/HttpGeoSimplify.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/HttpHandler/HttpGeoSimplify.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -125,7 +125,7 @@
// There are multiple supported versions
INT32 version = m_userInfo->GetApiVersion();
- if (version != MG_API_VERSION(3, 3, 0))
+ if (version != MG_API_VERSION(4, 0, 0))
{
throw new MgInvalidOperationVersionException(
L"MgHttpGeoSimplify.ValidateOperationVersion", __LINE__, __WFILE__, NULL, L"", NULL);
Modified: sandbox/jng/v4/Web/src/HttpHandler/HttpGeoSpatialPredicate.cpp
===================================================================
--- sandbox/jng/v4/Web/src/HttpHandler/HttpGeoSpatialPredicate.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/HttpHandler/HttpGeoSpatialPredicate.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -83,7 +83,7 @@
// There are multiple supported versions
INT32 version = m_userInfo->GetApiVersion();
- if (version != MG_API_VERSION(3, 3, 0))
+ if (version != MG_API_VERSION(4, 0, 0))
{
throw new MgInvalidOperationVersionException(
L"MgHttpGeoSpatialPredicate.ValidateOperationVersion", __LINE__, __WFILE__, NULL, L"", NULL);
Modified: sandbox/jng/v4/Web/src/HttpHandler/HttpGeoTessellate.cpp
===================================================================
--- sandbox/jng/v4/Web/src/HttpHandler/HttpGeoTessellate.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/HttpHandler/HttpGeoTessellate.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -108,7 +108,7 @@
// There are multiple supported versions
INT32 version = m_userInfo->GetApiVersion();
- if (version != MG_API_VERSION(3, 3, 0))
+ if (version != MG_API_VERSION(4, 0, 0))
{
throw new MgInvalidOperationVersionException(
L"MgHttpGeoTessellate.ValidateOperationVersion", __LINE__, __WFILE__, NULL, L"", NULL);
Modified: sandbox/jng/v4/Web/src/HttpHandler/HttpGeometryInfo.cpp
===================================================================
--- sandbox/jng/v4/Web/src/HttpHandler/HttpGeometryInfo.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/HttpHandler/HttpGeometryInfo.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -65,7 +65,7 @@
std::string mbXml;
mbXml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
- mbXml += "<GeometryInfo xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"GeometryInfo-3.3.0.xsd\">";
+ mbXml += "<GeometryInfo xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"GeometryInfo-4.0.0.xsd\">";
mbXml += "<Area>";
std::string sArea;
MgUtil::DoubleToString(area, sArea);
@@ -151,7 +151,7 @@
// There are multiple supported versions
INT32 version = m_userInfo->GetApiVersion();
- if (version != MG_API_VERSION(3, 3, 0))
+ if (version != MG_API_VERSION(4, 0, 0))
{
throw new MgInvalidOperationVersionException(
L"MgHttpGeometryInfo.ValidateOperationVersion", __LINE__, __WFILE__, NULL, L"", NULL);
Modified: sandbox/jng/v4/Web/src/HttpHandler/HttpGetClassDefinition.cpp
===================================================================
--- sandbox/jng/v4/Web/src/HttpHandler/HttpGetClassDefinition.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/HttpHandler/HttpGetClassDefinition.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -38,8 +38,8 @@
m_resId = params->GetParameterValue(MgHttpResourceStrings::reqFeatResourceId);
m_bSimple = false;
- // Get simple flag (SIMPLE). Only recognize this flag for 3.3.0 and above
- if (m_userInfo->GetApiVersion() >= MG_API_VERSION(3, 3, 0))
+ // Get simple flag (SIMPLE). Only recognize this flag for 4.0.0 and above
+ if (m_userInfo->GetApiVersion() >= MG_API_VERSION(4, 0, 0))
{
STRING simple = params->GetParameterValue(MgHttpResourceStrings::reqFeatSimple);
if (simple.length() > 0)
Modified: sandbox/jng/v4/Web/src/HttpHandler/HttpGetTileProviders.cpp
===================================================================
--- sandbox/jng/v4/Web/src/HttpHandler/HttpGetTileProviders.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/HttpHandler/HttpGetTileProviders.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -81,7 +81,7 @@
// There are multiple supported versions
INT32 version = m_userInfo->GetApiVersion();
if (version != MG_API_VERSION(3,0,0) &&
- version != MG_API_VERSION(3,3,0))
+ version != MG_API_VERSION(4,0,0))
{
throw new MgInvalidOperationVersionException(
L"MgHttpGetTileProviders.ValidateOperationVersion", __LINE__, __WFILE__, NULL, L"", NULL);
Modified: sandbox/jng/v4/Web/src/HttpHandler/HttpQueryMapFeatures.cpp
===================================================================
--- sandbox/jng/v4/Web/src/HttpHandler/HttpQueryMapFeatures.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/HttpHandler/HttpQueryMapFeatures.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -177,7 +177,7 @@
INT32 version = m_userInfo->GetApiVersion();
if (version != MG_API_VERSION(1,0,0) &&
version != MG_API_VERSION(2,6,0) &&
- version != MG_API_VERSION(3,3,0))
+ version != MG_API_VERSION(4,0,0))
{
throw new MgInvalidOperationVersionException(
L"MgHttpQueryMapFeatures.ValidateOperationVersion", __LINE__, __WFILE__, NULL, L"", NULL);
Modified: sandbox/jng/v4/Web/src/HttpHandler/HttpRequestResponseHandler.cpp
===================================================================
--- sandbox/jng/v4/Web/src/HttpHandler/HttpRequestResponseHandler.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/HttpHandler/HttpRequestResponseHandler.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -180,8 +180,8 @@
m_userInfo->SetClientIp(clientIp);
}
- // Get clean json flag (CLEAN). Only recognize this flag for 3.3.0 and above
- if (version >= MG_API_VERSION(3, 3, 0))
+ // Get clean json flag (CLEAN). Only recognize this flag for 4.0.0 and above
+ if (version >= MG_API_VERSION(4, 0, 0))
{
STRING cleanJson = hrParam->GetParameterValue(MgHttpResourceStrings::reqClean);
if (cleanJson.length() > 0)
@@ -244,7 +244,7 @@
version != MG_API_VERSION(1,2,0) &&
version != MG_API_VERSION(2,0,0) &&
version != MG_API_VERSION(2,2,0) &&
- version != MG_API_VERSION(3,3,0))
+ version != MG_API_VERSION(4,0,0))
{
throw new MgInvalidOperationVersionException(
L"MgHttpRequestResponseHandler.ValidateOperationVersion", __LINE__, __WFILE__, NULL, L"", NULL);
Modified: sandbox/jng/v4/Web/src/HttpHandler/HttpSelectFeatures.cpp
===================================================================
--- sandbox/jng/v4/Web/src/HttpHandler/HttpSelectFeatures.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/HttpHandler/HttpSelectFeatures.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -55,8 +55,8 @@
m_bEnablePrecision = true;
}
}
- // Get transform flag (TRANSFORMTO). Only recognize this flag for 3.3.0 and above
- if (m_userInfo->GetApiVersion() >= MG_API_VERSION(3, 3, 0))
+ // Get transform flag (TRANSFORMTO). Only recognize this flag for 4.0.0 and above
+ if (m_userInfo->GetApiVersion() >= MG_API_VERSION(4, 0, 0))
{
m_transformTo = params->GetParameterValue(MgHttpResourceStrings::reqGeoTransformTo);
}
Modified: sandbox/jng/v4/Web/src/HttpHandler/HttpSelectFeaturesSpatially.cpp
===================================================================
--- sandbox/jng/v4/Web/src/HttpHandler/HttpSelectFeaturesSpatially.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/HttpHandler/HttpSelectFeaturesSpatially.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -66,8 +66,8 @@
}
}
- // Get transform flag (TRANSFORMTO). Only recognize this flag for 3.3.0 and above
- if (m_userInfo->GetApiVersion() >= MG_API_VERSION(3, 3, 0))
+ // Get transform flag (TRANSFORMTO). Only recognize this flag for 4.0.0 and above
+ if (m_userInfo->GetApiVersion() >= MG_API_VERSION(4, 0, 0))
{
m_transformTo = params->GetParameterValue(MgHttpResourceStrings::reqGeoTransformTo);
}
Modified: sandbox/jng/v4/Web/src/HttpHandler/XmlJsonConvert.cpp
===================================================================
--- sandbox/jng/v4/Web/src/HttpHandler/XmlJsonConvert.cpp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/HttpHandler/XmlJsonConvert.cpp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -908,7 +908,7 @@
s_elementPathTypeMap["/TileProviderList/TileProvider/ConnectionProperties/ConnectionProperty/@Required"] = XML_DATA_TYPE_BOOLEAN;
s_elementPathTypeMap["/TileProviderList/TileProvider/ConnectionProperties/ConnectionProperty/@Protected"] = XML_DATA_TYPE_BOOLEAN;
s_elementPathTypeMap["/TileProviderList/TileProvider/ConnectionProperties/ConnectionProperty/@Enumerable"] = XML_DATA_TYPE_BOOLEAN;
- //FeatureSchemaCollection-3.3.0.xsd
+ //FeatureSchemaCollection-4.0.0.xsd
s_elementPathTypeMap["/FeatureSchemaCollection/FeatureSchema/Classes/ClassDefinition/IsAbstract"] = XML_DATA_TYPE_BOOLEAN;
s_elementPathTypeMap["/FeatureSchemaCollection/FeatureSchema/Classes/ClassDefinition/IsComputed"] = XML_DATA_TYPE_BOOLEAN;
s_elementPathTypeMap["/FeatureSchemaCollection/FeatureSchema/Classes/ClassDefinition/Properties/Property/PropertyType"] = XML_DATA_TYPE_NUM_INT;
@@ -926,7 +926,7 @@
s_elementPathTypeMap["/FeatureSchemaCollection/FeatureSchema/Classes/ClassDefinition/Properties/Property/HasMeasure"] = XML_DATA_TYPE_BOOLEAN;
s_elementPathTypeMap["/FeatureSchemaCollection/FeatureSchema/Classes/ClassDefinition/Properties/Property/DefaultImageXSize"] = XML_DATA_TYPE_NUM_INT;
s_elementPathTypeMap["/FeatureSchemaCollection/FeatureSchema/Classes/ClassDefinition/Properties/Property/DefaultImageYSize"] = XML_DATA_TYPE_NUM_INT;
- //ClassDefinition-3.3.0.xsd
+ //ClassDefinition-4.0.0.xsd
s_elementPathTypeMap["/ClassDefinition/IsAbstract"] = XML_DATA_TYPE_BOOLEAN;
s_elementPathTypeMap["/ClassDefinition/IsComputed"] = XML_DATA_TYPE_BOOLEAN;
s_elementPathTypeMap["/ClassDefinition/Properties/Property/PropertyType"] = XML_DATA_TYPE_NUM_INT;
@@ -944,9 +944,9 @@
s_elementPathTypeMap["/ClassDefinition/Properties/Property/HasMeasure"] = XML_DATA_TYPE_BOOLEAN;
s_elementPathTypeMap["/ClassDefinition/Properties/Property/DefaultImageXSize"] = XML_DATA_TYPE_NUM_INT;
s_elementPathTypeMap["/ClassDefinition/Properties/Property/DefaultImageYSize"] = XML_DATA_TYPE_NUM_INT;
- //UnitOfMeasure-3.3.0.xsd
+ //UnitOfMeasure-4.0.0.xsd
s_elementPathTypeMap["/UnitOfMeasure/Value"] = XML_DATA_TYPE_NUM_DOUBLE;
- //GeometryInfo-3.3.0.xsd
+ //GeometryInfo-4.0.0.xsd
s_elementPathTypeMap["/GeometryInfo/Area"] = XML_DATA_TYPE_NUM_DOUBLE;
s_elementPathTypeMap["/GeometryInfo/Dimension"] = XML_DATA_TYPE_NUM_INT;
s_elementPathTypeMap["/GeometryInfo/Length"] = XML_DATA_TYPE_NUM_DOUBLE;
@@ -960,7 +960,7 @@
s_elementPathTypeMap["/GeometryInfo/Envelope/UpperRight/Y"] = XML_DATA_TYPE_NUM_DOUBLE;
s_elementPathTypeMap["/GeometryInfo/Centroid/X"] = XML_DATA_TYPE_NUM_DOUBLE;
s_elementPathTypeMap["/GeometryInfo/Centroid/Y"] = XML_DATA_TYPE_NUM_DOUBLE;
- //TransformedCoordinateCollection-3.3.0.xsd
+ //TransformedCoordinateCollection-4.0.0.xsd
s_elementPathTypeMap["/TransformedCoordinateCollection/CoordinateSystem/EpsgCode"] = XML_DATA_TYPE_NUM_INT;
s_elementPathTypeMap["/TransformedCoordinateCollection/TransformedCoordinate/X"] = XML_DATA_TYPE_NUM_DOUBLE;
s_elementPathTypeMap["/TransformedCoordinateCollection/TransformedCoordinate/Y"] = XML_DATA_TYPE_NUM_DOUBLE;
@@ -1049,7 +1049,7 @@
//BatchPropertyCollection-1.0.0.xsd
s_multiElementPaths.insert("/BatchPropertyCollection/PropertyCollection");
s_multiElementPaths.insert("/BatchPropertyCollection/PropertyCollection/Property");
- //ClassDefinition-3.3.0.xsd
+ //ClassDefinition-4.0.0.xsd
s_multiElementPaths.insert("/ClassDefinition/Properties/Property");
s_multiElementPaths.insert("/ClassDefinition/Properties/Property/SpecificGeometryTypes/Type");
//DataStoreList-1.0.0.xsd
@@ -1084,7 +1084,7 @@
s_multiElementPaths.insert("/FeatureProviderRegistry/FeatureProvider");
s_multiElementPaths.insert("/FeatureProviderRegistry/FeatureProvider/ConnectionProperties/ConnectionProperty");
s_multiElementPaths.insert("/FeatureProviderRegistry/FeatureProvider/ConnectionProperties/ConnectionProperty/Value");
- //FeatureSchemaCollection-3.3.0.xsd
+ //FeatureSchemaCollection-4.0.0.xsd
s_multiElementPaths.insert("/FeatureSchemaCollection/FeatureSchema");
s_multiElementPaths.insert("/FeatureSchemaCollection/FeatureSchema/Classes/ClassDefinition");
s_multiElementPaths.insert("/FeatureSchemaCollection/FeatureSchema/Classes/ClassDefinition/Properties/Property");
@@ -1150,7 +1150,7 @@
//UserList-1.0.0.xsd
s_multiElementPaths.insert("/UserList/User");
s_multiElementPaths.insert("/UserList/Group");
- //TransformedCoordinateCollection-3.3.0.xsd
+ //TransformedCoordinateCollection-4.0.0.xsd
s_multiElementPaths.insert("/TransformedCoordinateCollection/TransformedCoordinate");
//Miscellaneous MapGuide response types that don't have a formal schema
s_multiElementPaths.insert("/FeatureInformation/FeatureSet/Layer");
Modified: sandbox/jng/v4/Web/src/mapadmin/resizableadmin.php
===================================================================
--- sandbox/jng/v4/Web/src/mapadmin/resizableadmin.php 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/mapadmin/resizableadmin.php 2019-05-27 15:14:08 UTC (rev 9513)
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
- define( 'SITE_ADMINISTRATOR_VERSION', "3.3.0.0" );
+ define( 'SITE_ADMINISTRATOR_VERSION', "4.0.0.0" );
define( 'APP_TITLE', "MapGuide Site Administrator" );
define( 'APP_LOGO', "" );
Modified: sandbox/jng/v4/Web/src/mapviewerjava/ajaxviewerabout.jsp
===================================================================
--- sandbox/jng/v4/Web/src/mapviewerjava/ajaxviewerabout.jsp 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/mapviewerjava/ajaxviewerabout.jsp 2019-05-27 15:14:08 UTC (rev 9513)
@@ -32,7 +32,7 @@
String titleBar = product + " Viewer";
String serverTitle = product + " Server";
String viewerTitle = product + " Viewer";
-String viewerVersion = "3.3.0.0";
+String viewerVersion = "4.0.0.0";
String serverVersion;
%>
Modified: sandbox/jng/v4/Web/src/mapviewernet/ajaxviewerabout.aspx
===================================================================
--- sandbox/jng/v4/Web/src/mapviewernet/ajaxviewerabout.aspx 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/mapviewernet/ajaxviewerabout.aspx 2019-05-27 15:14:08 UTC (rev 9513)
@@ -32,7 +32,7 @@
String titleBar = product + " Viewer";
String serverTitle = product + " Server";
String viewerTitle = product + " Viewer";
-String viewerVersion = "3.3.0.0";
+String viewerVersion = "4.0.0.0";
String serverVersion = "##Unknown";
</script>
Modified: sandbox/jng/v4/Web/src/mapviewerphp/ajaxviewerabout.php
===================================================================
--- sandbox/jng/v4/Web/src/mapviewerphp/ajaxviewerabout.php 2019-05-27 13:29:07 UTC (rev 9512)
+++ sandbox/jng/v4/Web/src/mapviewerphp/ajaxviewerabout.php 2019-05-27 15:14:08 UTC (rev 9513)
@@ -21,7 +21,7 @@
include 'product.php';
include 'constants.php';
-define('VIEWER_VERSION', "3.3.0.0" );
+define('VIEWER_VERSION', "4.0.0.0" );
$titleBar = $product . " Viewer";
$serverTitle = $product . " Server";
More information about the mapguide-commits
mailing list