rails.git
12 years agoRemoving the in_world test from the model since it is included in the geo_record...
Shaun McDonald [Tue, 8 Jul 2008 18:17:08 +0000 (18:17 +0000)]
Removing the in_world test from the model since it is included in the geo_record library. Adding visible and version to the nodes and current_nodes fixtures. Adding old node test. Slightly different comparisions.

12 years agonode unit tests with inside limits now.
Shaun McDonald [Tue, 8 Jul 2008 15:38:31 +0000 (15:38 +0000)]
node unit tests with inside limits now.

12 years agoTidy up a bit after shaun's merge...
Tom Hughes [Mon, 7 Jul 2008 16:16:05 +0000 (16:16 +0000)]
Tidy up a bit after shaun's merge...

12 years agoFixing the resync that I had done wrong at the end of last week on the nodes. All...
Shaun McDonald [Mon, 7 Jul 2008 14:20:27 +0000 (14:20 +0000)]
Fixing the resync that I had done wrong at the end of last week on the nodes. All unit tests now do work. More assertions added. Using a scaling factor as a constant, so that the nodes are stored in the db correctly. Using the same scaling factor in the georecord library, to make code more readable, and reduce errors. Removing duplicate code that is in the GeoRecord include library.

12 years agoDon't hardcode the API version in the data browser.
Tom Hughes [Fri, 4 Jul 2008 18:15:42 +0000 (18:15 +0000)]
Don't hardcode the API version in the data browser.

12 years agoMerge changes from trunk 7673:8632.
Shaun McDonald [Thu, 3 Jul 2008 13:06:24 +0000 (13:06 +0000)]
Merge changes from trunk 7673:8632.

12 years agoNow all the unit tests work
Shaun McDonald [Thu, 3 Jul 2008 10:56:17 +0000 (10:56 +0000)]
Now all the unit tests work

12 years agoQuote default when used as a key in a hash as it is a keyword...
Tom Hughes [Sat, 28 Jun 2008 09:59:47 +0000 (09:59 +0000)]
Quote default when used as a key in a hash as it is a keyword...

12 years agoMerge data browser branch to trunk.
Tom Hughes [Fri, 27 Jun 2008 23:09:05 +0000 (23:09 +0000)]
Merge data browser branch to trunk.

12 years agoRefactor to remove some code duplication.
Tom Hughes [Thu, 26 Jun 2008 23:01:55 +0000 (23:01 +0000)]
Refactor to remove some code duplication.

12 years agoDisable the data browswer when the database is not available.
Tom Hughes [Thu, 26 Jun 2008 17:36:21 +0000 (17:36 +0000)]
Disable the data browswer when the database is not available.

12 years agoMinor correction to German translation.
Tom Hughes [Wed, 25 Jun 2008 16:46:25 +0000 (16:46 +0000)]
Minor correction to German translation.

12 years agoHandle international idiots in a reasonable selection of languages.
Tom Hughes [Wed, 25 Jun 2008 15:18:07 +0000 (15:18 +0000)]
Handle international idiots in a reasonable selection of languages.

12 years agoTry and make message and comment notifications more idiot proof.
Tom Hughes [Wed, 25 Jun 2008 14:41:37 +0000 (14:41 +0000)]
Try and make message and comment notifications more idiot proof.

12 years agoRailsify relation selection (aka ripping out the f***in SQL).
Tom Hughes [Tue, 24 Jun 2008 23:42:39 +0000 (23:42 +0000)]
Railsify relation selection (aka ripping out the f***in SQL).

12 years agoImprove the layout of the object browser views.
Tom Hughes [Tue, 24 Jun 2008 16:44:45 +0000 (16:44 +0000)]
Improve the layout of the object browser views.

12 years agoMerge 8381:8390 from trunk.
Tom Hughes [Sun, 22 Jun 2008 15:24:12 +0000 (15:24 +0000)]
Merge 8381:8390 from trunk.

12 years agoMake GeoRecord inject class methods correctly when included.
Tom Hughes [Sun, 22 Jun 2008 15:22:13 +0000 (15:22 +0000)]
Make GeoRecord inject class methods correctly when included.

12 years agoMerge 8377:8381 from trunk.
Tom Hughes [Sun, 22 Jun 2008 14:46:46 +0000 (14:46 +0000)]
Merge 8377:8381 from trunk.

12 years agoMake the polymorphic relation association work properly.
Tom Hughes [Sun, 22 Jun 2008 14:44:34 +0000 (14:44 +0000)]
Make the polymorphic relation association work properly.

12 years agoMerge 7922:8377 from trunk.
Tom Hughes [Sun, 22 Jun 2008 12:23:43 +0000 (12:23 +0000)]
Merge 7922:8377 from trunk.

12 years agoAdd support for putting the site in an offline mode where it operates
Tom Hughes [Sun, 22 Jun 2008 12:10:32 +0000 (12:10 +0000)]
Add support for putting the site in an offline mode where it operates
without a database but with most features disabled.

12 years agoUse a polymorphic association to model relation members and add
Tom Hughes [Sat, 21 Jun 2008 17:38:17 +0000 (17:38 +0000)]
Use a polymorphic association to model relation members and add
associations for upward links from objects to relations that they
are a part of.

12 years agoRemoved bogus belongs_to user declaration.
Tom Hughes [Sat, 21 Jun 2008 16:19:36 +0000 (16:19 +0000)]
Removed bogus belongs_to user declaration.

12 years agotrap for #971 until I can work out why it's doing it
Richard Fairhurst [Wed, 11 Jun 2008 14:45:36 +0000 (14:45 +0000)]
trap for #971 until I can work out why it's doing it

12 years agoReplacing the non existant image with a pending text on the trace page
Shaun McDonald [Tue, 10 Jun 2008 17:17:32 +0000 (17:17 +0000)]
Replacing the non existant image with a pending text on the trace page

12 years agoWork around the fact that exists? no longer works for models with
Tom Hughes [Sat, 7 Jun 2008 22:40:39 +0000 (22:40 +0000)]
Work around the fact that exists? no longer works for models with
no primary key.

12 years agoLet's have one last try...
Tom Hughes [Sat, 7 Jun 2008 00:03:27 +0000 (00:03 +0000)]
Let's have one last try...

12 years agoMagic foo to make composite_primary_keys work.
Tom Hughes [Fri, 6 Jun 2008 23:53:20 +0000 (23:53 +0000)]
Magic foo to make composite_primary_keys work.

12 years agoGo back to rails 2.0.2 for now as 2.1.0 doesn't quite work...
Tom Hughes [Fri, 6 Jun 2008 23:32:21 +0000 (23:32 +0000)]
Go back to rails 2.0.2 for now as 2.1.0 doesn't quite work...

12 years agoSwitch to rails 2.1.0 release.
Tom Hughes [Fri, 6 Jun 2008 23:17:56 +0000 (23:17 +0000)]
Switch to rails 2.1.0 release.

12 years agoDon't use comma to separate values in the location cookie, as rails 2.0.2 will
Tom Hughes [Thu, 5 Jun 2008 23:27:52 +0000 (23:27 +0000)]
Don't use comma to separate values in the location cookie, as rails 2.0.2 will
treat comma (as well as semicolon) as a cookie separate. Also change the name
of the location cookie to avoid problems parsing old ones.

12 years agoSwitch to rails 2.0.2 as Debian/Ubuntu is able to handle it now.
Tom Hughes [Thu, 5 Jun 2008 23:06:29 +0000 (23:06 +0000)]
Switch to rails 2.0.2 as Debian/Ubuntu is able to handle it now.

12 years agoMake sure the diary tab always links to the global diary rather than
Tom Hughes [Thu, 5 Jun 2008 21:20:30 +0000 (21:20 +0000)]
Make sure the diary tab always links to the global diary rather than
a specific user's diary. Closes #956.

12 years agoRemoving id's so that the ids are generated, and it makes it easier to deal with...
Shaun McDonald [Wed, 4 Jun 2008 16:35:00 +0000 (16:35 +0000)]
Removing id's so that the ids are generated, and it makes it easier to deal with referential tests. Now have messages and users with basic tests. Using api.rubyonrails.com/classes/Fixtures.html.

