remove things related to deleted models from base_viewer

full rework incoming

Author: aperrin66

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/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,29 @@
 from django.conf import settings
 
 from geospaas.base_viewer.forms import BaseSearchForm
-from geospaas.catalog.models import Dataset, GeographicLocation
+from geospaas.catalog.models import Dataset
 from geospaas.catalog.managers import LOCAL_FILE_SERVICE
 
-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):