@@ -168,11 +168,11 @@ class Report < ActiveRecord::Base
else
html << %Q{<br /><img src="#{self.reporter.icon}" class="profile" />}
end
- if(item.rating.nil?)
+ if(self.rating.nil?)
rating_icon = "/images/rating_none.png"
- elsif(item.rating <= 30)
+ elsif(self.rating <= 30)
rating_icon = "/images/rating_bad.png"
- elsif (item.rating <= 70)
+ elsif (self.rating <= 70)
rating_icon = "/images/rating_medium.png"
else
rating_icon = "/images/rating_good.png"
app/models/report.rb
@@ -2,10 +2,10 @@
<div class="filters">
<h2>Available filters:</h2>
<ul class="nobullets">
+ <li>View state-by-state: <%= state_select %></li>
<li><a href="#" onclick="return updateMap('count=100')">Show last 100 reports</a></li>
<li><a href="#" onclick="return updateMap('wait_time=90')">Show wait time > 90 minutes</a></li>
<li><a href="#" onclick="return updateMap('rating=30')">Show only bad ratings</a></li>
- <li>View state-by-state: <%= state_select %></li>
</ul>
</div>
app/views/reports/_legend.html.erb
@@ -27,8 +27,8 @@ ActionController::Routing::Routes.draw do |map|
map.connect 'local/:filter', :controller => "reports", :action => "index"
map.kml_feed 'feeds/:count.kml', :controller => "reports", :action => "index", :format => :kml
- map.json_feed 'feeds/:page.json', :controller => "reports", :action => "index"
- map.json_state_feed 'feeds/:state/:page.json', :controller => "reports", :action => "index"
+ map.json_feed 'feeds/:page.json', :controller => "reports", :action => "index", :format => :jso
+ map.json_state_feed 'feeds/state/:state/:page.json', :controller => "reports", :action => "index"
map.resources :reports,
:collection => {
config/routes.rb
@@ -60,7 +60,7 @@ function initMapJS(map_filters){
$("#filter_state").change(function () {
state = $("#filter_state").val();
- updateMap("state/"+state);
+ updateState(state);
});
// display the map centered on a latitude and longitude (Google zoom levels)
var myPoint = new LatLonPoint(38, -90);
@@ -74,6 +74,21 @@ function initMapJS(map_filters){
}
+function updateState(state, page) {
+ var current_filter = "";
+ if(page == null)
+ page = 1;
+ hideMessage();
+
+ mapstraction.removeAllMarkers();
+ fadeMap();
+ gmarkers = [];
+ filters = current_filter = "state=" + state;
+
+ $("#update_status").show();
+ $.getJSON("/feeds/state/"+state+"/" + page +".json", "");
+ return false;
+}
function updateMap(map_filter) {
var current_filter = "";
hideMessage();
@@ -88,7 +103,7 @@ function updateMap(map_filter) {
}
$("#update_status").show();
- $.getJSON("/feeds/json/"+current_filter+"/1/200/0.json", "");
+ $.getJSON("/reports.json?"+current_filter+"&page=1&count=200&callback=updateJSON", "");
return false;
}
function showMessage(message) {
public/javascripts/mapping.js
@@ -27,7 +27,15 @@ while (1)
open(ATOM, ">reports.atom");
print ATOM $content;
close(ATOM);
- move("reports.atom", "public/feeds/reports.atom");
+ move("reports.atom", "/home/votereport/current/public/reports.atom");
+
+ $res = $ua->get("http://votereport.us/reports.kml");
+ $content = $res->content;
+ open(ATOM, ">reports.kml");
+ print ATOM $content;
+ close(ATOM);
+ move("reports.atom", "/home/votereport/current/public/reports.kml");
+
#print "KML and Atom fetched.\n";
for (my $i=0;$i<scalar @abbr;$i++)
{
@@ -50,7 +58,7 @@ sub state
my $res = $ua->get("http://votereport.us/reports.json?state=$state&wait_time=0&per_page=200&callback=updateJSON&page=$i");
print STATE $res->content;
close STATE;
- my $fdir = "/home/votereport/current/public/feeds/json";
+ my $fdir = "/home/votereport/current/public/feeds/state";
mkdir($fdir) unless (-d $fdir);
mkdir("$fdir/$state") unless (-d "$fdir/$state");
move("$i.json", "$fdir/$state/$i.json");
script/cachefiles
94ed1d3f6643dbc3353f551a779536b1ec377e71
Andrew Turner
ajturner@highearthorbit.com
http://github.com/davetroy/votereport/commit/65712c1bb8e92eac5cfddb3e55474161bc0ef0c6
65712c1bb8e92eac5cfddb3e55474161bc0ef0c6
2008-11-04T05:36:37-08:00
2008-11-04T05:36:37-08:00
Changed cache location for states. Fixed state loading of cache
3ea0dc23ae75e2eb3e9e187c234ff6c5d201ca80
Andrew Turner
ajturner@highearthorbit.com