Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Biodivsports public detail view #3358

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ CHANGELOG
2.96.0+dev (XXXX-XX-XX)
-----------------------

**New features**

- New sensitivity area detail public view : New sensitivity public view for sensitive areas (``/public/sensitiveareas/{pk}``).

**Improvements**

- Sensitivity: Add missing attachments list to sensitive areas API
Expand Down
2 changes: 1 addition & 1 deletion geotrek/api/tests/test_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
SENSITIVE_AREA_PROPERTIES_JSON_STRUCTURE = sorted([
'id', 'contact', 'create_datetime', 'description', 'elevation', 'geometry',
'info_url', 'kml_url', 'name', 'period', 'practices', 'provider', 'published', 'species_id',
'structure', 'update_datetime', 'url', 'attachments'
'structure', 'update_datetime', 'url', 'public_url', 'attachments'
])

SENSITIVE_AREA_SPECIES_PROPERTIES_JSON_STRUCTURE = sorted([
Expand Down
8 changes: 7 additions & 1 deletion geotrek/api/v2/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -913,6 +913,7 @@ class SensitiveAreaSerializer(DynamicFieldsMixin, TimeStampedSerializer):
geometry = geo_serializers.GeometryField(read_only=True, source="geom_transformed", precision=7)
species_id = serializers.SerializerMethodField()
kml_url = serializers.SerializerMethodField()
public_url = serializers.SerializerMethodField()
attachments = AttachmentSerializer(many=True)

def get_name(self, obj):
Expand All @@ -936,13 +937,18 @@ def get_kml_url(self, obj):
url = reverse('sensitivity:sensitivearea_kml_detail', kwargs={'lang': get_language(), 'pk': obj.pk})
return build_url(self, url)

def get_public_url(self, obj):
url = reverse('apiv2:sensitivearea-detail', kwargs={'pk': obj.pk, 'format': 'html'})
return build_url(self, url)


class Meta(TimeStampedSerializer.Meta):
model = sensitivity_models.SensitiveArea
fields = TimeStampedSerializer.Meta.fields + (
'id', 'contact', 'description', 'elevation',
'geometry', 'info_url', 'kml_url', 'name', 'period',
'practices', 'published', 'species_id', 'provider', 'structure',
'url', 'attachments'
'update_datetime', 'url', 'public_url', 'attachments'
)

class BubbleSensitiveAreaSerializer(SensitiveAreaSerializer):
Expand Down
24 changes: 24 additions & 0 deletions geotrek/api/v2/views/sensitivity.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import logging
import datetime

from django.conf import settings
from django.contrib.gis.db.models.functions import Transform
from django.db.models import F, Case, When, Prefetch
from django_filters.rest_framework.backends import DjangoFilterBackend
from rest_framework.renderers import TemplateHTMLRenderer
from rest_framework.response import Response

from geotrek.common.models import Attachment
from geotrek.api.v2 import serializers as api_serializers, \
Expand All @@ -11,6 +16,9 @@
from ..filters import GeotrekQueryParamsFilter, GeotrekQueryParamsDimensionFilter, GeotrekInBBoxFilter, GeotrekSensitiveAreaFilter, NearbyContentFilter, UpdateOrCreateDateFilter


logger = logging.getLogger(__name__)


class SensitiveAreaViewSet(api_viewsets.GeotrekGeometricViewset):
filter_backends = (
DjangoFilterBackend,
Expand All @@ -23,6 +31,22 @@ class SensitiveAreaViewSet(api_viewsets.GeotrekGeometricViewset):
)
bbox_filter_field = 'geom_transformed'
bbox_filter_include_overlapping = True
renderer_classes = api_viewsets.GeotrekGeometricViewset.renderer_classes + [TemplateHTMLRenderer]
template_name = 'sensitivity/sensitivearea_detail_public.html'

def retrieve(self, request, *args, **kwargs):
retrieve = super().retrieve(request, *args, **kwargs)
if request.accepted_renderer.format == 'html' and self.get_object():
instance = self.get_object()
current_month = datetime.date.today().month
return Response(
{
'object': instance,
'current_month': current_month,
'current_sensitivity': instance.species.list_period()[current_month - 1]
}
)
return retrieve

def get_serializer_class(self):
if 'bubble' in self.request.GET:
Expand Down
3 changes: 3 additions & 0 deletions geotrek/sensitivity/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ def pretty_period(self):
for p in range(1, 13)
if getattr(self, 'period{:02}'.format(p))])

def list_period(self):
return [getattr(self, 'period{:02}'.format(p)) for p in range(1, 13)]

def pretty_practices(self):
return ", ".join([str(practice) for practice in self.practices.all()])

Expand Down
9 changes: 8 additions & 1 deletion geotrek/sensitivity/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,21 @@ class Meta(MapentityGeojsonModelSerializer.Meta):
class SensitiveAreaAPISerializer(TranslatedModelSerializer):
species = SpeciesSerializer()
kml_url = rest_serializers.SerializerMethodField()
public_url = rest_serializers.SerializerMethodField()
attachments = AttachmentSerializer(many=True)

def get_kml_url(self, obj):
return reverse('sensitivity:sensitivearea_kml_detail', kwargs={'lang': get_language(), 'pk': obj.pk})

def get_public_url(self, obj):
return reverse('apiv2:sensitivearea-detail', kwargs={'pk': obj.pk, 'format': 'html'})

class Meta:
model = sensitivity_models.SensitiveArea
fields = ('id', 'species', 'description', 'contact', 'published', 'publication_date', 'kml_url', 'attachments')
fields = (
'id', 'species', 'description', 'contact', 'published', 'publication_date',
'kml_url', 'public_url', 'attachments'
)


class SensitiveAreaAPIGeojsonSerializer(GeoFeatureModelSerializer, SensitiveAreaAPISerializer):
Expand Down
25 changes: 13 additions & 12 deletions geotrek/sensitivity/static/sensitivity/main.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@

$(window).on('entity:map', function (e, data) {

if (data.modelname != 'sensitivearea') {
var map = data.map;
if (data.modelname != 'sensitivearea') {
var map = data.map;

// Show sensitivity layer in application maps
var layer = new L.ObjectsLayer(null, {
modelname: 'sensitivearea',
style: L.Util.extend(window.SETTINGS.map.styles['sensitivearea'] || {}, {clickable:false}),
});
var url = window.SETTINGS.urls['sensitivearea_layer'];
layer.load(url);
map.layerscontrol.addOverlay(layer, tr('sensitivearea'), tr('Sensitivity'));
}
});
// Show sensitivity layer in application maps
var layer = new L.ObjectsLayer(null, {
modelname: 'sensitivearea',
style: L.Util.extend(window.SETTINGS.map.styles['sensitivearea'] || {}, {clickable:false}),
});
var url = window.SETTINGS.urls['sensitivearea_layer'];
layer.load(url);
map.layerscontrol.addOverlay(layer, tr('sensitivearea'), tr('Sensitivity'));
}
});
Loading