sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1701293 - in /sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing: crs/ProjectedCRS.xml operation/Transformation.xml
Date Fri, 04 Sep 2015 17:05:21 GMT
Author: desruisseaux
Date: Fri Sep  4 17:05:20 2015
New Revision: 1701293

URL: http://svn.apache.org/r1701293
Log:
Complete test files.

Modified:
    sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/ProjectedCRS.xml
    sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/operation/Transformation.xml

Modified: sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/ProjectedCRS.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/ProjectedCRS.xml?rev=1701293&r1=1701292&r2=1701293&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/ProjectedCRS.xml
(original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/ProjectedCRS.xml
Fri Sep  4 17:05:20 2015
@@ -21,7 +21,6 @@
 <gml:ProjectedCRS xsi:schemaLocation = "http://www.opengis.net/gml/3.2 http://schemas.opengis.net/gml/3.2.1/coordinateReferenceSystems.xsd"
                   xmlns:gml          = "http://www.opengis.net/gml/3.2"
                   xmlns:xsi          = "http://www.w3.org/2001/XMLSchema-instance"
-                  xmlns:xlink        = "http://www.w3.org/1999/xlink"
                   gml:id             = "epsg-crs-27572">
 
   <gml:identifier codeSpace="IOGP">urn:ogc:def:crs:EPSG::27572</gml:identifier>
@@ -32,35 +31,107 @@
       <gml:identifier codeSpace="IOGP">urn:ogc:def:coordinateOperation:EPSG::18082</gml:identifier>
       <gml:name codeSpace="EPSG">Lambert zone II</gml:name>
       <gml:scope>Large and medium scale topographic mapping and engineering survey.</gml:scope>
-      <gml:method xlink:href="urn:ogc:def:method:EPSG::9801"/>
+      <gml:method>
+        <gml:OperationMethod gml:id="epsg-method-9801">
+          <gml:identifier codeSpace="IOGP">urn:ogc:def:method:EPSG::9801</gml:identifier>
+          <gml:name>Lambert Conic Conformal (1SP)</gml:name>
+          <gml:formula>See EPSG Guidance Note #7-2.</gml:formula>
+          <gml:sourceDimensions>2</gml:sourceDimensions>
+          <gml:targetDimensions>2</gml:targetDimensions>
+          <gml:parameter>
+            <gml:OperationParameter gml:id="epsg-param-8801">
+              <gml:identifier codeSpace="IOGP">urn:ogc:def:parameter:EPSG::8801</gml:identifier>
+              <gml:name>Latitude of natural origin</gml:name>
+            </gml:OperationParameter>
+          </gml:parameter>
+          <gml:parameter>
+            <gml:OperationParameter gml:id="epsg-param-8802">
+              <gml:identifier codeSpace="IOGP">urn:ogc:def:parameter:EPSG::8802</gml:identifier>
+              <gml:name>Longitude of natural origin</gml:name>
+            </gml:OperationParameter>
+          </gml:parameter>
+          <gml:parameter>
+            <gml:OperationParameter gml:id="epsg-param-8805">
+              <gml:identifier codeSpace="IOGP">urn:ogc:def:parameter:EPSG::8805</gml:identifier>
+              <gml:name>Scale factor at natural origin</gml:name>
+            </gml:OperationParameter>
+          </gml:parameter>
+          <gml:parameter>
+            <gml:OperationParameter gml:id="epsg-param-8806">
+              <gml:identifier codeSpace="IOGP">urn:ogc:def:parameter:EPSG::8806</gml:identifier>
+              <gml:name>False easting</gml:name>
+            </gml:OperationParameter>
+          </gml:parameter>
+          <gml:parameter>
+            <gml:OperationParameter gml:id="epsg-param-8807">
+              <gml:identifier codeSpace="IOGP">urn:ogc:def:parameter:EPSG::8807</gml:identifier>
+              <gml:name>False northing</gml:name>
+            </gml:OperationParameter>
+          </gml:parameter>
+        </gml:OperationMethod>
+      </gml:method>
+
+      <!--
+        All parameters below this point are duplication of the parameters already defined
above.
+        For now we do not yet use the XML references, but this is something that we will
need to
+        support in a future SIS version. See https://issues.apache.org/jira/browse/SIS-173
issue.
+        In the meantime, we have to change the gml:id attribute values used below for avoiding
+        collisions with the gml:id attribute used in above parameters.
+      -->
+
       <gml:parameterValue>
         <gml:ParameterValue>
           <gml:value uom="urn:ogc:def:uom:EPSG::9105">52</gml:value>
-          <gml:operationParameter xlink:href="urn:ogc:def:parameter:EPSG::8801"/>
+          <gml:operationParameter>
+            <gml:OperationParameter gml:id="t-8801">
+              <gml:identifier codeSpace="IOGP">urn:ogc:def:parameter:EPSG::8801</gml:identifier>
+              <gml:name>Latitude of natural origin</gml:name>
+            </gml:OperationParameter>
+          </gml:operationParameter>
         </gml:ParameterValue>
       </gml:parameterValue>
       <gml:parameterValue>
         <gml:ParameterValue>
           <gml:value uom="urn:ogc:def:uom:EPSG::9105">0</gml:value>
-          <gml:operationParameter xlink:href="urn:ogc:def:parameter:EPSG::8802"/>
+          <gml:operationParameter>
+            <gml:OperationParameter gml:id="t-8802">
+              <gml:identifier codeSpace="IOGP">urn:ogc:def:parameter:EPSG::8802</gml:identifier>
+              <gml:name>Longitude of natural origin</gml:name>
+            </gml:OperationParameter>
+          </gml:operationParameter>
         </gml:ParameterValue>
       </gml:parameterValue>
       <gml:parameterValue>
         <gml:ParameterValue>
           <gml:value uom="urn:ogc:def:uom:EPSG::9201">0.99987742</gml:value>
-          <gml:operationParameter xlink:href="urn:ogc:def:parameter:EPSG::8805"/>
+          <gml:operationParameter>
+            <gml:OperationParameter gml:id="t-8805">
+              <gml:identifier codeSpace="IOGP">urn:ogc:def:parameter:EPSG::8805</gml:identifier>
+              <gml:name>Scale factor at natural origin</gml:name>
+            </gml:OperationParameter>
+          </gml:operationParameter>
         </gml:ParameterValue>
       </gml:parameterValue>
       <gml:parameterValue>
         <gml:ParameterValue>
           <gml:value uom="urn:ogc:def:uom:EPSG::9001">600000</gml:value>
-          <gml:operationParameter xlink:href="urn:ogc:def:parameter:EPSG::8806"/>
+          <gml:operationParameter>
+            <gml:OperationParameter gml:id="t-8806">
+              <gml:identifier codeSpace="IOGP">urn:ogc:def:parameter:EPSG::8806</gml:identifier>
+              <gml:name>False easting</gml:name>
+            </gml:OperationParameter>
+          </gml:operationParameter>
         </gml:ParameterValue>
       </gml:parameterValue>
       <gml:parameterValue>
         <gml:ParameterValue>
           <gml:value uom="urn:ogc:def:uom:EPSG::9001">2200000</gml:value>
-          <gml:operationParameter xlink:href="urn:ogc:def:parameter:EPSG::8807"/>
+          <gml:operationParameter>
+            <gml:OperationParameter gml:id="t-8807">
+              <gml:identifier codeSpace="IOGP">urn:ogc:def:parameter:EPSG::8807</gml:identifier>
+              <gml:name>False northing</gml:name>
+            </gml:OperationParameter>
+          </gml:operationParameter>
         </gml:ParameterValue>
       </gml:parameterValue>
     </gml:Conversion>

Modified: sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/operation/Transformation.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/operation/Transformation.xml?rev=1701293&r1=1701292&r2=1701293&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/operation/Transformation.xml
(original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/operation/Transformation.xml
Fri Sep  4 17:05:20 2015
@@ -167,7 +167,7 @@
       <gml:targetDimensions>2</gml:targetDimensions>
       <gml:parameter>
         <gml:OperationParameter gml:id="ParameterDescriptor">
-          <gml:identifier codeSpace="OGP">urn:ogc:def:parameter:EPSG::8602</gml:identifier>
+          <gml:identifier codeSpace="IOGP">urn:ogc:def:parameter:EPSG::8602</gml:identifier>
           <gml:name>Longitude offset</gml:name>
         </gml:OperationParameter>
       </gml:parameter>
@@ -185,7 +185,7 @@
       -->
       <gml:operationParameter>
         <gml:OperationParameter gml:id="ParameterDescriptor-copy">
-          <gml:identifier codeSpace="OGP">urn:ogc:def:parameter:EPSG::8602</gml:identifier>
+          <gml:identifier codeSpace="IOGP">urn:ogc:def:parameter:EPSG::8602</gml:identifier>
           <gml:name>Longitude offset</gml:name>
         </gml:OperationParameter>
       </gml:operationParameter>



Mime
View raw message