From c57ef3f6b6bbf45af4dd2a296df586ec4f593d42 Mon Sep 17 00:00:00 2001
From: q0w <43147888+q0w@users.noreply.github.com>
Date: Sun, 25 Feb 2024 19:27:36 +0300
Subject: [PATCH] 5.0: Remove OSMGeoAdmin, GeoModelAdmin (#1981)

---
 django-stubs/contrib/gis/admin/__init__.pyi |  2 -
 django-stubs/contrib/gis/admin/options.pyi  | 44 ---------------------
 scripts/stubtest/allowlist_todo.txt         |  4 --
 3 files changed, 50 deletions(-)

diff --git a/django-stubs/contrib/gis/admin/__init__.pyi b/django-stubs/contrib/gis/admin/__init__.pyi
index 94ead5db7..e668daa91 100644
--- a/django-stubs/contrib/gis/admin/__init__.pyi
+++ b/django-stubs/contrib/gis/admin/__init__.pyi
@@ -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
diff --git a/django-stubs/contrib/gis/admin/options.pyi b/django-stubs/contrib/gis/admin/options.pyi
index 047952c2d..ecab4c4af 100644
--- a/django-stubs/contrib/gis/admin/options.pyi
+++ b/django-stubs/contrib/gis/admin/options.pyi
@@ -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
diff --git a/scripts/stubtest/allowlist_todo.txt b/scripts/stubtest/allowlist_todo.txt
index 18ee516c0..e93106fee 100644
--- a/scripts/stubtest/allowlist_todo.txt
+++ b/scripts/stubtest/allowlist_todo.txt
@@ -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