cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3984 commits 4 branches 1 tag 499 MiB
Commit graph

224 commits

Author SHA1 Message Date
Tom Hughes
18883b59c8 Merge branch 'master' into openstreetbugs 2011-08-24 21:25:05 +01:00
Tom Hughes
c24967d168 Remove :root qualifiers as they don't seem to work in rails 2.3.14 2011-08-22 22:42:38 +01:00
Tom Hughes
72e33046c8 Merge branch 'master' into openstreetbugs 
Conflicts:
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
 2011-08-13 11:48:04 +01:00
Tom Hughes
e5c80c80ad Use num_changes to detect empty changesets instead of the bbox 2011-07-12 15:55:17 +01:00
Tom Hughes
8382181635 Tidy up the note controller 
Go through most of the note controller, tidying things up, fixing
a few bugs, and making sure we have tests for everything.
 2011-05-22 17:02:48 +01:00
Tom Hughes
08d6a0c910 Update tests for change in name from "map_bug" to "note" etc 2011-05-22 12:40:56 +01:00
Tom Hughes
f4928d0e95 Rename a number of methods in the map_bugs controller 2011-05-18 00:36:02 +01:00
Tom Hughes
882700c5c8 Rename some columns and indexes in the bug tables 2011-05-18 00:36:00 +01:00
Tom Hughes
d2cf09f389 Make sure the ruby quadtile code give the same result as the C version 2011-05-18 00:36:00 +01:00
Tom Hughes
22bef89d1a Use quad tiling to select bugs in an area 
Remove the _no_quadtile versiond of the selection routines and switch
to using the ordinary ones but with a (large) limit applied on the size
of the area to prevent us spending ages working out the list of tiles
to be selected.
 2011-05-18 00:35:56 +01:00
Tom Hughes
b42a28067d Make sure the ruby quadtile code give the same result as the C version 2011-05-08 15:18:03 +01:00
Tom Hughes
fb4d003ebe Tidy up some of the map bugs code 2011-05-07 13:05:39 +01:00
Tom Hughes
e7cd90f4b4 Merge branch 'master' into openstreetbugs 2011-05-06 22:56:47 +01:00
Tom Hughes
e098d52424 Rearrange changeset list page to put the map beside the list 2011-05-05 20:25:53 +01:00
Kai Krueger
001ff5764b Merge branch 'master' into openstreetbugs2 2011-04-19 22:00:30 -06:00
Tom Hughes
4b20afd51e Preserve the referer at the end of account creation 2011-04-03 13:46:18 +01:00
Matt Amos
8b12abd5bb Phase 2 CTs implementation and tests, with config parameter 2011-04-03 13:46:16 +01:00
Matt Amos
f3ff36418b Fixed bug in changeset queries 
The 'or' condition needed to be bracketed within larger 'and' expression.
 2011-03-15 13:56:55 +00:00
Tom Hughes
2d937f94d5 Add support for conditional deletes in changeset uploads 
A delete element in an osmChange upload can now have an if-unused
attribute to indicate that the delete should not be done if the
object is still in use.
 2010-12-15 23:59:06 +00:00
Tom Hughes
f20a85a5c5 Allow the client to request errors as an XML document 2010-12-15 23:58:59 +00:00
Shaun McDonald
8e58ec0ff5 Update expected GPS namespace in tests 
Update tests to expect the correct GPX namespace URL to reflect the
change made in 7369b7427c ane make the
tests pass again.
 2010-12-06 00:40:11 +00:00
Tom Hughes
d458bb044c Fix test for change to editor options 2010-12-01 09:27:12 +00:00
Tom Hughes
06105d280c Fixup tests for changes to multi-editor functionality 2010-11-29 21:19:54 +00:00
Matt Amos
cd66a5db99 Initial work on support for multiple editors 2010-11-29 12:20:21 +00:00
Tom Hughes
a1cb0f04d4 Merge branch 'master' into openstreetbugs 
Conflicts:
	app/views/site/index.html.erb
 2010-10-17 11:02:11 +01:00
