dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 661
committer: Jan Henrik Overland janhenrik.overland@xxxxxxxxx
branch nick: trunk
timestamp: Thu 2009-09-10 16:00:04 +0700
message:
  (GIS) Rev 660 bugs fixed.
added:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/init
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/config.js
  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/Mapping.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.

=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/init'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/init	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/init	2009-09-10 09:00:04 +0000
@@ -0,0 +1,1 @@
+{"type":"FeatureCollection","features":[]}
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/config.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/config.js	2009-09-05 12:06:54 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/config.js	2009-09-10 09:00:04 +0000
@@ -8,8 +8,7 @@
 
 //  Layers and widgets
 
-    GEOJSON_URL = 'geojson/';
-    INIT_URL = 'geojson/init';
+    INIT_URL = 'init';
     CHOROPLETH_LAYERNAME = 'Thematic map';
 
 //  Map

=== 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	2009-09-10 07:02:04 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2009-09-10 09:00:04 +0000
@@ -287,7 +287,7 @@
                     }),
                     'strategies': [new OpenLayers.Strategy.Fixed()],
                     'protocol': new OpenLayers.Protocol.HTTP({
-                        'url': GEOJSON_URL + mapLayers[i].mapSource,
+                        'url': path + 'getGeoJson.action?name=' + mapLayers[i].mapSource,
                         'format': new OpenLayers.Format.GeoJSON()
                     })
                 });
@@ -438,14 +438,7 @@
         minListWidth: combo_width + 26,
         triggerAction: 'all',
         mode: 'remote',
-        store: geojsonStore,
-        listeners: {
-            'select': {
-                fn: function() {
-					alert(this.getStore().getById(this.getValue()).get('level'));
-                }
-            }
-        }
+        store: geojsonStore
     });
     
     var typeComboBox = new Ext.form.ComboBox({
@@ -622,7 +615,7 @@
                                     
                                     Ext.getCmp('organisationunitlevel_cb').reset();
                                     Ext.getCmp('newname_tf').reset();
-                                    Ext.getCmp('maplayerpath_tf').reset();
+                                    Ext.getCmp('maplayerpath_cb').reset();
                                     Ext.getCmp('newnamecolumn_tf').reset();
                                     Ext.getCmp('newlongitude_tf').reset();
                                     Ext.getCmp('newlatitude_tf').reset();
@@ -1735,7 +1728,7 @@
                     }),
                     'strategies': [new OpenLayers.Strategy.Fixed()],
                     'protocol': new OpenLayers.Protocol.HTTP({
-                        'url': GEOJSON_URL + mlmsf,
+                        'url': path + 'getGeoJson.action?name=' + mlmsf,
                         'format': new OpenLayers.Format.GeoJSON()
                     })
                 })

=== 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	2009-09-06 12:50:16 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Mapping.js	2009-09-10 09:00:04 +0000
@@ -397,7 +397,7 @@
         if (this.newUrl) {
             URL = this.newUrl;
             this.newUrl = false;
-            this.setUrl('geojson/' + URL);
+            this.setUrl(path + 'getGeoJson.action?name=' + URL);
         }
         
         if (!Ext.getCmp('maps_cb').getValue()) {