refactor models, change map package storage and map package loading

This commit is contained in:
Laura Klünder 2016-08-29 22:10:43 +02:00
parent 0656090f27
commit 376d85f9b4
12 changed files with 226 additions and 150 deletions

View file

@ -1,11 +1,10 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.9 on 2016-08-29 16:48
# Generated by Django 1.9.9 on 2016-08-29 20:00
from __future__ import unicode_literals
import django.db.models.deletion
from django.db import migrations, models
import c3nav.mapdata.models.source
import parler.models
@ -39,10 +38,10 @@ class Migration(migrations.Migration):
('master', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='translations', to='mapdata.Feature')),
],
options={
'db_tablespace': '',
'managed': True,
'default_permissions': (),
'db_table': 'mapdata_feature_translation',
'managed': True,
'db_tablespace': '',
'verbose_name': 'feature Translation',
},
),
@ -66,6 +65,7 @@ class Migration(migrations.Migration):
('left', models.DecimalField(decimal_places=2, max_digits=6, null=True, verbose_name='left coordinate')),
('top', models.DecimalField(decimal_places=2, max_digits=6, null=True, verbose_name='top coordinate')),
('right', models.DecimalField(decimal_places=2, max_digits=6, null=True, verbose_name='right coordinate')),
('directory', models.CharField(max_length=100, verbose_name='folder name')),
],
),
migrations.CreateModel(
@ -73,7 +73,6 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.SlugField(unique=True, verbose_name='source name')),
('image', models.FileField(max_length=70, storage=c3nav.mapdata.models.source.SourceImageStorage(), upload_to=c3nav.mapdata.models.source.map_source_filename, verbose_name='source image')),
('bottom', models.DecimalField(decimal_places=2, max_digits=6, verbose_name='bottom coordinate')),
('left', models.DecimalField(decimal_places=2, max_digits=6, verbose_name='left coordinate')),
('top', models.DecimalField(decimal_places=2, max_digits=6, verbose_name='top coordinate')),