diff --git a/django/contrib/gis/forms/widgets.py b/django/contrib/gis/forms/widgets.py index 49ca48794b..55895ae9f3 100644 --- a/django/contrib/gis/forms/widgets.py +++ b/django/contrib/gis/forms/widgets.py @@ -1,5 +1,4 @@ import logging -import warnings from django.conf import settings from django.contrib.gis import gdal @@ -7,7 +6,6 @@ from django.contrib.gis.geometry import json_regex from django.contrib.gis.geos import GEOSException, GEOSGeometry from django.forms.widgets import Widget from django.utils import translation -from django.utils.deprecation import RemovedInDjango51Warning logger = logging.getLogger("django.contrib.gis") @@ -20,8 +18,6 @@ class BaseGeometryWidget(Widget): geom_type = "GEOMETRY" map_srid = 4326 - map_width = 600 # RemovedInDjango51Warning - map_height = 400 # RemovedInDjango51Warning display_raw = False supports_3d = False @@ -29,19 +25,8 @@ class BaseGeometryWidget(Widget): def __init__(self, attrs=None): self.attrs = {} - for key in ("geom_type", "map_srid", "map_width", "map_height", "display_raw"): + for key in ("geom_type", "map_srid", "display_raw"): self.attrs[key] = getattr(self, key) - if ( - (attrs and ("map_width" in attrs or "map_height" in attrs)) - or self.map_width != 600 - or self.map_height != 400 - ): - warnings.warn( - "The map_height and map_width widget attributes are deprecated. Please " - "use CSS to size map widgets.", - category=RemovedInDjango51Warning, - stacklevel=2, - ) if attrs: self.attrs.update(attrs) diff --git a/django/contrib/gis/static/gis/js/OLMapWidget.js b/django/contrib/gis/static/gis/js/OLMapWidget.js index b750327409..f3025f24ac 100644 --- a/django/contrib/gis/static/gis/js/OLMapWidget.js +++ b/django/contrib/gis/static/gis/js/OLMapWidget.js @@ -62,11 +62,6 @@ class MapWidget { this.options.base_layer = new ol.layer.Tile({source: new ol.source.OSM()}); } - // RemovedInDjango51Warning: when the deprecation ends, remove setting - // width/height (3 lines below). - const mapContainer = document.getElementById(this.options.map_id); - mapContainer.style.width = `${mapContainer.dataset.width}px`; - mapContainer.style.height = `${mapContainer.dataset.height}px`; this.map = this.createMap(); this.featureCollection = new ol.Collection(); this.featureOverlay = new ol.layer.Vector({ diff --git a/django/contrib/gis/templates/gis/openlayers.html b/django/contrib/gis/templates/gis/openlayers.html index 2849813c6e..f9f7e5fa51 100644 --- a/django/contrib/gis/templates/gis/openlayers.html +++ b/django/contrib/gis/templates/gis/openlayers.html @@ -1,8 +1,7 @@ {% load i18n l10n %}
{% translate "Debugging window (serialized value)" %}
{% endif %}