Author: claudep
Date: 2012-03-17 13:13:06 -0700 (Sat, 17 Mar 2012)
New Revision: 17762
Modified:
django/trunk/django/contrib/gis/admin/options.py
django/trunk/docs/ref/contrib/gis/tutorial.txt
Log:
Fixed #17915 -- Switched GeoModelAdmin default WMS layer URL from Metacarta to
OSGeo.
Modified: django/trunk/django/contrib/gis/admin/options.py
===================================================================
--- django/trunk/django/contrib/gis/admin/options.py 2012-03-17 17:44:42 UTC
(rev 17761)
+++ django/trunk/django/contrib/gis/admin/options.py 2012-03-17 20:13:06 UTC
(rev 17762)
@@ -33,7 +33,7 @@
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
Modified: django/trunk/docs/ref/contrib/gis/tutorial.txt
===================================================================
--- django/trunk/docs/ref/contrib/gis/tutorial.txt 2012-03-17 17:44:42 UTC
(rev 17761)
+++ django/trunk/docs/ref/contrib/gis/tutorial.txt 2012-03-17 20:13:06 UTC
(rev 17762)
@@ -753,7 +753,7 @@
.. _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 @@
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:
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
