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.

Sign up for GitHub

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

Support OSM project areas and user defined AOI's for reporting #110

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Support OSM project areas and user defined AOI's for reporting #110

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56e6c3d
Work in progress for issue 71 - support OSM project areas and user de…
timlinux Apr 9, 2017
6ed0d9b
Merge remote-tracking branch 'upstream/develop' into issue-71
timlinux Apr 10, 2017
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
35 changes: 32 additions & 3 deletions reporter/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,16 @@ <h1>OpenStreetMap Reporter</h1>
<h2>Filters</h2>
<hr/>
</div>
<div class="span8">
<h4>Area of Interest: </h4>
<select name='aoi_select' id='aoi_select'>
{% for tag_name in available_aois%}
<option {% if aoi_name == current_aoi_name %} selected {% endif %}>
{{ aoi_name }}
</option>
{% endfor %}
</select>
</div>
<div class="span4">
<h4>Feature Type : </h4>
<select name='feature_select' id='feature_select'>
Expand All @@ -74,17 +84,17 @@ <h4>Feature Type : </h4>
{% endfor %}
</select>
</div>
<div class="span3">
<div class="span4">
<div class="date-box">
<h4>Date From : </h4><input type='text' data-language='en' id='date-from'/>
</div>
</div>
<div class="span3">
<div class="span4">
<div class="date-box">
<h4>Date To : </h4><input type='text' class='datepicker-here' data-language='en' id='date-to'/>
</div>
</div>
<div class="span2">
<div class="span4">
<button type="button" class="btn btn-default" id="refresh-with-date" style="margin-top:17px; width: 100%">Refresh</button>
</div>
</div>
Expand Down Expand Up @@ -212,7 +222,26 @@ <h2 id="report-heading">{{ current_tag_name|capitalize|replace('_', ' ')}} Contr
clickable: false
}).addTo(map);
window.bbox = map.getBounds().toBBoxString();

// Add AOI's to the map
polyLayer = L.geoJson(null, {filter: layerFilter, onEachFeature: addProjectToList}).addTo(map);
$.getJSON("https://s3.amazonaws.com/tm-projects-vt/hotprojects.geojson", function(data) {
polyLayer.addData(data);
});

});

//polyLayer will only include feature
function layerFilter(feature) {
if (feature.properties.name != "") return true
}
//for every HOT project area, add an entry to the select widget
function addProjectToList(feature, layer) {
projectName = feature.properties.name;
var projectsWidget = $("#aoi_select");
projectsWidget.append("<option value='" + feature.id + "'>" + projectName + "</option>");
}

$(function () {
{# Pie chart for all users #}
var myData = [
Expand Down