Commit Graph

16 Commits

Author SHA1 Message Date
Brenda Wallace
f4af682d45 Updated code for Rail 5 2018-01-03 17:12:17 +13:00
Miles Gould
7fa0d22583 Graph real crop sunninesses from server
Works for me in superficial manual testing, but needs automated tests.
Also currently does two server round trips (one for planting locations
and one for sunninesses); it would be better to combine these into one,
or alternatively to create a "crop stats" API endpoint and calculate
sunniness stats in SQL.
2017-01-09 15:13:55 +00:00
Brenda Wallace
6e0e7e4de1 Merge remote-tracking branch 'upstream/dev' into bw/bar_graphs
Conflicts:
	CONTRIBUTORS.md
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/crops.js.erb
	app/views/crops/show.html.haml
2016-12-07 11:17:30 +13:00
Daniel O'Connor
e38321aa33 #981 Add mapbox access token (on my free 50k views account) and update to v4 2016-07-28 14:27:49 +09:30
Shiho Takagi
c253c86787 minor improvements 2015-03-17 11:40:32 +11:00
Shiho Takagi
0c6b6e0e0e added show all/less toggle button 2015-03-12 13:49:37 +11:00
Marlena Compton
5a1fd19abc move bar color into the data 2015-03-03 05:49:13 -08:00
Marlena Compton
a013385d35 add bits to get the labels in the right place 2015-01-31 08:02:51 -08:00
Marlena Compton
73e144278e added chart to the page 2015-01-27 07:26:31 -08:00
Taylor Griffin
b28ce28703 replace mapbox_map_id and nominatim_user_agent_email with benign values if Rails env is test 2014-07-28 00:12:40 +10:00
Taylor Griffin
948aeb1289 working on getting Selenium tests to pass 2014-07-27 21:04:52 +10:00
Skud
828e9d318a check that map exists on page before drawing it 2014-07-04 11:02:23 +10:00
Skud
890a21ddb2 small refactoring to clean up js 2014-07-04 10:49:52 +10:00
Skud
f28ddaded1 renamed div#map to #cropmap on crop page
this prevents confusion when assets are compiled (i.e. it worked in dev
but not on staging; this fixes the problem.)
2014-07-04 10:38:37 +10:00
Skud
f8cb7248b7 Reduced cluster radius for maps
on both crops and places pages

Did this because the clusters were annoyingly over-general, eg. showing
164 people in the eastern part of North America.  Cluster radius of 20px
is about the radius of the cluster icon itself.  Seems to work better
eg. for separating Melbourne from Sydney on the world map.
2014-06-30 11:56:46 -07:00
Skud
4972127957 Display crop plantings on a map 2014-06-30 11:51:01 -07:00