]> git.openstreetmap.org Git - rails.git/log
14 years agoresync from rails_port 11795:12304
Shaun McDonald [Fri, 12 Dec 2008 19:29:27 +0000 (19:29 +0000)]
resync from rails_port 11795:12304

14 years agoLog the request on a few requests when there is a bad request, probably should do...
Shaun McDonald [Fri, 12 Dec 2008 19:04:28 +0000 (19:04 +0000)]
Log the request on a few requests when there is a bad request, probably should do this in a few more places. This makes it easier to see why we are getting errors/bad requests.

14 years agoremoving debug statement
Shaun McDonald [Fri, 12 Dec 2008 18:56:22 +0000 (18:56 +0000)]
removing debug statement

14 years agoImproving the not found handling of preferences. adding a user preference test. addin...
Shaun McDonald [Fri, 12 Dec 2008 18:54:03 +0000 (18:54 +0000)]
Improving the not found handling of preferences. adding a user preference test. adding some utility methods to the  test helper

14 years agoAdd some extra indexes.
Tom Hughes [Fri, 12 Dec 2008 15:43:02 +0000 (15:43 +0000)]
Add some extra indexes.

14 years agoOptimise lookup of traces with a given tag.
Tom Hughes [Fri, 12 Dec 2008 15:17:14 +0000 (15:17 +0000)]
Optimise lookup of traces with a given tag.

14 years agocapture the too many way nodes error, and give the user an error message
Shaun McDonald [Fri, 12 Dec 2008 11:24:40 +0000 (11:24 +0000)]
capture the too many way nodes error, and give the user an error message

14 years agoMaking amf controller act more like the xml apis
Shaun McDonald [Thu, 11 Dec 2008 17:22:15 +0000 (17:22 +0000)]
Making amf controller act more like the xml apis

14 years agoDon't give an error when you access the login page when you are logged in. Instead...
Shaun McDonald [Thu, 11 Dec 2008 15:05:53 +0000 (15:05 +0000)]
Don't give an error when you access the login page when you are logged in. Instead take you to the page in the referer or the home page.

14 years agosome more progress towards making amf_controller do version checking of nodes before...
Shaun McDonald [Thu, 11 Dec 2008 10:38:36 +0000 (10:38 +0000)]
some more progress towards making amf_controller do version checking of nodes before deleting them

14 years agosome further progress to amf controller checking the version numbers.
Shaun McDonald [Wed, 10 Dec 2008 18:07:30 +0000 (18:07 +0000)]
some further progress to amf controller checking the version numbers.

14 years agoAdded missing version to the pure rails AMF controller. More stringent tests on which...
Matt Amos [Wed, 10 Dec 2008 14:31:07 +0000 (14:31 +0000)]
Added missing version to the pure rails AMF controller. More stringent tests on whichways.

14 years agoSome fixes to the rails part of the AMF controller and associated test.
Matt Amos [Wed, 10 Dec 2008 13:23:21 +0000 (13:23 +0000)]
Some fixes to the rails part of the AMF controller and associated test.

14 years agoSome improvements for the XML parsing, as there are somethings that we don't need...
Shaun McDonald [Tue, 9 Dec 2008 18:44:11 +0000 (18:44 +0000)]
Some improvements for the XML parsing, as there are somethings that we don't need, like timestamp and visibility, thus hopefully bringing a speedup in the xml parsing. Some more AMF controller fixes, plenty more to go though.

15 years agocount -> size for compatibility with ruby 1.8.6
Shaun McDonald [Mon, 8 Dec 2008 15:47:29 +0000 (15:47 +0000)]
count -> size for compatibility with ruby 1.8.6

15 years agothe user id may be negative, so that osmosis can create changesets for users that...
Shaun McDonald [Mon, 8 Dec 2008 15:32:29 +0000 (15:32 +0000)]
the user id may be negative, so that osmosis can create changesets for users that are anonymous, which it uses a negative id for, as a special id.

15 years agoAdding the ability to see the min/max lat/lon for a changeset in the data browser...
Shaun McDonald [Mon, 8 Dec 2008 15:30:19 +0000 (15:30 +0000)]
Adding the ability to see the min/max lat/lon for a changeset in the data browser. Adding file for the nice message that should show when a user is missing in the message controller.

15 years agoAdding some amf create poi tests. Minor bugfix tweaks to the amf controller
Shaun McDonald [Mon, 8 Dec 2008 14:22:34 +0000 (14:22 +0000)]
Adding some amf create poi tests. Minor bugfix tweaks to the amf controller

15 years agoFix for the refactoring commited yesterday, based on review by Dave Stubbs
Shaun McDonald [Fri, 5 Dec 2008 11:08:58 +0000 (11:08 +0000)]
Fix for the refactoring commited yesterday, based on review by Dave Stubbs

15 years agoRefactoring the amf controller, and all models so that save_with_history! is now...
Shaun McDonald [Thu, 4 Dec 2008 17:30:17 +0000 (17:30 +0000)]
Refactoring the amf controller, and all models so that save_with_history! is now private. Everyone should use create_with_history, delete_with_history, and update_from instead. Also gets the amf controller to do version checks in the node/way/relation models. Needs checked. This breaks Potlatch until #1376 is fixed.

15 years agoturning the session off for the changeset controller, to come in line with the other...
Shaun McDonald [Thu, 4 Dec 2008 14:36:21 +0000 (14:36 +0000)]
turning the session off for the changeset controller, to come in line with the other api controllers

15 years agoAdding missing fixtures to test helper.
Matt Amos [Wed, 3 Dec 2008 18:24:00 +0000 (18:24 +0000)]
Adding missing fixtures to test helper.

15 years agoDeal with active record not found exceptions when creating message. Some tidying...
Shaun McDonald [Wed, 3 Dec 2008 12:56:02 +0000 (12:56 +0000)]
Deal with active record not found exceptions when creating message. Some tidying of html. For some reason in rails 2.1.2 having a comment at the end of a line, in the view,  means that the closing tag needs to be on the next line.

15 years agoadding link to download the full changeset xml
Shaun McDonald [Tue, 2 Dec 2008 18:44:50 +0000 (18:44 +0000)]
adding link to download the full changeset xml

15 years agoActually set the instance var when closing the changeset
Shaun McDonald [Mon, 1 Dec 2008 18:47:03 +0000 (18:47 +0000)]
Actually set the instance var when closing the changeset

15 years agoensure that uploads that don't supply a lat and lon for a node. Adding related test...
Shaun McDonald [Mon, 1 Dec 2008 18:32:54 +0000 (18:32 +0000)]
ensure that uploads that don't supply a lat and lon for a node. Adding related test and fixing other tests.

15 years agobetter handling of duplicate tags. Extra validation in the tests.
Shaun McDonald [Fri, 28 Nov 2008 17:38:23 +0000 (17:38 +0000)]
better handling of duplicate tags. Extra validation in the tests.

15 years agoChanged duplicate tags test to test the correct code path - was previously failing...
Matt Amos [Fri, 28 Nov 2008 12:33:18 +0000 (12:33 +0000)]
Changed duplicate tags test to test the correct code path - was previously failing in libxml, rather than the duplicate tags check.

15 years agoAdding pagination to the changesets, thus allowing you to browe large changesets...
Shaun McDonald [Thu, 27 Nov 2008 17:06:43 +0000 (17:06 +0000)]
Adding pagination to the changesets, thus allowing you to browe large changesets, without MySQL complaining about memory. Probably needs some fine tuning. You currently can only page one of nodes, ways, and relations, without manually setting the relations. Fixing deprection notice for the classic_pagination plugin.

15 years agoAdding test to check that users can't update changesets that they don't own.
Matt Amos [Wed, 26 Nov 2008 15:03:50 +0000 (15:03 +0000)]
Adding test to check that users can't update changesets that they don't own.

15 years agoMoved transaction boundary to cover used-by tests on deletion so that the database...
Matt Amos [Wed, 26 Nov 2008 14:49:56 +0000 (14:49 +0000)]
Moved transaction boundary to cover used-by tests on deletion so that the database can help prevent race conditions.

15 years agoMoved changeset consistency checks to library code.
Matt Amos [Wed, 26 Nov 2008 12:56:42 +0000 (12:56 +0000)]
Moved changeset consistency checks to library code.

