rails.git
11 years agoDisabled edit tab until z13 is reached.
Tom Hughes [Wed, 27 May 2009 13:34:50 +0000 (13:34 +0000)]
Disabled edit tab until z13 is reached.

11 years agoCreate a proper exception class for invalid bounding box exceptions.
Tom Hughes [Tue, 26 May 2009 23:47:45 +0000 (23:47 +0000)]
Create a proper exception class for invalid bounding box exceptions.

11 years agoMerge r15175 from i18n_2 branch.
Thomas Wood [Tue, 26 May 2009 22:33:28 +0000 (22:33 +0000)]
Merge r15175 from i18n_2 branch.

11 years agoWorking around mysql bug...
Matt Amos [Tue, 26 May 2009 16:55:05 +0000 (16:55 +0000)]
Working around mysql bug...

11 years agoAdded missing ordering to relation members. This was only visible in some relations...
Matt Amos [Tue, 26 May 2009 15:57:57 +0000 (15:57 +0000)]
Added missing ordering to relation members. This was only visible in some relations when grabbing from the history API.

11 years agoBetter testing of bbox handling in relations. Maybe fixes #1861, but wasn't able...
Matt Amos [Tue, 26 May 2009 15:37:29 +0000 (15:37 +0000)]
Better testing of bbox handling in relations. Maybe fixes #1861, but wasn't able to reproduce the exact case. Fixed bug handling bboxes where element is repeated in relation.

11 years agoUse SOTM logo to link to the SOTM site.
Tom Hughes [Tue, 26 May 2009 13:16:10 +0000 (13:16 +0000)]
Use SOTM logo to link to the SOTM site.

11 years agofix #1849
Richard Fairhurst [Mon, 25 May 2009 10:19:50 +0000 (10:19 +0000)]
fix #1849

11 years agofix upload item count
Richard Fairhurst [Sat, 23 May 2009 19:11:44 +0000 (19:11 +0000)]
fix upload item count

11 years agoadapt for larger fonts on Linux; fix indexing with renumbered nodes
Richard Fairhurst [Fri, 22 May 2009 19:43:56 +0000 (19:43 +0000)]
adapt for larger fonts on Linux; fix indexing with renumbered nodes

11 years agoOverride interestingTagsExclude in GML layer - improve databrowser in US by ignoring...
Andy Allan [Fri, 22 May 2009 14:20:22 +0000 (14:20 +0000)]
Override interestingTagsExclude in GML layer - improve databrowser in US by ignoring vanilla TIGER nodes

11 years agoDisabled automatic parsing of XML to a hash in request bodies for a modest 15% speedup.
Matt Amos [Thu, 21 May 2009 23:48:34 +0000 (23:48 +0000)]
Disabled automatic parsing of XML to a hash in request bodies for a modest 15% speedup.

11 years agoReverting earlier change that means that zoom isn't set in certain code paths.
Shaun McDonald [Thu, 21 May 2009 23:20:46 +0000 (23:20 +0000)]
Reverting earlier change that means that zoom isn't set in certain code paths.

11 years agoCheck for wrapped timeout errors properly.
Tom Hughes [Thu, 21 May 2009 21:55:30 +0000 (21:55 +0000)]
Check for wrapped timeout errors properly.

11 years agoFixed typo.
Matt Amos [Thu, 21 May 2009 21:24:29 +0000 (21:24 +0000)]
Fixed typo.

11 years agoRationalise API error classes by getting of the render_opts method which
Tom Hughes [Thu, 21 May 2009 19:28:39 +0000 (19:28 +0000)]
Rationalise API error classes by getting of the render_opts method which
was never used except to extract the data it contained. Instead each class
now has a status method that returns the HTTP status code to use and a
to_s method to return a textual description of the error.

11 years agoFixup AMF controller tests.
Tom Hughes [Thu, 21 May 2009 17:30:32 +0000 (17:30 +0000)]
Fixup AMF controller tests.

11 years agoFix some comments to reflect reality.
Tom Hughes [Thu, 21 May 2009 17:30:20 +0000 (17:30 +0000)]
Fix some comments to reflect reality.

11 years agoallow the user to pass in a gpx and a zoom
Shaun McDonald [Thu, 21 May 2009 17:25:39 +0000 (17:25 +0000)]
allow the user to pass in a gpx and a zoom

11 years agoAdd svn ignore for the sql files used for dumping the db schema.
Shaun McDonald [Thu, 21 May 2009 14:57:47 +0000 (14:57 +0000)]
Add svn ignore for the sql files used for dumping the db schema.

11 years agoAdded locking around update and delete methods on main API objects. This should remov...
Matt Amos [Thu, 21 May 2009 14:57:03 +0000 (14:57 +0000)]
Added locking around update and delete methods on main API objects. This should remove the 500 errors which come from concurrent overlapping updates. Experimental - might be too slow for production.

