=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/OrganisationUnitConverter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/OrganisationUnitConverter.java 2010-06-02 09:51:11 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/OrganisationUnitConverter.java 2010-06-02 13:17:11 +0000 @@ -65,7 +65,7 @@ private static final String FIELD_ACTIVE = "active"; private static final String FIELD_COMMENT = "comment"; private static final String FIELD_GEO_CODE = "geoCode"; - private static final String FIELD_COORDINATE = "coordinate"; + private static final String FIELD_COORDINATES = "coordinates"; private static final String FIELD_FEATURE = "feature"; private static final String FIELD_LAST_UPDATED = "lastUpdated"; private static final String ATTRIBUTE_TYPE = "type"; @@ -130,7 +130,7 @@ writer.openElement( FIELD_FEATURE, ATTRIBUTE_TYPE, unit.getFeatureType() ); for ( String coordinate : unit.getCoordinatesAsCollection() ) { - writer.writeElement( FIELD_COORDINATE, coordinate ); + writer.writeElement( FIELD_COORDINATES, coordinate ); } writer.closeElement(); @@ -185,7 +185,7 @@ unit.setFeatureType( reader.getAttributeValue( ATTRIBUTE_TYPE ) ); Collection coordinates = new ArrayList(); - while ( reader.moveToStartElement( FIELD_COORDINATE, FIELD_FEATURE ) ) + while ( reader.moveToStartElement( FIELD_COORDINATES, FIELD_FEATURE ) ) { coordinates.add( reader.getElementValue() ); } === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfOrganisationUnits.xml' --- dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfOrganisationUnits.xml 2010-06-02 09:51:11 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfOrganisationUnits.xml 2010-06-02 13:17:11 +0000 @@ -12,9 +12,9 @@ Comment GeoCode -11.11,22.22 33.33,44.44 55.55,66.66 -77.77,88.88 99.99,11.11 22.22,33.33 -44.44,55.55 66.66,77.77 88.88,99.99 +11.11,22.22 33.33,44.44 55.55,66.66 +77.77,88.88 99.99,11.11 22.22,33.33 +44.44,55.55 66.66,77.77 88.88,99.99 2010-01-01 @@ -30,9 +30,9 @@ Comment GeoCode -11.11,22.22 33.33,44.44 55.55,66.66 -77.77,88.88 99.99,11.11 22.22,33.33 -44.44,55.55 66.66,77.77 88.88,99.99 +11.11,22.22 33.33,44.44 55.55,66.66 +77.77,88.88 99.99,11.11 22.22,33.33 +44.44,55.55 66.66,77.77 88.88,99.99 2010-01-01 @@ -48,9 +48,9 @@ Comment GeoCode -11.11,22.22 33.33,44.44 55.55,66.66 -77.77,88.88 99.99,11.11 22.22,33.33 -44.44,55.55 66.66,77.77 88.88,99.99 +11.11,22.22 33.33,44.44 55.55,66.66 +77.77,88.88 99.99,11.11 22.22,33.33 +44.44,55.55 66.66,77.77 88.88,99.99 2010-01-01