Merge pull request #7 from Terralego/fix_migrations

Fix migrations

CHANGES.md

@@ -2,6 +2,18 @@
 CHANGELOG
 =========
 
+0.3.3      (2019-09-25)
+-----------------------
+
+### Breaking Changes with front
+
+* key to access tilejson is changed from 'layer_tilejson' and 'group_tilejson' to 'tilejson' in both cases.
+
+### Fix
+
+* Fix migration file that prevent old terracommon app migration
+
+
 0.3.2      (2019-09-24)
 -----------------------
 

docker-compose.yml

@@ -1,7 +1,9 @@
-version: "3.7"
+version: "3"
 services:
   postgres:
     image: makinacorpus/pgrouting:10-2.5-2.6
+    volumes:
+      - postgres:/var/lib/postgresql/data
     environment:
       - POSTGRES_PASSWORD=travis_ci_test
       - POSTGRES_USER=travis_ci_test
@@ -18,3 +20,6 @@ services:
     ports:
       - "8000:8000"
     command: python3.7 ./manage.py runserver 0.0.0.0:8000
+
+volumes:
+  postgres:

geostore/VERSION.md

@@ -1 +1 @@
-0.3.2
+0.3.3

geostore/migrations/0027_layergroup.py

@@ -6,8 +6,8 @@ def create_groups(apps, schema_editor):
     LayerGroup.objects.create(name='default', slug='default')
     Layer = apps.get_model('geostore', 'Layer')
     for layer in Layer.objects.all():
-        group_name = layer.group
-        group, created = LayerGroup.objects.get_or_create(name=group_name)
+        group_name = layer.group or 'default'
+        group, created = LayerGroup.objects.get_or_create(name=group_name, defaults={'slug': group_name})
         group.layers.add(layer)
 
 
@@ -26,7 +26,7 @@ class Migration(migrations.Migration):
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
                 ('name', models.CharField(max_length=256, unique=True)),
-                ('slug', models.SlugField()),
+                ('slug', models.SlugField(unique=True)),
                 ('layers', models.ManyToManyField(to='geostore.Layer', related_name='layer_groups')),
             ],
             options={

geostore/migrations/0029_auto_20190926_0803.py

@@ -0,0 +1,54 @@
+# Generated by Django 2.2.5 on 2019-09-26 08:03
+
+import django.contrib.postgres.indexes
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('geostore', '0028_remove_layer_group'),
+    ]
+
+    operations = [
+        migrations.RemoveIndex(
+            model_name='feature',
+            name='geo_featu_identif_212b28_idx',
+        ),
+        migrations.RemoveIndex(
+            model_name='feature',
+            name='geo_featu_layer_i_3dcdde_gist',
+        ),
+        migrations.RemoveIndex(
+            model_name='feature',
+            name='geo_feat_layer_i_921f95_idx',
+        ),
+        migrations.RemoveIndex(
+            model_name='feature',
+            name='geo_featu_updated_62a19a_idx',
+        ),
+        migrations.RemoveIndex(
+            model_name='feature',
+            name='geo_featu_updated_cfeac3_idx',
+        ),
+        migrations.AddIndex(
+            model_name='feature',
+            index=models.Index(fields=['layer'], name='geostore_fe_layer_i_71cad6_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='feature',
+            index=models.Index(fields=['updated_at'], name='geostore_fe_updated_fcdc6b_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='feature',
+            index=models.Index(fields=['updated_at', 'layer'], name='geostore_fe_updated_bdb823_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='feature',
+            index=models.Index(fields=['identifier'], name='geostore_fe_identif_f6c552_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='feature',
+            index=django.contrib.postgres.indexes.GistIndex(fields=['layer', 'geom'], name='geostore_fe_layer_i_c3168f_gist'),
+        ),
+    ]

geostore/serializers/__init__.py

@@ -46,10 +46,10 @@ class Meta:
 
 
 class GroupSerializer(serializers.ModelSerializer):
-    group_tilejson = serializers.SerializerMethodField()
+    tilejson = serializers.SerializerMethodField()
     group_tiles = serializers.SerializerMethodField()
 
-    def get_group_tilejson(self, obj):
+    def get_tilejson(self, obj):
         return urlunquote(reverse('geostore:group-tilejson', args=[obj.slug]))
 
     def get_group_tiles(self, obj):
@@ -66,7 +66,7 @@ class LayerSerializer(serializers.ModelSerializer):
     geojson_url = serializers.SerializerMethodField()
     schema = serializers.JSONField(required=False, validators=[validate_json_schema])
     layer_intersects = serializers.SerializerMethodField()
-    layer_tilejson = serializers.SerializerMethodField()
+    tilejson = serializers.SerializerMethodField()
     layer_groups = GroupSerializer(many=True, read_only=True)
 
     def get_routing_url(self, obj):
@@ -81,7 +81,7 @@ def get_geojson_url(self, obj):
     def get_layer_intersects(self, obj):
         return reverse('geostore:layer-intersects', args=[obj.name, ])
 
-    def get_layer_tilejson(self, obj):
+    def get_tilejson(self, obj):
         return urlunquote(reverse('geostore:layer-tilejson', args=[obj.pk]))
 
     class Meta:

geostore/tiles/mixins.py

@@ -50,7 +50,7 @@ def get_attribution(self):
         return ','.join(set(
             [
                 l.layer_settings_with_default('metadata', 'attribution')
-                for l in self.layers
+                for l in self.layers if l.layer_settings_with_default('metadata', 'attribution')
             ])) or None
 
     def get_description(self):

setup.py

@@ -35,11 +35,11 @@
         'Programming Language :: Python :: 3.7',
     ],
     install_requires=[
-        'django>=2.2,<3.0', # wait for restframework-gis, 0.14 doesnt support django 3.0
+        'django>=2.2,<3.0',  # wait for restframework-gis, 0.14 doesnt support django 3.0
         'djangorestframework>=3.8',
         "djangorestframework-gis>=0.14",
         "drf-yasg>=1.9",
-        "packaging", # wait for drf-yasg fix
+        "packaging",  # wait for drf-yasg fix
         "deepmerge",
         "requests>=2.19",
         "mercantile>=1.0",