public/images/._findButton.gif public/images/._headerbg.gif public/images/._spinner.gif public/images/findButton.gif public/images/headerbg.gif public/images/spinner.gif @@ -12,6 +12,7 @@ clone the repository setup your datebase > rake ssc06:setup > rake db:migrate +> rake lookup:setup h2. Start up the server > ./script/server README @@ -21,6 +21,7 @@ class SuburbsController < ApplicationController :postcodes => postcodes.collect { |p| p.poa } } 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 app/controllers/suburbs_controller.rb @@ -15,6 +15,7 @@ namespace :ssc06 do `psql -f #{postgres_dir}/lwpostgis.sql -d australia` `psql -f #{postgres_dir}/spatial_ref_sys.sql -d australia` `psql australia < lib/data/processed/suburbs.sql` +# `psql -c "update suburbs set name_2006 = regexp_replace(name_2006, '([A-Za-z ]+)( .+)*?', '\\\\1');" australia` end task :drop_database do @@ -32,7 +33,7 @@ namespace :ssc06 do end namespace :lookup do - task :setup => [:load_lgas, :load_postcodes] + task :setup => [:load_lgas, :load_postcodes, :load_safety_cameras] task :load_lgas do `psql australia < lib/data/lookups/Suburb2LGA.csv` lib/tasks/database.rake public/._index.html @@ -25,18 +25,22 @@ </head> <body> - <div id="header"> - GovHack - - <input id="locationInput" type="text" value="Enter Suburb"/><input type="button" value="Go" /> - </div> + <div id="wrapper"> + <div id="header"> + <div id="loadingSpinner"></div> + <div id="suburbEntryForm"> + <input id="locationInput" type="text" value="Enter Suburb"/> + <input id="locationInputButton" type="image" src="/images/findButton.gif" value="Find" /> + </div> + </div> - <div id="content"> - <div id="map"></div> - <div id="details"></div> - </div> + <div id="content"> + <div id="map"></div> + <div id="details"></div> + </div> - <div id="footer"> + <div id="footer"> + </div> </div> </body> </html> \ No newline at end of file public/index.html public/javascripts/._app.js @@ -42,7 +42,6 @@ var Application = new Class({ 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'); @@ -50,24 +49,41 @@ var Application = new Class({ suburbName.set('text', suburbData.name); suburbContainer.appendChild(suburbName); - - + // Post code info suburbData.postcodes.each(function(item, index){ var suburbPostcode = new Element('div'); suburbPostcode.set('text', item); + suburbPostcode.addClass('suburbPostcode'); suburbContainer.appendChild(suburbPostcode); }); + // Council info suburbData.lgas.each(function(item, index){ var suburbLocality = new Element('div'); suburbLocality.set('text', item + ' City Council'); + suburbLocality.addClass('suburbLocality'); suburbContainer.appendChild(suburbLocality); }); - + + suburbData.safety_cameras.each(function(item, index) { + var cameraLocation = new Element('div'); + cameraLocation.set('text', item.from + " " + item.to); + cameraType = new Element('div'); + cameraType.set('text', item.camera_type); + cameraType.addClass('cameraType'); + + if(cameraType == "COMBINED SPEED / RED-LIGHT (INTERSECTION) CAMERA SYSTEMS") { + cameraType.addClass('redLight'); + } + + suburbContainer.appendChild(cameraLocation); + suburbContainer.appendChild(cameraType); + }); + + // Chuck it all into the page $('details').appendChild(suburbContainer); var mapper = new Mapper(); - console.log(mapper); mapper.drawMap(suburbData.latitude, suburbData.longitude); } }).send(); public/javascripts/app.js @@ -1,6 +1,8 @@ body { - color: #fff; - background: #222; + color: #444; + background: #fff; + margin: 0; + padding: 0; font-family: Helvetica, Arial, sans-serif; } @@ -15,5 +17,49 @@ div#map { } div#header { - + background: url('../images/headerbg.gif') repeat-x; + height: 59px; + width: 100%; + border-right: 2px solid #ccc; + border-bottom: 2px solid #ccc; + border-left: 2px solid #ccc; + -moz-border-radius: 5px; +} + +div#suburbEntryForm { + float: left; + margin-top: 15px; + margin-left: 15px; +} + +#locationInput { + border: 1px solid #999; + font-size: 1.1em; + padding: 2px; +} + +#locationInputButton { + margin-bottom: -7px; +} + +#loadingSpinner { + float: right; + display: block; + background: url('../images/spinner.gif') no-repeat; + height: 32px; + width: 32px; + margin-top: 13px; + margin-right: 15px; +} + + +div#content { + margin-top: 10px; +} + +div.suburbContainer div.suburbName { + font-size: 1.5em; + font-weight: bold; + margin-bottom: 10px; + color: #666; } \ No newline at end of file public/stylesheets/base.css c0a1959fda485c92ddd4cb3c8b7649cedf4ed9bf Mark Mansour mark@stateofflux.com http://github.com/markmansour/govhack/commit/c26ae06d941eb65675f6ffae81787144e40f714a c26ae06d941eb65675f6ffae81787144e40f714a

2009-10-30T17:25:51-07:00

add some bling efd2225ffbbadbbcca1fba87dd04828bd6662d7b Mark Mansour mark@stateofflux.com