dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17190
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-10-21 15:44:43 +0700
message:
  Minor fix to geojson, don't add extra array on export
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.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-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java	2014-10-21 07:43:54 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java	2014-10-21 08:44:43 +0000
@@ -78,7 +78,6 @@
     public static final String FEATURETYPE_MULTIPOLYGON = "MultiPolygon";
     public static final String FEATURETYPE_POLYGON = "Polygon";
     public static final String FEATURETYPE_POINT = "Point";
-    public static final String FEATURETYPE_MULTIPOINT = "MultiPoint";
     public static final String RESULTTYPE_SYMBOL = "Symbol";
 
     public static final String KEY_USER_ORGUNIT = "USER_ORGUNIT";

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.java	2014-10-21 08:21:34 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.java	2014-10-21 08:44:43 +0000
@@ -284,10 +284,6 @@
         {
             featureType = OrganisationUnit.FEATURETYPE_POLYGON;
         }
-        else
-        {
-            featureType = OrganisationUnit.FEATURETYPE_MULTIPOINT;
-        }
 
         generator.writeStartObject();
 
@@ -297,10 +293,8 @@
         generator.writeObjectFieldStart( "geometry" );
         generator.writeStringField( "type", featureType );
 
-        generator.writeArrayFieldStart( "coordinates" );
-
+        generator.writeFieldName( "coordinates" );
         generator.writeRawValue( organisationUnit.getCoordinates() );
-        generator.writeEndArray();
 
         generator.writeEndObject();