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

WIP - Clustering requests on the map. #3

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

WIP - Clustering requests on the map. #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf54fb1
initial cluster markers, needs more work on the interaction with the …
mick Oct 1, 2012
c065c2a
adjust zoom levels
mick Oct 1, 2012
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
5 changes: 2 additions & 3 deletions app/modules/boundary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function(app) {
model: Boundary.Model,
sync: function(method, collection, options){
collection.reset()
var url = "/assets/js/data/sf_neighborhoods.json"
var url = "/assets/js/data/chicago_boundaries.json"

if(method == "read"){
$.ajax(url, {data:options.data,
Expand All @@ -33,10 +33,9 @@ function(app) {
error:function(err,b,c) {
console.log(err,b,c);
}
}, "json");
});
}
}

});

// Return the module for AMD compliance.
Expand Down
13 changes: 12 additions & 1 deletion app/modules/city.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,18 @@ function(app) {
$.ajax(url, {data:options.data,
dataType:"json",
success:function(data) {
collection.add(data, {silent:true});

_.each(data, function(city){

if(city.boundary_file){
$.ajax("/assets/js/data/"+city.boundary_file, {data:{}, dataType:"json", success:function(ret){
var thecity = collection.where({"jurisdiction_id":city.jurisdiction_id});
thecity[0].set("boundaries", ret);
}})
}
collection.add(city, {silent:true});

});
collection.trigger("add");
},
error:function(err,b,c) {
Expand Down
163 changes: 139 additions & 24 deletions app/modules/map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,8 @@ function(app) {
var Map = app.module();


// Contour object
function Contour(a) {
this.pts = a || []; // an array of Point objects defining the contour
return this;
}


Contour.prototype.area = function() {
var PolygonArea = function(pts) {
var area=0;
var pts = this.pts;
var nPts = pts.length;
var j=nPts-1;
var p1; var p2;
Expand All @@ -33,8 +25,7 @@ function(app) {
return area;
};

Contour.prototype.centroid = function() {
var pts = this. pts;
var PolygonCentroid = function(pts) {
var nPts = pts.length;
var x=0; var y=0;
var f;
Expand All @@ -48,8 +39,8 @@ function(app) {
y+=(p1.y+p2.y)*f;
}

f=this.area()*6;
return {x: x/f,y:y/f};
f=PolygonArea(pts)*6;
return [x/f,y/f];
};


Expand Down Expand Up @@ -83,43 +74,126 @@ function(app) {
mapMoved:function(){
var latlng = this.map.getCenter();

var city = this.cities.endpointByLocation(latlng);
var city = this.currentCity = this.cities.endpointByLocation(latlng);

if(city){
this.cityBounds(city);
app.filters.addOrSet("jurisdiction_id", city.get("jurisdiction_id"));
app.trigger("city_changed", city);
}
},
zoomChanged:function(){
console.log("zoom",this.map.getZoom());
if(this.map.getZoom() > 10){
if(this.map.getZoom() > 13){
//close enough for requests.
console.log("requests")
this.clearCityBounds();
this.citiesGroup.clearLayers();
this.renderRequests();
}else if(this.map.getZoom() > 10){
//cluster markers.
console.log("neighborhood cluster-markers")
this.mapBoundaries.clearLayers();
this.citiesGroup.clearLayers();
this.srGroup.clearLayers();
if(this.currentCity)
this.changeBoundaries(this.currentCity);
}else if(this.map.getZoom() > 9){
//cluster markers.
console.log("city level cluster-markers")
this.mapBoundaries.clearLayers();
this.citiesGroup.clearLayers();
this.srGroup.clearLayers();
}else{
console.log("city name")
// just city names
this.clearCityBounds();
this.citiesGroup.clearLayers();
this.mapBoundaries.clearLayers();
this.changeCities();
this.srGroup.clearLayers();
}
},
cleanup: function() {
app.off(null, null, this);
},
changeBoundaries:function(){
this.mapBoundaries.clearLayers();
changeBoundaries:function(city){
if(this.map.getZoom() < 13)
return;
var boundaries = city.get("boundaries");
if(!boundaries)
return;
this.mapBoundaries.clearLayers();
this.mapBoundaries = new L.LayerGroup();
var self = this;
this.boundaries.each(function(bound){
_.each(boundaries.features, function(bound){
var points = [];
var count = 0;
_.each(bound.get("geometry").coordinates, function(poly){
_.each(bound.geometry.coordinates, function(poly){
points[count] = [];
var cpoints = [];
_.each(poly, function(coord){
points[count].push(new L.LatLng(coord[1], coord[0]));
cpoints.push({x:coord[0], y:coord[1]})
});
bound.centeroid = PolygonCentroid(cpoints);
count++;
});

var polygon = new L.MultiPolygon(points, {stroke:true, color:"#03f", weight:2, fill:true});
polygon.bindPopup(bound.get("properties").nbrhood);
var polygon = new L.MultiPolygon(points, {stroke:false, color:"#03f", weight:3, fill:true, fillOpacity:0});
polygon.points = points;
if(!isNaN(bound.centeroid[0])){

if(city.get("stats")){
var stat = city.get("stats").where({ward:bound.properties.WARD});
if(stat && stat.length > 0){
var boundaryIcon = L.divIcon({className: 'boundary-icon',
iconAnchor:[25, 25],
iconSize:[50,50],
html:"<div class='cluster-marker'>"+
"<img src='/assets/img/markers/cluster.png' />"+
"<div class='marker-label'>"+stat[0].get("opened_requests")+"</div></div>"
});

var marker = new L.Marker([bound.centeroid[1], bound.centeroid[0]],
{icon:boundaryIcon});
self.mapBoundaries.addLayer(marker);
polygon.marker = marker;
marker.polygon = polygon;

var zoomToBoundary = function(polygon, map){


var latlngs= [].concat(polygon.points);

var bounds = new L.LatLngBounds(latlngs);
if(map.getZoom() <= 13)
map.fitBounds(bounds);
}

marker.on("mouseover", function(ev){
this.polygon.setStyle({stroke:true});
});
marker.on("mouseout", function(ev){
this.polygon.setStyle({stroke:false});
});
marker.on("click", function(){
zoomToBoundary(this.polygon, self.map);
});
}
}
}
polygon.on("mouseover", function(ev){
this.setStyle({stroke:true});
//get marker element, show label.
});
polygon.on("mouseout", function(ev){
this.setStyle({stroke:false});
//get marker element, hide label.
});
polygon.on("click", function(ev){
zoomToBoundary(this, self.map);
});

self.mapBoundaries.addLayer(polygon);
});
this.mapBoundaries.addTo(this.map);
Expand Down Expand Up @@ -169,6 +243,9 @@ function(app) {
if(this.cityPolygon){
this.map.removeLayer(this.cityPolygon)
}
if(this.cityClusterMarker){
this.map.removeLayer(this.cityClusterMarker);
}
},
cityBounds:function(city){
this.clearCityBounds();
Expand All @@ -179,6 +256,7 @@ function(app) {
if(!p){
return;
}
var cpoints = []
if(p.geometry.type == "MultiPolygon"){
_.each(p.geometry.coordinates, function(poly){
points[count] = [];
Expand All @@ -187,36 +265,73 @@ function(app) {
points[count][count2] = [];
_.each(poly2, function(coord){
points[count][count2].push(new L.LatLng(coord[1], coord[0]));
cpoints.push({x:coord[0], y:coord[1]})
});
count2++;
});
count++;
});
}else if(p.geometry.type == "Polygon"){

_.each(p.geometry.coordinates, function(poly){
points[count] = [];
_.each(poly, function(coord){
points[count].push(new L.LatLng(coord[1], coord[0]));
cpoints.push({x:coord[0], y:coord[1]})
});
count++;
});

}
var sum = 0;
if(city.get("stats")){
sum = city.get("stats").reduce(function(memo, stat){ return memo + stat.get("opened_requests"); }, sum);
}else{
sum = this.serviceRequests.where({"jurisdiction_id":
app.filters.where({"name":"jurisdiction_id"})[0].get("value")}).length;
}


var center = PolygonCentroid(cpoints);
var boundaryIcon = L.divIcon({className: 'boundary-icon',
iconAnchor:[30, 30],
iconSize:[60,60],
html:"<div class='cluster-marker'>"+
"<img src='/assets/img/markers/cluster.png' />"+
"<div class='marker-label'>"+sum+"</div></div>"
});

this.cityClusterMarker = new L.Marker([center[1], center[0]],
{icon:boundaryIcon});
this.cityClusterMarker.addTo(this.map);


this.cityPolygon = new L.MultiPolygon(points, {stroke:true, color:"#333", weight:4, fill:false});
this.cityPolygon.bindPopup(city.get("name"));
this.cityPolygon.addTo(this.map)

this.cityClusterMarker.polygon = this.cityPolygon;
this.cityPolygon.marker = this.polygon;



},
renderRequests:function(){
if(this.map.getZoom() <= 10)
return;

console.log("render requests");
var markers = [];
var self = this;


if( app.filters.where({"name":"jurisdiction_id"}).length > 0){
var srs = this.serviceRequests.where({"jurisdiction_id":
app.filters.where({"name":"jurisdiction_id"})[0].get("value")});
}else{
var srs = this.serviceRequests.where();
}

this.serviceRequests.each(function(sr){
_.each(srs, function(sr){
if(sr.get('lat')){
var marker = new L.Marker([sr.get('lat'), sr.get('long')], {service_request_id:sr.get("service_request_id")} );
marker.bindPopup(self.popupForRequest(sr.toJSON()));
Expand Down
30 changes: 26 additions & 4 deletions app/modules/serviceRequest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
define([
// Application.
"app"
"app",
"modules/stats"
],

// Map dependencies from above array.
function(app) {
function(app, Stats) {

// Create a new module.
var ServiceRequest = app.module();
Expand All @@ -25,7 +26,7 @@ function(app) {
},
sync: function(method, collection, options){
var filterParams = this.filterParams();
filterParams.page_size = 200;
filterParams.page_size = 300;

if(!options.data)
options.data = {};
Expand Down Expand Up @@ -56,10 +57,31 @@ function(app) {

}


//console.log(data)
for(d in data){

data[d].city = city.get("name");
data[d].jurisdiction_id = city.get("jurisdiction_id");
}



// If this city has a stats api, use that. If not calc some stats here.
if(city.get("stats_url")){

$.ajax(city.get("stats_url"),
{data:{start:"2012-09-01", end:"2012-10-01"},
dataType:"jsonp",
success:function(data){
var stats = new Stats.Collection();
stats.add(data.summaries);
city.set("stats", stats);
}});
}

// Else If the city has boundaries, calc those stats based on open311 data.


collection.add(data, {silent:true});
collection.trigger("add");
},
Expand Down
25 changes: 24 additions & 1 deletion app/modules/stats.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,30 @@ function(app) {

// Default collection.
Stats.Collection = Backbone.Collection.extend({
model: Stats.Model
model: Stats.Model,
sync: function(method, collection, options){
collection.reset()
var url = "http://freaky-mustard-data.herokuapp.com/api/v1/ward/summary";

var startdate = new Date(Date.now() - 2592000000); //last month
var enddate = new Date();

options.data.start = startdate.getFullYear()+"-"+(startdate.getMonth()+1)+"-"+startdate.getDate();
options.data.end = enddate.getFullYear()+"-"+(enddate.getMonth()+1)+"-"+enddate.getDate();

if(method == "read"){
$.ajax(url, {data:options.data,
dataType:"json",
success:function(data) {
collection.add({city:"chicago", "stats":data.summaries}, {silent:true});
collection.trigger("add");
},
error:function(err,b,c) {
console.log(err,b,c);
}
});
}
}
});

// Return the module for AMD compliance.
Expand Down
Loading