15 years agoRenaming the include action to expand_bbox in the changeset controller.
Shaun McDonald [Wed, 26 Nov 2008 11:36:10 +0000 (11:36 +0000)]
Renaming the include action to expand_bbox in the changeset controller.

15 years agoAdd a delete method for the user model.
Tom Hughes [Tue, 25 Nov 2008 23:53:21 +0000 (23:53 +0000)]
Add a delete method for the user model.

15 years agoSome improvements to the error messages that are returned by the api.
Shaun McDonald [Tue, 25 Nov 2008 18:59:35 +0000 (18:59 +0000)]
Some improvements to the error messages that are returned by the api.

15 years agoMore model validations. Fixing one test.
Shaun McDonald [Tue, 25 Nov 2008 17:23:47 +0000 (17:23 +0000)]
More model validations. Fixing one test.

15 years agovarious fixes/enhancements, including a couple to the 0.5 version
Richard Fairhurst [Tue, 25 Nov 2008 00:15:30 +0000 (00:15 +0000)]
various fixes/enhancements, including a couple to the 0.5 version

15 years agovarious fixes/enhancements, including a couple to the 0.5 version
Richard Fairhurst [Tue, 25 Nov 2008 00:15:30 +0000 (00:15 +0000)]
various fixes/enhancements, including a couple to the 0.5 version

15 years agoMake the role in relations optional, with a test to make sure it is. Also start movin...
Shaun McDonald [Mon, 24 Nov 2008 18:55:24 +0000 (18:55 +0000)]
Make the role in relations optional, with a test to make sure it is. Also start moving the errors reading the xml to exceptions, thus making it possible to give meaningful error messages, when bad xml is sent (More work is required on this including doing the same for nodes and ways). With the latest gems update it seems that the lib xml handling was broken, using the newer method. Adding the content type for the exceptions.

15 years agocosmetic tweaks to diary interface. icon for new entries link
Harry Wood [Mon, 24 Nov 2008 00:40:04 +0000 (00:40 +0000)]
cosmetic tweaks to diary interface. icon for new entries link

15 years agoFixed bug in changeset idle timeout. Fixed another with a spurious require.
Matt Amos [Fri, 21 Nov 2008 12:53:09 +0000 (12:53 +0000)]
Fixed bug in changeset idle timeout. Fixed another with a spurious require.

15 years agoCloses #1350 through updating amf_controller to use the newer closed_at method of...
Shaun McDonald [Thu, 20 Nov 2008 21:23:44 +0000 (21:23 +0000)]
Closes #1350 through updating amf_controller to use the newer closed_at method of determining whether a changeset is closed. Richard please check the rest of the amf controller for more things that may reference the open field that is no longer available. Use is_open? to determine if a changeset is open. Fix indentation in amf controller. Fix minor bug in the links to changesets in the data brower.

15 years agoChangeset tag unit tests
Shaun McDonald [Wed, 19 Nov 2008 18:00:52 +0000 (18:00 +0000)]
Changeset tag unit tests

15 years agoMore tag validations, and finishing the node/way/relation tests.
Shaun McDonald [Wed, 19 Nov 2008 17:23:15 +0000 (17:23 +0000)]
More tag validations, and finishing the node/way/relation tests.

15 years agoRemember whether the user set the public checkbox on GPX upload as a user preference...
Shaun McDonald [Tue, 18 Nov 2008 20:22:09 +0000 (20:22 +0000)]
Remember whether the user set the public checkbox on GPX upload as a user preference. Closes #827

15 years agoRelation Tag testing. Also sort the belong_to/has_many for user/changeset/old_way.
Shaun McDonald [Tue, 18 Nov 2008 18:50:24 +0000 (18:50 +0000)]
Relation Tag testing. Also sort the belong_to/has_many for user/changeset/old_way.

15 years agoRequire the user to be logged in for those methods which make no
Tom Hughes [Tue, 18 Nov 2008 17:23:40 +0000 (17:23 +0000)]
Require the user to be logged in for those methods which make no
sense otherwise.

15 years agoFix syntax of status only renders. Closes #1345.
Tom Hughes [Tue, 18 Nov 2008 17:19:37 +0000 (17:19 +0000)]
Fix syntax of status only renders. Closes #1345.

15 years agoValidations on the way tags, with unit tests
Shaun McDonald [Tue, 18 Nov 2008 16:21:32 +0000 (16:21 +0000)]
Validations on the way tags, with unit tests

15 years agoMake the dates and times that the server deals with UTC. This is probably required...
Shaun McDonald [Mon, 17 Nov 2008 19:11:54 +0000 (19:11 +0000)]
Make the dates and times that the server deals with UTC. This is probably required for changeset, as they could auto close instantly when the clocks go forward by one hour.

15 years agoMigration to add close-time to changesets. This replaces the boolean 'open' attribute...
Matt Amos [Mon, 17 Nov 2008 19:00:01 +0000 (19:00 +0000)]
Migration to add close-time to changesets. This replaces the boolean 'open' attribute. Added checks to ensure that the maximum lifetime and number of changes in a changeset are enforced. Added some tests.

15 years agoAdding validations for the length of node tags, and the presence of the id (and versi...
Shaun McDonald [Mon, 17 Nov 2008 18:53:09 +0000 (18:53 +0000)]
Adding validations for the length of node tags, and the presence of the id (and version). More tests, including some boiler plate tests.

15 years agoMade user input parsing more robust in changeset query method. Added tests.
Matt Amos [Mon, 17 Nov 2008 15:30:46 +0000 (15:30 +0000)]
Made user input parsing more robust in changeset query method. Added tests.

15 years agoVerify that the key and value isn't getting mixed up by having them different. verify...
Shaun McDonald [Mon, 17 Nov 2008 15:00:19 +0000 (15:00 +0000)]
Verify that the key and value isn't getting mixed up by having them different. verify the error message is the same when returning the user conflict on closing changeset test.

15 years agoFixed some bugs in changeset query code. Added more test cases.
Matt Amos [Mon, 17 Nov 2008 14:32:15 +0000 (14:32 +0000)]
Fixed some bugs in changeset query code. Added more test cases.

15 years agoAdded tests for changeset close method.
Matt Amos [Mon, 17 Nov 2008 11:59:42 +0000 (11:59 +0000)]
Added tests for changeset close method.

15 years agoImplemented changeset tags updating via the update method.
Matt Amos [Mon, 17 Nov 2008 11:45:50 +0000 (11:45 +0000)]
Implemented changeset tags updating via the update method.

15 years agoAltered tests on AMF controller so that they give failures instead of errors. Return...
Matt Amos [Mon, 17 Nov 2008 11:12:48 +0000 (11:12 +0000)]
Altered tests on AMF controller so that they give failures instead of errors. Return format seems to have changed, so someone who knows more about AMF controller should have a look.

15 years agochangeset comments and a couple of other small fixes
Richard Fairhurst [Sun, 16 Nov 2008 13:30:02 +0000 (13:30 +0000)]
changeset comments and a couple of other small fixes

15 years agoFreezing composite primary key so that we can apply TomH's patch to it, and that...
Shaun McDonald [Sat, 15 Nov 2008 01:11:27 +0000 (01:11 +0000)]
Freezing composite primary key so that we can apply TomH's patch to it, and that way Potlatch will work in Rails mode without a problem. Please test.

15 years agofinished Rails-friendly amf_controller. Note that this requires Tom's patched composi...
Richard Fairhurst [Fri, 14 Nov 2008 17:36:38 +0000 (17:36 +0000)]
finished Rails-friendly amf_controller. Note that this requires Tom's patched composite_primary_keys to work unless you tell Potlatch to use SQL reads

15 years agoMore unit test stubs
Shaun McDonald [Fri, 14 Nov 2008 17:28:16 +0000 (17:28 +0000)]
More unit test stubs

15 years agoUnit tests work again. Fixed the set fixture class that I should. Adding 2 length...
Shaun McDonald [Fri, 14 Nov 2008 16:26:56 +0000 (16:26 +0000)]
Unit tests work again. Fixed the set fixture class that I should. Adding 2 length checks to the user preference controller.

15 years agoAdding some more unit test stubs that need filling out. Adding changeset tags fixture...
Shaun McDonald [Fri, 14 Nov 2008 02:06:04 +0000 (02:06 +0000)]
Adding some more unit test stubs that need filling out. Adding changeset tags fixture. Indentation fix in way model.

15 years agoAdding some more diary entry tests. Making the RSS feed links more portable, by using...
Shaun McDonald [Thu, 13 Nov 2008 17:20:40 +0000 (17:20 +0000)]
Adding some more diary entry tests. Making the RSS feed links more portable, by using the SERVER_URL constant. Fixing the validation for the length of the language of diary entries until the i18n branch is integrated.

15 years agoCovering the case of an entry not being found. More diary entry tests.
Shaun McDonald [Wed, 12 Nov 2008 18:48:58 +0000 (18:48 +0000)]
Covering the case of an entry not being found. More diary entry tests.

15 years agoreplaced "wtf does this do" comment by something explaining what it does.
Frederik Ramm [Wed, 12 Nov 2008 00:11:57 +0000 (00:11 +0000)]
replaced "wtf does this do" comment by something explaining what it does.

15 years agomore diary entry test
Shaun McDonald [Tue, 11 Nov 2008 18:33:08 +0000 (18:33 +0000)]
more diary entry test

15 years agomore diary entry tests, and a minor fix to the relation member that makes the code...
Shaun McDonald [Tue, 11 Nov 2008 18:07:59 +0000 (18:07 +0000)]
more diary entry tests, and a minor fix to the relation member that makes the code a bit more readable.

15 years agoslight more work on the diary test
Shaun McDonald [Mon, 10 Nov 2008 19:21:59 +0000 (19:21 +0000)]
slight more work on the diary test

15 years agoPostgres adapter, and make migration 022 db-agnostic
Andy Allan [Mon, 10 Nov 2008 19:14:00 +0000 (19:14 +0000)]
Postgres adapter, and make migration 022 db-agnostic

15 years agonil protection - mysql however has a default for enums, which is why it wasn't a...
Andy Allan [Mon, 10 Nov 2008 17:10:55 +0000 (17:10 +0000)]
nil protection - mysql however has a default for enums, which is why it wasn't a problem before

15 years agoMade relations ordered. Added some tests for this. Otherwise interface is unchanged.
Matt Amos [Mon, 10 Nov 2008 15:41:05 +0000 (15:41 +0000)]
Made relations ordered. Added some tests for this. Otherwise interface is unchanged.

15 years agoOoops, forgot to commit the routes for the changeset query and include calls.
Matt Amos [Mon, 10 Nov 2008 15:37:34 +0000 (15:37 +0000)]
Ooops, forgot to commit the routes for the changeset query and include calls.

15 years agoboolean correctness
Andy Allan [Mon, 10 Nov 2008 11:47:20 +0000 (11:47 +0000)]
boolean correctness

15 years agoforgot the test change from 11866
Andy Allan [Mon, 10 Nov 2008 11:39:10 +0000 (11:39 +0000)]
forgot the test change from 11866

15 years agoIn YAML yes is a boolean keyword: also fix test that was erroneously asserting success
Andy Allan [Mon, 10 Nov 2008 11:32:17 +0000 (11:32 +0000)]
In YAML yes is a boolean keyword: also fix test that was erroneously asserting success

15 years ago0.6-friendly Potlatch (work in progress). DO NOT SET POTLATCH_USE_SQL=false as it...
Richard Fairhurst [Sun, 9 Nov 2008 23:50:03 +0000 (23:50 +0000)]
0.6-friendly Potlatch (work in progress). DO NOT SET POTLATCH_USE_SQL=false as it won't work

15 years agoadding first integration for testing user diaries, as multiple controllers are requir...
Shaun McDonald [Sun, 9 Nov 2008 19:51:56 +0000 (19:51 +0000)]
adding first integration for testing user diaries, as multiple controllers are required. more work required.

15 years agoremove indexes before renaming tables (some dbs have database-level index namespaces...
Andy Allan [Sun, 9 Nov 2008 19:30:22 +0000 (19:30 +0000)]
remove indexes before renaming tables (some dbs have database-level index namespaces) and unsigned is also a mysqlism

15 years agoamf get*_history tests and related fixes
Dave Stubbs [Sun, 9 Nov 2008 18:48:16 +0000 (18:48 +0000)]
amf get*_history tests and related fixes

15 years agoa few more amf tests and associated bug fixes
Dave Stubbs [Sun, 9 Nov 2008 17:41:38 +0000 (17:41 +0000)]
a few more amf tests and associated bug fixes

15 years agofixing the tests due to a osm -> diffChange and moving to floats
Shaun McDonald [Sun, 9 Nov 2008 16:49:27 +0000 (16:49 +0000)]
fixing the tests due to a osm -> diffChange and moving to floats

15 years agoupdate nodes/ways/relation XML to include user id as well as display name
Dave Stubbs [Sun, 9 Nov 2008 16:43:09 +0000 (16:43 +0000)]
update nodes/ways/relation XML to include user id as well as display name

15 years agoreturn user id AND name with changeset get request
Frederik Ramm [Sun, 9 Nov 2008 16:12:23 +0000 (16:12 +0000)]
return user id AND name with changeset get request

15 years agomigrations: add specific method for nodes/ways/relations enum column
Andy Allan [Sun, 9 Nov 2008 16:11:42 +0000 (16:11 +0000)]
migrations: add specific method for nodes/ways/relations enum column

15 years agofix SCALE, make changeset GET use floats
Frederik Ramm [Sun, 9 Nov 2008 15:52:10 +0000 (15:52 +0000)]
fix SCALE, make changeset GET use floats

15 years agorequire auth for close
Frederik Ramm [Sun, 9 Nov 2008 13:44:08 +0000 (13:44 +0000)]
require auth for close

15 years agocosmetic tweaks to 'login' and 'create account' screens
Harry Wood [Sun, 9 Nov 2008 12:17:53 +0000 (12:17 +0000)]
cosmetic tweaks to 'login' and 'create account' screens

15 years agomini fix
Frederik Ramm [Sun, 9 Nov 2008 12:06:05 +0000 (12:06 +0000)]
mini fix

15 years agomake diff upload result a "diffResult" rather than "osm" document
Frederik Ramm [Sun, 9 Nov 2008 11:30:03 +0000 (11:30 +0000)]
make diff upload result a "diffResult" rather than "osm" document

15 years agomove index dropping to remove_index method
Andy Allan [Sun, 9 Nov 2008 11:19:46 +0000 (11:19 +0000)]
move index dropping to remove_index method

15 years agobumping the version of composite primary keys for the amf controler as there are...
Shaun McDonald [Sun, 9 Nov 2008 11:13:10 +0000 (11:13 +0000)]
bumping the version of composite primary keys for the amf controler as there are bugs in it

15 years agooops remove my test
Harry Wood [Sun, 9 Nov 2008 10:57:05 +0000 (10:57 +0000)]
oops remove my test

15 years agoUpdate DB readme for PgSQL a bit
Daniel Silverstone [Sun, 9 Nov 2008 10:41:48 +0000 (10:41 +0000)]
Update DB readme for PgSQL a bit

15 years agofix accidental commit of local config changes
Frederik Ramm [Sat, 8 Nov 2008 19:55:13 +0000 (19:55 +0000)]
fix accidental commit of local config changes

15 years agofix version number return for "modify" sections of diff uploads
Frederik Ramm [Sat, 8 Nov 2008 19:43:31 +0000 (19:43 +0000)]
fix version number return for "modify" sections of diff uploads

15 years ago1st amf_controller tests, and some basic sanity check fixes
Dave Stubbs [Sat, 8 Nov 2008 19:41:29 +0000 (19:41 +0000)]
1st amf_controller tests, and some basic sanity check fixes

15 years agoIgnore the bits in tmp/
Daniel Silverstone [Sat, 8 Nov 2008 19:33:41 +0000 (19:33 +0000)]
Ignore the bits in tmp/

15 years agoCREATE FUNCTION statement for pgsql
Daniel Silverstone [Sat, 8 Nov 2008 19:21:03 +0000 (19:21 +0000)]
CREATE FUNCTION statement for pgsql