dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 20258
committer: Halvdan Hoem Grelland <halvdanhg@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-09-21 14:31:10 +0200
message:
  Converted to FeatureType enum literal values in DXF2 featureType element
modified:
  dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/gml/gml2dxf2.xsl
  dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/gml/GmlImportServiceTest.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/gml/gml2dxf2.xsl'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/gml/gml2dxf2.xsl	2015-09-21 12:26:37 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/gml/gml2dxf2.xsl	2015-09-21 12:31:10 +0000
@@ -42,7 +42,7 @@
 
   <!-- GML feature matchers -->
   <xsl:template match="gml:Polygon">
-    <featureType>Polygon</featureType>
+    <featureType>POLYGON</featureType>
     <coordinates>
       <xsl:text>[[</xsl:text>
       <xsl:apply-templates select=".//gml:coordinates" mode="multipleCoordinates"/>
@@ -55,7 +55,7 @@
   </xsl:template>
 
   <xsl:template match="gml:MultiPolygon">
-    <featureType>MultiPolygon</featureType>
+    <featureType>MULTI_POLYGON</featureType>
     <coordinates>
       <xsl:text>[</xsl:text>
       <xsl:apply-templates select=".//gml:polygonMember"/>
@@ -64,7 +64,7 @@
   </xsl:template>
 
   <xsl:template match="gml:Point">
-    <featureType>Point</featureType>
+    <featureType>POINT</featureType>
     <coordinates>
       <xsl:apply-templates select=".//gml:coordinates" mode="singleCoordinate"/>
       <xsl:apply-templates select=".//gml:pos"/>

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/gml/GmlImportServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/gml/GmlImportServiceTest.java	2015-09-17 04:29:29 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/gml/GmlImportServiceTest.java	2015-09-21 12:31:10 +0000
@@ -141,7 +141,6 @@
     // -------------------------------------------------------------------------
 
     @Test
-    @Ignore
     public void testImportGml()
         throws Exception
     {