" + yLabel() + ": " + d.value) + .style("left", (d3.event.pageX) + "px") + .style("top", (d3.event.pageY - 40) + "px"); + }) + .on("mouseout", function(d) { + div.transition() + .duration(500) + .style("opacity", 0); + }); + + }); + } + + my.x = function (_){ + return arguments.length ? (x = _, my) : x; + }; + + my.y = function (_){ + return arguments.length ? (y = _, my) : y; + }; + + my.width = function (_){ + return arguments.length ? (width = _, my) : width; + }; + + my.height = function (_){ + return arguments.length ? (height = _, my) : height; + }; + + my.padding = function (_){ + return arguments.length ? (xScale.padding(_), my) : xScale.padding(); + }; + + return my; + } \ No newline at end of file diff --git a/haitidata/static/js/pie.js b/haitidata/static/js/pie.js new file mode 100644 index 0000000..ea9478b --- /dev/null +++ b/haitidata/static/js/pie.js @@ -0,0 +1,415 @@ +function pieChart(cat, qnt, title, id){ + var width = function(){ return document.getElementById(id).parentNode.offsetWidth}, + height = 500, + margin = {top: 80, right: 100, bottom: 10, left: 10}, + colour = d3.scaleOrdinal(d3.schemeCategory20c), // colour scheme + variable, // value in data that will dictate proportions on chart + category, // compare data by + padAngle = 0.015, // effectively dictates the gap between slices + transTime, // transition time + updateData, + floatFormat = d3.format("." + d3.precisionFixed(0.5) + "f"), + cornerRadius = 3; // sets how rounded the corners are on each slice + + function chart(selection){ + selection.each(function() { + // generate chart + // =========================================================================================== + // Set up constructors for making donut. See https://github.com/d3/d3-shape/blob/master/README.md + var radius = Math.min(width(), (height - margin.top)) / 2; + + // creates a new pie generator + var pie = d3.pie() + .value(function(d) { return floatFormat(d[variable]); }) + .sort(null); + + // contructs and arc generator. This will be used for the donut. The difference between outer and inner + // radius will dictate the thickness of the donut + var arc = d3.arc() + .outerRadius(radius * 0.8) + .innerRadius(2) + .cornerRadius(cornerRadius) + .padAngle(padAngle); + + // this arc is used for aligning the text labels + var outerArc = d3.arc() + .outerRadius(radius * 0.83) + .innerRadius(radius * 0.83); + // =========================================================================================== + + // =========================================================================================== + // append the svg object to the selection + var svg = selection.append('svg') + .attr("id", "chart_svg") + .attr('width', width() + margin.left + margin.right) + .attr('height', height + margin.top + margin.bottom) + .append('g') + .attr('transform', 'translate(' + width() / 2 + ',' + height / 2 + ')'); + // =========================================================================================== + + // =========================================================================================== + // g elements to keep elements within svg modular + svg.append('g').attr('class', 'slices'); + svg.append('g').attr('class', 'labelName'); + svg.append('g').attr('class', 'lines'); + // =========================================================================================== + + // =========================================================================================== + // add and colour the donut slices + var path = svg.select('.slices') + .selectAll('path') + .data(pie) + .enter().append('path') + .attr('fill', function(d) { return colour(d.data[category]); }) + .attr('d', arc); + // =========================================================================================== + + // =========================================================================================== + // add text labels + var occupedLabel = []; + var label = svg.select('.labelName').selectAll('text') + .data(pie) + .enter().append('text') + .attr('dy', '.35em') + .html(updateLabelText) + .attr('transform', labelTransform) + .style('text-anchor', function(d) { + // if slice centre is on the left, anchor text to start, otherwise anchor to end + return (midAngle(d)) < Math.PI ? 'start' : 'end'; + }); + // =========================================================================================== + + // =========================================================================================== + // add lines connecting labels to slice. A polyline creates straight lines connecting several points + var occupedPoint = []; + var polyline = svg.select('.lines') + .selectAll('polyline') + .data(pie) + .enter().append('polyline') + .attr('points', calculatePoints); + // =========================================================================================== + + // =========================================================================================== + // add tooltip to mouse events on slices and labels + d3.selectAll('.labelName text, .slices path').call(toolTip); + // =========================================================================================== + + // =========================================================================================== + // FUNCTION TO UPDATE CHART + updateData = function() { + + var updatePath = d3.select('.slices').selectAll('path'); + var updateLines = d3.select('.lines').selectAll('polyline'); + var updateLabels = d3.select('.labelName').selectAll('text'); + + var data0 = path.data(), // store the current data before updating to the new + data1 = pie(data); + + // update data attached to the slices, labels, and polylines. the key function assigns the data to + // the correct element, rather than in order of how the data appears. This means that if a category + // already exists in the chart, it will have its data updated rather than removed and re-added. + updatePath = updatePath.data(data1, key); + updateLines = updateLines.data(data1, key); + updateLabels = updateLabels.data(data1, key); + + // adds new slices/lines/labels + updatePath.enter().append('path') + .each(function(d, i) { this._current = findNeighborArc(i, data0, data1, key) || d; }) + .attr('fill', function(d) { return colour(d.data[category]); }) + .attr('d', arc); + + updateLines.enter().append('polyline') + .each(function(d, i) { this._current = findNeighborArc(i, data0, data1, key) || d; }) + .attr('points', calculatePoints); + + updateLabels.enter().append('text') + .each(function(d, i) { this._current = findNeighborArc(i, data0, data1, key) || d; }) + .html(updateLabelText) + .attr('transform', labelTransform) + .style('text-anchor', function(d) { return (midAngle(d)) < Math.PI ? 'start' : 'end'; }); + + // removes slices/labels/lines that are not in the current dataset + updatePath.exit() + .transition() + .duration(transTime) + .attrTween("d", arcTween) + .remove(); + + updateLines.exit() + .transition() + .duration(transTime) + .attrTween("points", pointTween) + .remove(); + + updateLabels.exit() + .remove(); + + // animates the transition from old angle to new angle for slices/lines/labels + updatePath.transition().duration(transTime) + .attrTween('d', arcTween); + + updateLines.transition().duration(transTime) + .attrTween('points', pointTween); + + updateLabels.transition().duration(transTime) + .attrTween('transform', labelTween) + .styleTween('text-anchor', labelStyleTween); + + updateLabels.html(updateLabelText); // update the label text + + // add tooltip to mouse events on slices and labels + d3.selectAll('.labelName text, .slices path').call(toolTip); + + }; + // =========================================================================================== + // Functions + // calculates the angle for the middle of a slice + function midAngle(d) { return d.startAngle + (d.endAngle - d.startAngle) / 2}; + + // function that creates and adds the tool tip to a selected element + function toolTip(selection) { + + // add tooltip (svg circle element) when mouse enters label or slice + selection.on('mouseenter', function (data) { + + svg.append('rect') + .attr('transform', "translate(-320, 230)") + .attr('class', 'toolRect') + .attr("width", 190) + .attr("height", 60) + .style('fill', colour(data.data[category])) // colour based on category mouse is over + .style('fill-opacity', 0.35); + + svg.append('text') + .attr('transform', "translate(-310, 255)") + .attr('class', 'toolRect') + .html(toolTipHTML(data)) // add text to the rect + .style('font-size', '.9em'); // centres text in tooltip + }); + + // remove the tooltip when mouse leaves the slice/label + selection.on('mouseout', function () { + d3.selectAll('.toolRect').remove(); + }); + } + + // function to create the HTML string for the tool tip. Loops through each key in data object + // and returns the html string key: value + function toolTipHTML(data) { + + var tip = '', + i = 0; + + for (var key in data.data) { + + // if value is a number, format it as a float + var value = (!isNaN(data.data[key])) ? parseFloat(data.data[key]) : data.data[key]; + qnt = (title == "Count" ? "Count" : qnt); + + // leave off 'dy' attr for first tspan so the 'dy' attr on text element works. The 'dy' attr on + // tspan effectively imitates a line break. + if (i === 0) tip += '
+
+{% trans "Remove Chart" %}
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/haitidata/templates/charts_app/chart_detail.html b/haitidata/templates/charts_app/chart_detail.html
new file mode 100644
index 0000000..bf72025
--- /dev/null
+++ b/haitidata/templates/charts_app/chart_detail.html
@@ -0,0 +1,368 @@
+{% extends "charts_app/chart_base.html" %}
+{% load i18n %}
+{% load dialogos_tags %}
+{% load agon_ratings_tags %}
+{% load bootstrap_tags %}
+{% load url from future %}
+{% load base_tags %}
+{% load guardian_tags %}
+
+{% block page-title %}
+ {% trans "Explore Charts" %}
+
+
++ {% blocktrans with object.title as object_title %} + Are you sure you want to remove {{ object_title }} chart? + {% endblocktrans %} +
+ +
+
+
+
+
+ {% trans "Charts" %}
+
+
+{% endblock %}
+
+{% block subheader %}
+
+
+
+
+
+
+ {{ object.title }}
++ +
+ {% block social_links %} + {% if SOCIAL_BUTTONS %} + {% include "social_links.html" %} + {% endif %} + {% endblock %} +
+
+
+
+
+
+
+
+Abstract
+{{ object.abstract }}
+
+ {% include "_actions.html" %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% trans "Rate this document" %}
+ + + +{% trans 'Average Rating' %}
+ + ({{num_votes}}) + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{% endblock %}
diff --git a/haitidata/templates/charts_app/chart_list.html b/haitidata/templates/charts_app/chart_list.html
new file mode 100644
index 0000000..4003d26
--- /dev/null
+++ b/haitidata/templates/charts_app/chart_list.html
@@ -0,0 +1,65 @@
+{% extends "charts_app/chart_base.html" %}
+{% load i18n %}
+{% load staticfiles %}
+{% load url from future %}
+
+{% block title %}{{ block.super }} {% trans "Charts" %}{% endblock %}
+{% block page-title %}
+ {% trans "Explore Charts" %}
+ {% if user.is_authenticated %}
+
+ {% endif %}
+{% endblock %}
+
+{% block body_class %}charts
+
+{% endblock %}
+
+{% block body %}
+
+ {% with include_type_filter='true' %}
+ {% with facet_type='charts' %}
+ {% with header='Chart Type' %}
+ {% with filter='doc_type__in' %}
+ {% include "search/_search_content.html" %}
+
+ {% endwith %}
+ {% endwith %}
+ {% endwith %}
+ {% endwith %}
+
+
+
+
+
+ {% include "_bulk_permissions_form.html" %}
+
+
+
+{% endblock %}
+
+{% block extra_script %}
+ {% if GEONODE_SECURITY_ENABLED %}
+ {% include "_permissions_form_js.html" %}
+ {% endif %}
+
+ {% with include_spatial='true' %}
+ {% endwith %}
+{% endblock extra_script %}
diff --git a/haitidata/templates/charts_app/chart_update_form.html b/haitidata/templates/charts_app/chart_update_form.html
new file mode 100644
index 0000000..f30fd8e
--- /dev/null
+++ b/haitidata/templates/charts_app/chart_update_form.html
@@ -0,0 +1,356 @@
+{% extends "charts_app/chart_base.html" %}
+{% load i18n %}
+{% load dialogos_tags %}
+{% load agon_ratings_tags %}
+{% load bootstrap_tags %}
+{% load url from future %}
+{% load base_tags %}
+{% load guardian_tags %}
+
+{% block page-title %}
+ {% trans "Explore Charts" %}
+ CHARTS
+-
+ {% for chart in object_list %}
+
- {{ chart.title }} +
- {{ chart.layer }} - {{ chart.category }} - {{ chart.quantity }} +
- {{ chart.type }} - {{ chart.agg_type }} +
- {{ chart.abstract }} +
- No Charts yet! + {% endfor %} +
+ {% empty %} +
+
+
+
+
+ {% trans "Charts" %}
+
+
+{% endblock %}
+
+{% block subheader %}
+
+
+
+
+
+
+ {{ object.title }}
++ +
+ {% block social_links %} + {% if SOCIAL_BUTTONS %} + {% include "social_links.html" %} + {% endif %} + {% endblock %} +
+
+
+
+
+
+
+
+Abstract
+{{ object.abstract }}
+
+ {% include "_actions.html" %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% trans "Rate this document" %}
+ + + +{% trans 'Average Rating' %}
+ + ({{num_votes}}) + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{% endblock %}
diff --git a/haitidata/templates/geonode-client/layer_map.html b/haitidata/templates/geonode-client/layer_map.html
index 2ba679b..6af8bc2 100644
--- a/haitidata/templates/geonode-client/layer_map.html
+++ b/haitidata/templates/geonode-client/layer_map.html
@@ -20,8 +20,8 @@
{% else %}
printService: "",
{% endif %}
- /* The URL to a REST map configuration service. This service
- * provides listing and, with an authenticated user, saving of
+ /* The URL to a REST map configuration service. This service
+ * provides listing and, with an authenticated user, saving of
* maps on the server for sharing and editing.
*/
rest: "{% url "maps_browse" %}",
diff --git a/haitidata/templates/layers-paolo/layer_detail.html b/haitidata/templates/layers-paolo/layer_detail.html
new file mode 100644
index 0000000..17d24a8
--- /dev/null
+++ b/haitidata/templates/layers-paolo/layer_detail.html
@@ -0,0 +1,708 @@
+{% extends "layers/layer_base.html" %}
+{% load i18n %}
+{% load dialogos_tags %}
+{% load agon_ratings_tags %}
+{% load bootstrap_tags %}
+{% load pagination_tags %}
+{% load url from future %}
+{% load base_tags %}
+{% load guardian_tags %}
+
+{% block title %}{{ block.super }} {% trans "Layers" %} | {{ resource.title|default:resource.typename }}{% endblock %}
+{% block page-title %}
+ {% trans "Explore Layers" %}
+
+{% endblock %}
+
+{% block head %}
+
+ {% if TWITTER_CARD %}
+ {% include "base/_resourcebase_twittercard.html" %}
+ {% endif %}
+
+ {% if OPENGRAPH_ENABLED %}
+ {% include "base/_resourcebase_opengraph.html" %}
+ {% endif %}
+
+ {% if preview == 'geoext' %}
+ {% include "layers/layer_geoext_map.html" %}
+ {% elif preview == 'OL3' %}
+ {% include "layers/layer_ol3_map.html" %}
+ {% elif preview == 'react' %}
+ {% include 'geonode-client/layer_map.html' %}
+ {% else %}
+ {% include "layers/layer_leaflet_map.html" %}
+ {% endif %}
+{{ block.super }}
+{% endblock %}
+
+
+{% block body_class %}layers{% endblock %}
+
+{% block subheader %}
+
+
+
+
+
+
+ {{ resource.title|default:resource.typename }}
++ {{ resource.service_type }} + {% if resource.category %} + {% trans "in" %} {{ resource.category }} | + {% endif %} + {% if resource.date %} + {% if resource.date_type == 'creation' %} {% trans "Created on" %} {{ resource.date }} + {% elif resource.date_type == 'publication' %} {% trans "Published on" %} {{ resource.date }} + {% else %} {% trans "Updated on" %} {{ resource.date }} + {% endif %} + {% endif %} +
+ {% block social_links %} + {% if SOCIAL_BUTTONS %} + {% include "social_links.html" %} + {% endif %} + {% endblock %} +
+
+
+
+
+
+{% endblock %}
+
+{% block body_outer %}
+
-
+
+{% endblock header %}
+
- {% block middle %}
+{% block middle %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% include "_actions.html" %}
+
+
+
+
+
+ {% include "base/resourcebase_info_panel.html" %}
+
+
+ {% if resource.is_mosaic %}
+
+
+ {% endif %}
+
+
+ {% if resource.is_mosaic %}
+
+
+
+ {% endif %}
+ {% if resource.attribute_set.all %}
+
+
+
+ {% endif %}
+
+
+
+ {% with resource as obj %}
+ {% include "_comments.html" %}
+ {% endwith %}
+
+
+ {% if GEOGIG_ENABLED and resource.link_set.geogig %}
+ {% with "_geogig_layer_detail.html" as geogig_template %}
+
+ {% with resource as obj %}
+ {% include geogig_template %}
+ {% endwith %}
+
+ {% endwith %}
+ {% endif %}
+
+
+
+ {% if request.user.is_authenticated %}
+
+
+
+
+
+
+
+
+
+
+
+ {% paginate %}
+ | {% trans "Bounding Box" %} (minX,minY,maxX,maxY) | +{% trans "Time" %} | + +{% trans "Actions" %} | +
|---|---|---|
| + | {% if feature.properties.time %}{{ feature.properties.time }}{% endif %} | + +
+ 
+ 
+
+ |
+
| {% trans "Dimension" %} | +{% trans "Enabled" %} | +{% trans "Regex" %} | +
|---|---|---|
| {% trans "TIME" %} | +{% if resource.has_time %}{% trans "True" %}{% else %}{% trans "False" %}{% endif %} | +{% if resource.time_regex %}{{ resource.time_regex }}{% else %} {% endif %} | +
| {% trans "Attribute Name" %} | +{% trans "Label" %} | +{% trans "Description" %} | + {% if wps_enabled %} +{% trans "Range" %} | +{% trans "Average" %} | +{% trans "Median" %} | +{% trans "Standard Deviation" %} | + {% endif %} +|
|---|---|---|---|---|---|---|---|
| {{ attribute }} | +{{ attribute.attribute_label|default:"" }} | +{{ attribute.description|default:"" }} | + {% if wps_enabled %} + {% if attribute.unique_values == "NA" %} +{{ attribute.unique_values }} | + {% else %} ++ + | + {% endif %} +{{ attribute.average|floatformat:"2" }} | +{{ attribute.median|floatformat:"2" }} | +{{ attribute.stddev|floatformat:"2" }} | + {% endif %} +
{% trans "Rate this layer" %}
+ {% user_rating request.user resource "layer" as user_layer_rating %} + + {% endif %} +{% trans 'Average Rating' %}
+ {% overall_rating resource "layer" as layer_rating %} + {% num_ratings resource as num_votes %} + ({{num_votes}}) +
+
+
+{% endblock %}
+
+{% block extra_script %}
+
+ {% if GEOGIG_ENABLED and resource.link_set.geogig %}
+ {% with "_geogig_scripts.html" as geogig_scripts_template %}
+ {% include geogig_scripts_template %}
+ {% endwith %}
+ {% endif %}
+
+ {% if request.user.is_authenticated %}
+ {% user_rating_js request.user resource "layer" %}
+ {% else %}
+ {% overall_rating resource 'layer' as the_layer_rating %}
+ {% endif %}
+ {% include 'rating.html' %}
+ {% include 'request_download.html' %}
+
+
+ {% if GEONODE_SECURITY_ENABLED %}
+ {% include "_permissions_form_js.html" %}
+ {% endif %}
+{% endblock extra_script %}
diff --git a/haitidata/templates/layers-paolo/layer_detail.save.html b/haitidata/templates/layers-paolo/layer_detail.save.html
new file mode 100644
index 0000000..9662e80
--- /dev/null
+++ b/haitidata/templates/layers-paolo/layer_detail.save.html
@@ -0,0 +1,601 @@
+{% extends "layers/layer_base.html" %}
+{% load i18n %}
+{% load dialogos_tags %}
+{% load agon_ratings_tags %}
+{% load bootstrap_tags %}
+{% load pagination_tags %}
+{% load url from future %}
+{% load base_tags %}
+{% load guardian_tags %}
+
+{% block title %}{{ block.super }} {% trans "Layers" %} | {{ resource.title|default:resource.typename }}{% endblock %}
+{% block page-title %}{% trans "Explore Layers" %}{% endblock %}
+
+{% block head %}
+
+ {% if TWITTER_CARD %}
+ {% include "base/_resourcebase_twittercard.html" %}
+ {% endif %}
+
+ {% if OPENGRAPH_ENABLED %}
+ {% include "base/_resourcebase_opengraph.html" %}
+ {% endif %}
+
+ {% if preview == 'geoext' %}
+ {% include "layers/layer_geoext_map.html" %}
+ {% elif preview == 'OL3' %}
+ {% include "layers/layer_ol3_map.html" %}
+ {% elif preview == 'react' %}
+ {% include 'geonode-client/layer_map.html' %}
+ {% else %}
+ {% include "layers/layer_leaflet_map.html" %}
+ {% endif %}
+{{ block.super }}
+{% endblock %}
+
+
+{% block body_class %}layers{% endblock %}
+
+{% block subheader %}
+
+
+
+
+
+
+ + + A Layer Graph + +
+
+
+
+ 
+ Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod.
+
+
+ Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod.
+
+
+
+
+ + + Another Layer Graph + +
+
+
+
+ Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+
+
+
+
+
+
+ + + Create graph + +
+
+
+
+
+
+ -
+ {% if resource.storeType != "remoteStore" %}
+
- + {% if links or links_download %} + + {% else %} + {% if request.user.is_authenticated %} + + {% endif %} + {% endif %} + + {% endif %} + + + {% if GEOSERVER_BASE_URL %} + {% get_obj_perms request.user for resource.layer as "layer_perms" %} + {% endif %} + +
- + + + + + + {% if "change_resourcebase_metadata" in perms_list or "change_resourcebase" in perms_list or "delete_resourcebase" in perms_list or "change_layer_style" in layer_perms %} +
- + + + + {% endif %} + +
- + + + + + + {% if resource.get_legend %} +
-
+
{%trans "Legend" %}
+{{ style.sld_title }}
+ {% if resource.get_legend.link_type == 'image' %} + {% if request.user.is_authenticated and 'access_token' in request.session %} +
+ {% else %} +
+ {% endif %} + {% else %} + + {% endif %} +
+ {% endif %}
+ -
+
{% trans "Maps using this layer" %}
+ {% if resource.maps %} +{% trans "List of maps using this layer:" %}
+ {% endif %} +-
+ {% for maplayer in resource.maps %}
+
- {{ maplayer.map.title }} + {% empty %} +
- {% trans "This layer is not currently used in any maps." %} + {% endfor %} +
+ -
+
{% trans "Create a map using this layer" %}
+{% trans "Click the button below to generate a new map based on this layer." %}
+ {% trans "Create a Map" %} +
+
+ {% if documents.count > 0 %}
+ -
+
{% trans "Documents related to this layer" %}
+{% trans "List of documents related to this layer:" %}
+-
+ {% for document in documents %}
+
- {{ document.title }} + {% endfor %} +
+ {% endif %}
+
+ {% if user.is_authenticated %}
+ -
+
{% trans "Styles" %}
+{% trans "The following styles are associated with this layer. Choose a style to view it in the preview map." %}
+-
+ {% for style in resource.styles.all %}
+
- + {% if resource.default_style == style %} + + (default style) + {% else %} + + {% endif %} + {{ style.sld_title }} + + {% empty %} +
- {% trans "No styles associated with this layer" %} + {% endfor %} +
+ {% endif %}
+
+ {% if GEONODE_SECURITY_ENABLED %}
+ {% if "change_resourcebase_permissions" in perms_list %}
+ -
+
{% trans "Permissions" %}
+{% trans "Click the button below to change the permissions of this layer." %}
+ +
+ {% endif %}
+ {% endif %}
+
+ {% if resource.storeType == "remoteStore" %}
+ -
+
{% trans "External service layer" %}
+{% trans "Source" %}: {{ resource.service.title }}+{% trans "Type" %}: {{ resource.service.type }}+
+ {% endif %}
+
+ {% include "base/_resourcebase_contact_snippet.html" %}
+
+
+
+
+
+
+ {{ resource.title|default:resource.typename }}
++ {{ resource.service_type }} + {% if resource.category %} + {% trans "in" %} {{ resource.category }} | + {% endif %} + {% if resource.date %} + {% if resource.date_type == 'creation' %} {% trans "Created on" %} {{ resource.date }} + {% elif resource.date_type == 'publication' %} {% trans "Published on" %} {{ resource.date }} + {% else %} {% trans "Updated on" %} {{ resource.date }} + {% endif %} + {% endif %} +
+ {% block social_links %} + {% if SOCIAL_BUTTONS %} + {% include "social_links.html" %} + {% endif %} + {% endblock %} +
+
+{% endblock %}
+
+{% block extra_script %}
+
+ {% if GEOGIG_ENABLED and resource.link_set.geogig %}
+ {% with "_geogig_scripts.html" as geogig_scripts_template %}
+ {% include geogig_scripts_template %}
+ {% endwith %}
+ {% endif %}
+
+ {% if request.user.is_authenticated %}
+ {% user_rating_js request.user resource "layer" %}
+ {% else %}
+ {% overall_rating resource 'layer' as the_layer_rating %}
+ {% endif %}
+ {% include 'rating.html' %}
+ {% include 'request_download.html' %}
+
+
+ {% if GEONODE_SECURITY_ENABLED %}
+ {% include "_permissions_form_js.html" %}
+ {% endif %}
+{% endblock extra_script %}
diff --git a/haitidata/templates/layers/layer_detail.html b/haitidata/templates/layers/layer_detail.html
index 2dff65a..88bbe5b 100644
--- a/haitidata/templates/layers/layer_detail.html
+++ b/haitidata/templates/layers/layer_detail.html
@@ -9,7 +9,17 @@
{% load guardian_tags %}
{% block title %}{{ block.super }} {% trans "Layers" %} | {{ resource.title|default:resource.typename }}{% endblock %}
-{% block page-title %}{% trans "Explore Layers" %}{% endblock %}
+{% block page-title %}
+ {% trans "Explore Layers" %}
+
+{% endblock %}
{% block head %}
@@ -38,16 +48,16 @@
{% block subheader %}
+
+
+
+
+
+
+
+
+ {% include "_actions.html" %}
+
+
+
+
+
+ {% include "base/resourcebase_info_panel.html" %}
+
+
+ {% if resource.is_mosaic %}
+
+
+ {% endif %}
+
+
+ {% if resource.is_mosaic %}
+
+
+
+ {% endif %}
+ {% if resource.attribute_set.all %}
+
+
+
+ {% endif %}
+
+
+
+ {% with resource as obj %}
+ {% include "_comments.html" %}
+ {% endwith %}
+
+
+ {% if GEOGIG_ENABLED and resource.link_set.geogig %}
+ {% with "_geogig_layer_detail.html" as geogig_template %}
+
+ {% with resource as obj %}
+ {% include geogig_template %}
+ {% endwith %}
+
+ {% endwith %}
+ {% endif %}
+
+
+
+ {% if request.user.is_authenticated %}
+
+
+
+
+
+
+
+
+
+
+
+ {% paginate %}
+ | {% trans "Bounding Box" %} (minX,minY,maxX,maxY) | +{% trans "Time" %} | + +{% trans "Actions" %} | +
|---|---|---|
| + | {% if feature.properties.time %}{{ feature.properties.time }}{% endif %} | + +
+
+
+
+ |
+
| {% trans "Dimension" %} | +{% trans "Enabled" %} | +{% trans "Regex" %} | +
|---|---|---|
| {% trans "TIME" %} | +{% if resource.has_time %}{% trans "True" %}{% else %}{% trans "False" %}{% endif %} | +{% if resource.time_regex %}{{ resource.time_regex }}{% else %} {% endif %} | +
| {% trans "Attribute Name" %} | +{% trans "Label" %} | +{% trans "Description" %} | + {% if wps_enabled %} +{% trans "Range" %} | +{% trans "Average" %} | +{% trans "Median" %} | +{% trans "Standard Deviation" %} | + {% endif %} +|
|---|---|---|---|---|---|---|---|
| {{ attribute }} | +{{ attribute.attribute_label|default:"" }} | +{{ attribute.description|default:"" }} | + {% if wps_enabled %} + {% if attribute.unique_values == "NA" %} +{{ attribute.unique_values }} | + {% else %} ++ + | + {% endif %} +{{ attribute.average|floatformat:"2" }} | +{{ attribute.median|floatformat:"2" }} | +{{ attribute.stddev|floatformat:"2" }} | + {% endif %} +
{% trans "Rate this layer" %}
+ {% user_rating request.user resource "layer" as user_layer_rating %} + + {% endif %} +{% trans 'Average Rating' %}
+ {% overall_rating resource "layer" as layer_rating %} + {% num_ratings resource as num_votes %} + ({{num_votes}}) +
+
+
+-
+ {% if resource.storeType != "remoteStore" %}
+
- + {% if links or links_download %} + + {% else %} + {% if request.user.is_authenticated %} + + {% endif %} + {% endif %} + + {% endif %} + + + {% if GEOSERVER_BASE_URL %} + {% get_obj_perms request.user for resource.layer as "layer_perms" %} + {% endif %} + +
- + + + + + + {% if "change_resourcebase_metadata" in perms_list or "change_resourcebase" in perms_list or "delete_resourcebase" in perms_list or "change_layer_style" in layer_perms %} +
- + + + + {% endif %} + +
- + + + + + + {% if resource.get_legend %} +
-
+
{%trans "Legend" %}
+{{ style.sld_title }}
+ {% if resource.get_legend.link_type == 'image' %} + {% if request.user.is_authenticated and 'access_token' in request.session %} +
+ {% else %} +
+ {% endif %} + {% else %} + + {% endif %} +
+ {% endif %}
+ -
+
{% trans "Maps using this layer" %}
+ {% if resource.maps %} +{% trans "List of maps using this layer:" %}
+ {% endif %} +-
+ {% for maplayer in resource.maps %}
+
- {{ maplayer.map.title }} + {% empty %} +
- {% trans "This layer is not currently used in any maps." %} + {% endfor %} +
+ -
+
{% trans "Create a map using this layer" %}
+{% trans "Click the button below to generate a new map based on this layer." %}
+ {% trans "Create a Map" %} +
+
+ {% if documents.count > 0 %}
+ -
+
{% trans "Documents related to this layer" %}
+{% trans "List of documents related to this layer:" %}
+-
+ {% for document in documents %}
+
- {{ document.title }} + {% endfor %} +
+ {% endif %}
+
+ {% if user.is_authenticated %}
+ -
+
{% trans "Styles" %}
+{% trans "The following styles are associated with this layer. Choose a style to view it in the preview map." %}
+-
+ {% for style in resource.styles.all %}
+
- + {% if resource.default_style == style %} + + (default style) + {% else %} + + {% endif %} + {{ style.sld_title }} + + {% empty %} +
- {% trans "No styles associated with this layer" %} + {% endfor %} +
+ {% endif %}
+
+ {% if GEONODE_SECURITY_ENABLED %}
+ {% if "change_resourcebase_permissions" in perms_list %}
+ -
+
{% trans "Permissions" %}
+{% trans "Click the button below to change the permissions of this layer." %}
+ +
+ {% endif %}
+ {% endif %}
+
+ {% if resource.storeType == "remoteStore" %}
+ -
+
{% trans "External service layer" %}
+{% trans "Source" %}: {{ resource.service.title }}+{% trans "Type" %}: {{ resource.service.type }}+
+ {% endif %}
+
+ {% include "base/_resourcebase_contact_snippet.html" %}
+
-
-
- {% endblock header %}
-
+
+
+ {% trans "About" %}
+
+
+ {% block extra_tab %}
+ {% endblock %}
+ {% endblock %}
+
+
+
+
-
{% endblock %}
{% block body_outer %}
+
-
+ {{ resource.title|default:resource.typename }}
-+
+
+
+
+
- {{ resource.title|default:resource.typename }}
+{{ resource.service_type }} {% if resource.category %} - {% trans "in" %} {{ resource.category }} | + {% trans "in" %} {{ resource.category }} | {% endif %} - {% if resource.date %} + {% if resource.date %} {% if resource.date_type == 'creation' %} {% trans "Created on" %} {{ resource.date }} {% elif resource.date_type == 'publication' %} {% trans "Published on" %} {{ resource.date }} {% else %} {% trans "Updated on" %} {{ resource.date }} @@ -59,13 +69,14 @@ {% include "social_links.html" %} {% endif %} {% endblock %} -
@@ -227,11 +238,6 @@
{% endif %}
-
-
-
{% with resource as obj %}
{% include "_comments.html" %}
@@ -271,8 +277,8 @@
{% if resource.storeType != "remoteStore" %}
{% if links or links_download %}
-
- {% else %}
+
+ {% else %}
{% if request.user.is_authenticated %}
{% endif %}
@@ -482,6 +488,186 @@
{% trans "Create a Map" %}
+
+
+
+ {% if "download_resourcebase" in perms_list %}
+
+
+ {% endif %}
+
- {% if user.is_authenticated %}
- {% trans "Maps" %}
-
- {% else %}
- {% trans "Maps" %}
- {% endif %}
-
-
- {% trans "About" %}
-
-
- {% block extra_tab %}
- {% endblock %}
- {% endblock %}
-
-
-
- No charts available at this time
- Create Chart -{% trans "Charts using this layer" %}
+ {% if resource.maps %} +{% trans "List of charts with this layer:" %}
+ {% endif %} +-
+ {% for chart in resource.chart_set.all %}
+
- {{ chart.get_type_display }}, Category field = {{chart.category}}, Quantity field = {{chart.quantity}} + {% empty %} +
No charts available at this time
+ {% endfor %}
+
{% trans "Create a chart using this layer" %}
+{% trans "Click the button below to generate a new chart based on this layer, choosing a quantity and a category field." %}
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{% if documents.count > 0 %}
+
+
+ {% trans "Documents related to this layer" %}
@@ -547,6 +733,7 @@ {% endblock %} {% block extra_script %} +{{ block.super }} {% if GEOGIG_ENABLED and resource.link_set.geogig %} {% with "_geogig_scripts.html" as geogig_scripts_template %} diff --git a/haitidata/templates/site_base.html b/haitidata/templates/site_base.html index ace650b..982bdbb 100644 --- a/haitidata/templates/site_base.html +++ b/haitidata/templates/site_base.html @@ -36,6 +36,7 @@{% block page-title %}{% endblock %}
@@ -132,12 +133,12 @@ {% include "_messages.html" %} {% block body_outer %}
-
{% endblock %}
- {% block body %}{% endblock %}
-
-
- {% block sidebar %}{% endblock %}
-
+
+ {% block body %}{% endblock %}
+
+
+ {% block sidebar %}{% endblock %}
+
Field choice
+Choose category field
+ + + \ No newline at end of file diff --git a/wfs_harvest/tests.py b/wfs_harvest/tests.py new file mode 100644 index 0000000..fb01967 --- /dev/null +++ b/wfs_harvest/tests.py @@ -0,0 +1,20 @@ +import urllib + +from django.test import SimpleTestCase +from django.core.urlresolvers import reverse + +from . import views + +# Create your tests here. +class GetFieldsView(SimpleTestCase): + def test_non_existing_lyr(self): + # url = reverse(views.get_fields) + enc_lyrname = urllib.urlencode({'lyrname': 'idontexist'}) + # complete_url = url + '?' + enc_lyrname + # self.client.get('/table') + # self.client.get(complete_url) + self.assertTrue(False) + + def test_non_existing_field(self): + # self.client.get(reverse('wfs_harvest:get_fields')) + self.assertTrue(False) \ No newline at end of file diff --git a/wfs_harvest/urls.py b/wfs_harvest/urls.py new file mode 100644 index 0000000..c29d41e --- /dev/null +++ b/wfs_harvest/urls.py @@ -0,0 +1,8 @@ +from django.conf.urls import url + +from . import views + +urlpatterns = [ + url(r'^$', views.get_wfs_csv), + url(r'^fields$', views.get_fields) + ] diff --git a/wfs_harvest/utils.py b/wfs_harvest/utils.py new file mode 100644 index 0000000..c599214 --- /dev/null +++ b/wfs_harvest/utils.py @@ -0,0 +1,56 @@ +import urllib +import xml.etree.ElementTree as ET + +from geonode.layers.models import Layer + + +def get_fields(layer_id): + layer = Layer.objects.get(pk=layer_id) + lyrname = layer.typename + params = urllib.urlencode({ + 'service':'WFS', + 'version':'1.1.0', + 'request':'DescribeFeatureType', + 'typename':lyrname + }) + + wfs_request = urllib.urlopen('http://localhost/geoserver/ows?%s' + % params) + content = wfs_request.read() + + root = ET.fromstring(content) + namespace = root.tag.split('}')[0] + '}' + xpath = ('./{0}complexType/{0}complexContent/' + '{0}extension/{0}sequence/{0}element').format(namespace) + numeric_types = ['byte', 'decimal', 'int', 'integer', 'long', 'short', + 'boolean', 'double', 'float'] + fields = {} + for element in root.findall(xpath): + type = element.attrib['type'] + if not type.startswith('gml:'): + fields[element.attrib['name']] = type[4:] + + fieldnames = fields.keys() + num_fieldnames = [k for k, v in fields.iteritems() if v in numeric_types] + + return fieldnames, num_fieldnames + + +def get_featno(layer_id): + lyr = Layer.objects.get(pk=layer_id) + wfs_baseurl = lyr.link_set.get(link_type='OGC:WFS').url + + params = urllib.urlencode({ + 'service': 'WFS', + 'version': '1.1.0', + 'request': 'GetFeature', + 'typename': lyr.typename, + 'resultType': 'hits' + }) + + wfs_count_request = urllib.urlopen(wfs_baseurl + '?%s' % params) + content = wfs_count_request.read() + + root = ET.fromstring(content) + + return int(root.attrib['numberOfFeatures']) diff --git a/wfs_harvest/views.py b/wfs_harvest/views.py new file mode 100644 index 0000000..6c4330e --- /dev/null +++ b/wfs_harvest/views.py @@ -0,0 +1,80 @@ +import urllib +import xml.etree.ElementTree as ET + +from django.http import HttpResponse +from django.shortcuts import render +from django.conf import settings + +from geonode.layers.models import Layer + +from utils import get_featno + + +def get_fields(request): + lyrname = request.GET['lyrname'] + params = urllib.urlencode({ + 'service':'WFS', + 'version':'1.1.0', + 'request':'DescribeFeatureType', + 'typename':lyrname + }) + + wfs_request = urllib.urlopen('http://localhost/geoserver/ows?%s' + % params) + content = wfs_request.read() + + root = ET.fromstring(content) + namespace = root.tag.split('}')[0] + '}' + xpath = ('./{0}complexType/{0}complexContent/' + '{0}extension/{0}sequence/{0}element').format(namespace) + numeric_types = ['byte', 'decimal', 'int', 'integer', 'long', 'short', + 'boolean', 'double', 'float'] + fields = {} + for element in root.findall(xpath): + type = element.attrib['type'] + if not type.startswith('gml:'): + fields[element.attrib['name']] = type[4:] + + fieldnames = fields.keys() + num_fieldnames = [k for k, v in fields.iteritems() if v in numeric_types] + + context = { + 'lyrname': lyrname, + 'fieldnames': fieldnames, + 'num_fieldnames': num_fieldnames + } + return render(request, 'wfs_harvest/field_choice.html', context) + + +def get_wfs_csv(request): + qdict = request.GET + typename = qdict['lyrname'] + category_field = qdict['category'] + quantity_field = qdict['quantity'] + + lyr = Layer.objects.get(typename=typename) + featno = get_featno(lyr.id) + if featno > settings.MAX_CSV_RECORDS: + response = HttpResponse('{0} has too many records; csv download' + ' is not available for very large ' + 'datasets'.format(lyr.title)) + response.status_code = 413 + response.reason_phrase = 'REQUEST ENTITY TOO LARGE' + return response + + params = urllib.urlencode({ + 'service':'WFS', + 'version':'1.1.0', + 'request':'GetFeature', + 'typename':typename, + 'propertyName':category_field + ',' + quantity_field, + 'outputFormat':'csv', + 'maxFeatures': str(settings.MAX_CSV_RECORDS) + }) + + wfs_baseurl = lyr.link_set.get(link_type='OGC:WFS').url + wfs_request = urllib.urlopen(wfs_baseurl + '?%s' % params) + content = wfs_request.read() + response = HttpResponse(content, content_type='text/csv') + response['Content-Disposition'] = 'attachment; filename="myfile.csv"' + return response