p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Claude Paroz 2012-03-17 20:13:06 +00:00
parent f0b9bb2ef9
commit b452439a6e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/gis/admin/options.py
View File

@ -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

4
docs/ref/contrib/gis/tutorial.txt
View File

@ -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: