Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 2361 [merge]
committer: Jan Henrik Overland <[email protected]>
branch nick: trunk
timestamp: Wed 2010-10-13 12:52:14 +0200
message:
(GIS) Fixed bug where switching map source type caused an error.
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js
--
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/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);
+ }
}
}
}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
