dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 2403 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2010-12-20 23:23:00 +0100
message:
  (GIS) Minor bugs fixed.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonAction.java
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css


--
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-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonAction.java'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonAction.java	2010-12-02 09:41:40 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonAction.java	2010-12-20 22:21:18 +0000
@@ -28,7 +28,6 @@
  */
 
 import java.util.Collection;
-import java.util.HashSet;
 
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
@@ -93,16 +92,13 @@
     {
         OrganisationUnit parent = organisationUnitService.getOrganisationUnit( parentId );
         
-        if ( level == null )
-        {
-            level = organisationUnitService.getLevelOfOrganisationUnit( parent );
-        }
+        level = level == null ? organisationUnitService.getLevelOfOrganisationUnit( parent ) : level;
         
         object = organisationUnitService.getOrganisationUnitsAtLevel( level, parent );
         
         FilterUtils.filter( object, new OrganisationUnitWithCoordinatesFilter() );
         
-        return object.iterator().next().getFeatureType();
+        return object.size() > 0 ? object.iterator().next().getFeatureType() : NONE;
     }
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2010-12-15 09:01:00 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2010-12-20 22:21:18 +0000
@@ -241,17 +241,6 @@
 .ext-gecko .x-btn button, .ext-webkit .x-btn button {
     padding-right:2px;
 }
-#ext-gen105 {
-    background-position:0 center;
-    background-repeat:no-repeat;
-    width:14px;
-    height:14px;
-}
-
-/* Ext FieldSet */
-#boundary_fs {
-    margin-bottom:4px;
-}
 
 /* Ext ComboBox */
 .combo-disabled {