=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-07-14 02:30:45 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-07-23 21:04:00 +0000
@@ -3213,9 +3213,9 @@
         listeners: {
             expand: {
                 fn: function() {
+                    ACTIVEPANEL = thematicMap;
                     choroplethLayer.setVisibility(false);
                     choropleth.classify(false, true);
-                    ACTIVEPANEL = thematicMap;
                 }
             }
         }
@@ -3233,9 +3233,9 @@
         listeners: {
             expand: {
                 fn: function() {
+                    ACTIVEPANEL = thematicMap2;
                     proportionalSymbolLayer.setVisibility(false);
                     proportionalSymbol.classify(false, true);
-                    ACTIVEPANEL = thematicMap2;
                 }
             }
         }
@@ -3253,10 +3253,10 @@
         listeners: {
             expand: {
                 fn: function() {
+                    ACTIVEPANEL = organisationUnitAssignment;
                     choroplethLayer.setVisibility(false);
                     proportionalSymbolLayer.setVisibility(false);
                     mapping.classify(false, true);
-                    ACTIVEPANEL = organisationUnitAssignment;
                 }
             }
         }

=== 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	2010-07-14 01:27:58 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2010-07-23 21:04:00 +0000
@@ -629,7 +629,7 @@
                                     Ext.getCmp('colorB_cf').setValue(data.mapLegendSet[0].colorHigh);
                                 }
                                 
-                                choropleth.classify(false);
+                                choropleth.classify(false, true);
                             },
                             failure: function()
                             {
@@ -695,7 +695,7 @@
                             Ext.getCmp('mapview_cb').reset();
                         }
 						
-						choropleth.classify(false);
+						choropleth.classify(false, true);
  
                         // var iId = Ext.getCmp('dataelement_cb').getValue();
                         
@@ -786,7 +786,7 @@
                             Ext.getCmp('mapview_cb').reset();
                         }
                         
-                        this.classify(false);
+                        this.classify(false, true);
                     },
                     scope: this
                 }
@@ -977,7 +977,7 @@
 							Ext.getCmp('maplegendset_cb').showField();
 							
 							if (Ext.getCmp('maplegendset_cb').getValue()) {
-								this.classify(false);
+								this.classify(false, true);
 							}
                         }
                         else if (Ext.getCmp('maplegendtype_cb').getValue() == map_legend_type_automatic && Ext.getCmp('maplegendtype_cb').getValue() != LEGEND[thematicMap].type) {
@@ -995,7 +995,7 @@
 							Ext.getCmp('colorB_cf').showField();
 							Ext.getCmp('maplegendset_cb').hideField();
                             
-                            this.classify(false);
+                            this.classify(false, true);
                         }
                     },
                     scope: this
@@ -1061,7 +1061,7 @@
                             Ext.getCmp('bounds_tf').hideField();
                             Ext.getCmp('numClasses_cb').showField();
                             
-                            this.classify(false);
+                            this.classify(false, true);
                         }
                     },
                     scope: this
@@ -1105,7 +1105,7 @@
 						
 						if (Ext.getCmp('numClasses_cb').getValue() != LEGEND[thematicMap].classes) {
 							LEGEND[thematicMap].classes = Ext.getCmp('numClasses_cb').getValue();
-							this.classify(false);
+							this.classify(false, true);
 						}
                     },
                     scope: this
@@ -1146,7 +1146,7 @@
             text: i18n_refresh,
             handler: function() {
                 this.layer.setVisibility(true);
-                this.classify(true);
+                this.classify(true, true);
             },
             scope: this
         }
@@ -1213,7 +1213,7 @@
 			}
         }
         else {
-            choropleth.classify(false);
+            choropleth.classify(false, true);
         }
     },
     
@@ -1290,7 +1290,7 @@
         
             MASK.msg = i18n_creating_choropleth;
             MASK.show();        
-            
+
             MAPDATA[ACTIVEPANEL].name = Ext.getCmp('map_tf').getValue();
             MAPDATA[ACTIVEPANEL].nameColumn = 'name';
             MAPDATA[ACTIVEPANEL].longitude = BASECOORDINATE.longitude;