diff options
| author | Claude Paroz <claude@2xlibre.net> | 2012-03-17 20:13:06 +0000 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2012-03-17 20:13:06 +0000 |
| commit | b452439a6ef291e54877668719aa32888b3b3e1a (patch) | |
| tree | a5cfa5eda49d205017fb5655ca1ca23aaf419f92 | |
| parent | f0b9bb2ef958052ab9c9b414dbcfa653eca7b83e (diff) | |
Fixed #17915 -- Switched GeoModelAdmin default WMS layer URL from Metacarta to OSGeo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17762 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/gis/admin/options.py | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/tutorial.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/django/contrib/gis/admin/options.py b/django/contrib/gis/admin/options.py index 4732e7363f..f709056acf 100644 --- a/django/contrib/gis/admin/options.py +++ b/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 diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt index ac4df64eb6..34014d7be4 100644 --- a/docs/ref/contrib/gis/tutorial.txt +++ b/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: |