dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 209
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-04-21 12:00:27 +0200
message:
  Made the update of map method skip orgunit and orgunitlevel
modified:
  dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java

=== modified file 'dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java'
--- dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java	2009-04-16 15:30:49 +0000
+++ dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java	2009-04-21 10:00:27 +0000
@@ -102,17 +102,8 @@
     {
         Map map = mappingService.getMapByMapLayerPath( mapLayerPath );
 
-        OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( organisationUnitId );
-
-        OrganisationUnitLevel organisationUnitLevel = organisationUnitService
-            .getOrganisationUnitLevel( organisationUnitLevelId );
-
-        Set<String> staticMapLayerPaths = null;
-
         if ( map != null )
         {
-            map.setOrganisationUnit( organisationUnit );
-            map.setOrganisationUnitLevel( organisationUnitLevel );
             map.setUniqueColumn( uniqueColumn );
             map.setNameColumn( nameColumn );
             map.setLongitude( longitude );
@@ -123,8 +114,13 @@
         }
         else
         {
+            OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( organisationUnitId );
+
+            OrganisationUnitLevel organisationUnitLevel = organisationUnitService
+                .getOrganisationUnitLevel( organisationUnitLevelId );
+
             map = new Map( mapLayerPath, organisationUnit, organisationUnitLevel, uniqueColumn, nameColumn, longitude,
-                latitude, zoom, staticMapLayerPaths );
+                latitude, zoom, null );
 
             mappingService.addMap( map );
         }



--
Trunk
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.