Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions ohmg/core/management/commands/oneoffs.py
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ def old_ds_to_new(file_set):

from ohmg.core.models import Layer, LayerSet

for ls in LayerSet.objects.all():
for ls in LayerSet.objects.all().order_by("map__title"):
print(ls)
if ls.multimask:
for k, v in ls.multimask.items():
Expand All @@ -428,5 +428,5 @@ def old_ds_to_new(file_set):
layers = Layer.objects.filter(slug=k, region__document__map=ls.map)
for layer in layers:
layer.mask = GEOSGeometry(json.dumps(v["geometry"]))
layer.save(skip_map_lookup_update=True)
layer.save(skip_map_lookup_update=True, set_extent=False)
print("")
6 changes: 6 additions & 0 deletions ohmg/core/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -1135,7 +1135,13 @@ def update_multimask_from_geojson(self, multimask_geojson):
if multimask_geojson["features"]:
self.multimask = {}
for feature in multimask_geojson["features"]:
layer_slug = feature["properties"]["layer"]
self.multimask[feature["properties"]["layer"]] = feature

## future patch: save mask directly to layers
layer = Layer.objects.get(slug=layer_slug, region__document__map=self.map)
layer.mask = GEOSGeometry(json.dumps(feature["geometry"]))
layer.save(skip_map_lookup_update=True)
else:
self.multimask = None
self.save(update_fields=["multimask"])
Expand Down