Ticket #17915: 17915-1.diff

File 17915-1.diff, 1.6 KB (added by claudep, 3 years ago)

Replace Metacarta by OSGeo WMS server

  • django/contrib/gis/admin/options.py

    diff --git a/django/contrib/gis/admin/options.py b/django/contrib/gis/admin/options.py
    index 4732e73..f709056 100644
    a b class GeoModelAdmin(ModelAdmin): 
    3333    map_template = 'gis/admin/openlayers.html'
    3434    openlayers_url = 'http://openlayers.org/api/2.11/OpenLayers.js'
    3535    point_zoom = num_zoom - 6
    36     wms_url = 'http://labs.metacarta.com/wms/vmap0'
     36    wms_url = 'http://vmap0.tiles.osgeo.org/wms/vmap0'
    3737    wms_layer = 'basic'
    3838    wms_name = 'OpenLayers WMS'
    3939    debug = False
  • docs/ref/contrib/gis/tutorial.txt

    diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt
    index eebd50a..ade5cd8 100644
    a b the vertexes to the desired position. 
    755755.. _OpenLayers: http://openlayers.org/
    756756.. _Open Street Map: http://openstreetmap.org/
    757757.. _Vector Map Level 0: http://earth-info.nga.mil/publications/vmap0.html
    758 .. _Metacarta: http://metacarta.com
     758.. _OSGeo: http://www.osgeo.org
    759759
    760760.. _osmgeoadmin-intro:
    761761
    With the :class:`~django.contrib.gis.admin.OSMGeoAdmin`, GeoDjango uses 
    766766a `Open Street Map`_ layer in the admin.
    767767This provides more context (including street and thoroughfare details) than
    768768available with the :class:`~django.contrib.gis.admin.GeoModelAdmin`
    769 (which uses the `Vector Map Level 0`_ WMS data set hosted at `Metacarta`_).
     769(which uses the `Vector Map Level 0`_ WMS data set hosted at `OSGeo`_).
    770770
    771771First, there are some important requirements and limitations:
    772772
Back to Top