summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbgaechter <bgaechter@users.noreply.github.com>2016-03-29 23:19:36 +0200
committerClaude Paroz <claude@2xlibre.net>2016-05-02 18:06:03 +0200
commit4e2ee8662753ca6a2619039b903f11c60709f398 (patch)
treeeed53c766972f21fa03002a5c04d92ecaf45bf98
parentf2b2a35699332108ef6f91abe296b35e0a9579bc (diff)
Fixed #26569 -- Updated OSM Mapnik constructor
-rw-r--r--django/contrib/gis/forms/widgets.py1
-rw-r--r--django/contrib/gis/templates/gis/openlayers-osm.html2
2 files changed, 1 insertions, 2 deletions
diff --git a/django/contrib/gis/forms/widgets.py b/django/contrib/gis/forms/widgets.py
index 77291396a9..01d2f7e53f 100644
--- a/django/contrib/gis/forms/widgets.py
+++ b/django/contrib/gis/forms/widgets.py
@@ -95,7 +95,6 @@ class OSMWidget(BaseGeometryWidget):
class Media:
js = (
'http://openlayers.org/api/2.13.1/OpenLayers.js',
- 'http://www.openstreetmap.org/openlayers/OpenStreetMap.js',
'gis/js/OLMapWidget.js',
)
diff --git a/django/contrib/gis/templates/gis/openlayers-osm.html b/django/contrib/gis/templates/gis/openlayers-osm.html
index 7b644aaa8d..c24c0f30fb 100644
--- a/django/contrib/gis/templates/gis/openlayers-osm.html
+++ b/django/contrib/gis/templates/gis/openlayers-osm.html
@@ -13,5 +13,5 @@ options['scale_text'] = true;
options['mouse_position'] = true;
options['default_lon'] = {{ default_lon|unlocalize }};
options['default_lat'] = {{ default_lat|unlocalize }};
-options['base_layer'] = new OpenLayers.Layer.OSM.Mapnik("OpenStreetMap (Mapnik)");
+options['base_layer'] = new OpenLayers.Layer.OSM("OpenStreetMap (Mapnik)");
{% endblock %}