=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js	2011-12-09 14:32:33 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js	2011-12-25 16:31:14 +0000
@@ -598,9 +598,10 @@
             listeners: {
                 'select': {
                     scope: this,
-                    fn: function() {
+                    fn: function(c) {
                         this.requireUpdate = true;
                         this.formValidation.validateForm.call(this);
+                        this.organisationUnitSelection.setValues(null, null, null, c.getValue(), c.getRawValue());
                     }
                 }
             }
@@ -640,6 +641,7 @@
                         tree.selectedNode = n;
                         this.requireUpdate = true;
                         this.formValidation.validateForm.call(this);
+                        this.organisationUnitSelection.setValues(n.attributes.id, n.attributes.text, n.attributes.level);
                     }
                 }
             }
@@ -1035,6 +1037,9 @@
 
     classify: function(exception, lockPosition) {
         if (this.formValidation.validateForm.apply(this, [exception])) {
+            if (!this.layer.features.length) {
+                this.loadGeoJson();
+            }
             G.vars.mask.msg = G.i18n.aggregating_map_values;
             G.vars.mask.show();
             

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2011-12-12 10:31:20 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2011-12-25 16:31:14 +0000
@@ -898,9 +898,10 @@
             listeners: {
                 'select': {
                     scope: this,
-                    fn: function() {
+                    fn: function(c) {
                         this.requireUpdate = true;
                         this.formValidation.validateForm.call(this);
+                        this.organisationUnitSelection.setValues(null, null, null, c.getValue(), c.getRawValue());
                     }
                 }
             }
@@ -940,6 +941,7 @@
                         tree.selectedNode = n;
                         this.requireUpdate = true;
                         this.formValidation.validateForm.call(this);
+                        this.organisationUnitSelection.setValues(n.attributes.id, n.attributes.text, n.attributes.level);
                     }
                 }
             }
@@ -1665,6 +1667,10 @@
 
     classify: function(exception, lockPosition) {
         if (this.formValidation.validateForm.apply(this, [exception])) {
+            if (!this.layer.features.length) {
+                this.loadGeoJson();
+            }
+            
             G.vars.mask.msg = G.i18n.loading;
             G.vars.mask.show();
             

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js	2011-12-09 14:32:33 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js	2011-12-25 16:31:14 +0000
@@ -898,9 +898,10 @@
             listeners: {
                 'select': {
                     scope: this,
-                    fn: function() {
+                    fn: function(c) {
                         this.requireUpdate = true;
                         this.formValidation.validateForm.call(this);
+                        this.organisationUnitSelection.setValues(null, null, null, c.getValue(), c.getRawValue());
                     }
                 }
             }
@@ -940,6 +941,7 @@
                         tree.selectedNode = n;
                         this.requireUpdate = true;
                         this.formValidation.validateForm.call(this);
+                        this.organisationUnitSelection.setValues(n.attributes.id, n.attributes.text, n.attributes.level);
                     }
                 }
             }
@@ -1665,6 +1667,10 @@
 
     classify: function(exception, lockPosition) {
         if (this.formValidation.validateForm.apply(this, [exception])) {
+            if (!this.layer.features.length) {
+                this.loadGeoJson();
+            }
+            
             G.vars.mask.msg = G.i18n.loading;
             G.vars.mask.show();
             

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js	2011-12-12 11:01:38 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js	2011-12-25 16:31:14 +0000
@@ -405,9 +405,10 @@
             listeners: {
                 'select': {
                     scope: this,
-                    fn: function() {
+                    fn: function(c) {
                         this.requireUpdate = true;
                         this.formValidation.validateForm.call(this);
+                        this.organisationUnitSelection.setValues(null, null, null, c.getValue(), c.getRawValue());
                     }
                 }
             }
@@ -447,6 +448,7 @@
                         tree.selectedNode = n;
                         this.requireUpdate = true;
                         this.formValidation.validateForm.call(this);
+                        this.organisationUnitSelection.setValues(n.attributes.id, n.attributes.text, n.attributes.level);
                     }
                 }
             }
@@ -804,6 +806,9 @@
 
     classify: function(exception, lockPosition) {
         if (this.formValidation.validateForm.apply(this, [exception])) {
+            if (!this.layer.features.length) {
+                this.loadGeoJson();
+            }
             
             G.vars.lockPosition = lockPosition;