[QGIS Commit] r15119 - in trunk/qgis: resources/context_help src/app

[svn_qgis at osgeo.org]

Author: pcav
Date: 2011-02-01 23:33:32 -0800 (Tue, 01 Feb 2011)
New Revision: 15119

Modified:
   trunk/qgis/resources/context_help/QgsWMSSourceSelect-en_US
   trunk/qgis/src/app/qgswmssourceselect.cpp
Log:
Remove JPL WMS server - fixes #3464

Modified: trunk/qgis/resources/context_help/QgsWMSSourceSelect-en_US
===================================================================
--- trunk/qgis/resources/context_help/QgsWMSSourceSelect-en_US	2011-02-01 20:05:10 UTC (rev 15118)
+++ trunk/qgis/resources/context_help/QgsWMSSourceSelect-en_US	2011-02-02 07:33:32 UTC (rev 15119)
@@ -11,7 +11,7 @@
 <h4>Servers</h4>
 </a>
 To define a new WMS server in the <label>Server Connections</label> section, select <label>New</label>. Then enter the parameters to connect to your desired WMS server.<p>
-You can add some servers to play with by clicking the <label>Add default servers</label> button. This will add at least three WMS servers for you to use, including the NASA (JPL) WMS server.<p>
+You can add some servers to play with by clicking the <label>Add default servers</label> button. This will add at least three WMS servers for you to use.<p>
 Once the new WMS Server connection has been created, it will be preserved for future QGIS sessions.
 
 <a name="load">

Modified: trunk/qgis/src/app/qgswmssourceselect.cpp
===================================================================
--- trunk/qgis/src/app/qgswmssourceselect.cpp	2011-02-01 20:05:10 UTC (rev 15118)
+++ trunk/qgis/src/app/qgswmssourceselect.cpp	2011-02-02 07:33:32 UTC (rev 15119)
@@ -1066,7 +1066,6 @@
 void QgsWMSSourceSelect::addDefaultServers()
 {
   QMap<QString, QString> exampleServers;
-  exampleServers["NASA (JPL)"] = "http://wms.jpl.nasa.gov/wms.cgi";
   exampleServers["DM Solutions GMap"] = "http://www2.dmsolutions.ca/cgi-bin/mswms_gmap";
   exampleServers["Lizardtech server"] =  "http://wms.lizardtech.com/lizardtech/iserv/ows";
   exampleServers["GEOIMAGE-AUSTRIA"] =  "http://wms.geoimage.at/dop-1mfree?";