app/models/safety_camera_site.rb lib/data/lookups/safety_camera_sites.csv public/iphone/._demos public/iphone/._jqtouch public/iphone/._themes public/iphone/demos/._clock public/iphone/demos/._customanimation public/iphone/demos/._customanimation2 public/iphone/demos/._ext_autotitles public/iphone/demos/._ext_floaty public/iphone/demos/._ext_location public/iphone/demos/._ext_offline public/iphone/demos/._main public/iphone/demos/._todo public/iphone/demos/clock/._clock.css public/iphone/demos/clock/._icon.png public/iphone/demos/clock/._img public/iphone/demos/clock/._index.html public/iphone/demos/clock/clock.css public/iphone/demos/clock/icon.png public/iphone/demos/clock/img/._face.png public/iphone/demos/clock/img/._hour.png public/iphone/demos/clock/img/._minute.png public/iphone/demos/clock/img/._second.png public/iphone/demos/clock/img/._startup.png public/iphone/demos/clock/img/face.png public/iphone/demos/clock/img/hour.png public/iphone/demos/clock/img/minute.png public/iphone/demos/clock/img/second.png public/iphone/demos/clock/img/startup.png public/iphone/demos/clock/index.html public/iphone/demos/customanimation/._index.html public/iphone/demos/customanimation/._jqt_startup.png public/iphone/demos/customanimation/._jqtouch.png public/iphone/demos/customanimation/index.html public/iphone/demos/customanimation/jqt_startup.png public/iphone/demos/customanimation/jqtouch.png public/iphone/demos/customanimation2/._index.html public/iphone/demos/customanimation2/._jqt_startup.png public/iphone/demos/customanimation2/._jqtouch.png public/iphone/demos/customanimation2/index.html public/iphone/demos/customanimation2/jqt_startup.png public/iphone/demos/customanimation2/jqtouch.png public/iphone/demos/ext_autotitles/._index.html public/iphone/demos/ext_autotitles/._jqt_startup.png public/iphone/demos/ext_autotitles/._jqtouch.png public/iphone/demos/ext_autotitles/index.html public/iphone/demos/ext_autotitles/jqt_startup.png public/iphone/demos/ext_autotitles/jqtouch.png public/iphone/demos/ext_floaty/._index.html public/iphone/demos/ext_floaty/._jqt_startup.png public/iphone/demos/ext_floaty/._jqtouch.png public/iphone/demos/ext_floaty/index.html public/iphone/demos/ext_floaty/jqt_startup.png public/iphone/demos/ext_floaty/jqtouch.png public/iphone/demos/ext_location/._index.html public/iphone/demos/ext_location/._jqt_startup.png public/iphone/demos/ext_location/._jqtouch.png public/iphone/demos/ext_location/index.html public/iphone/demos/ext_location/jqt_startup.png public/iphone/demos/ext_location/jqtouch.png public/iphone/demos/ext_offline/._.htaccess public/iphone/demos/ext_offline/._cache.manifest public/iphone/demos/ext_offline/._index.html public/iphone/demos/ext_offline/._jqt_startup.png public/iphone/demos/ext_offline/._jqtouch.png public/iphone/demos/ext_offline/._sample.htaccess public/iphone/demos/ext_offline/.htaccess public/iphone/demos/ext_offline/cache.manifest public/iphone/demos/ext_offline/index.html public/iphone/demos/ext_offline/jqt_startup.png public/iphone/demos/ext_offline/jqtouch.png public/iphone/demos/ext_offline/sample.htaccess public/iphone/demos/main/._ajax.html public/iphone/demos/main/._ajax_post.php public/iphone/demos/main/._index.html public/iphone/demos/main/._jqt_startup.png public/iphone/demos/main/._jqtouch.png public/iphone/demos/main/ajax.html public/iphone/demos/main/ajax_post.php public/iphone/demos/main/index.html public/iphone/demos/main/jqt_startup.png public/iphone/demos/main/jqtouch.png public/iphone/demos/todo/._icon.png public/iphone/demos/todo/._index.html public/iphone/demos/todo/._startup.png public/iphone/demos/todo/icon.png public/iphone/demos/todo/index.html public/iphone/demos/todo/startup.png public/iphone/jqtouch/._jqtouch.css public/iphone/jqtouch/._jqtouch.js public/iphone/jqtouch/._jqtouch.min.css public/iphone/jqtouch/._jqtouch.min.js public/iphone/jqtouch/._jqtouch.transitions.js public/iphone/jqtouch/._jquery.1.3.2.min.js public/iphone/jqtouch/jqtouch.css public/iphone/jqtouch/jqtouch.js public/iphone/jqtouch/jqtouch.min.css public/iphone/jqtouch/jqtouch.min.js public/iphone/jqtouch/jqtouch.transitions.js public/iphone/jqtouch/jquery.1.3.2.min.js public/iphone/themes/._apple public/iphone/themes/._jqt public/iphone/themes/apple/._img public/iphone/themes/apple/._theme.css public/iphone/themes/apple/._theme.min.css public/iphone/themes/apple/img/._backButton.png public/iphone/themes/apple/img/._blueButton.png public/iphone/themes/apple/img/._cancel.png public/iphone/themes/apple/img/._chevron.png public/iphone/themes/apple/img/._grayButton.png public/iphone/themes/apple/img/._listArrowSel.png public/iphone/themes/apple/img/._listGroup.png public/iphone/themes/apple/img/._loading.gif public/iphone/themes/apple/img/._on_off.png public/iphone/themes/apple/img/._pinstripes.png public/iphone/themes/apple/img/._selection.png public/iphone/themes/apple/img/._thumb.png public/iphone/themes/apple/img/._toggle.png public/iphone/themes/apple/img/._toggleOn.png public/iphone/themes/apple/img/._toolButton.png public/iphone/themes/apple/img/._toolbar.png public/iphone/themes/apple/img/._whiteButton.png public/iphone/themes/apple/img/backButton.png public/iphone/themes/apple/img/blueButton.png public/iphone/themes/apple/img/cancel.png public/iphone/themes/apple/img/chevron.png public/iphone/themes/apple/img/grayButton.png public/iphone/themes/apple/img/listArrowSel.png public/iphone/themes/apple/img/listGroup.png public/iphone/themes/apple/img/loading.gif public/iphone/themes/apple/img/on_off.png public/iphone/themes/apple/img/pinstripes.png public/iphone/themes/apple/img/selection.png public/iphone/themes/apple/img/thumb.png public/iphone/themes/apple/img/toggle.png public/iphone/themes/apple/img/toggleOn.png public/iphone/themes/apple/img/toolButton.png public/iphone/themes/apple/img/toolbar.png public/iphone/themes/apple/img/whiteButton.png public/iphone/themes/apple/theme.css public/iphone/themes/apple/theme.min.css public/iphone/themes/jqt/._img public/iphone/themes/jqt/._theme.css public/iphone/themes/jqt/._theme.min.css public/iphone/themes/jqt/img/._back_button.png public/iphone/themes/jqt/img/._back_button_clicked.png public/iphone/themes/jqt/img/._button.png public/iphone/themes/jqt/img/._button_clicked.png public/iphone/themes/jqt/img/._chevron.png public/iphone/themes/jqt/img/._chevron_circle.png public/iphone/themes/jqt/img/._grayButton.png public/iphone/themes/jqt/img/._loading.gif public/iphone/themes/jqt/img/._on_off.png public/iphone/themes/jqt/img/._rowhead.png public/iphone/themes/jqt/img/._toggle.png public/iphone/themes/jqt/img/._toggleOn.png public/iphone/themes/jqt/img/._toolbar.png public/iphone/themes/jqt/img/._whiteButton.png public/iphone/themes/jqt/img/back_button.png public/iphone/themes/jqt/img/back_button_clicked.png public/iphone/themes/jqt/img/button.png public/iphone/themes/jqt/img/button_clicked.png public/iphone/themes/jqt/img/chevron.png public/iphone/themes/jqt/img/chevron_circle.png public/iphone/themes/jqt/img/grayButton.png public/iphone/themes/jqt/img/loading.gif public/iphone/themes/jqt/img/on_off.png public/iphone/themes/jqt/img/rowhead.png public/iphone/themes/jqt/img/toggle.png public/iphone/themes/jqt/img/toggleOn.png public/iphone/themes/jqt/img/toolbar.png public/iphone/themes/jqt/img/whiteButton.png public/iphone/themes/jqt/theme.css public/iphone/themes/jqt/theme.min.css @@ -10,15 +10,18 @@ class SuburbsController < ApplicationController lgas = SuburbsLga.find_all_by_state_2006(state_id, :select => "lga_name09", :conditions => ["LOWER(name_2006) = ?", suburb.downcase]) postcodes = SuburbsPostcode.find_all_by_state_2006(state_id, :select => "poa", :conditions => ["LOWER(name_2006) = ?", suburb.downcase]) + safety_cameras = SafetyCameraSite.find(:all, :conditions => ["LOWER(suburb_name_2006) = ?", suburb.downcase]) - render :json => { + resp = { :name => locality.name_2006, :state => state, :latitude => locality.the_centroid.x, :longitude => locality.the_centroid.y, :lgas => lgas.collect { |l| l.lga_name09 }, :postcodes => postcodes.collect { |p| p.poa } - }.to_json + } + resp.merge!(:safety_cameras => safety_cameras.collect { |sc| { :from => sc.start_location, :to => sc.end_location, :camera_type => sc.camera_type } } ) if ! safety_cameras.blank? + render :json => resp.to_json end def show app/controllers/suburbs_controller.rb @@ -4,7 +4,8 @@ namespace :ssc06 do desc "Load Suburb bounding box data into a PostGis database" task :shapefile_to_sql do - `shp2pgsql lib/data/ssc_2006/2923030001ssc06aaust/SSC06aAUST_region.shp suburbs -s 4283 -I -d > lib/data/processed/suburbs.sql` + `shp2pgsql lib/data/ssc_2006/2923030001ssc06aaust/SSC06aAUST_region.shp suburbs -s 4283 -I -d > lib/data/processed/suburbs_temp.sql` + `sed s/ (.+)/$2/g < lib/data/processed/suburbs_temp.sql > lib/data/processed/suburbs.sql` end task :create_database do @@ -40,4 +41,8 @@ namespace :lookup do task :load_postcodes do `psql australia < lib/data/lookups/Suburb2Postcode.csv` end + + task :load_safety_cameras do + `psql australia < lib/data/lookups/safety_camera_sites.csv` + end end lib/tasks/database.rake public/javascripts/._app.js @@ -1,7 +1,6 @@ var Application = new Class({ initialize: function() { this.createEvents(); - this.drawMap(); }, createEvents: function() { @@ -26,45 +25,67 @@ var Application = new Class({ //$('locationInput').morph({opacity: [1,0]}); newLocation = $('locationInput').value; - console.log(newLocation); // Attach updated location setting to the feed and refresh with flush - console.log(this.requestData); this.requestData(newLocation); + + // Clear details and map shit. + $('details').empty(); + $('map').empty(); } }.bind(this)); }, - // Draw a map on the page - drawMap: function(lat, long) { - var map = new EMS.Services.Map('map'); - }, + requestData: function(suburb) { - console.log('hi!'); var api = '/suburbs/vic/' + suburb; var request = new Request.JSON({ url: api, onComplete: function(suburbData) { + console.log(suburbData.lgas); var suburbContainer = new Element('div'); suburbContainer.addClass('suburbContainer'); - var suburbName = new Element('div'); suburbName.addClass('suburbName'); - suburbName.set('text', suburbData.name); - suburbContainer.appendChild(suburbName); - $('details').appendChild(suburbContainer); } + + + suburbData.postcodes.each(function(item, index){ + var suburbPostcode = new Element('div'); + suburbPostcode.set('text', item); + suburbContainer.appendChild(suburbPostcode); + }); + + suburbData.lgas.each(function(item, index){ + var suburbLocality = new Element('div'); + suburbLocality.set('text', item + ' City Council'); + suburbContainer.appendChild(suburbLocality); + }); + + $('details').appendChild(suburbContainer); + + var mapper = new Mapper(); + console.log(mapper); + mapper.drawMap(suburbData.latitude, suburbData.longitude); + } }).send(); + } +}); + +var Mapper = new Class({ + initialize: function() { }, - displayData: function(suburbData) { - console.log(suburbData); - - - + drawMap: function(lat, long) { + var latitude = this.lat; + var longitude = this.long; + // Draw a map on the page + map = new EMS.Services.Map('map'); + lonlat = new EMS.LonLat(lat, long); + map.setCenter(lonlat,12); } }); public/javascripts/app.js 39a3aae51a9414a4d2899f007495ad506d15c9b1 Mark Mansour mark@stateofflux.com http://github.com/markmansour/govhack/commit/c0a1959fda485c92ddd4cb3c8b7649cedf4ed9bf c0a1959fda485c92ddd4cb3c8b7649cedf4ed9bf 2009-10-30T05:48:25-07:00 2009-10-30T05:48:25-07:00 added Victorian speed camera info f17117a6aec6ae4137046c6ce5d30a8257394eb8 Mark Mansour mark@stateofflux.com