=== modified file 'dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/InternalMapLayer.java'
--- dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/InternalMapLayer.java	2013-10-07 11:46:08 +0000
+++ dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/InternalMapLayer.java	2013-10-10 17:32:50 +0000
@@ -167,7 +167,7 @@
         mapObject.setStrokeWidth( strokeWidth );
 
         // Build and set the geometric primitive that outlines org unit on the map
-        mapObject.setGeometry( InternalMapObject.buildAndApplyGeometryForOrganisationUnit( unit ) );
+        mapObject.buildGeometryForOrganisationUnit( unit );
 
         // Add the map object to the map layer
         addMapObject( mapObject );
@@ -190,7 +190,7 @@
         mapObject.setStrokeColor( Color.BLACK );
         mapObject.setStrokeWidth( 1 );
 
-        mapObject.setGeometry( InternalMapObject.buildAndApplyGeometryForOrganisationUnit( unit ) );
+        mapObject.buildGeometryForOrganisationUnit( unit );
         addMapObject( mapObject );
         mapObject.setMapLayer( this );
     }

=== modified file 'dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/InternalMapObject.java'
--- dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/InternalMapObject.java	2013-10-06 22:11:27 +0000
+++ dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/InternalMapObject.java	2013-10-10 17:32:50 +0000
@@ -138,7 +138,7 @@
      * 
      * @param orgUnit the organisation unit
      */
-    public static Geometry buildAndApplyGeometryForOrganisationUnit( OrganisationUnit orgUnit )
+    public void buildGeometryForOrganisationUnit( OrganisationUnit orgUnit )
     {
         // The final GeoTools primitive
         Geometry primitive = null;
@@ -179,7 +179,7 @@
             throw new RuntimeException( "Not sure what to do with the feature type '" + orgUnit.getFeatureType() + "'" );
         }
 
-        return primitive;
+        this.geometry = primitive;
     }
 
     public Style getStyle()