Data model rework

docs/source/geospaas/catalog.rst

@@ -13,14 +13,6 @@ Subpackages
 Submodules
 ==========
 
-geospaas.catalog.managers
--------------------------
-
-.. automodule:: geospaas.catalog.managers
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 geospaas.catalog.models
 -----------------------
 

geospaas/base_viewer/forms.py

@@ -2,8 +2,6 @@
 from django.utils import timezone
 from leaflet.forms.widgets import LeafletWidget
 
-from geospaas.catalog.models import Source
-
 
 class BaseSearchForm(forms.Form):
     """ Basic version of form for basic seaching of django-geospaas metadata """
@@ -20,8 +18,6 @@ class BaseSearchForm(forms.Form):
     time_coverage_start = forms.DateTimeField(
         initial=timezone.datetime(2000, 1, 1, tzinfo=timezone.utc))
     time_coverage_end = forms.DateTimeField(initial=timezone.now())
-    source = forms.ModelMultipleChoiceField(
-        Source.objects.all(), required=False)
 
     def filter(self, ds):
         """ Filtering method of the form. All filtering processes are coded here """
@@ -34,12 +30,6 @@ def filter(self, ds):
         # Too late datasets are excluded from the filtering results
         ds = ds.exclude(time_coverage_start__gt=t_1)
 
-        src = self.cleaned_data.get('source', None)
-        # Just the one(s) with correct selected source should pass the filtering actions
-        # if Source is given in the input form
-        if src:
-            ds = ds.filter(source__in=src)
-
         # spatial filtering
         if self.cleaned_data['polygon']:
             # filtering by user provided polygon

geospaas/base_viewer/templates/base_viewer/ds_info.html

@@ -5,7 +5,7 @@
     {% endblock ds_detailed_info %}
     {% for url in ds.dataseturi_set.all %}
     <div class="attr_title">Address:</div>
-    {% if show_local_address or url.service != local_file_service %}
+    {% if show_local_address %}
     <div class="attr_content">{{ url.uri|escape|urlize}} </div>
     {% else %}
     <div class="attr_content">hidden local address of dataset</div>

geospaas/base_viewer/urls.py

@@ -1,10 +1,10 @@
 from django.urls import path
 
-from geospaas.base_viewer.views import IndexView, get_geometry_geojson
+from geospaas.base_viewer.views import IndexView#, get_geometry_geojson
 
 
 app_name = 'base_viewer'
 urlpatterns = [
     path('', IndexView.as_view(), name='index'),
-    path('geometry/<int:pk>', get_geometry_geojson, name='geometry_geojson'),
+    # path('geometry/<int:pk>', get_geometry_geojson, name='geometry_geojson'),
 ]

geospaas/base_viewer/views.py

@@ -6,29 +6,28 @@
 from django.conf import settings
 
 from geospaas.base_viewer.forms import BaseSearchForm
-from geospaas.catalog.models import Dataset, GeographicLocation
-from geospaas.catalog.managers import LOCAL_FILE_SERVICE
+from geospaas.catalog.models import Dataset
 
-def get_geometry_geojson(request, pk, *args, **kwargs):
-    """ Get GeographicLocation.Geometry as GeoJSON
+# def get_geometry_geojson(request, pk, *args, **kwargs):
+#     """ Get GeographicLocation.Geometry as GeoJSON
 
-    Parameters
-    ----------
-    pk : int
-        primary key of GeographicLocation object
+#     Parameters
+#     ----------
+#     pk : int
+#         primary key of GeographicLocation object
 
-    Returns
-    -------
-    response : HttpResponse
-        GeoJSON with geometry of GeographicLocation
+#     Returns
+#     -------
+#     response : HttpResponse
+#         GeoJSON with geometry of GeographicLocation
 
-    """
-    gl = GeographicLocation.objects.filter(pk=pk)
-    if gl.count() == 0:
-        geojson = '{}'
-    else:
-        geojson = serialize('geojson', gl)
-    return HttpResponse(geojson)
+#     """
+#     gl = GeographicLocation.objects.filter(pk=pk)
+#     if gl.count() == 0:
+#         geojson = '{}'
+#     else:
+#         geojson = serialize('geojson', gl)
+#     return HttpResponse(geojson)
 
 
 class IndexView(View):

geospaas/catalog/admin.py

