=== 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-11-17 14:35:17 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.java 2014-11-24 06:33:13 +0000 @@ -240,6 +240,7 @@ public void getGeoJson( @RequestParam( value = "level", required = false ) List rpLevels, @RequestParam( value = "parent", required = false ) List rpParents, + @RequestParam( value = "properties", required = false, defaultValue = "true" ) boolean rpProperties, HttpServletResponse response ) throws IOException { rpLevels = rpLevels != null ? rpLevels : new ArrayList(); @@ -270,7 +271,7 @@ for ( OrganisationUnit organisationUnit : organisationUnits ) { - writeFeature( generator, organisationUnit ); + writeFeature( generator, organisationUnit, rpProperties ); } generator.writeEndArray(); @@ -279,7 +280,7 @@ generator.close(); } - public void writeFeature( JsonGenerator generator, OrganisationUnit organisationUnit ) throws IOException + public void writeFeature( JsonGenerator generator, OrganisationUnit organisationUnit, boolean includeProperties ) throws IOException { if ( organisationUnit.getFeatureType() == null || organisationUnit.getCoordinates() == null ) { @@ -308,11 +309,16 @@ generator.writeEndObject(); generator.writeObjectFieldStart( "properties" ); - generator.writeStringField( "code", organisationUnit.getCode() ); - generator.writeStringField( "name", organisationUnit.getName() ); - generator.writeStringField( "level", String.valueOf( organisationUnit.getLevel() ) ); - generator.writeStringField( "parent", organisationUnit.getParent().getUid() ); - generator.writeStringField( "parentGraph", organisationUnit.getParentGraph() ); + + if ( includeProperties ) + { + generator.writeStringField( "code", organisationUnit.getCode() ); + generator.writeStringField( "name", organisationUnit.getName() ); + generator.writeStringField( "level", String.valueOf( organisationUnit.getLevel() ) ); + generator.writeStringField( "parent", organisationUnit.getParent().getUid() ); + generator.writeStringField( "parentGraph", organisationUnit.getParentGraph() ); + } + generator.writeEndObject(); generator.writeEndObject();