------------------------------------------------------------ revno: 170 committer: Jan Henrik Overland [email protected] branch nick: trunk timestamp: Tue 2009-04-14 15:21:16 +0200 message: Map position automatically set when changing maps. Config.js cleaned up. Lighter pageload added. modified: gis/dhis-gis-geostat/demos/geostat/config.js gis/dhis-gis-geostat/demos/geostat/geostat.js gis/dhis-gis-geostat/demos/geostat/index.html gis/dhis-gis-geostat/demos/geostat/pageload_geojson.txt gis/dhis-gis-geostat/mfbase/mapfish/widgets/geostat/Choropleth.js gis/dhis-gis-geostat/mfbase/mapfish/widgets/geostat/Mapping.js
=== modified file 'gis/dhis-gis-geostat/demos/geostat/config.js' --- gis/dhis-gis-geostat/demos/geostat/config.js 2009-04-14 12:17:30 +0000 +++ gis/dhis-gis-geostat/demos/geostat/config.js 2009-04-14 13:21:16 +0000 @@ -2,9 +2,9 @@ localhost = 'http://localhost:8180'; // MAP -init_longitude = 82; -init_latitude = 22; -init_zoom = 5; +init_longitude = 0; +init_latitude = 0; +init_zoom = 3; // LAYER NAMES choroplethLayerName = "Choropleth"; === modified file 'gis/dhis-gis-geostat/demos/geostat/geostat.js' --- gis/dhis-gis-geostat/demos/geostat/geostat.js 2009-04-14 12:17:30 +0000 +++ gis/dhis-gis-geostat/demos/geostat/geostat.js 2009-04-14 13:21:16 +0000 @@ -307,7 +307,7 @@ url: 'pageload_geojson.txt', featureSelection: false, loadMask: {msg: 'Loading shapefile...', msgCls: 'x-mask-loading'}, - legendDiv: 'myChoroplethLegendDiv', + legendDiv: 'choroplethLegend', defaults:{ width: 130 }, @@ -341,7 +341,7 @@ url: 'pageload_geojson.txt', featureSelection: false, loadMask: {msg: 'Loading shapefile...', msgCls: 'x-mask-loading'}, - legendDiv: 'myChoroplethLegendDiv', + legendDiv: 'choroplethLegend', defaults:{ width: 130 }, @@ -683,7 +683,7 @@ { mapData = Ext.util.JSON.decode(responseObject.responseText); -// map.setCenter(new OpenLayers.LonLat(mapData.map.longitude, mapData.map.latitude), mapData.map.zoom); + map.setCenter(new OpenLayers.LonLat(mapData.map.longitude, mapData.map.latitude), mapData.map.zoom); if (redirect == 'choropleth') { getChoroplethData(); } === modified file 'gis/dhis-gis-geostat/demos/geostat/index.html' --- gis/dhis-gis-geostat/demos/geostat/index.html 2009-04-06 18:55:31 +0000 +++ gis/dhis-gis-geostat/demos/geostat/index.html 2009-04-14 13:21:16 +0000 @@ -55,7 +55,7 @@ <div id="south"></div> <div id="legend"> - <div id="myChoroplethLegendDiv"></div> + <div id="choroplethLegend"></div> </div> <div id="position"> === modified file 'gis/dhis-gis-geostat/demos/geostat/pageload_geojson.txt' --- gis/dhis-gis-geostat/demos/geostat/pageload_geojson.txt 2009-04-14 12:17:30 +0000 +++ gis/dhis-gis-geostat/demos/geostat/pageload_geojson.txt 2009-04-14 13:21:16 +0000 @@ -1,1 +1,18 @@ -{"type":"FeatureCollection","features":[]} \ No newline at end of file +{ + "type":"FeatureCollection", + "features": + [ + { + "type":"Feature", + "id":"zn_roads.459", + "geometry":{ + "type":"MultiLineString", + "coordinates":[[[39.739494,-4.94044],[39.738823,-4.935949],[39.727032,-4.91666],[39.724014,-4.907471]]] + }, + "geometry_name":"the_geom", + "properties":{"TRACK_ID":0,"ID":" ","RDLNTYPE":2} + } + ], + "crs":{"type":"EPSG","properties":{"code":"4326"}}, + "bbox":[38.960568,-7.753602,39.785995,-4.907471] +} \ No newline at end of file === modified file 'gis/dhis-gis-geostat/mfbase/mapfish/widgets/geostat/Choropleth.js' --- gis/dhis-gis-geostat/mfbase/mapfish/widgets/geostat/Choropleth.js 2009-04-14 12:17:30 +0000 +++ gis/dhis-gis-geostat/mfbase/mapfish/widgets/geostat/Choropleth.js 2009-04-14 13:21:16 +0000 @@ -553,8 +553,6 @@ return; } - default_map = Ext.getCmp('map_cb').getValue(); - loadMapData('choropleth'); var options = {}; @@ -573,7 +571,6 @@ this.coreComp.updateOptions(options); this.coreComp.applyClassification(); this.classificationApplied = true; - }, === modified file 'gis/dhis-gis-geostat/mfbase/mapfish/widgets/geostat/Mapping.js' --- gis/dhis-gis-geostat/mfbase/mapfish/widgets/geostat/Mapping.js 2009-04-14 12:17:30 +0000 +++ gis/dhis-gis-geostat/mfbase/mapfish/widgets/geostat/Mapping.js 2009-04-14 13:21:16 +0000 @@ -319,8 +319,6 @@ return; } - default_map = Ext.getCmp('maps_cb').getValue(); - loadMapData('assignment'); var options = {}; -- Trunk 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. _______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
