]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Wed, 20 May 2009 22:18:36 +0000 (22:18 +0000)]
Add a global timeout that is applied to most API requests.
Matt Amos [Wed, 20 May 2009 17:39:59 +0000 (17:39 +0000)]
Using an around_handler for catching and rendering errors in most of the API controller methods. This simplifies the code and makes errors and error messages a bit more consistent. Also added a utility method for checking the HTTP method.
Tom Hughes [Wed, 20 May 2009 13:24:59 +0000 (13:24 +0000)]
Log arguments to AMF read methods.
Thomas Wood [Sat, 16 May 2009 22:46:42 +0000 (22:46 +0000)]
Back out the stupid change.
Thomas Wood [Sat, 16 May 2009 22:42:34 +0000 (22:42 +0000)]
Second part of [15085]
Thomas Wood [Sat, 16 May 2009 22:37:08 +0000 (22:37 +0000)]
Database config changes to hopefully stop people from accidently commiting database.yml. (As recommended by Shaun)
I'll back this out if it doesn't work nicely with what's on dev.
Tom Hughes [Fri, 15 May 2009 17:59:01 +0000 (17:59 +0000)]
Revert harry's commit of the database configuration.
Harry Wood [Fri, 15 May 2009 16:24:55 +0000 (16:24 +0000)]
label changesets as (big) based on their bbox area
Shaun McDonald [Fri, 15 May 2009 15:41:45 +0000 (15:41 +0000)]
Extra little test, setting the language on the diary fixtures.
Tom Hughes [Fri, 15 May 2009 09:18:10 +0000 (09:18 +0000)]
Arrays of object IDs are a bad idea.
Tom Hughes [Fri, 15 May 2009 09:10:50 +0000 (09:10 +0000)]
Optimise retrieval of full relations.
Matt Amos [Thu, 14 May 2009 13:13:09 +0000 (13:13 +0000)]
Oops. Fixed another Time/DateTime problem.
Matt Amos [Thu, 14 May 2009 11:52:15 +0000 (11:52 +0000)]
Fixed problem with Time vs. DateTime classes in fixtures. Weirdly only affected mysql backend.
Matt Amos [Thu, 14 May 2009 11:19:28 +0000 (11:19 +0000)]
Fixed precondition failed message which was trying to dereference nil.
Richard Fairhurst [Thu, 14 May 2009 08:38:32 +0000 (08:38 +0000)]
Apply #1824.
Shaun McDonald [Wed, 13 May 2009 23:42:18 +0000 (23:42 +0000)]
Remove a rescue, which is stopping a more detailed error message being returned to the user.
Richard Fairhurst [Wed, 13 May 2009 19:23:59 +0000 (19:23 +0000)]
always set new node id when updating/deleting (to be read in conjunction with zere's patch)
Matt Amos [Wed, 13 May 2009 19:21:04 +0000 (19:21 +0000)]
Added a consistency check that both ids are valid and match. Fixed diff upload code where this wasn't being set.
Shaun McDonald [Tue, 12 May 2009 15:29:27 +0000 (15:29 +0000)]
Actually mark a trace as being public based on the saved preference, rather than simply ignoring the saved preference.
Matt Amos [Tue, 12 May 2009 14:38:22 +0000 (14:38 +0000)]
Removed updatetimeout method, as it isn't needed any more.
Matt Amos [Tue, 12 May 2009 13:54:37 +0000 (13:54 +0000)]
Fixed bug #1816 - the timeout updating logic should have been in a before_save handler, not in save_with_tags.
Tom Hughes [Mon, 11 May 2009 16:50:09 +0000 (16:50 +0000)]
Use a local lookup table for country bounding boxes rather than relying
on geonames.org being able to do it in a reasonable time.
Matt Amos [Mon, 11 May 2009 16:17:36 +0000 (16:17 +0000)]
disabling test case because i don't think there is a fix with the current version of composite_primary_keys.
Shaun McDonald [Mon, 11 May 2009 15:50:03 +0000 (15:50 +0000)]
Use a regular expression for the test, since it can give one of two responses based on the order in the db.
Matt Amos [Mon, 11 May 2009 15:16:36 +0000 (15:16 +0000)]
A better optimisation, as suggested by TomH.
Matt Amos [Mon, 11 May 2009 14:34:04 +0000 (14:34 +0000)]
Added optimisation for way checking. Same method as for relations.
Tom Hughes [Mon, 11 May 2009 10:31:34 +0000 (10:31 +0000)]
Destroy OL objects which use the dataLayer before we destroy the layer
or we will get errors which stop the rest of stopBrowse() executing.
Tom Hughes [Sun, 10 May 2009 11:57:10 +0000 (11:57 +0000)]
Add an internal geocoder for lat/lon positions.
Matt Amos [Sun, 10 May 2009 00:33:55 +0000 (00:33 +0000)]
Fixed problem where tag lengths were generating a 422 error with no message. They now generate a 400 error with a meaningful message.
Tom Hughes [Sat, 9 May 2009 16:46:36 +0000 (16:46 +0000)]
Add a warning about whitelisting webmaster@openstreetmap.org in antispam
systems.
Tom Hughes [Sat, 9 May 2009 12:17:10 +0000 (12:17 +0000)]
Set a custom return path so that we can ignore bounces.
Richard Fairhurst [Sat, 9 May 2009 10:00:40 +0000 (10:00 +0000)]
a few small fixes
Tom Hughes [Fri, 8 May 2009 18:21:39 +0000 (18:21 +0000)]
Move geocoder constants to application configuration to avoid test warnings.
Tom Hughes [Fri, 8 May 2009 18:12:30 +0000 (18:12 +0000)]
Add gem specification file to stop rake test complaining.
Shaun McDonald [Fri, 8 May 2009 18:04:08 +0000 (18:04 +0000)]
Updating for rails 2.2.2
Tom Hughes [Fri, 8 May 2009 17:56:12 +0000 (17:56 +0000)]
Patch composite_primary_keys to work around issue when one component of
a composite key is called "id".
Tom Hughes [Fri, 8 May 2009 17:54:49 +0000 (17:54 +0000)]
Add version 2.2.2 of composite_primary_keys.
Shaun McDonald [Fri, 8 May 2009 17:26:23 +0000 (17:26 +0000)]
fix the user unit test so that it doesn't use a depricated method in rails 2.2.2
Tom Hughes [Fri, 8 May 2009 15:05:57 +0000 (15:05 +0000)]
Include CC-BY-SA in attribution.
Shaun McDonald [Fri, 8 May 2009 14:20:26 +0000 (14:20 +0000)]
No need to define a constand for the appconfig var. Removes a warning when running under rails 2.2.2
Shaun McDonald [Fri, 8 May 2009 13:12:53 +0000 (13:12 +0000)]
more changeset tests. No need for @ vars in the tests
Tom Hughes [Fri, 8 May 2009 08:12:26 +0000 (08:12 +0000)]
Add missing requires for the migration helper core.
Tom Hughes [Fri, 8 May 2009 08:10:28 +0000 (08:10 +0000)]
Fix bogus casts - lat/lon are signed.
Tom Hughes [Fri, 8 May 2009 08:01:33 +0000 (08:01 +0000)]
Add postgres implementation of tile_for_point function.
Tom Hughes [Fri, 8 May 2009 00:03:40 +0000 (00:03 +0000)]
Add yet more foreign keys.
Thomas Wood [Thu, 7 May 2009 23:02:46 +0000 (23:02 +0000)]
One last commit tonight :P
Thomas Wood [Thu, 7 May 2009 22:58:32 +0000 (22:58 +0000)]
Fix the test I just broke...
Thomas Wood [Thu, 7 May 2009 22:52:02 +0000 (22:52 +0000)]
Commit bits of missing css that were required in previous upload.
Thomas Wood [Thu, 7 May 2009 22:48:14 +0000 (22:48 +0000)]
De-duplicate some of the changeset stuff out to a new partial view.
Add css hooks for upcoming fix for #1734
Shaun McDonald [Thu, 7 May 2009 17:57:59 +0000 (17:57 +0000)]
Some more tests
Tom Hughes [Thu, 7 May 2009 17:54:52 +0000 (17:54 +0000)]
Add foreign key constraints for users.
Shaun McDonald [Thu, 7 May 2009 14:10:17 +0000 (14:10 +0000)]
fix typo which meant that it was testing the node twice, rather than the node then the node history
Thomas Wood [Wed, 6 May 2009 21:08:50 +0000 (21:08 +0000)]
Tests for PreconditionFailed error messages.
Change to relation.rb to bring element selection in-line with that of way, so to return nil to be caught later, rather than raise an error.
Change to way.rb to clarify which way on diff upload.
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.
Shaun McDonald [Wed, 6 May 2009 17:56:10 +0000 (17:56 +0000)]
fixing the tests I broke earlier due to the fixture changes
Shaun McDonald [Wed, 6 May 2009 14:58:48 +0000 (14:58 +0000)]
More trace tests
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.
Shaun McDonald [Tue, 5 May 2009 18:31:37 +0000 (18:31 +0000)]
some tests for the site and export controllers
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.
Richard Fairhurst [Mon, 4 May 2009 23:37:06 +0000 (23:37 +0000)]
Potlatch 0.11b
Thomas Wood [Mon, 4 May 2009 22:42:07 +0000 (22:42 +0000)]
Sort the tags for the databrowser output.
Thomas Wood [Sat, 2 May 2009 18:28:39 +0000 (18:28 +0000)]
Fix another mis-referenced error message id!
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
Tom Hughes [Fri, 1 May 2009 23:20:53 +0000 (23:20 +0000)]
Get rid of foreign_class specification which is no longer needed.
Thomas Wood [Fri, 1 May 2009 21:01:02 +0000 (21:01 +0000)]
Fix indentation fail
Thomas Wood [Fri, 1 May 2009 20:49:51 +0000 (20:49 +0000)]
Fix AMF controller failing tests due to changed error messages.
Shaun McDonald [Fri, 1 May 2009 10:29:19 +0000 (10:29 +0000)]
a fix for the relation controller test
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.
Matt Amos [Thu, 30 Apr 2009 18:12:23 +0000 (18:12 +0000)]
Fixed bad coding practice in test.
Matt Amos [Thu, 30 Apr 2009 18:09:54 +0000 (18:09 +0000)]
Fixed indeterminacy in test.
Matt Amos [Thu, 30 Apr 2009 17:37:18 +0000 (17:37 +0000)]
Fix failing test case.
Shaun McDonald [Thu, 30 Apr 2009 17:25:53 +0000 (17:25 +0000)]
couple of fixes to the changeset upload delete
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
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.
Tom Hughes [Thu, 30 Apr 2009 07:54:26 +0000 (07:54 +0000)]
Do the statistics generation in a transaction.
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
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."
Thomas Wood [Thu, 30 Apr 2009 06:50:51 +0000 (06:50 +0000)]
Fix html: closing <a> tag.
Richard Fairhurst [Thu, 30 Apr 2009 01:23:50 +0000 (01:23 +0000)]
Potlatch 0.11a
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.
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.
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
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.
Tom Hughes [Tue, 28 Apr 2009 16:26:06 +0000 (16:26 +0000)]
Eager load node and way details when processing a map call.
Tom Hughes [Tue, 28 Apr 2009 16:25:37 +0000 (16:25 +0000)]
Use the alias for the conditions as well...
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.
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.
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.
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.
Tom Hughes [Tue, 28 Apr 2009 12:08:47 +0000 (12:08 +0000)]
Cope with sessions which don't exist.
Tom Hughes [Tue, 28 Apr 2009 11:14:15 +0000 (11:14 +0000)]
Reject any AMF request which is not a POST request.
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.
Tom Hughes [Tue, 28 Apr 2009 09:00:01 +0000 (09:00 +0000)]
Remove debugging statement.
Tom Hughes [Tue, 28 Apr 2009 08:59:33 +0000 (08:59 +0000)]
Don't log the contents of the changeset.
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
Thomas Wood [Mon, 27 Apr 2009 18:23:43 +0000 (18:23 +0000)]
Further clarify descriptive texts regarding public editing.
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.
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
Tom Hughes [Sun, 26 Apr 2009 23:27:40 +0000 (23:27 +0000)]
Finish removing old request counting logic.
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.