Fixed #17915 -- Switched GeoModelAdmin default WMS layer URL from Met…

…acarta to OSGeo.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17762 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/contrib/gis/admin/options.py

@@ -33,7 +33,7 @@ class GeoModelAdmin(ModelAdmin):
     map_template = 'gis/admin/openlayers.html'
     openlayers_url = 'http://openlayers.org/api/2.11/OpenLayers.js'
     point_zoom = num_zoom - 6
-    wms_url = 'http://labs.metacarta.com/wms/vmap0'
+    wms_url = 'http://vmap0.tiles.osgeo.org/wms/vmap0'
     wms_layer = 'basic'
     wms_name = 'OpenLayers WMS'
     debug = False

docs/ref/contrib/gis/tutorial.txt

@@ -753,7 +753,7 @@ the vertexes to the desired position.
 .. _OpenLayers: http://openlayers.org/
 .. _Open Street Map: http://openstreetmap.org/
 .. _Vector Map Level 0: http://earth-info.nga.mil/publications/vmap0.html
-.. _Metacarta: http://metacarta.com
+.. _OSGeo: http://www.osgeo.org
 
 .. _osmgeoadmin-intro:
 
@@ -764,7 +764,7 @@ With the :class:`~django.contrib.gis.admin.OSMGeoAdmin`, GeoDjango uses
 a `Open Street Map`_ layer in the admin.
 This provides more context (including street and thoroughfare details) than
 available with the :class:`~django.contrib.gis.admin.GeoModelAdmin`
-(which uses the `Vector Map Level 0`_ WMS data set hosted at `Metacarta`_).
+(which uses the `Vector Map Level 0`_ WMS data set hosted at `OSGeo`_).
 
 First, there are some important requirements and limitations: