]> git.openstreetmap.org Git - rails.git/log
rails.git
15 years agoOne final (I've checked the rest now!) mis-referenced id, plus make the error msg...
Thomas Wood [Wed, 6 May 2009 19:55:25 +0000 (19:55 +0000)]
One final (I've checked the rest now!) mis-referenced id, plus make the error msg simpler.

15 years agofixing the tests I broke earlier due to the fixture changes
Shaun McDonald [Wed, 6 May 2009 17:56:10 +0000 (17:56 +0000)]
fixing the tests I broke earlier due to the fixture changes

15 years agoMore trace tests
Shaun McDonald [Wed, 6 May 2009 14:58:48 +0000 (14:58 +0000)]
More trace tests

15 years agoPotential fix for slow relation precondition checking based on Frederik's suggestion...
Matt Amos [Wed, 6 May 2009 10:35:39 +0000 (10:35 +0000)]
Potential fix for slow relation precondition checking based on Frederik's suggestion on the list to only check new members.

15 years agosome tests for the site and export controllers
Shaun McDonald [Tue, 5 May 2009 18:31:37 +0000 (18:31 +0000)]
some tests for the site and export controllers

15 years agobe a bit more specific when a way is a member of a relation. Actually return an error...
Shaun McDonald [Tue, 5 May 2009 17:07:06 +0000 (17:07 +0000)]
be a bit more specific when a way is a member of a relation. Actually return an error message when a relation precondition fails. Remove a debug statement.

15 years agoPotlatch 0.11b
Richard Fairhurst [Mon, 4 May 2009 23:37:06 +0000 (23:37 +0000)]
Potlatch 0.11b

15 years agoSort the tags for the databrowser output.
Thomas Wood [Mon, 4 May 2009 22:42:07 +0000 (22:42 +0000)]
Sort the tags for the databrowser output.

15 years agoFix another mis-referenced error message id!
Thomas Wood [Sat, 2 May 2009 18:28:39 +0000 (18:28 +0000)]
Fix another mis-referenced error message id!

15 years agoData browser changes, make links more user friendly, displaying name tag where possible.
Thomas Wood [Sat, 2 May 2009 00:26:37 +0000 (00:26 +0000)]
Data browser changes, make links more user friendly, displaying name tag where possible.
Changes to models ok'd (and suggested as temporary solution) by TomH
References #1777

15 years agoGet rid of foreign_class specification which is no longer needed.
Tom Hughes [Fri, 1 May 2009 23:20:53 +0000 (23:20 +0000)]
Get rid of foreign_class specification which is no longer needed.

15 years agoFix indentation fail
Thomas Wood [Fri, 1 May 2009 21:01:02 +0000 (21:01 +0000)]
Fix indentation fail

15 years agoFix AMF controller failing tests due to changed error messages.
Thomas Wood [Fri, 1 May 2009 20:49:51 +0000 (20:49 +0000)]
Fix AMF controller failing tests due to changed error messages.

15 years agoa fix for the relation controller test
Shaun McDonald [Fri, 1 May 2009 10:29:19 +0000 (10:29 +0000)]
a fix for the relation controller test

15 years agoUse association names with :joins instead of writing the SQL for the
Tom Hughes [Thu, 30 Apr 2009 23:45:55 +0000 (23:45 +0000)]
Use association names with :joins instead of writing the SQL for the
join by hand.

15 years agoFixed bad coding practice in test.
Matt Amos [Thu, 30 Apr 2009 18:12:23 +0000 (18:12 +0000)]
Fixed bad coding practice in test.

15 years agoFixed indeterminacy in test.
Matt Amos [Thu, 30 Apr 2009 18:09:54 +0000 (18:09 +0000)]
Fixed indeterminacy in test.

15 years agoFix failing test case.
Matt Amos [Thu, 30 Apr 2009 17:37:18 +0000 (17:37 +0000)]
Fix failing test case.

15 years agocouple of fixes to the changeset upload delete
Shaun McDonald [Thu, 30 Apr 2009 17:25:53 +0000 (17:25 +0000)]
couple of fixes to the changeset upload delete

15 years agogive a id when a way is a member of a relation
Shaun McDonald [Thu, 30 Apr 2009 16:50:20 +0000 (16:50 +0000)]
give a id when a way is a member of a relation

15 years agoWe don't need an extra method for the amf controller for saving nodes, just catch...
Shaun McDonald [Thu, 30 Apr 2009 15:16:15 +0000 (15:16 +0000)]
We don't need an extra method for the amf controller for saving nodes, just catch the exception and do nothing with that exception.

15 years agoDo the statistics generation in a transaction.
Tom Hughes [Thu, 30 Apr 2009 07:54:26 +0000 (07:54 +0000)]
Do the statistics generation in a transaction.

15 years agoFix another error reporting bug similar to previous, again on printing RelationMember...
Thomas Wood [Thu, 30 Apr 2009 07:10:57 +0000 (07:10 +0000)]
Fix another error reporting bug similar to previous, again on printing RelationMember.id rather than RelationMember.relation.id

15 years agoFix grammar/referred relation id in precondition failed error.
Thomas Wood [Thu, 30 Apr 2009 06:52:14 +0000 (06:52 +0000)]
Fix grammar/referred relation id in precondition failed error.
From: "Precondition failed: The relation 5 is a used in relation 4,0."
To: "Precondition failed: The relation 5 is used in relation 4."

15 years agoFix html: closing <a> tag.
Thomas Wood [Thu, 30 Apr 2009 06:50:51 +0000 (06:50 +0000)]
Fix html: closing <a> tag.

15 years agoPotlatch 0.11a
Richard Fairhurst [Thu, 30 Apr 2009 01:23:50 +0000 (01:23 +0000)]
Potlatch 0.11a

15 years agoUse :joins instead of :include to pull in the changesets - this does an
Tom Hughes [Wed, 29 Apr 2009 23:45:54 +0000 (23:45 +0000)]
Use :joins instead of :include to pull in the changesets - this does an
inner join instead of a left outer join (which is fine as all objects should
have a changeset) and more importantly stops rails generating a subquery
that doesn't work.

15 years agofix more of the tests, particularly changeset controller. Needed more fixtures to...
Shaun McDonald [Wed, 29 Apr 2009 22:25:49 +0000 (22:25 +0000)]
fix more of the tests, particularly changeset controller. Needed more fixtures to fix them. The last failing changeset controller test needs some more work on the fixtures.

15 years agoMore changeset test improvements. Another fixture was required for one of the tests
Shaun McDonald [Wed, 29 Apr 2009 17:29:58 +0000 (17:29 +0000)]
More changeset test improvements. Another fixture was required for one of the tests

15 years agoFixed 'raw' raises by converting them to the appropriate OSM::APIError type. Made...
Matt Amos [Wed, 29 Apr 2009 10:07:35 +0000 (10:07 +0000)]
Fixed 'raw' raises by converting them to the appropriate OSM::APIError type. Made the error messages for placeholder fixing more informative. Added tests for these.

15 years agoEager load node and way details when processing a map call.
Tom Hughes [Tue, 28 Apr 2009 16:26:06 +0000 (16:26 +0000)]
Eager load node and way details when processing a map call.

15 years agoUse the alias for the conditions as well...
Tom Hughes [Tue, 28 Apr 2009 16:25:37 +0000 (16:25 +0000)]
Use the alias for the conditions as well...

15 years agoUse an alias for current_relation_members to avoid clashing with
Tom Hughes [Tue, 28 Apr 2009 16:15:02 +0000 (16:15 +0000)]
Use an alias for current_relation_members to avoid clashing with
any attempt to eager load it.

15 years agoEager load nodes and node tags for the way when doing a getway call.
Tom Hughes [Tue, 28 Apr 2009 15:55:54 +0000 (15:55 +0000)]
Eager load nodes and node tags for the way when doing a getway call.

15 years agoDon't bother running GC as it doesn't seem to get as much memory back
Tom Hughes [Tue, 28 Apr 2009 14:07:51 +0000 (14:07 +0000)]
Don't bother running GC as it doesn't seem to get as much memory back
anyway plus the run_gc! method in the fastcgi dispatcher is a disaster
as it disables GC completely except for when it is forced by making a
call to the run_gc! method.

15 years agoAdd a changeset cache to stop us looking up the same changeset over
Tom Hughes [Tue, 28 Apr 2009 13:40:30 +0000 (13:40 +0000)]
Add a changeset cache to stop us looking up the same changeset over
and over again when processing a map call.

15 years agoCope with sessions which don't exist.
Tom Hughes [Tue, 28 Apr 2009 12:08:47 +0000 (12:08 +0000)]
Cope with sessions which don't exist.

15 years agoReject any AMF request which is not a POST request.
Tom Hughes [Tue, 28 Apr 2009 11:14:15 +0000 (11:14 +0000)]
Reject any AMF request which is not a POST request.

15 years agoFix session plugin work with the new ruby pg driver for postgresql.
Tom Hughes [Tue, 28 Apr 2009 10:57:25 +0000 (10:57 +0000)]
Fix session plugin work with the new ruby pg driver for postgresql.

15 years agoRemove debugging statement.
Tom Hughes [Tue, 28 Apr 2009 09:00:01 +0000 (09:00 +0000)]
Remove debugging statement.

15 years agoDon't log the contents of the changeset.
Tom Hughes [Tue, 28 Apr 2009 08:59:33 +0000 (08:59 +0000)]
Don't log the contents of the changeset.

15 years agoQuick fix to reference relation rather than relation_member when linking to the relat...
Thomas Wood [Mon, 27 Apr 2009 21:26:23 +0000 (21:26 +0000)]
Quick fix to reference relation rather than relation_member when linking to the relation, not sure when the bug was introduced. Tests still need to be written for the browse controller.
Closes #1764

15 years agoFurther clarify descriptive texts regarding public editing.
Thomas Wood [Mon, 27 Apr 2009 18:23:43 +0000 (18:23 +0000)]
Further clarify descriptive texts regarding public editing.

15 years agoFix the node and relation tests from when the users with data public=false were disal...
Shaun McDonald [Mon, 27 Apr 2009 11:57:58 +0000 (11:57 +0000)]
Fix the node and relation tests from when the users with data public=false were disallowed from editing. Needed extra fixtures.

15 years agoImprove the node/way/relation already deleted error message, and get rid bug in way...
Shaun McDonald [Mon, 27 Apr 2009 11:49:56 +0000 (11:49 +0000)]
Improve the node/way/relation already deleted error message, and get rid bug in way model with missing new in exception

15 years agoFinish removing old request counting logic.
Tom Hughes [Sun, 26 Apr 2009 23:27:40 +0000 (23:27 +0000)]
Finish removing old request counting logic.

15 years agoRemove old code to exit after 10000 requests as the memory limit code
Tom Hughes [Sun, 26 Apr 2009 23:14:20 +0000 (23:14 +0000)]
Remove old code to exit after 10000 requests as the memory limit code
should do a better job of controlling things.

15 years agoTidy up.
Tom Hughes [Sun, 26 Apr 2009 23:13:06 +0000 (23:13 +0000)]
Tidy up.

15 years agoMake node update work with the new require data public to edit policy. Added convenie...
Shaun McDonald [Sun, 26 Apr 2009 22:46:41 +0000 (22:46 +0000)]
Make node update work with the new require data public to edit policy. Added convenience testing method for the require data public. Add 2 new fixtures that are owned by the public user.

15 years agoMake the report_error function support any http status code for added flexibility.
Shaun McDonald [Sun, 26 Apr 2009 21:11:31 +0000 (21:11 +0000)]
Make the report_error function support any http status code for added flexibility.

15 years agoFix typo of missing .new for some of the errors. Tests are useful.
Shaun McDonald [Sun, 26 Apr 2009 20:56:58 +0000 (20:56 +0000)]
Fix typo of missing .new for some of the errors. Tests are useful.

15 years agomove relations mapping out of way/node objects, so we don't need horrible expensive...
Richard Fairhurst [Sun, 26 Apr 2009 18:26:48 +0000 (18:26 +0000)]
move relations mapping out of way/node objects, so we don't need horrible expensive getrelations any more

15 years agoRun GC if we hit the memory limit, and only restart if we are still too big.
Tom Hughes [Sun, 26 Apr 2009 17:01:59 +0000 (17:01 +0000)]
Run GC if we hit the memory limit, and only restart if we are still too big.

15 years agoIncrease the hard memory limit and set a lower soft limit that does a
Tom Hughes [Sun, 26 Apr 2009 16:56:40 +0000 (16:56 +0000)]
Increase the hard memory limit and set a lower soft limit that does a
clean restart between requests.

15 years agoDo a GC run every 10 requests.
Tom Hughes [Sun, 26 Apr 2009 11:28:55 +0000 (11:28 +0000)]
Do a GC run every 10 requests.

15 years agoNull descriptions are not allowed.
Tom Hughes [Sat, 25 Apr 2009 22:26:56 +0000 (22:26 +0000)]
Null descriptions are not allowed.

15 years agoFixed bug in exception creation.
Matt Amos [Sat, 25 Apr 2009 15:20:48 +0000 (15:20 +0000)]
Fixed bug in exception creation.

15 years agoibid
Richard Fairhurst [Fri, 24 Apr 2009 20:40:48 +0000 (20:40 +0000)]
ibid

15 years agoa couple of minor revert fixes
Richard Fairhurst [Fri, 24 Apr 2009 20:12:43 +0000 (20:12 +0000)]
a couple of minor revert fixes

15 years agoFixed dumb copy-and-paste mistake.
Matt Amos [Fri, 24 Apr 2009 18:47:41 +0000 (18:47 +0000)]
Fixed dumb copy-and-paste mistake.

15 years agopass common API error text through to Potlatch so it can be shown to the user
Richard Fairhurst [Fri, 24 Apr 2009 17:44:52 +0000 (17:44 +0000)]
pass common API error text through to Potlatch so it can be shown to the user

15 years agolots of relations changes for speed and version management
Richard Fairhurst [Fri, 24 Apr 2009 14:46:52 +0000 (14:46 +0000)]
lots of relations changes for speed and version management

15 years agoPatching better 412 error messages from mis-commit on old api06 branch.
Matt Amos [Fri, 24 Apr 2009 10:08:15 +0000 (10:08 +0000)]
Patching better 412 error messages from mis-commit on old api06 branch.

15 years agoBackout broken attempt at making case insensitive authentication work
Tom Hughes [Thu, 23 Apr 2009 23:46:45 +0000 (23:46 +0000)]
Backout broken attempt at making case insensitive authentication work
on Postgres. As implemented this forces a table scan to authenticate
users which is ridiculous to save people pressing the shift key.

15 years agoThe render method needs to be last, otherwise the error header won't get set. Needs...
Shaun McDonald [Thu, 23 Apr 2009 21:03:59 +0000 (21:03 +0000)]
The render method needs to be last, otherwise the error header won't get set. Needs tests.

15 years agoHack a way to make the email and display name case insensitive for logging in, based...
Shaun McDonald [Thu, 23 Apr 2009 19:20:08 +0000 (19:20 +0000)]
Hack a way to make the email and display name case insensitive for logging in, based on a suggestion by firefishy to use ILIKE. Changes requested from users on mailing list. Includes some tests to check the case insensitivity of the username, and and e-mail address on login.

15 years agoAdded better error messages on 412 precondition failed.
Matt Amos [Thu, 23 Apr 2009 18:39:36 +0000 (18:39 +0000)]
Added better error messages on 412 precondition failed.

15 years agofix another way-node/Way-Node problem in amf_controller; add WinIE JS compatibility...
Richard Fairhurst [Thu, 23 Apr 2009 17:54:17 +0000 (17:54 +0000)]
fix another way-node/Way-Node problem in amf_controller; add WinIE JS compatibility via ExternalInterface (we can use this later to alert for a commit message if none is provided)

15 years agochange updatelinks params so that Potlatch can pass in the view bbox. Also check...
Harry Wood [Thu, 23 Apr 2009 14:38:40 +0000 (14:38 +0000)]
change updatelinks params so that Potlatch can pass in the view bbox. Also check if it's missing. closes #1738

15 years agoactually delete nodes on deleteway (might help)
Richard Fairhurst [Thu, 23 Apr 2009 12:01:42 +0000 (12:01 +0000)]
actually delete nodes on deleteway (might help)

15 years agofix nodes bug
Richard Fairhurst [Thu, 23 Apr 2009 08:32:26 +0000 (08:32 +0000)]
fix nodes bug

15 years agolighttpd increase server.max-fds from 1024 (default) to 8192 after lighttpd deadlock.
Grant Slater [Thu, 23 Apr 2009 02:00:15 +0000 (02:00 +0000)]
lighttpd increase server.max-fds from 1024 (default) to 8192 after lighttpd deadlock.

15 years agofix word-wrap in "close changeset" dialogue
Richard Fairhurst [Wed, 22 Apr 2009 23:57:37 +0000 (23:57 +0000)]
fix word-wrap in "close changeset" dialogue

15 years agoremove debug stuff
Richard Fairhurst [Wed, 22 Apr 2009 19:42:22 +0000 (19:42 +0000)]
remove debug stuff

15 years agochange relation_member 'type' case, to match change in database
Richard Fairhurst [Wed, 22 Apr 2009 17:47:06 +0000 (17:47 +0000)]
change relation_member 'type' case, to match change in database

15 years agoFix multiple issues with links to /history from the homepage. Thanks to Ed Avis for...
Thomas Wood [Wed, 22 Apr 2009 17:08:04 +0000 (17:08 +0000)]
Fix multiple issues with links to /history from the homepage. Thanks to Ed Avis for bringing this to our attention.

15 years agoFixing the create relation test, which now also tests to make sure that private users...
Shaun McDonald [Wed, 22 Apr 2009 14:38:23 +0000 (14:38 +0000)]
Fixing the create relation test, which now also tests to make sure that private users cannot edit.

15 years agoUse postgres interval syntax.
Tom Hughes [Wed, 22 Apr 2009 13:41:17 +0000 (13:41 +0000)]
Use postgres interval syntax.

15 years agoThe active flag is still an integer for some reason, not a boolean.
Tom Hughes [Wed, 22 Apr 2009 13:34:12 +0000 (13:34 +0000)]
The active flag is still an integer for some reason, not a boolean.
Closes #1727.

15 years agoadding the maximum number of elements in a changeset to the capabilities call, includ...
Shaun McDonald [Wed, 22 Apr 2009 11:03:22 +0000 (11:03 +0000)]
adding the maximum number of elements in a changeset to the capabilities call, including test update

15 years agobit more debug
Richard Fairhurst [Wed, 22 Apr 2009 08:37:55 +0000 (08:37 +0000)]
bit more debug

15 years agoadd temporary relations debug code
Richard Fairhurst [Wed, 22 Apr 2009 08:25:33 +0000 (08:25 +0000)]
add temporary relations debug code

15 years agoremove Bavaria
Richard Fairhurst [Wed, 22 Apr 2009 07:41:21 +0000 (07:41 +0000)]
remove Bavaria

15 years agofixing some of the relation tests. Some adjustments to the fixtures.
Shaun McDonald [Wed, 22 Apr 2009 00:42:23 +0000 (00:42 +0000)]
fixing some of the relation tests. Some adjustments to the fixtures.

15 years agoibid
Richard Fairhurst [Tue, 21 Apr 2009 23:59:27 +0000 (23:59 +0000)]
ibid

15 years agothere is not HTML attribute named "padding". either use "cellpadding" (this patch...
Frederik Ramm [Tue, 21 Apr 2009 23:55:02 +0000 (23:55 +0000)]
there is not HTML attribute named "padding". either use "cellpadding" (this patch), or use the CSS attribute (i.e. style="padding: 0px").

15 years agoQuick and dirty fix for relation tags issue.
Matt Amos [Tue, 21 Apr 2009 23:40:27 +0000 (23:40 +0000)]
Quick and dirty fix for relation tags issue.

15 years agomodified "user" link in "recent changes" list to point directly to user's list of...
Frederik Ramm [Tue, 21 Apr 2009 23:38:43 +0000 (23:38 +0000)]
modified "user" link in "recent changes" list to point directly to user's list of changes which is what you expect in this context, rather than going to that user's user page and having to click "edits" there.

15 years agofix id/relid inconsistency
Richard Fairhurst [Tue, 21 Apr 2009 23:36:53 +0000 (23:36 +0000)]
fix id/relid inconsistency

15 years agoFixed search controller to have some chance of working.
Tom Hughes [Tue, 21 Apr 2009 23:35:19 +0000 (23:35 +0000)]
Fixed search controller to have some chance of working.

15 years agoForce selection to fail when no traces match the tag.
Tom Hughes [Tue, 21 Apr 2009 21:54:44 +0000 (21:54 +0000)]
Force selection to fail when no traces match the tag.

15 years agoDon't generate an IN condition with an empty list.
Tom Hughes [Tue, 21 Apr 2009 21:51:02 +0000 (21:51 +0000)]
Don't generate an IN condition with an empty list.

15 years agoUse correct names for member types.
Tom Hughes [Tue, 21 Apr 2009 21:37:27 +0000 (21:37 +0000)]
Use correct names for member types.

15 years agoFix bbox display again, how do we keep mixing our lons and lats?
Thomas Wood [Tue, 21 Apr 2009 21:30:37 +0000 (21:30 +0000)]
Fix bbox display again, how do we keep mixing our lons and lats?

15 years agoAdding more tests for updating relation tags.
Matt Amos [Tue, 21 Apr 2009 20:33:16 +0000 (20:33 +0000)]
Adding more tests for updating relation tags.

15 years agoExtra test for updating relation tags.
Matt Amos [Tue, 21 Apr 2009 19:53:14 +0000 (19:53 +0000)]
Extra test for updating relation tags.

15 years agoMore test fixes after fixture changes.
Matt Amos [Tue, 21 Apr 2009 19:51:43 +0000 (19:51 +0000)]
More test fixes after fixture changes.

15 years agoFixed formatting and stuff in fixtures.
Matt Amos [Tue, 21 Apr 2009 18:37:24 +0000 (18:37 +0000)]
Fixed formatting and stuff in fixtures.

15 years agoSlight performance improvement (a reported 2s) by skipping db query if no bbox is...
Thomas Wood [Tue, 21 Apr 2009 18:04:43 +0000 (18:04 +0000)]
Slight performance improvement (a reported 2s) by skipping db query if no bbox is passed in on /history
Thanks apmon for the report.

15 years agoAdd new fixtures for testing multiple tags on a relation.
Shaun McDonald [Tue, 21 Apr 2009 17:54:59 +0000 (17:54 +0000)]
Add new fixtures for testing multiple tags on a relation.