Skip to content

Commit

Permalink
Implement layer embed view in GeoNode
Browse files Browse the repository at this point in the history
  • Loading branch information
afabiani committed Feb 9, 2021
1 parent 38959bd commit 1f8c053
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 17 deletions.
2 changes: 2 additions & 0 deletions geonode/layers/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@
views.layer_metadata_detail, name='layer_metadata_detail'),
url(r'^(?P<layername>[^/]*)/metadata_upload$',
views.layer_metadata_upload, name='layer_metadata_upload'),
url(r'^(?P<layername>[^/]+)/embed$',
views.layer_embed, name='layer_embed'),
url(r'^(?P<layername>[^/]*)/style_upload$',
views.layer_sld_upload, name='layer_sld_upload'),
url(r'^(?P<layername>[^/]*)/style_edit$',
Expand Down
20 changes: 15 additions & 5 deletions geonode/layers/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
from django.contrib.gis.geos import GEOSGeometry
from django.core.exceptions import PermissionDenied
from django.template.response import TemplateResponse
from django.views.decorators.clickjacking import xframe_options_exempt
from requests import Request
from itertools import chain
from six import string_types
Expand Down Expand Up @@ -1552,11 +1553,12 @@ def decimal_default(obj):
'bbox_y0': layer_obj.bbox_helper.ymin,
'bbox_y1': layer_obj.bbox_helper.ymax,
}
return HttpResponse(json.dumps(
response,
ensure_ascii=False,
default=decimal_default
),
return HttpResponse(
json.dumps(
response,
ensure_ascii=False,
default=decimal_default
),
content_type='application/javascript')


Expand Down Expand Up @@ -1654,6 +1656,14 @@ def layer_sld_edit(
return layer_detail(request, layername, template)


@xframe_options_exempt
def layer_embed(
request,
layername,
template='layers/layer_embed.html'):
return layer_detail(request, layername, template)


@login_required
def layer_batch_metadata(request):
return batch_modify(request, 'Layer')
Expand Down
16 changes: 4 additions & 12 deletions geonode/maps/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@

from django.conf.urls import url, include
from django.views.generic import TemplateView

from geonode import geoserver
from geonode.utils import check_ogc_backend
from geonode.monitoring import register_url_event

from . import views
Expand All @@ -33,15 +30,10 @@

new_map_view = views.new_map
existing_map_view = views.map_view

if check_ogc_backend(geoserver.BACKEND_PACKAGE):
new_map_view = views.new_map
existing_map_view = views.map_view
map_embed = views.map_embed
map_edit = views.map_edit
map_json = views.map_json
map_thumbnail = views.map_thumbnail

map_embed = views.map_embed
map_edit = views.map_edit
map_json = views.map_json
map_thumbnail = views.map_thumbnail
maps_list = register_url_event()(TemplateView.as_view(template_name='maps/map_list.html'))

urlpatterns = [
Expand Down

0 comments on commit 1f8c053

Please sign in to comment.