=== 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-10-12 15:21:18 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-10-13 10:40:40 +0000
@@ -3094,7 +3094,13 @@
                     if (ACTIVEPANEL != GLOBALS.config.thematicMap) {
                         ACTIVEPANEL = GLOBALS.config.thematicMap;
                         this.layer.setVisibility(false);
-                        this.classify(false, true);
+                        
+                        if (this.legend.type == GLOBALS.config.map_legend_type_predefined) {
+                            this.applyPredefinedLegend();
+                        }
+                        else {
+                            this.classify(false, true);
+                        }
                     }
                 }
             }
@@ -3116,7 +3122,13 @@
                     if (ACTIVEPANEL != GLOBALS.config.thematicMap2) {
                         ACTIVEPANEL = GLOBALS.config.thematicMap2;
                         this.layer.setVisibility(false);
-                        this.classify(false, true);
+                        
+                        if (this.legend.type == GLOBALS.config.map_legend_type_predefined) {
+                            this.applyPredefinedLegend();
+                        }
+                        else {
+                            this.classify(false, true);
+                        }
                     }
                 }
             }