Commit d8e311c8 authored by Justin Bronn's avatar Justin Bronn
Browse files

Updated OpenLayers (now points to 2.10) and OpenStreetMap JavaScript URLs. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14445 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 222c7326

django/contrib/gis/admin/options.py

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ class GeoModelAdmin(ModelAdmin): 
    map_height = 400

    map_srid = 4326

    map_template = 'gis/admin/openlayers.html'

    openlayers_url = 'http://openlayers.org/api/2.8/OpenLayers.js'

    openlayers_url = 'http://openlayers.org/api/2.10/OpenLayers.js'

    point_zoom = num_zoom - 6

    wms_url = 'http://labs.metacarta.com/wms/vmap0'

    wms_layer = 'basic'
@@ -115,7 +115,7 @@ from django.contrib.gis import gdal 
if gdal.HAS_GDAL:

    class OSMGeoAdmin(GeoModelAdmin):

        map_template = 'gis/admin/osm.html'

        extra_js = ['http://openstreetmap.org/openlayers/OpenStreetMap.js']

        extra_js = ['http://www.openstreetmap.org/openlayers/OpenStreetMap.js']

        num_zoom = 20

        map_srid = 900913

        max_extent = '-20037508,-20037508,20037508,20037508'