Merge authors: Jan Henrik Øverland (janhenrik-overland) ------------------------------------------------------------ revno: 2354 [merge] committer: Jan Henrik Overland <janhenrik.overl...@gmail.com> branch nick: trunk timestamp: Tue 2010-10-12 17:26:07 +0200 message: (GIS) Minor bug fixed. modified: 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/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/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:00:41 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js 2010-10-12 15:21:18 +0000 @@ -1,7 +1,5 @@ /* OpenLayers map */ var MAP; -/* Center point of the country */ -var BASECOORDINATE = {}; /* Geojson, shapefile or database */ var MAPSOURCE; /* Fixed periods or from-to dates */ === 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-10-12 13:25:01 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js 2010-10-12 15:21:18 +0000 @@ -1474,6 +1474,10 @@ MAP.zoomToExtent(this.layer.getDataExtent()); } + this.mapData = { + nameColumn: 'name' + }; + if (this.mapView) { if (this.mapView.longitude && this.mapView.latitude && this.mapView.zoom) { MAP.setCenter(new OpenLayers.LonLat(this.mapView.longitude, this.mapView.latitude), this.mapView.zoom); === 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-12 13:25:01 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js 2010-10-12 15:24:42 +0000 @@ -1411,6 +1411,10 @@ MAP.zoomToExtent(this.layer.getDataExtent()); } + this.mapData = { + nameColumn: 'name' + }; + if (this.mapView) { if (this.mapView.longitude && this.mapView.latitude && this.mapView.zoom) { MAP.setCenter(new OpenLayers.LonLat(this.mapView.longitude, this.mapView.latitude), this.mapView.zoom);
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp