dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1642
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: trunk
timestamp: Fri 2010-03-12 14:27:25 +0100
message:
  (GIS) getWMSCapabilities is now only executed when needed.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.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-03-12 13:07:33 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-03-12 13:27:25 +0000
@@ -1133,7 +1133,10 @@
 	var wmsMapStore = new GeoExt.data.WMSCapabilitiesStore({
 		url: path_geoserver + ows
 	});
-	wmsMapStore.load();
+	
+	if (MAPSOURCE == map_source_type_shapefile) {
+		wmsMapStore.load();
+	}
 	
 	var geojsonStore = new Ext.data.JsonStore({
         url: path + 'getGeoJsonFiles' + type,
@@ -1361,7 +1364,7 @@
             data: [['Polygon']]
         })
     });
-	
+
 	var newNameColumnComboBox = new Ext.form.ComboBox({
         id: 'newnamecolumn_cb',
         editable: false,
@@ -1410,7 +1413,6 @@
 				}
 			}
 		}				
-					
 	});
     
 	var editNameColumnComboBox = new Ext.form.ComboBox({
@@ -2018,7 +2020,10 @@
 	var wmsOverlayStore = new GeoExt.data.WMSCapabilitiesStore({
 		url: path_geoserver + ows
 	});
-	wmsOverlayStore.load();
+	
+	if (MAPSOURCE == map_source_type_shapefile) {
+		wmsOverlayStore.load();
+	}
 	
     var mapLayerNameTextField = new Ext.form.TextField({
         id: 'maplayername_tf',