diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-08-04 17:42:20 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-08-04 17:42:20 +0200 |
commit | 4e39e520091435d65c8a847527a3a1def63d01ce (patch) | |
tree | 6f5fa32207e0e3f4bd31b0f62105678aa308c52b | |
parent | 5063bf07c5128131f5eecbce994cfeb670ef8a08 (diff) | |
download | Ishtar-4e39e520091435d65c8a847527a3a1def63d01ce.tar.bz2 Ishtar-4e39e520091435d65c8a847527a3a1def63d01ce.zip |
Context record: add point 2d
4 files changed, 74 insertions, 0 deletions
diff --git a/archaeological_context_records/migrations/0006_auto_20170804_1741.py b/archaeological_context_records/migrations/0006_auto_20170804_1741.py new file mode 100644 index 000000000..ae3eb387d --- /dev/null +++ b/archaeological_context_records/migrations/0006_auto_20170804_1741.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +import django.contrib.gis.db.models.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_context_records', '0005_auto_20170802_1557'), + ] + + operations = [ + migrations.AddField( + model_name='contextrecord', + name='point_2d', + field=django.contrib.gis.db.models.fields.PointField(srid=4326, null=True, verbose_name='Point (2D)', blank=True), + ), + migrations.AddField( + model_name='historicalcontextrecord', + name='point_2d', + field=django.contrib.gis.db.models.fields.PointField(srid=4326, null=True, verbose_name='Point (2D)', blank=True), + ), + migrations.AlterField( + model_name='contextrecord', + name='datings', + field=models.ManyToManyField(related_name='context_records', to='archaeological_context_records.Dating'), + ), + ] diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 243ce32f8..e3a344be8 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -297,6 +297,7 @@ class ContextRecord(BulkUpdatedItem, BaseHistorizedItem, ImageModel, OwnPerms, verbose_name=_(u"Excavation technique")) related_context_records = models.ManyToManyField( 'ContextRecord', through='RecordRelations', blank=True) + point_2d = models.PointField(_(u"Point (2D)"), blank=True, null=True) point = models.PointField(_(u"Point"), blank=True, null=True, dim=3) polygon = models.PolygonField(_(u"Polygon"), blank=True, null=True) cached_label = models.TextField(_(u"Cached name"), null=True, blank=True) diff --git a/archaeological_files/migrations/0005_auto_20170804_1741.py b/archaeological_files/migrations/0005_auto_20170804_1741.py new file mode 100644 index 000000000..223528cc1 --- /dev/null +++ b/archaeological_files/migrations/0005_auto_20170804_1741.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_files', '0004_auto_20170802_1557'), + ] + + operations = [ + migrations.AlterField( + model_name='file', + name='main_town', + field=models.ForeignKey(related_name='file_main', verbose_name='Main town', blank=True, to='ishtar_common.Town', null=True), + ), + migrations.AlterField( + model_name='file', + name='towns', + field=models.ManyToManyField(related_name='file', verbose_name='Towns', to='ishtar_common.Town', blank=True), + ), + ] diff --git a/archaeological_operations/migrations/0005_auto_20170804_1741.py b/archaeological_operations/migrations/0005_auto_20170804_1741.py new file mode 100644 index 000000000..08d110bfc --- /dev/null +++ b/archaeological_operations/migrations/0005_auto_20170804_1741.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_operations', '0004_auto_20170802_1557'), + ] + + operations = [ + migrations.AlterField( + model_name='operation', + name='archaeological_sites', + field=models.ManyToManyField(related_name='operations', verbose_name='Archaeological sites', to='archaeological_operations.ArchaeologicalSite', blank=True), + ), + ] |