From 667e4026c2b6809f2854911568eb90b2b0bcfd6f Mon Sep 17 00:00:00 2001
From: Adam Cox <mr.adamcox@gmail.com>
Date: Wed, 15 Apr 2026 20:41:03 -0500
Subject: [PATCH 1/2] remove multimask field from LayerSet

---
 ohmg/core/admin.py                            |  1 -
 ohmg/core/management/commands/checkdb.py      | 32 +------------------
 .../0010_remove_layerset_multimask.py         | 17 ++++++++++
 ohmg/core/models/layerset.py                  |  1 -
 4 files changed, 18 insertions(+), 33 deletions(-)
 create mode 100644 ohmg/core/migrations/0010_remove_layerset_multimask.py

diff --git a/ohmg/core/admin.py b/ohmg/core/admin.py
index 2d415a1f..31e9282e 100644
--- a/ohmg/core/admin.py
+++ b/ohmg/core/admin.py
@@ -65,7 +65,6 @@ class LayerSetAdmin(admin.ModelAdmin):
         "layer_display_list",
         "extent",
         "multimask_extent",
-        "multimask",
     )
     search_fields = ("map__title",)
     list_filter = ("category",)
diff --git a/ohmg/core/management/commands/checkdb.py b/ohmg/core/management/commands/checkdb.py
index b5f44c45..2ac4c3fb 100644
--- a/ohmg/core/management/commands/checkdb.py
+++ b/ohmg/core/management/commands/checkdb.py
@@ -1,9 +1,7 @@
-import copy
-
 from django.core.management.base import BaseCommand
 from django.db.models import Q
 
-from ohmg.core.models import Document, Layer, LayerSet
+from ohmg.core.models import Document
 from ohmg.core.utils.cli import confirm_continue
 from ohmg.georeference.models import GeorefSession, PrepSession, SessionLock
 
@@ -62,34 +60,6 @@ def fix_layer_slug(slug, valid_slugs):
             else:
                 return None
 
-        if options["operation"] == "multimasks":
-            valid_slugs = list(Layer.objects.all().values_list("slug", flat=True))
-            layersets = LayerSet.objects.exclude(multimask=None).order_by("map_id")
-            to_save = set()
-            errors = []
-            for ls in layersets:
-                new_mm = copy.deepcopy(ls.multimask)
-                for k, v in ls.multimask.items():
-                    newslug = fix_layer_slug(k, valid_slugs)
-                    if not newslug:
-                        errors.append(f"ERROR: {k}")
-                    elif newslug != k:
-                        print(f"{k} -> {newslug}")
-                        new_mm[newslug] = new_mm.pop(k)
-                        new_mm[newslug]["properties"] = {"layer": newslug}
-                        to_save.add(ls)
-                ls.multimask = new_mm
-
-            for e in errors:
-                print(e)
-            print(f"{len(errors)} layer slugs have errors")
-
-            print(f"{len(to_save)} multimasks to fix")
-            if options["fix"]:
-                for ls in to_save:
-                    print(f"saving {ls}")
-                    ls.save()
-
         if options["operation"] == "sessions":
             print("\nchecking PrepSessions...")
             s = PrepSession.objects.filter(doc2__isnull=True)
diff --git a/ohmg/core/migrations/0010_remove_layerset_multimask.py b/ohmg/core/migrations/0010_remove_layerset_multimask.py
new file mode 100644
index 00000000..16695e98
--- /dev/null
+++ b/ohmg/core/migrations/0010_remove_layerset_multimask.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.27 on 2026-04-15 20:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0009_layer_mask'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='layerset',
+            name='multimask',
+        ),
+    ]
diff --git a/ohmg/core/models/layerset.py b/ohmg/core/models/layerset.py
index 64083fd9..3401f768 100644
--- a/ohmg/core/models/layerset.py
+++ b/ohmg/core/models/layerset.py
@@ -46,7 +46,6 @@ class Meta:
         blank=True,
         null=True,
     )
-    multimask = models.JSONField(null=True, blank=True)
     mosaic_geotiff = models.FileField(
         upload_to="mosaics",
         null=True,

From bef844df1c09caec2f182ff588545c5425ee13a7 Mon Sep 17 00:00:00 2001
From: Adam Cox <mr.adamcox@gmail.com>
Date: Wed, 15 Apr 2026 21:17:26 -0500
Subject: [PATCH 2/2] update test data fixtures

---
 .../fixtures/core/new-iberia-1885-main-content-layerset.json     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/data/fixtures/core/new-iberia-1885-main-content-layerset.json b/tests/data/fixtures/core/new-iberia-1885-main-content-layerset.json
index e6758de0..05968e7e 100644
--- a/tests/data/fixtures/core/new-iberia-1885-main-content-layerset.json
+++ b/tests/data/fixtures/core/new-iberia-1885-main-content-layerset.json
@@ -5,7 +5,6 @@
   "fields": {
     "map": "sanborn03375_001",
     "category": 1,
-    "multimask": null,
     "mosaic_geotiff": "",
     "mosaic_json": "",
     "extent": "[\"-91.82785034179688\", \"29.998949050206093\", \"-91.81137084960938\", \"30.015598098308676\"]"