dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #08418
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2019: (GIS) Major speed increase when changing legend only (map values not reloaded).
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 2019 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-11-09 14:56:01 +0100
message:
(GIS) Major speed increase when changing legend only (map values not reloaded).
modified:
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/Symbol.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/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-11-08 17:27:58 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js 2010-11-09 13:47:08 +0000
@@ -74,6 +74,8 @@
organisationUnitSelectionType: false,
+ updateValues: false,
+
initComponent: function() {
this.initProperties();
@@ -84,6 +86,7 @@
if (GLOBALS.vars.parameter) {
this.mapView = GLOBALS.vars.parameter.mapView;
+ this.updateValues = true;
this.legend = {
value: this.mapView.mapLegendType,
method: this.mapView.method || this.legend.method,
@@ -209,6 +212,7 @@
scope: this,
fn: function(cb) {
this.mapView = GLOBALS.stores.mapView.getAt(GLOBALS.stores.mapView.find('id', cb.getValue())).data;
+ this.updateValues = true;
this.legend.value = this.mapView.mapLegendType;
this.legend.method = this.mapView.method || this.legend.method;
@@ -311,6 +315,7 @@
scope: this,
fn: function(cb) {
Ext.getCmp('mapview_cb').clearValue();
+ this.updateValues = true;
Ext.Ajax.request({
url: GLOBALS.conf.path_mapping + 'getMapLegendSetByIndicator' + GLOBALS.conf.type,
@@ -399,6 +404,7 @@
scope: this,
fn: function(cb) {
Ext.getCmp('mapview_cb').clearValue();
+ this.updateValues = true;
Ext.Ajax.request({
url: GLOBALS.conf.path_mapping + 'getMapLegendSetByDataElement' + GLOBALS.conf.type,
@@ -487,6 +493,7 @@
scope: this,
fn: function() {
Ext.getCmp('mapview_cb').clearValue();
+ this.updateValues = true;
this.classify(false, true);
}
}
@@ -507,6 +514,7 @@
scope: this,
fn: function(df, date) {
Ext.getCmp('mapview_cb').clearValue();
+ this.updateValues = true;
Ext.getCmp('enddate_df').setMinValue(date);
this.classify(false, true);
}
@@ -528,6 +536,7 @@
scope: this,
fn: function(df, date) {
Ext.getCmp('mapview_cb').clearValue();
+ this.updateValues = true;
Ext.getCmp('startdate_df').setMaxValue(date);
this.classify(false, true);
}
@@ -556,6 +565,7 @@
scope: this,
fn: function(cb) {
Ext.getCmp('mapview_cb').clearValue();
+ this.updateValues = true;
if (cb.getValue() != this.newUrl) {
this.loadFromFile(cb.getValue());
@@ -670,6 +680,7 @@
width: 130,
scope: this,
handler: function() {
+ this.updateValues = true;
if (tf.getValue()) {
this.organisationUnitSelectionType.setParent(tf.value);
this.loadFromDatabase(tf.value);
@@ -735,6 +746,7 @@
width: 130,
scope: this,
handler: function() {
+ this.updateValues = true;
if (tf.value) {
this.organisationUnitSelectionType.setLevel(tf.value);
this.loadFromDatabase(tf.value);
@@ -1473,66 +1485,72 @@
if (this.validateForm(exception)) {
GLOBALS.vars.mask.msg = i18n_aggregating_map_values;
GLOBALS.vars.mask.show();
+
+ if (this.updateValues) {
+ this.mapData = {
+ nameColumn: 'name'
+ };
- if (!position) {
- GLOBALS.vars.map.zoomToExtent(this.layer.getDataExtent());
- }
-
- this.mapData = {
- nameColumn: 'name'
- };
-
- if (this.mapView) {
- if (this.mapView.longitude && this.mapView.latitude && this.mapView.zoom) {
- GLOBALS.vars.map.setCenter(new OpenLayers.LonLat(this.mapView.longitude, this.mapView.latitude), this.mapView.zoom);
- }
- else {
+ if (!position) {
GLOBALS.vars.map.zoomToExtent(this.layer.getDataExtent());
}
- this.mapView = false;
- }
-
- var dataUrl = this.valueType.isIndicator() ?
- (this.organisationUnitSelectionType.isParent() ? 'getIndicatorMapValuesByParent' : 'getIndicatorMapValuesByLevel') :
- (this.organisationUnitSelectionType.isLevel() ? 'getDataMapValuesByParent' : 'getDataMapValuesByLevel');
-
- var params = {
- id: this.valueType.isIndicator() ? Ext.getCmp('indicator_cb').getValue() : Ext.getCmp('dataelement_cb').getValue(),
- periodId: GLOBALS.vars.mapDateType.isFixed() ? Ext.getCmp('period_cb').getValue() : null,
- startDate: GLOBALS.vars.mapDateType.isStartEnd() ? new Date(Ext.getCmp('startdate_df').getValue()).format('Y-m-d') : null,
- endDate: GLOBALS.vars.mapDateType.isStartEnd() ? new Date(Ext.getCmp('enddate_df').getValue()).format('Y-m-d') : null,
- parentId: this.organisationUnitSelectionType.parent,
- level: this.organisationUnitSelectionType.level
- };
-
- Ext.Ajax.request({
- url: GLOBALS.conf.path_mapping + dataUrl + GLOBALS.conf.type,
- method: 'POST',
- params: params,
- scope: this,
- success: function(r) {
- var mapvalues = Ext.util.JSON.decode(r.responseText).mapvalues;
- GLOBALS.vars.exportValues = GLOBALS.util.getExportDataValueJSON(mapvalues);
+
+ if (this.mapView) {
+ if (this.mapView.longitude && this.mapView.latitude && this.mapView.zoom) {
+ GLOBALS.vars.map.setCenter(new OpenLayers.LonLat(this.mapView.longitude, this.mapView.latitude), this.mapView.zoom);
+ }
+ else {
+ GLOBALS.vars.map.zoomToExtent(this.layer.getDataExtent());
+ }
+ this.mapView = false;
+ }
+
+ var dataUrl = this.valueType.isIndicator() ?
+ (this.organisationUnitSelectionType.isParent() ? 'getIndicatorMapValuesByParent' : 'getIndicatorMapValuesByLevel') :
+ (this.organisationUnitSelectionType.isLevel() ? 'getDataMapValuesByParent' : 'getDataMapValuesByLevel');
+
+ var params = {
+ id: this.valueType.isIndicator() ? Ext.getCmp('indicator_cb').getValue() : Ext.getCmp('dataelement_cb').getValue(),
+ periodId: GLOBALS.vars.mapDateType.isFixed() ? Ext.getCmp('period_cb').getValue() : null,
+ startDate: GLOBALS.vars.mapDateType.isStartEnd() ? new Date(Ext.getCmp('startdate_df').getValue()).format('Y-m-d') : null,
+ endDate: GLOBALS.vars.mapDateType.isStartEnd() ? new Date(Ext.getCmp('enddate_df').getValue()).format('Y-m-d') : null,
+ parentId: this.organisationUnitSelectionType.parent,
+ level: this.organisationUnitSelectionType.level
+ };
- if (mapvalues.length == 0) {
- Ext.message.msg(false, i18n_current_selection_no_data);
- GLOBALS.vars.mask.hide();
- return;
- }
+ Ext.Ajax.request({
+ url: GLOBALS.conf.path_mapping + dataUrl + GLOBALS.conf.type,
+ method: 'POST',
+ params: params,
+ scope: this,
+ success: function(r) {
+ var mapvalues = Ext.util.JSON.decode(r.responseText).mapvalues;
+ GLOBALS.vars.exportValues = GLOBALS.util.getExportDataValueJSON(mapvalues);
+
+ if (mapvalues.length == 0) {
+ Ext.message.msg(false, i18n_current_selection_no_data);
+ GLOBALS.vars.mask.hide();
+ return;
+ }
- for (var i = 0; i < mapvalues.length; i++) {
- for (var j = 0; j < this.layer.features.length; j++) {
- if (mapvalues[i].orgUnitName == this.layer.features[j].attributes.name) {
- this.layer.features[j].attributes.value = parseFloat(mapvalues[i].value);
- this.layer.features[j].attributes.labelString = this.layer.features[j].attributes.name + ' (' + this.layer.features[j].attributes.value + ')';
- break;
+ for (var i = 0; i < mapvalues.length; i++) {
+ for (var j = 0; j < this.layer.features.length; j++) {
+ if (mapvalues[i].orgUnitName == this.layer.features[j].attributes.name) {
+ this.layer.features[j].attributes.value = parseFloat(mapvalues[i].value);
+ this.layer.features[j].attributes.labelString = this.layer.features[j].attributes.name + ' (' + this.layer.features[j].attributes.value + ')';
+ break;
+ }
}
}
+
+ this.updateValues = false;
+ this.applyValues();
}
-
- this.applyValues();
- }
- });
+ });
+ }
+ else {
+ this.applyValues();
+ }
}
},
@@ -1542,98 +1560,100 @@
GLOBALS.vars.mask.msg = i18n_aggregating_map_values;
GLOBALS.vars.mask.show();
- Ext.Ajax.request({
- url: GLOBALS.conf.path_mapping + 'getMapByMapLayerPath' + GLOBALS.conf.type,
- method: 'POST',
- params: {mapLayerPath: this.newUrl},
- scope: this,
- success: function(r) {
- this.mapData = Ext.util.JSON.decode(r.responseText).map[0];
-
- this.mapData.organisationUnitLevel = parseFloat(this.mapData.organisationUnitLevel);
- this.mapData.longitude = parseFloat(this.mapData.longitude);
- this.mapData.latitude = parseFloat(this.mapData.latitude);
- this.mapData.zoom = parseFloat(this.mapData.zoom);
-
- if (!position) {
- if (this.mapData.zoom != GLOBALS.vars.map.getZoom()) {
- GLOBALS.vars.map.zoomTo(this.mapData.zoom);
- }
- GLOBALS.vars.map.setCenter(new OpenLayers.LonLat(this.mapData.longitude, this.mapData.latitude));
- }
-
- if (this.mapView) {
- if (this.mapView.longitude && this.mapView.latitude && this.mapView.zoom) {
- GLOBALS.vars.map.setCenter(new OpenLayers.LonLat(this.mapView.longitude, this.mapView.latitude), this.mapView.zoom);
- }
- else {
- GLOBALS.vars.map.setCenter(new OpenLayers.LonLat(this.mapData.longitude, this.mapData.latitude), this.mapData.zoom);
- }
- this.mapView = false;
- }
-
- var params = {
- id: this.valueType.isIndicator() ? Ext.getCmp('indicator_cb').getValue() : Ext.getCmp('dataelement_cb').getValue()
- };
-
-
- var indicatorOrDataElementId = this.valueType.isIndicator() ?
- Ext.getCmp('indicator_cb').getValue() : Ext.getCmp('dataelement_cb').getValue();
- var dataUrl = this.valueType.isIndicator() ?
- 'getIndicatorMapValuesByMap' : 'getDataMapValuesByMap';
- var periodId = Ext.getCmp('period_cb').getValue();
- var mapLayerPath = this.newUrl;
-
- Ext.Ajax.request({
- url: GLOBALS.conf.path_mapping + dataUrl + GLOBALS.conf.type,
- method: 'POST',
- params: {id:indicatorOrDataElementId, periodId:periodId, mapLayerPath:mapLayerPath},
- scope: this,
- success: function(r) {
- var mapvalues = Ext.util.JSON.decode(r.responseText).mapvalues;
- GLOBALS.vars.exportValues = GLOBALS.util.getExportDataValueJSON(mapvalues);
- var mv = new Array();
- var mour = new Array();
- var nameColumn = this.mapData.nameColumn;
- var options = {};
-
- if (mapvalues.length == 0) {
- Ext.message.msg(false, i18n_current_selection_no_data );
- GLOBALS.vars.mask.hide();
- return;
- }
-
- for (var i = 0; i < mapvalues.length; i++) {
- mv[mapvalues[i].orgUnitName] = mapvalues[i].orgUnitName ? mapvalues[i].value : '';
- }
-
- Ext.Ajax.request({
- url: GLOBALS.conf.path_mapping + 'getAvailableMapOrganisationUnitRelations' + GLOBALS.conf.type,
- method: 'POST',
- params: {mapLayerPath: mapLayerPath},
- scope: this,
- success: function(r) {
- var relations = Ext.util.JSON.decode(r.responseText).mapOrganisationUnitRelations;
-
- for (var i = 0; i < relations.length; i++) {
- mour[relations[i].featureId] = relations[i].organisationUnit;
- }
+ if (this.updateValues) {
+ Ext.Ajax.request({
+ url: GLOBALS.conf.path_mapping + 'getMapByMapLayerPath' + GLOBALS.conf.type,
+ method: 'POST',
+ params: {mapLayerPath: this.newUrl},
+ scope: this,
+ success: function(r) {
+ this.mapData = Ext.util.JSON.decode(r.responseText).map[0];
+ this.mapData.organisationUnitLevel = parseFloat(this.mapData.organisationUnitLevel);
+ this.mapData.longitude = parseFloat(this.mapData.longitude);
+ this.mapData.latitude = parseFloat(this.mapData.latitude);
+ this.mapData.zoom = parseFloat(this.mapData.zoom);
+
+ if (!position) {
+ GLOBALS.vars.map.zoomToExtent(this.layer.getDataExtent());
+ }
+
+ if (this.mapView) {
+ if (this.mapView.longitude && this.mapView.latitude && this.mapView.zoom) {
+ GLOBALS.vars.map.setCenter(new OpenLayers.LonLat(this.mapView.longitude, this.mapView.latitude), this.mapView.zoom);
+ }
+ else {
+ GLOBALS.vars.map.zoomToExtent(this.layer.getDataExtent());
+ }
+ this.mapView = false;
+ }
+
+ var params = {
+ id: this.valueType.isIndicator() ? Ext.getCmp('indicator_cb').getValue() : Ext.getCmp('dataelement_cb').getValue()
+ };
+
+
+ var indicatorOrDataElementId = this.valueType.isIndicator() ?
+ Ext.getCmp('indicator_cb').getValue() : Ext.getCmp('dataelement_cb').getValue();
+ var dataUrl = this.valueType.isIndicator() ?
+ 'getIndicatorMapValuesByMap' : 'getDataMapValuesByMap';
+ var periodId = Ext.getCmp('period_cb').getValue();
+ var mapLayerPath = this.newUrl;
+
+ Ext.Ajax.request({
+ url: GLOBALS.conf.path_mapping + dataUrl + GLOBALS.conf.type,
+ method: 'POST',
+ params: {id:indicatorOrDataElementId, periodId:periodId, mapLayerPath:mapLayerPath},
+ scope: this,
+ success: function(r) {
+ var mapvalues = Ext.util.JSON.decode(r.responseText).mapvalues;
+ GLOBALS.vars.exportValues = GLOBALS.util.getExportDataValueJSON(mapvalues);
+ var mv = new Array();
+ var mour = new Array();
+ var nameColumn = this.mapData.nameColumn;
+ var options = {};
+
+ if (mapvalues.length == 0) {
+ Ext.message.msg(false, i18n_current_selection_no_data );
+ GLOBALS.vars.mask.hide();
+ return;
+ }
+
+ for (var i = 0; i < mapvalues.length; i++) {
+ mv[mapvalues[i].orgUnitName] = mapvalues[i].orgUnitName ? mapvalues[i].value : '';
+ }
+
+ Ext.Ajax.request({
+ url: GLOBALS.conf.path_mapping + 'getAvailableMapOrganisationUnitRelations' + GLOBALS.conf.type,
+ method: 'POST',
+ params: {mapLayerPath: mapLayerPath},
+ scope: this,
+ success: function(r) {
+ var relations = Ext.util.JSON.decode(r.responseText).mapOrganisationUnitRelations;
+
+ for (var i = 0; i < relations.length; i++) {
+ mour[relations[i].featureId] = relations[i].organisationUnit;
+ }
- for (var j = 0; j < this.layer.features.length; j++) {
- var value = mv[mour[this.layer.features[j].attributes[nameColumn]]];
- this.layer.features[j].attributes.value = value ? parseFloat(value) : '';
- this.layer.features[j].data.id = this.layer.features[j].attributes[nameColumn];
- this.layer.features[j].data.name = this.layer.features[j].attributes[nameColumn];
- this.layer.features[j].attributes.labelString = this.layer.features[j].attributes[nameColumn] + ' (' + this.layer.features[j].attributes.value + ')';
+ for (var j = 0; j < this.layer.features.length; j++) {
+ var value = mv[mour[this.layer.features[j].attributes[nameColumn]]];
+ this.layer.features[j].attributes.value = value ? parseFloat(value) : '';
+ this.layer.features[j].data.id = this.layer.features[j].attributes[nameColumn];
+ this.layer.features[j].data.name = this.layer.features[j].attributes[nameColumn];
+ this.layer.features[j].attributes.labelString = this.layer.features[j].attributes[nameColumn] + ' (' + this.layer.features[j].attributes.value + ')';
+ }
+
+ this.updateValues = false;
+ this.applyValues();
}
-
- this.applyValues();
- }
- });
- }
- });
- }
- });
+ });
+ }
+ });
+ }
+ });
+ }
+ else {
+ this.applyValues();
+ }
}
},
=== 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 2010-11-08 18:16:24 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js 2010-11-09 13:47:08 +0000
@@ -74,6 +74,8 @@
organisationUnitSelectionType: false,
+ updateValues: false,
+
initComponent: function() {
this.initProperties();
@@ -177,6 +179,7 @@
scope: this,
fn: function(cb) {
this.mapView = GLOBALS.stores.mapView.getAt(GLOBALS.stores.mapView.find('id', cb.getValue())).data;
+ this.updateValues = true;
this.legend.value = this.mapView.mapLegendType;
this.legend.method = this.mapView.method || this.legend.method;
@@ -279,6 +282,7 @@
scope: this,
fn: function(cb) {
Ext.getCmp('mapview_cb2').clearValue();
+ this.updateValues = true;
Ext.Ajax.request({
url: GLOBALS.conf.path_mapping + 'getMapLegendSetByIndicator' + GLOBALS.conf.type,
@@ -367,6 +371,7 @@
scope: this,
fn: function(cb) {
Ext.getCmp('mapview_cb2').clearValue();
+ this.updateValues = true;
Ext.Ajax.request({
url: GLOBALS.conf.path_mapping + 'getMapLegendSetByDataElement' + GLOBALS.conf.type,
@@ -455,6 +460,7 @@
scope: this,
fn: function() {
Ext.getCmp('mapview_cb2').clearValue();
+ this.updateValues = true;
this.classify(false, true);
}
}
@@ -475,6 +481,7 @@
scope: this,
fn: function(df, date) {
Ext.getCmp('mapview_cb2').clearValue();
+ this.updateValues = true;
Ext.getCmp('enddate_df2').setMinValue(date);
this.classify(false, true);
}
@@ -496,6 +503,7 @@
scope: this,
fn: function(df, date) {
Ext.getCmp('mapview_cb2').clearValue();
+ this.updateValues = true;
Ext.getCmp('startdate_df2').setMaxValue(date);
this.classify(false, true);
}
@@ -524,6 +532,7 @@
scope: this,
fn: function(cb) {
Ext.getCmp('mapview_cb2').clearValue();
+ this.updateValues = true;
if (cb.getValue() != this.newUrl) {
this.loadFromFile(cb.getValue());
@@ -638,6 +647,7 @@
width: 130,
scope: this,
handler: function() {
+ this.updateValues = true;
if (tf.getValue()) {
this.organisationUnitSelectionType.setParent(tf.value);
this.loadFromDatabase(tf.value);
@@ -703,6 +713,7 @@
width: 130,
scope: this,
handler: function() {
+ this.updateValues = true;
if (tf.value) {
this.organisationUnitSelectionType.setLevel(tf.value);
this.loadFromDatabase(tf.value);
@@ -1441,66 +1452,72 @@
if (this.validateForm(exception)) {
GLOBALS.vars.mask.msg = i18n_aggregating_map_values;
GLOBALS.vars.mask.show();
+
+ if (this.updateValues) {
+ this.mapData = {
+ nameColumn: 'name'
+ };
- if (!position) {
- GLOBALS.vars.map.zoomToExtent(this.layer.getDataExtent());
- }
-
- this.mapData = {
- nameColumn: 'name'
- };
-
- if (this.mapView) {
- if (this.mapView.longitude && this.mapView.latitude && this.mapView.zoom) {
- GLOBALS.vars.map.setCenter(new OpenLayers.LonLat(this.mapView.longitude, this.mapView.latitude), this.mapView.zoom);
- }
- else {
+ if (!position) {
GLOBALS.vars.map.zoomToExtent(this.layer.getDataExtent());
}
- this.mapView = false;
- }
-
- var dataUrl = this.valueType.isIndicator() ?
- (this.organisationUnitSelectionType.isParent() ? 'getIndicatorMapValuesByParent' : 'getIndicatorMapValuesByLevel') :
- (this.organisationUnitSelectionType.isLevel() ? 'getDataMapValuesByParent' : 'getDataMapValuesByLevel');
-
- var params = {
- id: this.valueType.isIndicator ? Ext.getCmp('indicator_cb2').getValue() : Ext.getCmp('dataelement_cb2').getValue(),
- periodId: GLOBALS.vars.mapDateType.isFixed() ? Ext.getCmp('period_cb2').getValue() : null,
- startDate: GLOBALS.vars.mapDateType.isStartEnd() ? new Date(Ext.getCmp('startdate_df2').getValue()).format('Y-m-d') : null,
- endDate: GLOBALS.vars.mapDateType.isStartEnd() ? new Date(Ext.getCmp('enddate_df2').getValue()).format('Y-m-d') : null,
- parentId: this.organisationUnitSelectionType.parent,
- level: this.organisationUnitSelectionType.level
- };
-
- Ext.Ajax.request({
- url: GLOBALS.conf.path_mapping + dataUrl + GLOBALS.conf.type,
- method: 'POST',
- params: params,
- scope: this,
- success: function(r) {
- var mapvalues = Ext.util.JSON.decode(r.responseText).mapvalues;
- GLOBALS.vars.exportValues = GLOBALS.util.getExportDataValueJSON(mapvalues);
+
+ if (this.mapView) {
+ if (this.mapView.longitude && this.mapView.latitude && this.mapView.zoom) {
+ GLOBALS.vars.map.setCenter(new OpenLayers.LonLat(this.mapView.longitude, this.mapView.latitude), this.mapView.zoom);
+ }
+ else {
+ GLOBALS.vars.map.zoomToExtent(this.layer.getDataExtent());
+ }
+ this.mapView = false;
+ }
+
+ var dataUrl = this.valueType.isIndicator() ?
+ (this.organisationUnitSelectionType.isParent() ? 'getIndicatorMapValuesByParent' : 'getIndicatorMapValuesByLevel') :
+ (this.organisationUnitSelectionType.isLevel() ? 'getDataMapValuesByParent' : 'getDataMapValuesByLevel');
+
+ var params = {
+ id: this.valueType.isIndicator() ? Ext.getCmp('indicator_cb2').getValue() : Ext.getCmp('dataelement_cb2').getValue(),
+ periodId: GLOBALS.vars.mapDateType.isFixed() ? Ext.getCmp('period_cb2').getValue() : null,
+ startDate: GLOBALS.vars.mapDateType.isStartEnd() ? new Date(Ext.getCmp('startdate_df2').getValue()).format('Y-m-d') : null,
+ endDate: GLOBALS.vars.mapDateType.isStartEnd() ? new Date(Ext.getCmp('enddate_df2').getValue()).format('Y-m-d') : null,
+ parentId: this.organisationUnitSelectionType.parent,
+ level: this.organisationUnitSelectionType.level
+ };
- if (mapvalues.length == 0) {
- Ext.message.msg(false, i18n_current_selection_no_data);
- GLOBALS.vars.mask.hide();
- return;
- }
+ Ext.Ajax.request({
+ url: GLOBALS.conf.path_mapping + dataUrl + GLOBALS.conf.type,
+ method: 'POST',
+ params: params,
+ scope: this,
+ success: function(r) {
+ var mapvalues = Ext.util.JSON.decode(r.responseText).mapvalues;
+ GLOBALS.vars.exportValues = GLOBALS.util.getExportDataValueJSON(mapvalues);
+
+ if (mapvalues.length == 0) {
+ Ext.message.msg(false, i18n_current_selection_no_data);
+ GLOBALS.vars.mask.hide();
+ return;
+ }
- for (var i = 0; i < mapvalues.length; i++) {
- for (var j = 0; j < this.layer.features.length; j++) {
- if (mapvalues[i].orgUnitName == this.layer.features[j].attributes.name) {
- this.layer.features[j].attributes.value = parseFloat(mapvalues[i].value);
- this.layer.features[j].attributes.labelString = this.layer.features[j].attributes.name + ' (' + this.layer.features[j].attributes.value + ')';
- break;
+ for (var i = 0; i < mapvalues.length; i++) {
+ for (var j = 0; j < this.layer.features.length; j++) {
+ if (mapvalues[i].orgUnitName == this.layer.features[j].attributes.name) {
+ this.layer.features[j].attributes.value = parseFloat(mapvalues[i].value);
+ this.layer.features[j].attributes.labelString = this.layer.features[j].attributes.name + ' (' + this.layer.features[j].attributes.value + ')';
+ break;
+ }
}
}
+
+ this.updateValues = false;
+ this.applyValues();
}
-
- this.applyValues();
- }
- });
+ });
+ }
+ else {
+ this.applyValues();
+ }
}
},
@@ -1510,98 +1527,100 @@
GLOBALS.vars.mask.msg = i18n_aggregating_map_values;
GLOBALS.vars.mask.show();
- Ext.Ajax.request({
- url: GLOBALS.conf.path_mapping + 'getMapByMapLayerPath' + GLOBALS.conf.type,
- method: 'POST',
- params: {mapLayerPath: this.newUrl},
- scope: this,
- success: function(r) {
- this.mapData = Ext.util.JSON.decode(r.responseText).map[0];
-
- this.mapData.organisationUnitLevel = parseFloat(this.mapData.organisationUnitLevel);
- this.mapData.longitude = parseFloat(this.mapData.longitude);
- this.mapData.latitude = parseFloat(this.mapData.latitude);
- this.mapData.zoom = parseFloat(this.mapData.zoom);
-
- if (!position) {
- if (this.mapData.zoom != GLOBALS.vars.map.getZoom()) {
- GLOBALS.vars.map.zoomTo(this.mapData.zoom);
- }
- GLOBALS.vars.map.setCenter(new OpenLayers.LonLat(this.mapData.longitude, this.mapData.latitude));
- }
-
- if (this.mapView) {
- if (this.mapView.longitude && this.mapView.latitude && this.mapView.zoom) {
- GLOBALS.vars.map.setCenter(new OpenLayers.LonLat(this.mapView.longitude, this.mapView.latitude), this.mapView.zoom);
- }
- else {
- GLOBALS.vars.map.setCenter(new OpenLayers.LonLat(this.mapData.longitude, this.mapData.latitude), this.mapData.zoom);
- }
- this.mapView = false;
- }
-
- var params = {
- id: this.valueType.isIndicator() ? Ext.getCmp('indicator_cb2').getValue() : Ext.getCmp('dataelement_cb2').getValue()
- };
-
-
- var indicatorOrDataElementId = this.valueType.isIndicator() ?
- Ext.getCmp('indicator_cb2').getValue() : Ext.getCmp('dataelement_cb2').getValue();
- var dataUrl = this.valueType.isIndicator() ?
- 'getIndicatorMapValuesByMap' : 'getDataMapValuesByMap';
- var periodId = Ext.getCmp('period_cb2').getValue();
- var mapLayerPath = this.newUrl;
-
- Ext.Ajax.request({
- url: GLOBALS.conf.path_mapping + dataUrl + GLOBALS.conf.type,
- method: 'POST',
- params: {id:indicatorOrDataElementId, periodId:periodId, mapLayerPath:mapLayerPath},
- scope: this,
- success: function(r) {
- var mapvalues = Ext.util.JSON.decode(r.responseText).mapvalues;
- GLOBALS.vars.exportValues = GLOBALS.util.getExportDataValueJSON(mapvalues);
- var mv = new Array();
- var mour = new Array();
- var nameColumn = this.mapData.nameColumn;
- var options = {};
-
- if (mapvalues.length == 0) {
- Ext.message.msg(false, i18n_current_selection_no_data );
- GLOBALS.vars.mask.hide();
- return;
- }
-
- for (var i = 0; i < mapvalues.length; i++) {
- mv[mapvalues[i].orgUnitName] = mapvalues[i].orgUnitName ? mapvalues[i].value : '';
- }
-
- Ext.Ajax.request({
- url: GLOBALS.conf.path_mapping + 'getAvailableMapOrganisationUnitRelations' + GLOBALS.conf.type,
- method: 'POST',
- params: {mapLayerPath: mapLayerPath},
- scope: this,
- success: function(r) {
- var relations = Ext.util.JSON.decode(r.responseText).mapOrganisationUnitRelations;
-
- for (var i = 0; i < relations.length; i++) {
- mour[relations[i].featureId] = relations[i].organisationUnit;
- }
+ if (this.updateValues) {
+ Ext.Ajax.request({
+ url: GLOBALS.conf.path_mapping + 'getMapByMapLayerPath' + GLOBALS.conf.type,
+ method: 'POST',
+ params: {mapLayerPath: this.newUrl},
+ scope: this,
+ success: function(r) {
+ this.mapData = Ext.util.JSON.decode(r.responseText).map[0];
+ this.mapData.organisationUnitLevel = parseFloat(this.mapData.organisationUnitLevel);
+ this.mapData.longitude = parseFloat(this.mapData.longitude);
+ this.mapData.latitude = parseFloat(this.mapData.latitude);
+ this.mapData.zoom = parseFloat(this.mapData.zoom);
+
+ if (!position) {
+ GLOBALS.vars.map.zoomToExtent(this.layer.getDataExtent());
+ }
+
+ if (this.mapView) {
+ if (this.mapView.longitude && this.mapView.latitude && this.mapView.zoom) {
+ GLOBALS.vars.map.setCenter(new OpenLayers.LonLat(this.mapView.longitude, this.mapView.latitude), this.mapView.zoom);
+ }
+ else {
+ GLOBALS.vars.map.zoomToExtent(this.layer.getDataExtent());
+ }
+ this.mapView = false;
+ }
+
+ var params = {
+ id: this.valueType.isIndicator() ? Ext.getCmp('indicator_cb2').getValue() : Ext.getCmp('dataelement_cb2').getValue()
+ };
+
+
+ var indicatorOrDataElementId = this.valueType.isIndicator() ?
+ Ext.getCmp('indicator_cb2').getValue() : Ext.getCmp('dataelement_cb2').getValue();
+ var dataUrl = this.valueType.isIndicator() ?
+ 'getIndicatorMapValuesByMap' : 'getDataMapValuesByMap';
+ var periodId = Ext.getCmp('period_cb2').getValue();
+ var mapLayerPath = this.newUrl;
+
+ Ext.Ajax.request({
+ url: GLOBALS.conf.path_mapping + dataUrl + GLOBALS.conf.type,
+ method: 'POST',
+ params: {id:indicatorOrDataElementId, periodId:periodId, mapLayerPath:mapLayerPath},
+ scope: this,
+ success: function(r) {
+ var mapvalues = Ext.util.JSON.decode(r.responseText).mapvalues;
+ GLOBALS.vars.exportValues = GLOBALS.util.getExportDataValueJSON(mapvalues);
+ var mv = new Array();
+ var mour = new Array();
+ var nameColumn = this.mapData.nameColumn;
+ var options = {};
+
+ if (mapvalues.length == 0) {
+ Ext.message.msg(false, i18n_current_selection_no_data );
+ GLOBALS.vars.mask.hide();
+ return;
+ }
+
+ for (var i = 0; i < mapvalues.length; i++) {
+ mv[mapvalues[i].orgUnitName] = mapvalues[i].orgUnitName ? mapvalues[i].value : '';
+ }
+
+ Ext.Ajax.request({
+ url: GLOBALS.conf.path_mapping + 'getAvailableMapOrganisationUnitRelations' + GLOBALS.conf.type,
+ method: 'POST',
+ params: {mapLayerPath: mapLayerPath},
+ scope: this,
+ success: function(r) {
+ var relations = Ext.util.JSON.decode(r.responseText).mapOrganisationUnitRelations;
+
+ for (var i = 0; i < relations.length; i++) {
+ mour[relations[i].featureId] = relations[i].organisationUnit;
+ }
- for (var j = 0; j < this.layer.features.length; j++) {
- var value = mv[mour[this.layer.features[j].attributes[nameColumn]]];
- this.layer.features[j].attributes.value = value ? parseFloat(value) : '';
- this.layer.features[j].data.id = this.layer.features[j].attributes[nameColumn];
- this.layer.features[j].data.name = this.layer.features[j].attributes[nameColumn];
- this.layer.features[j].attributes.labelString = this.layer.features[j].attributes[nameColumn] + ' (' + this.layer.features[j].attributes.value + ')';
+ for (var j = 0; j < this.layer.features.length; j++) {
+ var value = mv[mour[this.layer.features[j].attributes[nameColumn]]];
+ this.layer.features[j].attributes.value = value ? parseFloat(value) : '';
+ this.layer.features[j].data.id = this.layer.features[j].attributes[nameColumn];
+ this.layer.features[j].data.name = this.layer.features[j].attributes[nameColumn];
+ this.layer.features[j].attributes.labelString = this.layer.features[j].attributes[nameColumn] + ' (' + this.layer.features[j].attributes.value + ')';
+ }
+
+ this.updateValues = false;
+ this.applyValues();
}
-
- this.applyValues();
- }
- });
- }
- });
- }
- });
+ });
+ }
+ });
+ }
+ });
+ }
+ else {
+ this.applyValues();
+ }
}
},
