=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapViewAction.java'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapViewAction.java 2010-10-29 11:24:12 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapViewAction.java 2010-11-08 14:55:36 +0000
@@ -113,7 +113,7 @@
}
else if ( object.getOrganisationUnitSelectionType().equals(
- MappingService.ORGANISATION_UNIT_SELECTION_TYPE_PARENT ) )
+ MappingService.ORGANISATION_UNIT_SELECTION_TYPE_LEVEL ) )
{
OrganisationUnitLevel level = organisationUnitService.getOrganisationUnitLevelByLevel( Integer
.parseInt( object.getMapSource() ) );
=== 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-11-05 12:43:26 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js 2010-11-08 17:31:19 +0000
@@ -3044,7 +3044,7 @@
legendDiv: 'polygonlegend',
defaults: {width: 130},
listeners: {
- expand: {
+ 'expand': {
fn: function() {
if (GLOBALS.vars.activePanel.value != GLOBALS.conf.thematicMap) {
GLOBALS.vars.activePanel.setPolygon();
@@ -3061,7 +3061,7 @@
}
}
});
-
+
proportionalSymbol = new mapfish.widgets.geostat.Symbol({
id: 'proportionalsymbol',
map: GLOBALS.vars.map,
@@ -3072,7 +3072,7 @@
legendDiv: 'pointlegend',
defaults: {width: 130},
listeners: {
- expand: {
+ 'expand': {
fn: function() {
if (GLOBALS.vars.activePanel.value != GLOBALS.conf.thematicMap2) {
GLOBALS.vars.activePanel.setPoint();
@@ -3089,7 +3089,7 @@
}
}
});
-
+
mapping = new mapfish.widgets.geostat.Mapping({
id: 'mapping',
map: GLOBALS.vars.map,
@@ -3100,7 +3100,7 @@
legendDiv: 'polygonlegend',
defaults: {width: 130},
listeners: {
- expand: {
+ 'expand': {
fn: function() {
GLOBALS.vars.activePanel.setAssignment();
this.layer.setVisibility(false);
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/MapFish.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/MapFish.js 2010-10-13 15:18:12 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/MapFish.js 2010-11-08 17:27:58 +0000
@@ -119,9 +119,9 @@
//"widgets/data/LayerStoreMediator.js",
//"widgets/data/GridRowFeatureMediator.js",
"widgets/geostat/Choropleth.js",
- "widgets/geostat/Mapping.js",
- //"widgets/geostat/ProportionalSymbol.js",
- "widgets/geostat/Symbol.js"
+ "widgets/geostat/Symbol.js",
+ "widgets/geostat/Mapping.js"
+ //"widgets/geostat/ProportionalSymbol.js"
//"widgets/tree/LayerTree.js",
//"widgets/tree/LayerTreeExtra.js",
//"widgets/toolbar/Toolbar.js",
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat/Choropleth.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat/Choropleth.js 2010-11-05 12:43:26 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat/Choropleth.js 2010-11-05 13:16:45 +0000
@@ -56,19 +56,6 @@
var mapLegendType = GLOBALS.vars.activePanel.isAssignment() ?
GLOBALS.conf.map_legend_type_automatic : GLOBALS.vars.activePanel.isPolygon() ?
Ext.getCmp('maplegendtype_cb').getValue() : Ext.getCmp('maplegendtype_cb2').getValue();
-
- // if (mapLegendType == GLOBALS.conf.map_legend_type_automatic) {
- // this.colorInterpolation = choropleth.colorInterpolation = mapfish.ColorRgb.getColorsArrayByRgbInterpolation(initialColors[0], initialColors[1], numColors);
- // for (var i = 0; i < choropleth.imageLegend.length && i < this.colorInterpolation.length; i++) {
- // choropleth.imageLegend[i].color = this.colorInterpolation[i].toHexString();
- // }
- // }
- // else if (mapLegendType == GLOBALS.conf.map_legend_type_predefined) {
- // this.colorInterpolation = choropleth.colorInterpolation;
- // for (var i = 0; i < choropleth.imageLegend.length && i < choropleth.colorInterpolation.length; i++) {
- // choropleth.imageLegend[i].color = choropleth.colorInterpolation[i].toHexString();
- // }
- // }
if (mapLegendType == GLOBALS.conf.map_legend_type_automatic) {
this.colorInterpolation = mapfish.ColorRgb.getColorsArrayByRgbInterpolation(initialColors[0], initialColors[1], numColors);
=== 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-01 17:30:19 +0000
+++ 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
@@ -986,7 +986,6 @@
},
createSelectFeatures: function() {
- var scope = this;
var onHoverSelect = function onHoverSelect(feature) {
if (GLOBALS.vars.activePanel.isPolygon()) {
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Mapping.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Mapping.js 2010-10-29 14:27:36 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Mapping.js 2010-11-08 17:27:58 +0000
@@ -63,8 +63,8 @@
stores: false,
initComponent : function() {
-
- var mapStore = new Ext.data.JsonStore({
+
+ var mapStore = new Ext.data.JsonStore({
url: GLOBALS.conf.path_mapping + 'getAllMaps' + GLOBALS.conf.type,
baseParams: { format: 'jsonmin' },
root: 'maps',
=== 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-10-29 14:27:36 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js 2010-11-08 17:27:58 +0000
@@ -75,13 +75,13 @@
organisationUnitSelectionType: false,
initComponent: function() {
-
+
this.initProperties();
-
+
this.createItems();
-
+
this.createSelectFeatures();
-
+
mapfish.widgets.geostat.Symbol.superclass.initComponent.apply(this);
},
@@ -112,7 +112,7 @@
initProperties: function() {
this.legend = {
- type: GLOBALS.conf.map_legend_type_automatic,
+ value: GLOBALS.conf.map_legend_type_automatic,
method: GLOBALS.conf.classify_by_equal_intervals,
classes: 5
};
@@ -137,7 +137,21 @@
}
};
- this.valueType = GLOBALS.conf.map_value_type_indicator;
+ this.valueType = {
+ value: GLOBALS.conf.map_value_type_indicator,
+ setIndicator: function() {
+ this.value = GLOBALS.conf.map_value_type_indicator;
+ },
+ setDatElement: function() {
+ this.value = GLOBALS.conf.map_value_type_dataelement;
+ },
+ isIndicator: function() {
+ return this.value == GLOBALS.conf.map_value_type_indicator;
+ },
+ isDataElement: function() {
+ return this.value == GLOBALS.conf.map_value_type_datalement;
+ }
+ };
},
createItems: function() {
@@ -164,7 +178,7 @@
fn: function(cb) {
this.mapView = GLOBALS.stores.mapView.getAt(GLOBALS.stores.mapView.find('id', cb.getValue())).data;
- this.legend.type = this.mapView.mapLegendType;
+ this.legend.value = this.mapView.mapLegendType;
this.legend.method = this.mapView.method || this.legend.method;
this.legend.classes = this.mapView.classes || this.legend.classes;
@@ -173,8 +187,8 @@
Ext.getCmp('mapdatetype_cb').setValue(GLOBALS.vars.mapDateType.value);
Ext.getCmp('mapview_cb2').setValue(this.mapView.id);
- this.valueType = this.mapView.mapValueType;
- Ext.getCmp('mapvaluetype_cb2').setValue(this.valueType);
+ this.valueType.value = this.mapView.mapValueType;
+ Ext.getCmp('mapvaluetype_cb2').setValue(this.valueType.value);
this.setMapView();
}
@@ -207,7 +221,7 @@
'select': {
scope: this,
fn: function(cb) {
- this.valueType = cb.getValue();
+ this.valueType.value = cb.getValue();
this.prepareMapViewValueType();
this.classify(false, true);
}
@@ -274,7 +288,7 @@
success: function(r) {
var mapLegendSet = Ext.util.JSON.decode(r.responseText).mapLegendSet[0];
if (mapLegendSet.id) {
- this.legend.type = GLOBALS.conf.map_legend_type_predefined;
+ this.legend.value = GLOBALS.conf.map_legend_type_predefined;
this.prepareMapViewLegend();
function load() {
@@ -292,7 +306,7 @@
}
}
else {
- this.legend.type = GLOBALS.conf.map_legend_type_automatic;
+ this.legend.value = GLOBALS.conf.map_legend_type_automatic;
this.prepareMapViewLegend();
this.classify(false, true);
}
@@ -362,7 +376,7 @@
success: function(r) {
var mapLegendSet = Ext.util.JSON.decode(r.responseText).mapLegendSet[0];
if (mapLegendSet.id) {
- this.legend.type = GLOBALS.conf.map_legend_type_predefined;
+ this.legend.value = GLOBALS.conf.map_legend_type_predefined;
this.prepareMapViewLegend();
function load() {
@@ -380,7 +394,7 @@
}
}
else {
- this.legend.type = GLOBALS.conf.map_legend_type_automatic;
+ this.legend.value = GLOBALS.conf.map_legend_type_automatic;
this.prepareMapViewLegend();
this.classify(false, true);
}
@@ -756,7 +770,7 @@
fieldLabel: i18n_legend_type,
emptyText: GLOBALS.conf.emptytext,
labelSeparator: GLOBALS.conf.labelseparator,
- value: this.legend.type,
+ value: this.legend.value,
triggerAction: 'all',
width: GLOBALS.conf.combo_width,
store: new Ext.data.SimpleStore({
@@ -770,16 +784,16 @@
'select': {
scope: this,
fn: function(cb) {
- if (cb.getValue() == GLOBALS.conf.map_legend_type_predefined && cb.getValue() != this.legend.type) {
- this.legend.type = GLOBALS.conf.map_legend_type_predefined;
+ if (cb.getValue() == GLOBALS.conf.map_legend_type_predefined && cb.getValue() != this.legend.value) {
+ this.legend.value = GLOBALS.conf.map_legend_type_predefined;
this.prepareMapViewLegend();
if (Ext.getCmp('maplegendset_cb2').getValue()) {
this.applyPredefinedLegend();
}
}
- else if (cb.getValue() == GLOBALS.conf.map_legend_type_automatic && cb.getValue() != this.legend.type) {
- this.legend.type = GLOBALS.conf.map_legend_type_automatic;
+ else if (cb.getValue() == GLOBALS.conf.map_legend_type_automatic && cb.getValue() != this.legend.value) {
+ this.legend.value = GLOBALS.conf.map_legend_type_automatic;
this.prepareMapViewLegend();
this.classify(false, true);
}
@@ -940,8 +954,7 @@
},
createSelectFeatures: function() {
- var scope = this;
-
+
var onHoverSelect = function onHoverSelect(feature) {
if (GLOBALS.vars.activePanel.isPoint()) {
Ext.getCmp('featureinfo_l').setText('' + feature.attributes[proportionalSymbol.mapData.nameColumn] + '
' + feature.attributes.value + '
', false);
@@ -960,7 +973,7 @@
var x = east_panel.x - 210;
var y = east_panel.y + 41;
- if (GLOBALS.vars.activePanel.isPoint() && GLOBALS..isDatabase()) {
+ if (GLOBALS.vars.activePanel.isPoint() && GLOBALS.vars.mapSourceType.isDatabase()) {
if (feature.attributes.hasChildrenWithCoordinates) {
if (GLOBALS.vars.locateFeatureWindow) {
GLOBALS.vars.locateFeatureWindow.destroy();
@@ -968,7 +981,7 @@
Ext.getCmp('map_tf2').setValue(feature.data.name);
Ext.getCmp('map_tf2').value = feature.attributes.id;
- scope.organisationUnitSelectionType.setParent(feature.attributes.id);
+ proportionalSymbol.organisationUnitSelectionType.setParent(feature.attributes.id);
proportionalSymbol.loadFromDatabase(feature.attributes.id, true);
}
else {
@@ -1020,7 +1033,7 @@
prepareMapViewValueType: function() {
var obj = {};
- if (this.valueType == GLOBALS.conf.map_value_type_indicator) {
+ if (this.valueType.isIndicator()) {
Ext.getCmp('indicatorgroup_cb2').showField();
Ext.getCmp('indicator_cb2').showField();
Ext.getCmp('dataelementgroup_cb2').hideField();
@@ -1038,7 +1051,7 @@
valueType: 'indicatorId'
};
}
- else if (this.valueType == GLOBALS.conf.map_value_type_dataelement) {
+ else if (this.valueType.isDataElement()) {
Ext.getCmp('indicatorgroup_cb2').hideField();
Ext.getCmp('indicator_cb2').hideField();
Ext.getCmp('dataelementgroup_cb2').showField();
@@ -1097,9 +1110,9 @@
},
prepareMapViewLegend: function() {
- Ext.getCmp('maplegendtype_cb2').setValue(this.legend.type);
+ Ext.getCmp('maplegendtype_cb2').setValue(this.legend.value);
- if (this.legend.type == GLOBALS.conf.map_legend_type_automatic) {
+ if (this.legend.value == GLOBALS.conf.map_legend_type_automatic) {
Ext.getCmp('method_cb2').showField();
Ext.getCmp('colorA_cf2').showField();
Ext.getCmp('colorB_cf2').showField();
@@ -1114,7 +1127,7 @@
Ext.getCmp('bounds_tf2').hideField();
}
}
- else if (this.legend.type == GLOBALS.conf.map_legend_type_predefined) {
+ else if (this.legend.value == GLOBALS.conf.map_legend_type_predefined) {
Ext.getCmp('method_cb2').hideField();
Ext.getCmp('numClasses_cb2').hideField();
Ext.getCmp('bounds_tf2').hideField();
@@ -1202,7 +1215,7 @@
this.applyPredefinedLegend(true);
}
- if (this.legend.type == GLOBALS.conf.map_legend_type_automatic) {
+ if (this.legend.value == GLOBALS.conf.map_legend_type_automatic) {
Ext.getCmp('method_cb2').setValue(this.mapView.method);
Ext.getCmp('colorA_cf2').setValue(this.mapView.colorLow);
Ext.getCmp('colorB_cf2').setValue(this.mapView.colorHigh);
@@ -1216,7 +1229,7 @@
this.setMapViewMap();
}
- else if (this.legend.type == GLOBALS.conf.map_legend_type_predefined) {
+ else if (this.legend.value == GLOBALS.conf.map_legend_type_predefined) {
if (GLOBALS.stores.predefinedMapLegendSet.isLoaded) {
predefinedMapLegendSetStoreCallback.call(this);
}
@@ -1243,7 +1256,7 @@
},
applyPredefinedLegend: function(isMapView) {
- this.legend.type = GLOBALS.conf.map_legend_type_predefined;
+ this.legend.value = GLOBALS.conf.map_legend_type_predefined;
var mls = Ext.getCmp('maplegendset_cb2').getValue();
var bounds = [];
Ext.Ajax.request({
@@ -1359,11 +1372,11 @@
organisationUnitSelectionType: this.organisationUnitSelectionType.value,
mapSource: GLOBALS.vars.mapSourceType.isDatabase() ? Ext.getCmp('map_tf2').value : Ext.getCmp('map_cb2').getValue(),
mapLegendType: Ext.getCmp('maplegendtype_cb2').getValue(),
- method: this.legend.type == GLOBALS.conf.map_legend_type_automatic ? Ext.getCmp('method_cb2').getValue() : '',
- classes: this.legend.type == GLOBALS.conf.map_legend_type_automatic ? Ext.getCmp('numClasses_cb2').getValue() : '',
- bounds: this.legend.type == GLOBALS.conf.map_legend_type_automatic && this.legend.method == GLOBALS.conf.classify_with_bounds ? Ext.getCmp('bounds_tf2').getValue() : '',
- colorLow: this.legend.type == GLOBALS.conf.map_legend_type_automatic ? Ext.getCmp('colorA_cf2').getValue() : '',
- colorHigh: this.legend.type == GLOBALS.conf.map_legend_type_automatic ? Ext.getCmp('colorB_cf2').getValue() : '',
+ method: this.legend.value == GLOBALS.conf.map_legend_type_automatic ? Ext.getCmp('method_cb2').getValue() : '',
+ classes: this.legend.value == GLOBALS.conf.map_legend_type_automatic ? Ext.getCmp('numClasses_cb2').getValue() : '',
+ bounds: this.legend.value == GLOBALS.conf.map_legend_type_automatic && this.legend.method == GLOBALS.conf.classify_with_bounds ? Ext.getCmp('bounds_tf2').getValue() : '',
+ colorLow: this.legend.value == GLOBALS.conf.map_legend_type_automatic ? Ext.getCmp('colorA_cf2').getValue() : '',
+ colorHigh: this.legend.value == GLOBALS.conf.map_legend_type_automatic ? Ext.getCmp('colorB_cf2').getValue() : '',
mapLegendSetId: Ext.getCmp('maplegendset_cb2').getValue() || '',
longitude: GLOBALS.vars.map.getCenter().lon,
latitude: GLOBALS.vars.map.getCenter().lat,
@@ -1447,7 +1460,7 @@
this.mapView = false;
}
- var dataUrl = this.valueType == GLOBALS.conf.map_value_type_indicator ?
+ var dataUrl = this.valueType.isIndicator() ?
(this.organisationUnitSelectionType.isParent() ? 'getIndicatorMapValuesByParent' : 'getIndicatorMapValuesByLevel') :
(this.organisationUnitSelectionType.isLevel() ? 'getDataMapValuesByParent' : 'getDataMapValuesByLevel');
@@ -1528,13 +1541,13 @@
}
var params = {
- id: this.valueType == GLOBALS.conf.map_value_type_indicator ? Ext.getCmp('indicator_cb2').getValue() : Ext.getCmp('dataelement_cb2').getValue()
+ id: this.valueType.isIndicator() ? Ext.getCmp('indicator_cb2').getValue() : Ext.getCmp('dataelement_cb2').getValue()
};
- var indicatorOrDataElementId = this.valueType == GLOBALS.conf.map_value_type_indicator ?
+ var indicatorOrDataElementId = this.valueType.isIndicator() ?
Ext.getCmp('indicator_cb2').getValue() : Ext.getCmp('dataelement_cb2').getValue();
- var dataUrl = this.valueType == GLOBALS.conf.map_value_type_indicator ?
+ var dataUrl = this.valueType.isIndicator() ?
'getIndicatorMapValuesByMap' : 'getDataMapValuesByMap';
var periodId = Ext.getCmp('period_cb2').getValue();
var mapLayerPath = this.newUrl;
@@ -1630,4 +1643,4 @@
}
});
-Ext.reg('choropleth', mapfish.widgets.geostat.Symbol);
\ No newline at end of file
+Ext.reg('proportionalSymbol', mapfish.widgets.geostat.Symbol);
\ No newline at end of file