11 years agoUse utility method for error reporting.
Matt Amos [Thu, 21 May 2009 14:55:25 +0000 (14:55 +0000)]
Use utility method for error reporting.

11 years agoDon't store the real database config in svn, instead store examples for Postgres...
Shaun McDonald [Thu, 21 May 2009 14:45:16 +0000 (14:45 +0000)]
Don't store the real database config in svn, instead store examples for Postgres and MySQL. (Reverting Edgemaster's silly revert.)

11 years agoRaising an exception in Ruby requires a .new. Add a timeout line to the capabilities...
Shaun McDonald [Thu, 21 May 2009 14:05:09 +0000 (14:05 +0000)]
Raising an exception in Ruby requires a .new. Add a timeout line to the capabilities call.

11 years agoGive the API error handler a generic rescue that returns 500 with
Tom Hughes [Thu, 21 May 2009 10:02:26 +0000 (10:02 +0000)]
Give the API error handler a generic rescue that returns 500 with
the exception details.

11 years agoMonkey patch rails to ensure OSM::APITimeoutError exceptions are not lost.
Tom Hughes [Thu, 21 May 2009 09:57:21 +0000 (09:57 +0000)]
Monkey patch rails to ensure OSM::APITimeoutError exceptions are not lost.

11 years agoPotlatch 1.0
Richard Fairhurst [Thu, 21 May 2009 00:30:33 +0000 (00:30 +0000)]
Potlatch 1.0

11 years agoAdd a global timeout that is applied to most API requests.
Tom Hughes [Wed, 20 May 2009 22:18:36 +0000 (22:18 +0000)]
Add a global timeout that is applied to most API requests.

11 years agoUsing an around_handler for catching and rendering errors in most of the API controll...
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.

11 years agoLog arguments to AMF read methods.
Tom Hughes [Wed, 20 May 2009 13:24:59 +0000 (13:24 +0000)]
Log arguments to AMF read methods.

11 years agoBack out the stupid change.
Thomas Wood [Sat, 16 May 2009 22:46:42 +0000 (22:46 +0000)]
Back out the stupid change.

11 years agoSecond part of [15085]
Thomas Wood [Sat, 16 May 2009 22:42:34 +0000 (22:42 +0000)]
Second part of [15085]

11 years agoDatabase config changes to hopefully stop people from accidently commiting database...
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.

11 years agoRevert harry's commit of the database configuration.
Tom Hughes [Fri, 15 May 2009 17:59:01 +0000 (17:59 +0000)]
Revert harry's commit of the database configuration.

11 years agolabel changesets as (big) based on their bbox area
Harry Wood [Fri, 15 May 2009 16:24:55 +0000 (16:24 +0000)]
label changesets as (big) based on their bbox area

11 years agoExtra little test, setting the language on the diary fixtures.
Shaun McDonald [Fri, 15 May 2009 15:41:45 +0000 (15:41 +0000)]
Extra little test, setting the language on the diary fixtures.

11 years agoArrays of object IDs are a bad idea.
Tom Hughes [Fri, 15 May 2009 09:18:10 +0000 (09:18 +0000)]
Arrays of object IDs are a bad idea.

11 years agoOptimise retrieval of full relations.
Tom Hughes [Fri, 15 May 2009 09:10:50 +0000 (09:10 +0000)]
Optimise retrieval of full relations.

11 years agoOops. Fixed another Time/DateTime problem.
Matt Amos [Thu, 14 May 2009 13:13:09 +0000 (13:13 +0000)]
Oops. Fixed another Time/DateTime problem.

11 years agoFixed problem with Time vs. DateTime classes in fixtures. Weirdly only affected mysql...
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.

11 years agoFixed precondition failed message which was trying to dereference nil.
Matt Amos [Thu, 14 May 2009 11:19:28 +0000 (11:19 +0000)]
Fixed precondition failed message which was trying to dereference nil.

11 years agoApply #1824.
Richard Fairhurst [Thu, 14 May 2009 08:38:32 +0000 (08:38 +0000)]
Apply #1824.

11 years agoRemove a rescue, which is stopping a more detailed error message being returned to...
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.

11 years agoalways set new node id when updating/deleting (to be read in conjunction with zere...
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)

11 years agoAdded a consistency check that both ids are valid and match. Fixed diff upload code...
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.

11 years agoActually mark a trace as being public based on the saved preference, rather than...
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.

11 years agoRemoved updatetimeout method, as it isn't needed any more.
Matt Amos [Tue, 12 May 2009 14:38:22 +0000 (14:38 +0000)]
Removed updatetimeout method, as it isn't needed any more.

11 years agoFixed bug #1816 - the timeout updating logic should have been in a before_save handle...
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.

11 years agoUse a local lookup table for country bounding boxes rather than relying
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.

11 years agodisabling test case because i don't think there is a fix with the current version...
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.

11 years agoUse a regular expression for the test, since it can give one of two responses based...
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.