@@ -1,12 +1,9 @@
 from django.contrib import admin
 
 from leaflet.admin import LeafletGeoAdmin
-from geospaas.catalog.models import GeographicLocation, Source, Dataset, DatasetURI, \
+from geospaas.catalog.models import Dataset, DatasetURI, \
         Parameter, DatasetRelationship
 
-admin.site.register(GeographicLocation, LeafletGeoAdmin)
-
-admin.site.register(Source, admin.ModelAdmin)
 admin.site.register(Dataset, admin.ModelAdmin)
 admin.site.register(DatasetURI, admin.ModelAdmin)
 admin.site.register(Parameter, admin.ModelAdmin)

geospaas/catalog/migrations/0012_auto_20250512_1411.py

@@ -0,0 +1,38 @@
+# Generated by Django 3.2.25 on 2025-05-12 14:11
+
+import django.contrib.gis.db.models.fields
+from django.db import migrations, models
+import geospaas.catalog.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('vocabularies', '0006_auto_20250512_1411'),
+        ('catalog', '0011_auto_20210525_1252'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Tag',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('data', models.JSONField(validators=[geospaas.catalog.models.validate_tag])),
+            ],
+        ),
+        migrations.AddField(
+            model_name='dataset',
+            name='keywords',
+            field=models.ManyToManyField(to='vocabularies.Keyword'),
+        ),
+        migrations.AddField(
+            model_name='dataset',
+            name='location',
+            field=django.contrib.gis.db.models.fields.GeometryField(blank=True, null=True, srid=4326),
+        ),
+        migrations.AddField(
+            model_name='dataset',
+            name='tags',
+            field=models.ManyToManyField(to='catalog.Tag'),
+        ),
+    ]

geospaas/catalog/migrations/0013_auto_20250512_1414.py

@@ -0,0 +1,21 @@
+# Generated by Django 3.2.25 on 2025-05-12 14:14
+
+from django.db import migrations
+
+
+def populate_location(apps, schema_editor):
+    Dataset = apps.get_model("catalog", "dataset")
+    for dataset in Dataset.objects.all():
+        dataset.location = dataset.geographic_location.geometry
+        dataset.save(update_fields=["location"])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalog', '0012_auto_20250512_1411'),
+    ]
+
+    operations = [
+        migrations.RunPython(populate_location, reverse_code=migrations.RunPython.noop),
+    ]

geospaas/catalog/migrations/0014_auto_20250513_1302.py

@@ -0,0 +1,47 @@
+# Generated by Django 3.2.25 on 2025-05-13 13:02
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalog', '0013_auto_20250512_1414'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='source',
+            name='instrument',
+        ),
+        migrations.RemoveField(
+            model_name='source',
+            name='platform',
+        ),
+        migrations.RemoveField(
+            model_name='dataset',
+            name='ISO_topic_category',
+        ),
+        migrations.RemoveField(
+            model_name='dataset',
+            name='data_center',
+        ),
+        migrations.RemoveField(
+            model_name='dataset',
+            name='gcmd_location',
+        ),
+        migrations.RemoveField(
+            model_name='dataset',
+            name='geographic_location',
+        ),
+        migrations.RemoveField(
+            model_name='dataset',
+            name='source',
+        ),
+        migrations.DeleteModel(
+            name='GeographicLocation',
+        ),
+        migrations.DeleteModel(
+            name='Source',
+        ),
+    ]

geospaas/catalog/migrations/0015_auto_20250515_1401.py

@@ -0,0 +1,21 @@
+# Generated by Django 3.2.25 on 2025-05-15 14:01
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalog', '0014_auto_20250513_1302'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='dataseturi',
+            name='name',
+        ),
+        migrations.RemoveField(
+            model_name='dataseturi',
+            name='service',
+        ),
+    ]

geospaas/catalog/migrations/0016_auto_20250625_0644.py

@@ -0,0 +1,32 @@
+# Generated by Django 3.2.25 on 2025-06-25 06:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalog', '0015_auto_20250515_1401'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='tag',
+            name='data',
+        ),
+        migrations.AddField(
+            model_name='tag',
+            name='name',
+            field=models.CharField(default='legacy', max_length=200),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='tag',
+            name='value',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AddConstraint(
+            model_name='tag',
+            constraint=models.UniqueConstraint(fields=('name', 'value'), name='unique_tag'),
+        ),
+    ]