12 years agoimproved messages fixtures. Additional user fixture (for sending messages between...
Shaun McDonald [Wed, 4 Jun 2008 06:48:49 +0000 (06:48 +0000)]
improved messages fixtures. Additional user fixture (for sending messages between the users). Checking that an empty message fails.

12 years agoCope with not having a layer configuration at all.
Tom Hughes [Tue, 3 Jun 2008 15:12:46 +0000 (15:12 +0000)]
Cope with not having a layer configuration at all.

12 years agoAdding some additional node fixtures to test edge cases. Having a bit of an issue...
Shaun McDonald [Mon, 2 Jun 2008 17:27:32 +0000 (17:27 +0000)]
Adding some additional node fixtures to test edge cases. Having a bit of an issue as the too far north and south tests aren't working as expected, even so the too far east and west ones are.

12 years agoYou can now test nodes. This test needs looked at again, as it currently doesn't...
Shaun McDonald [Mon, 2 Jun 2008 15:28:03 +0000 (15:28 +0000)]
You can now test nodes. This test needs looked at again, as it currently doesn't test the node tags

12 years agoFixing indentation
Shaun McDonald [Mon, 2 Jun 2008 15:22:17 +0000 (15:22 +0000)]
Fixing indentation

12 years agoFixing indentation
Shaun McDonald [Mon, 2 Jun 2008 15:13:29 +0000 (15:13 +0000)]
Fixing indentation

12 years agoDon't try and parse an empty string as a layer config, and cope a bit
Tom Hughes [Mon, 2 Jun 2008 12:45:24 +0000 (12:45 +0000)]
Don't try and parse an empty string as a layer config, and cope a bit
better if we do hit the end of the string. Closes #942.

12 years agosort the default test database user and password.
Shaun McDonald [Mon, 2 Jun 2008 11:00:09 +0000 (11:00 +0000)]
sort the default test database user and password.
Adding new test for the user

12 years agoRequire a form post to finally confirm an account to stop
Tom Hughes [Thu, 29 May 2008 20:43:58 +0000 (20:43 +0000)]
Require a form post to finally confirm an account to stop
accidental confirmations.

12 years agofix node relations bug (thanks Dave!)
Richard Fairhurst [Thu, 29 May 2008 19:58:05 +0000 (19:58 +0000)]
fix node relations bug (thanks Dave!)

12 years agoPotlatch 0.9c
Richard Fairhurst [Thu, 29 May 2008 01:18:38 +0000 (01:18 +0000)]
Potlatch 0.9c

12 years agoImprove the layout of the browse sidebar a bit.
Tom Hughes [Wed, 28 May 2008 23:46:55 +0000 (23:46 +0000)]
Improve the layout of the browse sidebar a bit.

12 years agoMerge 7744:7922 from trunk.
Tom Hughes [Wed, 28 May 2008 16:37:31 +0000 (16:37 +0000)]
Merge 7744:7922 from trunk.

12 years agoPotlatch 0.9b
Richard Fairhurst [Sun, 25 May 2008 08:17:16 +0000 (08:17 +0000)]
Potlatch 0.9b

12 years agotemporarily disable OAM (SWF)
Richard Fairhurst [Wed, 21 May 2008 15:20:55 +0000 (15:20 +0000)]
temporarily disable OAM (SWF)

12 years agodon't set _alpha so often when ways dimmed (SWF)
Richard Fairhurst [Wed, 21 May 2008 12:01:56 +0000 (12:01 +0000)]
don't set _alpha so often when ways dimmed (SWF)

12 years agoMake the layer attribute a bit less fragile - base layers and overlays are
Tom Hughes [Tue, 20 May 2008 23:37:06 +0000 (23:37 +0000)]
Make the layer attribute a bit less fragile - base layers and overlays are
now treated separately so that adding a new base laser doesn't break things.

12 years agoAdd a check to make sure that a node/way/relation doesn't already exist in the relati...
Shaun McDonald [Tue, 20 May 2008 15:25:18 +0000 (15:25 +0000)]
Add a check to make sure that a node/way/relation doesn't already exist in the relation as part of the preconditions. closes #718

12 years agoMake the "larger map" link on an HTML export point at the right layer.
Tom Hughes [Mon, 19 May 2008 10:00:52 +0000 (10:00 +0000)]
Make the "larger map" link on an HTML export point at the right layer.

12 years agoAdd the cycle map to the main site.
Tom Hughes [Mon, 19 May 2008 09:57:58 +0000 (09:57 +0000)]
Add the cycle map to the main site.

12 years agoYet another at fixing the layout of the search box. Seems to work now
Tom Hughes [Fri, 16 May 2008 10:42:51 +0000 (10:42 +0000)]
Yet another at fixing the layout of the search box. Seems to work now
on FF2, IE7, Operand and Safari though we are giving space away on FF.

12 years agofix revert to cope with moved nodes properly (OH NOES I updated some SQL)
Richard Fairhurst [Fri, 16 May 2008 10:32:53 +0000 (10:32 +0000)]
fix revert to cope with moved nodes properly (OH NOES I updated some SQL)

12 years agoReword the noscript section a bit.
Tom Hughes [Fri, 16 May 2008 10:09:55 +0000 (10:09 +0000)]
Reword the noscript section a bit.

12 years agoTry and make browsers display the search box sanely.
Tom Hughes [Fri, 16 May 2008 10:06:57 +0000 (10:06 +0000)]
Try and make browsers display the search box sanely.

12 years agoShowing a nice message for browsers with javascript disabled. closes #36
Shaun McDonald [Fri, 16 May 2008 09:44:50 +0000 (09:44 +0000)]
Showing a nice message for browsers with javascript disabled. closes #36

12 years agoTidy up map browse code and qualify various global names to avoid
Tom Hughes [Thu, 15 May 2008 16:57:34 +0000 (16:57 +0000)]
Tidy up map browse code and qualify various global names to avoid
any risk of conflicts.

12 years agoRemove bogus action attribute from the submit button - it should have
Tom Hughes [Thu, 15 May 2008 09:34:45 +0000 (09:34 +0000)]
Remove bogus action attribute from the submit button - it should have
no effect as there is no such attribute defined, but Opera seems to
decide that it should post the form to that URL instead of the one
give on the form element.

12 years agoapi06: remove debugging output.
Gabriel Ebner [Tue, 13 May 2008 13:42:03 +0000 (13:42 +0000)]
api06: remove debugging output.

12 years agoapi06: simplify diff uploading.
Gabriel Ebner [Tue, 13 May 2008 13:24:31 +0000 (13:24 +0000)]
api06: simplify diff uploading.

12 years agoapi06: diff upload: don't read the whole request into memory.
Gabriel Ebner [Tue, 13 May 2008 12:53:59 +0000 (12:53 +0000)]
api06: diff upload: don't read the whole request into memory.

Note: libxml-ruby-0.5.4 will segfault on this:
https://rubyforge.org/tracker/index.php?func=detail&aid=20117&group_id=494&atid=1971

12 years agoapi06: Fix OSM::APIVersionMismatchError.render_opts
Gabriel Ebner [Tue, 13 May 2008 12:32:43 +0000 (12:32 +0000)]
api06: Fix OSM::APIVersionMismatchError.render_opts

12 years agoapi06: fix syntax errors.
Gabriel Ebner [Tue, 13 May 2008 12:27:38 +0000 (12:27 +0000)]
api06: fix syntax errors.

12 years agoapi06: simplify exception handling and add exception handling to the diff
Gabriel Ebner [Tue, 13 May 2008 12:15:06 +0000 (12:15 +0000)]
api06: simplify exception handling and add exception handling to the diff
upload.

12 years agoThe ordering of these shouldn't have mattered, but it did, because I didn't put a...
Christopher Schmidt [Mon, 12 May 2008 21:12:30 +0000 (21:12 +0000)]
The ordering of these shouldn't have mattered, but it did, because I didn't put a regex filter on my :id, so "upload" was being treated as an ID (which clearly wouldn't work); This fix obviates the need for r7789, sorry about that.

12 years agoapi06: Fix typo.
Gabriel Ebner [Mon, 12 May 2008 21:11:51 +0000 (21:11 +0000)]
api06: Fix typo.

12 years agoapi06: s/delete_with_relations_and_history/delete_with_history/g
Gabriel Ebner [Mon, 12 May 2008 21:10:38 +0000 (21:10 +0000)]
api06: s/delete_with_relations_and_history/delete_with_history/g

12 years agoapi06: Move version-checking into the models, raising an exception on mismatch
Gabriel Ebner [Mon, 12 May 2008 21:05:11 +0000 (21:05 +0000)]
api06: Move version-checking into the models, raising an exception on mismatch
(still not implemented for delete requests though.)

12 years agoapi06: Make diff uploading work again.
Gabriel Ebner [Mon, 12 May 2008 20:43:35 +0000 (20:43 +0000)]
api06: Make diff uploading work again.

12 years agosplash screen
Richard Fairhurst [Mon, 12 May 2008 10:18:57 +0000 (10:18 +0000)]
splash screen

12 years agonode.tags is now (apparently) the same as tags_as_hash.
Christopher Schmidt [Mon, 12 May 2008 01:22:04 +0000 (01:22 +0000)]
node.tags is now (apparently) the same as tags_as_hash.

12 years agomake error_message spit out the message text to the user as well as
Christopher Schmidt [Sun, 11 May 2008 23:12:54 +0000 (23:12 +0000)]
make error_message spit out the message text to the user as well as
putting it in the header.

12 years agoundo composite keys change on old_ndoe
Christopher Schmidt [Sun, 11 May 2008 23:02:06 +0000 (23:02 +0000)]
undo composite keys change on old_ndoe

12 years agofrom_xml sets a version on nodes
Christopher Schmidt [Sun, 11 May 2008 22:27:40 +0000 (22:27 +0000)]
from_xml sets a version on nodes

12 years agoadd to_xml method for oldnode
Christopher Schmidt [Sun, 11 May 2008 22:26:46 +0000 (22:26 +0000)]
add to_xml method for oldnode

12 years agospit out whether the changeset is open in the xml
Christopher Schmidt [Sun, 11 May 2008 22:26:11 +0000 (22:26 +0000)]
spit out whether the changeset is open in the xml

12 years agoprevent update of any object without providing the correct/current
Christopher Schmidt [Sun, 11 May 2008 21:49:33 +0000 (21:49 +0000)]
prevent update of any object without providing the correct/current
version as part of the XML. This affects update-only at this time:
DELETE doesn't work the same way because we don't provide the data as
part of a DELETE

12 years agoMake capabilities report the current version for from/to version
Christopher Schmidt [Sun, 11 May 2008 21:23:38 +0000 (21:23 +0000)]
Make capabilities report the current version for from/to version
identifier

12 years agochange 'no nodes' response to use API_VERSION in output
Christopher Schmidt [Sun, 11 May 2008 21:21:30 +0000 (21:21 +0000)]
change 'no nodes' response to use API_VERSION in output

12 years agoadd support for closing changesets
Christopher Schmidt [Sun, 11 May 2008 21:18:42 +0000 (21:18 +0000)]
add support for closing changesets

12 years agohmmm, probably best not to gratuitously send the same request every second
Richard Fairhurst [Sun, 11 May 2008 20:25:11 +0000 (20:25 +0000)]
hmmm, probably best not to gratuitously send the same request every second

12 years agoPotlatch 0.9a
Richard Fairhurst [Sun, 11 May 2008 20:16:09 +0000 (20:16 +0000)]
Potlatch 0.9a

12 years agoadd FIXME FIXME FIXME for serializing changes in a changeset
Christopher Schmidt [Sun, 11 May 2008 20:07:47 +0000 (20:07 +0000)]
add FIXME FIXME FIXME for serializing changes in a changeset

12 years agoAdd support for accessing changesets as XML through the API via the
Christopher Schmidt [Sun, 11 May 2008 20:03:17 +0000 (20:03 +0000)]
Add support for accessing changesets as XML through the API via the
changeset controller "read" method

12 years agoMake edits return version numbers as plain text strings
Christopher Schmidt [Sun, 11 May 2008 19:47:19 +0000 (19:47 +0000)]
Make edits return version numbers as plain text strings

12 years agoAdd maximiseMap() and minimiseMap() functions to the edit page to allow the
Tom Hughes [Sun, 11 May 2008 16:15:35 +0000 (16:15 +0000)]
Add maximiseMap() and minimiseMap() functions to the edit page to allow the
size of the editing area to be toggled.

12 years agoFix what looks like an accidental change to the stylesheeet.
Tom Hughes [Sun, 11 May 2008 14:42:44 +0000 (14:42 +0000)]
Fix what looks like an accidental change to the stylesheeet.

12 years agoOnly add the data layer to the main map, and use the visibility changed
Tom Hughes [Sun, 11 May 2008 14:41:11 +0000 (14:41 +0000)]
Only add the data layer to the main map, and use the visibility changed
event to handle turning the data layer on and off.

12 years agoMerge 7452:7744 from trunk.
Tom Hughes [Fri, 9 May 2008 23:22:26 +0000 (23:22 +0000)]
Merge 7452:7744 from trunk.

12 years agoAdd the marker to the map correctly.
Tom Hughes [Fri, 9 May 2008 14:10:10 +0000 (14:10 +0000)]
Add the marker to the map correctly.

12 years agoPotlatch 0.9
Richard Fairhurst [Thu, 8 May 2008 10:24:17 +0000 (10:24 +0000)]
Potlatch 0.9

12 years agoRemove bogus apostrophe.
Tom Hughes [Wed, 7 May 2008 11:05:17 +0000 (11:05 +0000)]
Remove bogus apostrophe.

12 years agoTidy up handling of unknown traces.
Tom Hughes [Tue, 6 May 2008 16:57:40 +0000 (16:57 +0000)]
Tidy up handling of unknown traces.

12 years agoBackout message deletion functionality as it has unfortunate side effects
Tom Hughes [Tue, 6 May 2008 16:35:24 +0000 (16:35 +0000)]
Backout message deletion functionality as it has unfortunate side effects
as it also removes the message from the sender's outbox.

12 years agoFix replying to diary comments, and tidy a few things up.
Tom Hughes [Mon, 5 May 2008 23:01:05 +0000 (23:01 +0000)]
Fix replying to diary comments, and tidy a few things up.

12 years agoQuote reply messages properly.
Tom Hughes [Mon, 5 May 2008 22:52:19 +0000 (22:52 +0000)]
Quote reply messages properly.