Manage JSON overlay

Conflicts:
	chimere/static/chimere/js/jquery.chimere.js
	chimere/templatetags/chimere_tags.py

1 files changed, 56 insertions, 0 deletions

diff --git a/chimere/migrations/0004_auto_20161117_1911.py b/chimere/migrations/0004_auto_20161117_1911.py
new file mode 100644
index 0000000..100b2d6
--- /dev/null
+++ b/chimere/migrations/0004_auto_20161117_1911.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import chimere.widgets
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('chimere', '0003_convert_tiny_urls'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='AreaOverlays',
+            fields=[
+                ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)),
+                ('order', models.IntegerField(verbose_name='Order')),
+                ('area', models.ForeignKey(to='chimere.Area')),
+            ],
+            options={
+                'verbose_name': 'Area - Overlay',
+                'ordering': ('order',),
+                'verbose_name_plural': 'Areas - Overlays',
+            },
+        ),
+        migrations.CreateModel(
+            name='Overlay',
+            fields=[
+                ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)),
+                ('name', models.CharField(verbose_name='Name', max_length=150)),
+                ('overlay_type', models.CharField(verbose_name='Importer type', max_length=4, choices=[('JSON', 'GeoJSON')])),
+                ('overlay_file', models.FileField(verbose_name='File', upload_to='')),
+                ('style', models.TextField(null=True, help_text='Javascript definition. Cf. to openlayers3 documentation.', blank=True, verbose_name='Style definition')),
+            ],
+            options={
+                'verbose_name': 'Overlay file',
+                'verbose_name_plural': 'Overlay files',
+            },
+        ),
+        migrations.AlterModelOptions(
+            name='arealayers',
+            options={'verbose_name': 'Area - Layer', 'ordering': ('order',), 'verbose_name_plural': 'Areas - Layers'},
+        ),
+        migrations.AddField(
+            model_name='areaoverlays',
+            name='overlay',
+            field=models.ForeignKey(to='chimere.Overlay'),
+        ),
+        migrations.AddField(
+            model_name='area',
+            name='overlays',
+            field=chimere.widgets.SelectMultipleField(through='chimere.AreaOverlays', blank=True, related_name='overlays', to='chimere.Overlay'),
+        ),
+    ]