From 280ca9cacd70500659a0dcf05148adf386b00520 Mon Sep 17 00:00:00 2001 From: karakostis Date: Mon, 11 Sep 2017 16:02:47 +0200 Subject: [PATCH 01/20] changes in the libraries in setup.py and requirements.txt --- requirements.txt | 2 +- setup.py | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index f38514ef272..5759e0a2eb6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ MultipartPostHandler==0.1.0 # we can't use django-user-account until upstream merge changes for geonode. # this is temporary solution # OWSLib==0.14.0 -git+git://github.com/geopython/OWSLib@master#egg=OWSLib-0.14-dev +#git+git://github.com/geopython/OWSLib@master#egg=OWSLib-0.14-dev Paver==1.2.4 Unidecode==0.4.19 amqp==1.4.9 diff --git a/setup.py b/setup.py index 81bfdb779cd..5ea98a4a866 100644 --- a/setup.py +++ b/setup.py @@ -89,9 +89,8 @@ # geopython dependencies "pyproj==1.9.5.1", # python-pyproj (1.9.5) - # we can't use OWSLib 0.14 until upstream merge changes for geonode. - # this is temporary solution - "OWSLib==0.14-dev", # python-owslib (0.10.3) FIXME + #"OWSLib==0.14-dev", # python-owslib (0.10.3) FIXME + "OWSLib==0.14", "pycsw==2.0.3", # python-pycsw (1.10.1, 2.0.0 in ppa) FIXME "%s" % shapely_dep, # python-shapely (1.5.13) @@ -116,9 +115,11 @@ "geonode-announcements==1.0.8", "geonode-agon-ratings==0.3.5", # (0.3.1 in ppa) FIXME "pinax-notifications<4.0", - "django-user-accounts==2.0.2dev", + #"django-user-accounts==2.0.2dev", + "django-user-accounts==2.0.2", # we can't use django-user-account until upstream merge changes for geonode. # this is temporary solution + # "git+https://github.com/cezio/django-user-accounts/archive/252_255_mixed.zip", "geonode-arcrest>=10.2", "geonode-dialogos>=0.5", "gsconfig==1.0.6", # (1.0.3 in ppa) FIXME @@ -142,7 +143,7 @@ "factory_boy", # "WeasyPrint", - ], + ], zip_safe=False, dependency_links=[ 'https://github.com/cezio/django-user-accounts/archive/252_255_mixed.zip#egg=django-user-accounts-2.0.2dev' From 9d404b837330993b49771f99de1357a577c62739 Mon Sep 17 00:00:00 2001 From: karakostis Date: Wed, 13 Sep 2017 13:52:49 +0200 Subject: [PATCH 02/20] download_layer --- .../layers/templates/layers/layer_detail.html | 383 +++++++++++++++++- .../layers/layer_leaflet_modal_map.html | 89 ++++ geonode/layers/urls.py | 1 + geonode/layers/views.py | 124 ++++++ geonode/settings.py | 5 + geonode/static/lib/css/geonode_icon.png | Bin 0 -> 91400 bytes geonode/static/lib/css/leaflet-areaselect.css | 15 + geonode/static/lib/js/leaflet-areaselect.js | 182 +++++++++ 8 files changed, 797 insertions(+), 2 deletions(-) create mode 100644 geonode/layers/templates/layers/layer_leaflet_modal_map.html create mode 100644 geonode/static/lib/css/geonode_icon.png create mode 100644 geonode/static/lib/css/leaflet-areaselect.css create mode 100644 geonode/static/lib/js/leaflet-areaselect.js diff --git a/geonode/layers/templates/layers/layer_detail.html b/geonode/layers/templates/layers/layer_detail.html index 35eac339dd3..326b93b8726 100644 --- a/geonode/layers/templates/layers/layer_detail.html +++ b/geonode/layers/templates/layers/layer_detail.html @@ -1,5 +1,6 @@ {% extends "layers/layer_base.html" %} {% load i18n %} +{% load staticfiles %} {% load dialogos_tags %} {% load agon_ratings_tags %} {% load bootstrap_tags %} @@ -29,7 +30,35 @@ {% else %} {% include "layers/layer_leaflet_map.html" %} {% endif %} + {% include "layers/layer_leaflet_modal_map.html" %} {{ block.super }} + + + {% endblock %} @@ -257,7 +286,7 @@

{% trans 'Average Rating' %}

{% endif %} {% endif %} -