=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css' --- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 2011-08-20 19:30:37 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 2011-08-20 23:43:52 +0000 @@ -46,6 +46,10 @@ background-image:url('../../resources/ext-ux/theme/gray-extend-ux/grid-split.png'); height:23px; } +.x-toolbar .xtb-sep-panel { + background-image:url('../../resources/ext-ux/theme/gray-extend-ux/grid-split.png'); + height:17px; +} .x-panel-tbar .x-toolbar { padding:0; } @@ -144,6 +148,9 @@ .menu-mapview { background-image:url('../../../images/favorite.png'); } +.menu-history { + background-image:url('../../../images/history2.png'); +} .no-icon-menu .x-menu-item-icon { display: none; } @@ -489,7 +496,7 @@ #help h3 { padding:8px 0 0 0; font:bold 11px arial; - color:#222222; + color:#111; } #help p { padding:4px 0 4px 0; === modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js' --- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js 2011-08-20 20:36:57 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js 2011-08-20 21:53:24 +0000 @@ -1032,9 +1032,91 @@ } } } + }, + '-', + { + name: 'history', + text: 'History', + iconCls: 'menu-history', + disabled: true, + menu: {}, + addMenu: function() { + this.menu = new Ext.menu.Menu({ + defaults: { + itemCls: 'x-menu-item x-menu-item-custom' + }, + items: [], + listeners: { + 'add': function(menu) { + var items = menu.items.items; + var keys = menu.items.keys; + items.unshift(items.pop()); + keys.unshift(keys.pop()); + + if (items.length > 10) { + items[items.length-1].destroy(); + } + }, + 'click': function(menu, item, e) { + var mapView = item.mapView; + var scope = mapView.widget; + scope.mapView = mapView; + scope.updateValues = true; + + scope.legend.value = mapView.mapLegendType; + scope.legend.method = mapView.method || scope.legend.method; + scope.legend.classes = mapView.classes || scope.legend.classes; + + G.vars.map.setCenter(new OpenLayers.LonLat(mapView.longitude, mapView.latitude), mapView.zoom); + G.system.mapDateType.value = mapView.mapDateType; + Ext.getCmp('mapdatetype_cb').setValue(G.system.mapDateType.value); + + scope.valueType.value = mapView.mapValueType; + scope.cmp.mapValueType.setValue(scope.valueType.value); + + G.util.expandWidget(scope); + scope.setMapView(); + } + } + }); + }, + addItem: function(scope) { + if (!this.menu.items) { + this.addMenu(); + } + + var mapView = scope.formValues.getAllValues.call(scope); + mapView.widget = scope; + mapView.timestamp = G.date.getNowHMS(); + var c1 = ''; + var c2 = ''; + var spanEnd = ''; + mapView.label = '' + + c1 + mapView.timestamp + spanEnd + + c2 + mapView.parentOrganisationUnitName + spanEnd + + c1 + '( ' + mapView.organisationUnitLevelName + ' )' + spanEnd + + c2 + (mapView.mapValueType == G.conf.map_value_type_indicator ? mapView.indicatorName : mapView.dataElementName) + spanEnd + + c1 + (mapView.mapDateType == G.conf.map_date_type_fixed ? mapView.periodName : (mapView.startDate + ' - ' + mapView.endDate)) + spanEnd + + spanEnd; + + for (var i = 0; i < this.menu.items.items.length; i++) { + if (G.util.compareObjToObj(mapView, this.menu.items.items[i].mapView, ['longitude','latitude','zoom','widget','timestamp','label'])) { + this.menu.items.items[i].destroy(); + } + } + + this.menu.addMenuItem({ + html: mapView.label, + mapView: mapView + }); + + this.enable(); + } } ] }); + + this.widget.button = this; } } }); === modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js' --- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js 2011-08-20 20:36:57 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js 2011-08-20 23:43:52 +0000 @@ -144,7 +144,7 @@ url: G.conf.path_mapping + 'getMapLegendSetsByType' + G.conf.type, baseParams: {type: G.conf.map_legendset_type_predefined}, root: 'mapLegendSets', - fields: ['id', 'name', 'legendType', 'indicators', 'dataelements'], + fields: ['id', 'name', 'symbolizer', 'indicators', 'dataelements'], sortInfo: {field:'name', direction:'ASC'}, autoLoad: false, isLoaded: false, @@ -574,6 +574,10 @@ } }, { + xtype: 'tbseparator', + cls: 'xtb-sep-panel' + }, + { xtype: 'button', id: 'deleteview_b', iconCls: 'icon-remove', @@ -653,6 +657,7 @@ } } }); + favoriteWindow.setPagePosition(G.conf.window_x_left,G.conf.window_y_left); /* Section: export map */ var exportImageWindow = new Ext.Window({ @@ -831,6 +836,7 @@ } ] }); + exportImageWindow.setPagePosition(G.conf.window_x_left,G.conf.window_y_left); /* Section: predefined map legend set */ var predefinedMapLegendSetWindow = new Ext.Window({ @@ -961,7 +967,8 @@ ] }, { - xtype: 'form', + xtype: 'panel', + layout: 'form', items: [ { xtype: 'toolbar', @@ -1029,6 +1036,10 @@ } }, { + xtype: 'tbseparator', + cls: 'xtb-sep-panel' + }, + { xtype: 'button', id: 'deletepredefinedmaplegend_b', text: G.i18n.delete_, @@ -1118,7 +1129,7 @@ } } }, - {html: '
'+G.i18n.legends+'
'}, + {html: '
' + G.i18n.legends + '
'}, { xtype: 'multiselect', id: 'predefinednewmaplegend_ms', @@ -1134,7 +1145,7 @@ {html: '
Delete legend set
'}, { xtype: 'combo', - id: 'predefinedmaplegendsetindicator_cb', + id: 'predefinedmaplegendset_cb', editable: false, valueField: 'id', displayField: 'name', @@ -1147,7 +1158,7 @@ fieldLabel: G.i18n.legendset, width: G.conf.combo_width_fieldset, minListWidth: G.conf.combo_width_fieldset, - store:G.stores.predefinedMapLegendSet + store: G.stores.predefinedMapLegendSet } ] }, @@ -1231,13 +1242,17 @@ } }, { + xtype: 'tbseparator', + cls: 'xtb-sep-panel' + }, + { xtype: 'button', id: 'deletepredefinedmaplegendset_b', text: G.i18n.delete_, iconCls: 'icon-remove', handler: function() { - var mlsv = Ext.getCmp('predefinedmaplegendsetindicator_cb').getValue(); - var mlsrv = Ext.getCmp('predefinedmaplegendsetindicator_cb').getRawValue(); + var mlsv = Ext.getCmp('predefinedmaplegendset_cb').getValue(); + var mlsrv = Ext.getCmp('predefinedmaplegendset_cb').getRawValue(); if (!mlsv) { Ext.message.msg(false, G.i18n.please_select_a_legend_set); @@ -1250,14 +1265,30 @@ params: {id: mlsv}, success: function(r) { Ext.message.msg(true, G.i18n.legendset + ' ' + mlsrv + ' ' + G.i18n.was_deleted); + var store = G.stores.predefinedMapLegendSet; + var symbolizer = store.getAt(store.find('id', mlsv)).data.symbolizer; + G.stores.predefinedMapLegendSet.load(); - Ext.getCmp('predefinedmaplegendsetindicator_cb').clearValue(); - if (mlsv == Ext.getCmp('predefinedmaplegendsetindicator2_cb').getValue) { - Ext.getCmp('predefinedmaplegendsetindicator2_cb').clearValue(); + store = symbolizer == G.conf.map_legend_symbolizer_color ? + G.stores.predefinedColorMapLegendSet : G.stores.predefinedImageMapLegendSet; + store.load(); + + Ext.getCmp('predefinedmaplegendset_cb').clearValue(); + if (mlsv == Ext.getCmp('predefinedmaplegendsetindicator_cb').getValue) { + Ext.getCmp('predefinedmaplegendsetindicator_cb').clearValue(); } - if (mlsv == Ext.getCmp('predefinedmaplegendsetindicator2_cb').getValue) { + if (mlsv == Ext.getCmp('predefinedmaplegendsetdataelement_cb').getValue) { Ext.getCmp('predefinedmaplegendsetdataelement_cb').clearValue(); - } + } + if (mlsv == choropleth.cmp.mapLegendSet.getValue()) { + choropleth.cmp.mapLegendSet.clearValue(); + } + if (mlsv == point.cmp.mapLegendSet.getValue()) { + point.cmp.mapLegendSet.clearValue(); + } + if (mlsv == centroid.cmp.mapLegendSet.getValue()) { + centroid.cmp.mapLegendSet.clearValue(); + } } }); } @@ -1306,7 +1337,7 @@ {html: '
Assign indicators to legend set
'}, { xtype: 'combo', - id: 'predefinedmaplegendsetindicator2_cb', + id: 'predefinedmaplegendsetindicator_cb', editable: false, valueField: 'id', displayField: 'name', @@ -1366,8 +1397,8 @@ text: G.i18n.assign, iconCls: 'icon-assign', handler: function() { - var ls = Ext.getCmp('predefinedmaplegendsetindicator2_cb').getValue(); - var lsrw = Ext.getCmp('predefinedmaplegendsetindicator2_cb').getRawValue(); + var ls = Ext.getCmp('predefinedmaplegendsetindicator_cb').getValue(); + var lsrw = Ext.getCmp('predefinedmaplegendsetindicator_cb').getRawValue(); var lims = Ext.getCmp('predefinedmaplegendsetindicator_ms').getValue(); if (!ls) { @@ -1553,6 +1584,7 @@ } } }); + predefinedMapLegendSetWindow.setPagePosition(G.conf.window_x_left,G.conf.window_y_left); /* Section: help */ @@ -1748,6 +1780,10 @@ } }, { + xtype: 'tbseparator', + cls: 'xtb-sep-panel' + }, + { xtype: 'button', id: 'deletebaselayer_b', text: G.i18n.delete_, @@ -1944,6 +1980,10 @@ } }, { + xtype: 'tbseparator', + cls: 'xtb-sep-panel' + }, + { xtype: 'button', id: 'deletemaplayer_b', text: G.i18n.delete_, @@ -2055,6 +2095,8 @@ } } }); + adminWindow.setPagePosition(G.conf.window_x_left,G.conf.window_y_left); + var layerTree = new Ext.tree.TreePanel({ id: 'layertree_tp', @@ -2510,85 +2552,15 @@ handler: function() { G.util.zoomToVisibleExtent(); } - }); - - var viewHistoryButton = new Ext.Button({ - id: 'viewhistory_b', - iconCls: 'icon-history', - tooltip: G.i18n.history, - style: 'margin-top:1px', - addMenu: function() { - this.menu = new Ext.menu.Menu({ - id: 'viewhistory_m', - defaults: { - itemCls: 'x-menu-item x-menu-item-custom' - }, - items: [], - listeners: { - 'add': function(menu) { - var items = menu.items.items; - var keys = menu.items.keys; - items.unshift(items.pop()); - keys.unshift(keys.pop()); - - if (items.length > 10) { - items[items.length-1].destroy(); - } - }, - 'click': function(menu, item, e) { - var mapView = item.mapView; - var scope = mapView.widget; - scope.mapView = mapView; - scope.updateValues = true; - - scope.legend.value = mapView.mapLegendType; - scope.legend.method = mapView.method || scope.legend.method; - scope.legend.classes = mapView.classes || scope.legend.classes; - - G.vars.map.setCenter(new OpenLayers.LonLat(mapView.longitude, mapView.latitude), mapView.zoom); - G.system.mapDateType.value = mapView.mapDateType; - Ext.getCmp('mapdatetype_cb').setValue(G.system.mapDateType.value); - - scope.valueType.value = mapView.mapValueType; - scope.cmp.mapValueType.setValue(scope.valueType.value); - - G.util.expandWidget(scope); - scope.setMapView(); - } - } - }); - }, - addItem: function(scope) { - if (!this.menu) { - this.addMenu(); - } - - var mapView = scope.formValues.getAllValues.call(scope); - mapView.widget = scope; - mapView.timestamp = G.date.getNowHMS(); - var c1 = ''; - var c2 = ''; - var spanEnd = ''; - mapView.label = '' + - c1 + mapView.timestamp + spanEnd + - c2 + mapView.parentOrganisationUnitName + spanEnd + - c1 + '( ' + mapView.organisationUnitLevelName + ' )' + spanEnd + - c2 + (mapView.mapValueType == G.conf.map_value_type_indicator ? mapView.indicatorName : mapView.dataElementName) + spanEnd + - c1 + (mapView.mapDateType == G.conf.map_date_type_fixed ? mapView.periodName : (mapView.startDate + ' - ' + mapView.endDate)) + spanEnd + - spanEnd; - - for (var i = 0; i < this.menu.items.items.length; i++) { - if (G.util.compareObjToObj(mapView, this.menu.items.items[i].mapView, ['longitude','latitude','zoom','widget','timestamp','label'])) { - this.menu.items.items[i].destroy(); - } - } - - this.menu.addMenuItem({ - html: mapView.label, - mapView: mapView - }); - } - }); + }); + + var choroplethButton = new G.cls.vectorLayerButton('icon-thematic1', G.i18n.thematic_layer + ' 1', choropleth); + + var pointButton = new G.cls.vectorLayerButton('icon-thematic2', G.i18n.thematic_layer + ' 2', point); + + var symbolButton = new G.cls.vectorLayerButton('icon-symbol', 'Symbol layer', symbol); + + var centroidButton = new G.cls.vectorLayerButton('icon-centroid', 'Centroid layer', centroid); var favoriteButton = new Ext.Button({ iconCls: 'icon-favorite', @@ -2625,7 +2597,6 @@ favoriteWindow.hide(); } else { - favoriteWindow.setPagePosition(G.conf.window_x_left,G.conf.window_y_left); favoriteWindow.show(this.id); } } @@ -2660,7 +2631,6 @@ predefinedMapLegendSetWindow.hide(); } else { - predefinedMapLegendSetWindow.setPagePosition(G.conf.window_x_left,G.conf.window_y_left); predefinedMapLegendSetWindow.show(this.id); if (!G.stores.predefinedMapLegend.isLoaded) { G.stores.predefinedMapLegend.load(); @@ -2683,7 +2653,6 @@ exportImageWindow.hide(); } else { - exportImageWindow.setPagePosition(G.conf.window_x_left,G.conf.window_y_left); exportImageWindow.show(this.id); } } @@ -2741,12 +2710,11 @@ tooltip: 'Administrator settings', disabled: !G.user.isAdmin, style: 'margin-top:1px', - handler: function() { + handler: function() { if (!adminWindow.hidden) { adminWindow.hide(); } else { - adminWindow.setPagePosition(G.conf.window_x_left,G.conf.window_y_left); adminWindow.show(this.id); } } @@ -2761,9 +2729,6 @@ helpWindow.hide(); } else { - var c = Ext.getCmp('center').x; - var e = Ext.getCmp('east').x; - helpWindow.setPagePosition(c+((e-c)/2)-280, Ext.getCmp('east').y + 100); helpWindow.show(this.id); } } @@ -2788,16 +2753,15 @@ zoomInButton, zoomOutButton, zoomToVisibleExtentButton, - viewHistoryButton, ' ', '-', ' ',' ',' ', layersLabel, ' ',' ', - new G.cls.vectorLayerButton('icon-thematic1', G.i18n.thematic_layer + ' 1', choropleth), - new G.cls.vectorLayerButton('icon-thematic2', G.i18n.thematic_layer + ' 2', point), - new G.cls.vectorLayerButton('icon-symbol', 'Symbol layer', symbol), - new G.cls.vectorLayerButton('icon-centroid', 'Centroid layer', centroid), + choroplethButton, + pointButton, + symbolButton, + centroidButton, ' ', '-', ' ',' ',' ', @@ -2954,6 +2918,16 @@ document.getElementById('featuredatatext').innerHTML = '
' + G.i18n.no_feature_selected + '
'; + symbolButton.menu.remove(symbolButton.menu.items.last()); + symbolButton.menu.remove(symbolButton.menu.items.last()); + centroidButton.menu.remove(centroidButton.menu.items.last()); + centroidButton.menu.remove(centroidButton.menu.items.last()); + + var c = Ext.getCmp('center').x; + var e = Ext.getCmp('east').x; + + helpWindow.setPagePosition(c+((e-c)/2)-(helpWindow.width/2), Ext.getCmp('east').y + 100); + if (G.vars.parameter.id) { G.util.mapView.layer(G.vars.parameter.id); G.vars.parameter.id = null; === modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat.js' --- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat.js 2011-08-20 12:01:15 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat.js 2011-08-20 22:11:25 +0000 @@ -278,16 +278,14 @@ return Math.floor(1 + 3.3 * Math.log(this.nbVal, 10)); }, - classify: function(method, nbBins, bounds) { + classify: function(method, nbBins, bounds) { if (G.vars.activeWidget.legend.value == G.conf.map_legendset_type_automatic) { if (method == mapfish.GeoStat.Distribution.CLASSIFY_WITH_BOUNDS) { - var str = G.vars.activePanel.isPolygon() ? - choropleth.form.findField('bounds').getValue() : point.form.findField('bounds').getValue(); - + var str = G.vars.activeWidget.cmp.bounds.getValue(); + for (var i = 0; i < str.length; i++) { str = str.replace(' ',''); - } - + } if (str.charAt(str.length-1) == ',') { str = str.substring(0, str.length-1); } @@ -302,14 +300,8 @@ } } - var newInput = bounds.join(','); - - if (G.vars.activePanel.isPolygon()) { - choropleth.form.findField('bounds').setValue(newInput); - } - else { - point.form.findField('bounds').setValue(newInput); - } + var newInput = bounds.join(','); + G.vars.activeWidget.cmp.bounds.setValue(newInput); for (var k = 0; k < bounds.length; k++) { bounds[k] = parseFloat(bounds[k]); === modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js' --- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js 2011-08-20 12:01:15 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js 2011-08-20 22:11:25 +0000 @@ -1138,8 +1138,6 @@ }, applyValues: function() { - Ext.getCmp('viewhistory_b').addItem(this); - var options = { indicator: 'value', method: G.conf.classify_by_equal_intervals === 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 2011-08-20 19:52:17 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js 2011-08-20 21:53:24 +0000 @@ -1712,7 +1712,7 @@ }, applyValues: function() { - Ext.getCmp('viewhistory_b').addItem(this); + this.button.menu.find('name','history')[0].addItem(this); var options = { indicator: 'value', === modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js' --- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js 2011-08-20 19:52:17 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js 2011-08-20 21:53:24 +0000 @@ -1710,7 +1710,7 @@ }, applyValues: function() { - Ext.getCmp('viewhistory_b').addItem(this); + this.button.menu.find('name','history')[0].addItem(this); var options = { indicator: 'value', === 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 2011-08-20 12:01:15 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js 2011-08-20 23:43:52 +0000 @@ -115,11 +115,6 @@ }, getColors: function() { - var startColor = new mapfish.ColorRgb(); - startColor.setFromHex(this.form.findField('startcolor').getValue()); - var endColor = new mapfish.ColorRgb(); - endColor.setFromHex(this.form.findField('endcolor').getValue()); - return [startColor, endColor]; }, initProperties: function() { @@ -549,11 +544,11 @@ title: '' + feature.attributes.name + '', layout: 'fit', width: G.conf.window_width, - height: 95, + height: 100, items: [ { xtype: 'panel', - bodyStyle: 'padding:8px', + bodyStyle: 'padding:14px', items: [ {html: G.i18n.select_new_location_on_map} ] @@ -615,35 +610,6 @@ }); scope.featureOptions.menu.showAt([G.vars.mouseMove.x, G.vars.mouseMove.y]); } - else { - if (feature.attributes.hasChildrenWithCoordinates) { - if (G.vars.locateFeatureWindow) { - G.vars.locateFeatureWindow.destroy(); - } - - scope.updateValues = true; - scope.isDrillDown = true; - - function organisationUnitLevelCallback() { - var names = this.organisationUnitSelection.setValuesOnDrillDown(feature.attributes.id, feature.attributes.name); - this.form.findField('boundary').setValue(names[0]); - this.form.findField('level').setValue(names[1]); - this.loadGeoJson(); - } - - if (G.stores.organisationUnitLevel.isLoaded) { - organisationUnitLevelCallback.call(scope); - } - else { - G.stores.organisationUnitLevel.load({scope: scope, callback: function() { - organisationUnitLevelCallback.call(this); - }}); - } - } - else { - Ext.message.msg(false, G.i18n.no_coordinates_found); - } - } }; this.selectFeatures = new OpenLayers.Control.newSelectFeature( @@ -703,15 +669,6 @@ parentOrganisationUnitName: this.organisationUnitSelection.parent.name, organisationUnitLevel: this.organisationUnitSelection.level.level, organisationUnitLevelName: this.organisationUnitSelection.level.name, - mapLegendType: this.form.findField('maplegendtype').getValue(), - method: this.legend.value == G.conf.map_legendset_type_automatic ? this.form.findField('method').getValue() : null, - classes: this.legend.value == G.conf.map_legendset_type_automatic ? this.form.findField('classes').getValue() : null, - bounds: this.legend.value == G.conf.map_legendset_type_automatic && this.legend.method == G.conf.classify_with_bounds ? this.form.findField('bounds').getValue() : null, - colorLow: this.legend.value == G.conf.map_legendset_type_automatic ? this.form.findField('startcolor').getValue() : null, - colorHigh: this.legend.value == G.conf.map_legendset_type_automatic ? this.form.findField('endcolor').getValue() : null, - mapLegendSetId: this.legend.value == G.conf.map_legendset_type_predefined ? this.form.findField('maplegendset').getValue() : null, - radiusLow: this.form.findField('radiuslow').getValue(), - radiusHigh: this.form.findField('radiushigh').getValue(), longitude: G.vars.map.getCenter().lon, latitude: G.vars.map.getCenter().lat, zoom: parseFloat(G.vars.map.getZoom())