Tom Hughes
71f1554212 Make trace API a proper CRUD API like other object types 2010-10-11 23:09:27 +01:00
Tom Hughes
6fb8570200 Merge branch 'master' into openstreetbugs 
Conflicts:
	config/environment.rb
	config/routes.rb
 2010-09-06 12:51:50 +01:00
Matt Amos
838b1ee7e9 Fixed AMF controller to validate changeset comments 
Fixed AMF controller so that it doesn't accept non-UTF8 comments, and
throws away non-XML characters.
 2010-08-08 16:23:11 +01:00
Tom Hughes
f07819d81a Rework application configuration 
Use a preinitializer to load the settings from application.yml so
that they are available as early as possible. All settings can also
be overridden using environment variables.

The ad-hoc settins in environment.rb are then moved to this new
system so we have one consistent location for settings.
 2010-08-04 22:06:05 +01:00
Tom Hughes
52395b3cdf Merge branch 'master' into openstreetbugs 2010-07-28 21:30:55 +01:00
Tom Hughes
6f73468f18 Convert diary views to use CSS based user specific components 2010-07-21 22:24:35 +01:00
Tom Hughes
959442d087 Merge branch 'master' into openstreetbugs 2010-05-11 19:53:57 +01:00
Tom Hughes
e005926131 Update test to reflect changes in signup page 2010-05-11 19:17:14 +01:00
Tom Hughes
acbc99ac16 Merge branch 'master' into openstreetbugs 2010-04-19 21:30:42 +01:00
Shaun McDonald
9dabe69032 Adding timecop as a gem dependency when in development env. This allows for time based tests to be accurate/consistent. It will stop the random error on the api_controller_test#test_changes_simple, when you are on a slow machine/have bad timing. 2010-04-03 21:02:20 +00:00
Kai Krueger
abf3358ce5 Fixed some minor bugs and add tests to spot them 2010-03-27 11:45:36 +00:00
Matt Amos
11d136e508 Patching fix to test from branch. 2010-03-22 22:56:45 +00:00
Kai Krueger
4aec8dc3a5 minor improvement to the map_bugs tests 2010-03-21 12:04:15 +00:00
Kai Krueger
59a6ed0e20 Don't limit get map_bugs to a small Area, by disabling the quadtile index for those searches 
The volumn of bugs seem small enough to get away with normal or GiST indexes (not included yet)

Also includes some other fixes
 2010-03-20 11:59:23 +00:00
Kai Krueger
6d668f6f3a Add some rudimentary initial tests for the map bugs api 2010-03-17 23:43:32 +00:00
Tom Hughes
0b913efd05 Use Nominatim to reverse geocode diary location information and display 
a friendly human readable location instead of some coordinates.
 2010-02-27 12:41:56 +00:00
Tom Hughes
d3bcbf0367 Fix test for viewing an unknown user to actually specify a name - what 
it was doing before was testing whether the null user existed.
 2010-02-26 15:07:28 +00:00
Tom Hughes
8264fb92ff Fixup AMF tests to match Richard's latest changes. 2010-02-11 17:33:46 +00:00
Tom Hughes
8cd02f4136 Drop the username from the "new diary entry" link to avoid problems 
with caching - we don't need it as we know who the logged in user is
when a diary posting is made.
 2010-02-04 15:48:40 +00:00
Shaun McDonald
5cbaa2fca7 fix some trace tests, due to a change of the way that your own ones are rendered. 2010-01-10 15:21:53 +00:00
Matt Amos
b3f4637a42 Fixed copy-n-paste bug in querying for closed changesets and added a test for it. 2009-12-26 21:29:43 +00:00
Tom Hughes
d4b8020757 Fix tests to reflect changes to signup form. 2009-10-21 23:35:59 +00:00
Tom Hughes
eb0f9ff63d Merged 17073:17076 from trunk. 2009-10-13 20:25:11 +00:00
Tom Hughes
ef40b61ff4 Merged 17256:18123 from trunk. 2009-10-13 20:06:24 +00:00
Matt Amos
16b79f9964 Added a :display_name option for the changesets query code. 2009-10-12 10:12:12 +00:00