11 years agoA better optimisation, as suggested by TomH.
Matt Amos [Mon, 11 May 2009 15:16:36 +0000 (15:16 +0000)]
A better optimisation, as suggested by TomH.

11 years agoAdded optimisation for way checking. Same method as for relations.
Matt Amos [Mon, 11 May 2009 14:34:04 +0000 (14:34 +0000)]
Added optimisation for way checking. Same method as for relations.

11 years agoDestroy OL objects which use the dataLayer before we destroy the layer
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.

11 years agoAdd an internal geocoder for lat/lon positions.
Tom Hughes [Sun, 10 May 2009 11:57:10 +0000 (11:57 +0000)]
Add an internal geocoder for lat/lon positions.

11 years agoFixed problem where tag lengths were generating a 422 error with no message. They...
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.

11 years agoAdd a warning about whitelisting webmaster@openstreetmap.org in antispam
Tom Hughes [Sat, 9 May 2009 16:46:36 +0000 (16:46 +0000)]
Add a warning about whitelisting webmaster@openstreetmap.org in antispam
systems.

11 years agoSet a custom return path so that we can ignore bounces.
Tom Hughes [Sat, 9 May 2009 12:17:10 +0000 (12:17 +0000)]
Set a custom return path so that we can ignore bounces.

11 years agoa few small fixes
Richard Fairhurst [Sat, 9 May 2009 10:00:40 +0000 (10:00 +0000)]
a few small fixes

11 years agoMove geocoder constants to application configuration to avoid test warnings.
Tom Hughes [Fri, 8 May 2009 18:21:39 +0000 (18:21 +0000)]
Move geocoder constants to application configuration to avoid test warnings.

11 years agoAdd gem specification file to stop rake test complaining.
Tom Hughes [Fri, 8 May 2009 18:12:30 +0000 (18:12 +0000)]
Add gem specification file to stop rake test complaining.

11 years agoUpdating for rails 2.2.2
Shaun McDonald [Fri, 8 May 2009 18:04:08 +0000 (18:04 +0000)]
Updating for rails 2.2.2

11 years agoPatch composite_primary_keys to work around issue when one component of
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".

11 years agoAdd version 2.2.2 of composite_primary_keys.
Tom Hughes [Fri, 8 May 2009 17:54:49 +0000 (17:54 +0000)]
Add version 2.2.2 of composite_primary_keys.

11 years agofix the user unit test so that it doesn't use a depricated method in rails 2.2.2
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

11 years agoInclude CC-BY-SA in attribution.
Tom Hughes [Fri, 8 May 2009 15:05:57 +0000 (15:05 +0000)]
Include CC-BY-SA in attribution.

11 years agoNo need to define a constand for the appconfig var. Removes a warning when running...
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

11 years agomore changeset tests. No need for @ vars in the tests
Shaun McDonald [Fri, 8 May 2009 13:12:53 +0000 (13:12 +0000)]
more changeset tests. No need for @ vars in the tests

11 years agoAdd missing requires for the migration helper core.
Tom Hughes [Fri, 8 May 2009 08:12:26 +0000 (08:12 +0000)]
Add missing requires for the migration helper core.

11 years agoFix bogus casts - lat/lon are signed.
Tom Hughes [Fri, 8 May 2009 08:10:28 +0000 (08:10 +0000)]
Fix bogus casts - lat/lon are signed.

11 years agoAdd postgres implementation of tile_for_point function.
Tom Hughes [Fri, 8 May 2009 08:01:33 +0000 (08:01 +0000)]
Add postgres implementation of tile_for_point function.

11 years agoAdd yet more foreign keys.
Tom Hughes [Fri, 8 May 2009 00:03:40 +0000 (00:03 +0000)]
Add yet more foreign keys.

11 years agoOne last commit tonight :P
Thomas Wood [Thu, 7 May 2009 23:02:46 +0000 (23:02 +0000)]
One last commit tonight :P

11 years agoFix the test I just broke...
Thomas Wood [Thu, 7 May 2009 22:58:32 +0000 (22:58 +0000)]
Fix the test I just broke...

11 years agoCommit bits of missing css that were required in previous upload.
Thomas Wood [Thu, 7 May 2009 22:52:02 +0000 (22:52 +0000)]
Commit bits of missing css that were required in previous upload.

11 years agoDe-duplicate some of the changeset stuff out to a new partial view.
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

11 years agoSome more tests
Shaun McDonald [Thu, 7 May 2009 17:57:59 +0000 (17:57 +0000)]
Some more tests

11 years agoAdd foreign key constraints for users.
Tom Hughes [Thu, 7 May 2009 17:54:52 +0000 (17:54 +0000)]
Add foreign key constraints for users.

11 years agofix typo which meant that it was testing the node twice, rather than the node then...
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

11 years agoTests for PreconditionFailed error messages.
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.

11 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.

11 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

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

11 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.

11 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

11 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.

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

11 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.

11 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!

11 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

11 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.

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

11 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.

11 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

11 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.

11 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.

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

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

11 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

11 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