skip stuff if processupdates is no geometries were affected
This commit is contained in:
parent
d51bc684bb
commit
ff5826d8c2
4 changed files with 61 additions and 25 deletions
|
@ -15,13 +15,15 @@ class Command(BaseCommand):
|
|||
def add_arguments(self, parser):
|
||||
parser.add_argument('--include-history', action='store_const', const=True, default=False,
|
||||
help=_('incluce all history as well'))
|
||||
parser.add_argument('--include-geometries', action='store_const', const=True, default=False,
|
||||
help=_('incluce all geometries as well'))
|
||||
|
||||
def handle(self, *args, **options):
|
||||
from c3nav.mapdata.models import MapUpdate
|
||||
|
||||
logger = logging.getLogger('c3nav')
|
||||
|
||||
MapUpdate.objects.create(type='management')
|
||||
MapUpdate.objects.create(type='management', geometries_changed=options['include_geometries'])
|
||||
logger.info('New management update created.')
|
||||
|
||||
if options['include_history']:
|
||||
|
|
|
@ -0,0 +1,21 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.11.7 on 2017-12-23 01:38
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('mapdata', '0068_waytype_level_change_description'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='mapupdate',
|
||||
name='geometries_changed',
|
||||
field=models.BooleanField(default=True),
|
||||
preserve_default=False,
|
||||
),
|
||||
]
|
|
@ -21,6 +21,7 @@ class MapUpdate(models.Model):
|
|||
user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.PROTECT)
|
||||
type = models.CharField(max_length=32)
|
||||
processed = models.BooleanField(default=False)
|
||||
geometries_changed = models.BooleanField()
|
||||
|
||||
class Meta:
|
||||
verbose_name = _('Map update')
|
||||
|
@ -92,6 +93,7 @@ class MapUpdate(models.Model):
|
|||
if not new_updates:
|
||||
return ()
|
||||
|
||||
if any(update.geometries_changed for update in new_updates):
|
||||
from c3nav.mapdata.utils.cache.changes import changed_geometries
|
||||
changed_geometries.reset()
|
||||
|
||||
|
@ -123,6 +125,8 @@ class MapUpdate(models.Model):
|
|||
|
||||
from c3nav.mapdata.render.renderdata import LevelRenderData
|
||||
LevelRenderData.rebuild()
|
||||
else:
|
||||
logger.info('No geometries affected.')
|
||||
|
||||
logger.info('Rebuilding router...')
|
||||
from c3nav.routing.router import Router
|
||||
|
@ -143,12 +147,17 @@ class MapUpdate(models.Model):
|
|||
if not new and (self.was_processed or not self.processed):
|
||||
raise TypeError
|
||||
|
||||
from c3nav.mapdata.utils.cache.changes import changed_geometries
|
||||
|
||||
if self.geometries_changed is None:
|
||||
self.geometries_changed = not changed_geometries.is_empty
|
||||
|
||||
super().save(**kwargs)
|
||||
|
||||
with suppress(FileExistsError):
|
||||
os.mkdir(os.path.dirname(self._changed_geometries_filename()))
|
||||
|
||||
from c3nav.mapdata.utils.cache.changes import changed_geometries
|
||||
if self.geometries_changed:
|
||||
pickle.dump(changed_geometries, open(self._changed_geometries_filename(), 'wb'))
|
||||
|
||||
if new:
|
||||
|
|
4
src/c3nav/mapdata/utils/cache/changes.py
vendored
4
src/c3nav/mapdata/utils/cache/changes.py
vendored
|
@ -33,6 +33,10 @@ class GeometryChangeTracker:
|
|||
self._unary_unions[level_id] = union
|
||||
return union
|
||||
|
||||
@property
|
||||
def is_empty(self):
|
||||
return not self._geometries_by_level
|
||||
|
||||
@property
|
||||
def area(self):
|
||||
return sum((self._get_unary_union(level_id).area
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue