Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5.0: Remove OSMGeoAdmin, GeoModelAdmin #1981

Merged
merged 1 commit into from
Feb 25, 2024
+0 −50
Merged

5.0: Remove OSMGeoAdmin, GeoModelAdmin #1981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions django-stubs/contrib/gis/admin/__init__.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,5 @@ from django.contrib.admin import action as action
from django.contrib.admin import autodiscover as autodiscover
from django.contrib.admin import register as register
from django.contrib.admin import site as site
from django.contrib.gis.admin.options import GeoModelAdmin as GeoModelAdmin
from django.contrib.gis.admin.options import GISModelAdmin as GISModelAdmin
from django.contrib.gis.admin.options import OSMGeoAdmin as OSMGeoAdmin
from django.contrib.gis.admin.widgets import OpenLayersWidget as OpenLayersWidget
44 changes: 0 additions & 44 deletions django-stubs/contrib/gis/admin/options.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,53 +2,9 @@ from typing import Any

from django.contrib.admin import ModelAdmin
from django.contrib.gis.forms import BaseGeometryWidget
from django.forms.widgets import Media

spherical_mercator_srid: int

class GISModelAdmin(ModelAdmin):
gis_widget: BaseGeometryWidget
gis_widget_kwargs: dict[str, Any]

class GeoModelAdmin(ModelAdmin):
default_lon: int
default_lat: int
default_zoom: int
display_wkt: bool
display_srid: bool
extra_js: Any
num_zoom: int
max_zoom: bool
min_zoom: bool
units: str | bool
max_resolution: str | bool
max_extent: str | bool
modifiable: bool
mouse_position: bool
scale_text: bool
layerswitcher: bool
scrollable: bool
map_width: int
map_height: int
map_srid: int
map_template: str
openlayers_url: str
point_zoom: Any
wms_url: str
wms_layer: str
wms_name: str
wms_options: Any
debug: bool
widget: Any
@property
def media(self) -> Media: ...
def get_map_widget(self, db_field: Any) -> Any: ...

class OSMGeoAdmin(GeoModelAdmin):
map_template: str
num_zoom: int
map_srid: Any
max_extent: str
max_resolution: str
point_zoom: int
units: str
4 changes: 0 additions & 4 deletions scripts/stubtest/allowlist_todo.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,21 +226,17 @@ django.contrib.flatpages.models.FlatPage.title
django.contrib.flatpages.models.FlatPage.url
django.contrib.gis.admin.GISModelAdmin
django.contrib.gis.admin.GISModelAdmin.gis_widget
django.contrib.gis.admin.GeoModelAdmin
django.contrib.gis.admin.ModelAdmin
django.contrib.gis.admin.ModelAdmin.log_addition
django.contrib.gis.admin.ModelAdmin.log_change
django.contrib.gis.admin.ModelAdmin.log_deletion
django.contrib.gis.admin.OSMGeoAdmin
django.contrib.gis.admin.StackedInline
django.contrib.gis.admin.TabularInline
django.contrib.gis.admin.action
django.contrib.gis.admin.display
django.contrib.gis.admin.options.GISModelAdmin
django.contrib.gis.admin.options.GISModelAdmin.gis_widget
django.contrib.gis.admin.options.GeoModelAdmin
django.contrib.gis.admin.options.GeoModelAdminMixin
django.contrib.gis.admin.options.OSMGeoAdmin
django.contrib.gis.admin.site
django.contrib.gis.db.backends.base.features.BaseSpatialFeatures.can_alter_geometry_field
django.contrib.gis.db.backends.base.features.BaseSpatialFeatures.empty_intersection_returns_none
Expand Down