Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
  • Loading branch information...
commit b452439a6ef291e54877668719aa32888b3b3e1a 1 parent f0b9bb2
Claude Paroz authored March 17, 2012
2  django/contrib/gis/admin/options.py
@@ -33,7 +33,7 @@ class GeoModelAdmin(ModelAdmin):
33 33
     map_template = 'gis/admin/openlayers.html'
34 34
     openlayers_url = 'http://openlayers.org/api/2.11/OpenLayers.js'
35 35
     point_zoom = num_zoom - 6
36  
-    wms_url = 'http://labs.metacarta.com/wms/vmap0'
  36
+    wms_url = 'http://vmap0.tiles.osgeo.org/wms/vmap0'
37 37
     wms_layer = 'basic'
38 38
     wms_name = 'OpenLayers WMS'
39 39
     debug = False
4  docs/ref/contrib/gis/tutorial.txt
@@ -753,7 +753,7 @@ the vertexes to the desired position.
753 753
 .. _OpenLayers: http://openlayers.org/
754 754
 .. _Open Street Map: http://openstreetmap.org/
755 755
 .. _Vector Map Level 0: http://earth-info.nga.mil/publications/vmap0.html
756  
-.. _Metacarta: http://metacarta.com
  756
+.. _OSGeo: http://www.osgeo.org
757 757
 
758 758
 .. _osmgeoadmin-intro:
759 759
 
@@ -764,7 +764,7 @@ With the :class:`~django.contrib.gis.admin.OSMGeoAdmin`, GeoDjango uses
764 764
 a `Open Street Map`_ layer in the admin.
765 765
 This provides more context (including street and thoroughfare details) than
766 766
 available with the :class:`~django.contrib.gis.admin.GeoModelAdmin`
767  
-(which uses the `Vector Map Level 0`_ WMS data set hosted at `Metacarta`_).
  767
+(which uses the `Vector Map Level 0`_ WMS data set hosted at `OSGeo`_).
768 768
 
769 769
 First, there are some important requirements and limitations:
770 770
 

0 notes on commit b452439

Please sign in to comment.
Something went wrong with that request. Please try again.