@@ -1,3 +1,4 @@ +logging public/stylesheets/compiled/* notes .DS_Store .gitignore @@ -9,35 +9,45 @@ require 'world_boundaries.rb' class IndexController < ApplicationController + # + # generate rss - with country boundary respect if supplied + # def rss - @country = 'Iraq' - @country = params[:country] if params[:country] - @multipolygon = WorldBoundaries.polygon_country(@country) - @w,@e,@s,@n = WorldBoundaries.polygon_extent(@multipolygon) - synchronous = false - results = QuerySupport::query(@q,@s,@w,@n,@e,synchronous) @posts = [] - results[:results].each do |result| - next if result.kind != Note::KIND_POST - if WorldBoundaries.polygon_inside?(@multipolygon,result.lon,result.lat) - @posts << result + @country = nil + @country = params[:country] if params[:country] && params[:country].length > 1 + if @country + @multipolygon = WorldBoundaries.polygon_country(@country) + if @multipolygon + @w,@e,@s,@n = WorldBoundaries.polygon_extent(@multipolygon) + synchronous = false + results = QuerySupport::query(@q,@s,@w,@n,@e,synchronous) + results[:results].each do |result| + next if result.kind != Note::KIND_POST + if WorldBoundaries.polygon_inside?(@multipolygon,result.lon,result.lat) + @posts << result + end + end end end headers["Content-Type"] = "application/xml; charset=utf-8" render :layout => false end - def test - x1,x2,y1,y2 = WorldBoundaries.extent('Iraq') - @testresult = WorldBoundaries.inside?('Iraq',100,100) - render :layout => nil - end - # # The client side is javascript so this does very litle # def index + @country = nil + @country = params[:country] if params[:country] && params[:country].length > 1 + if @country + @multipolygon = WorldBoundaries.polygon_country(@country) + if @multipolygon + params[:w],params[:e],params[:s],params[:n] = WorldBoundaries.polygon_extent(@multipolygon) + end + @map.countrycode = @country + end # strive to supply session state of previous question if any to the map for json refresh @map.question = nil @@ -68,20 +78,42 @@ class IndexController < ApplicationController # preferentially pull user question and location of question; ignore session state @q = nil @q = session[:q] = params[:q].to_s if params[:q] + + # always grab the explicit bounds if any - can be overloaded @s = @w = @n = @e = 0.0 - begin - @s = session[:s] = params[:s].to_f if params[:s] - @w = session[:w] = params[:w].to_f if params[:w] - @n = session[:n] = params[:n].to_f if params[:n] - @e = session[:e] = params[:e].to_f if params[:e] - rescue - end + begin + @s = session[:s] = params[:s].to_f if params[:s] + @w = session[:w] = params[:w].to_f if params[:w] + @n = session[:n] = params[:n].to_f if params[:n] + @e = session[:e] = params[:e].to_f if params[:e] + rescue + end + + # allow explicit country code to set boundaries - overrides supplied bounds + @country = nil + @country = params[:country] if params[:country] && params[:country].length > 1 + if @country + @multipolygon = WorldBoundaries.polygon_country(@country) + if @multipolygon + @w,@e,@s,@n = WorldBoundaries.polygon_extent(@multipolygon) + end + end # pull user search term if supplied synchronous = false synchronous = true if params[:synchronous] && params[:synchronous] ==true results = QuerySupport::query(@q,@s,@w,@n,@e,synchronous) + # finalize the culling + if @multipolygon + temp_results = [] + results[:results].each do |result| + if WorldBoundaries.polygon_inside?(@multipolygon,result.lon,result.lat) + temp_results << result + end + end + results[:results] = temp_results + end render :json => results.to_json end app/controllers/index_controller.rb @@ -73,7 +73,7 @@ class WorldBoundaries < ActiveRecord::Base end def self.polygon_country(country_name) - country = WorldBoundaries.find(:first, :conditions => [ "cntry_name = ?", country_name ] ); + country = WorldBoundaries.find(:first, :conditions => [ "name = ?", country_name ] ); return country end app/models/world_boundaries.rb @@ -12,10 +12,14 @@ %h3 Places %ul %li Palestine - %li Iraq - %li Iran - %li Syria - %li Jordan + %li + %a{:href => "/?country=Iraq"} Iraq + %li + %a{:href => "/?country=Iran"} Iran + %li + %a{:href => "/?country=Syria"} Syria + %li + %a{:href => "/?country=Jordan"} Jordan %li United States %li Egypt %li Afghanistan @@ -39,4 +43,4 @@ #people %h3 People - #people_box \ No newline at end of file + #people_box app/views/index/index.html.haml @@ -45,6 +45,7 @@ class Dynamapper attr_accessor :map_type attr_accessor :features attr_accessor :map_usercallback + attr_accessor :countrycode # # initialize() @@ -60,7 +61,8 @@ class Dynamapper @zoom = args[:zoom] || 9 @map_type = "G_SATELLITE_MAP" @features = [] - @map_usercallback = "map_user_initialize" + @map_usercallback = "map_user_initialize" + @countrycode = "" end # @@ -739,7 +741,7 @@ function mapper_page_paint(blob) { function mapper_page_paint_request(recenter) { if(map == null) return; - var url = "/json?"; + var url = "/json?country=#{@countrycode}&"; // tack on the search phrase var q = document.getElementById("q"); lib/dynamapper/dynamapper.rb 679193d3201a9b926b690a5a2790cc3f1a5a2f81 Anselm Hook anselm@shams.meedan.net http://github.com/anselm/angel/commit/3f00bc786ffc123185ac7994d8431233518495da 3f00bc786ffc123185ac7994d8431233518495da 2009-09-15T19:58:27-07:00 2009-09-15T19:58:27-07:00 started to constrain the ui to only show specifally bounded regions in countries some style improvements teaching git to ignore compiled sheets cc60e9bc33c6b2167e08676bd748fe645ab553bb Anselm Hook anselm@shams.meedan.net