]> git.openstreetmap.org Git - rails.git/log
rails.git
15 years agotemporarily disable OAM (SWF)
Richard Fairhurst [Wed, 21 May 2008 15:20:55 +0000 (15:20 +0000)]
temporarily disable OAM (SWF)

15 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)

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

15 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

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

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

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

15 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)

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

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

15 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

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

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

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

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

16 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

16 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

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

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

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

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

16 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

16 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.)

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

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

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

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

16 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

16 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

16 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

16 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

16 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

16 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

16 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

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

16 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

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

16 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

16 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

16 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

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

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

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

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

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

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

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

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

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

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

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

16 years agoReinstate stripping of Re: prefixes that Steve dropped...
Tom Hughes [Mon, 5 May 2008 22:46:56 +0000 (22:46 +0000)]
Reinstate stripping of Re: prefixes that Steve dropped...

16 years agoapi06: Fix normal way and relation uploading (i.e. not as part of a diff).
Gabriel Ebner [Mon, 5 May 2008 22:41:32 +0000 (22:41 +0000)]
api06: Fix normal way and relation uploading (i.e. not as part of a diff).
(I'm sorry that I couldn't commit it earlier, but I didn't have access to an
internet connection until now.)

16 years agoRework the new Go button on the search form so that it actually stands
Tom Hughes [Mon, 5 May 2008 16:39:33 +0000 (16:39 +0000)]
Rework the new Go button on the search form so that it actually stands
some chance of rendering as intended.

It's still not really ideal to steal space from the seach box of course...

Closes #589.

16 years agoapi06: Diff upload works now (but no integration with changesets whatsoever as
Gabriel Ebner [Sun, 4 May 2008 15:56:10 +0000 (15:56 +0000)]
api06: Diff upload works now (but no integration with changesets whatsoever as
of now)

16 years agoapi06: Fix diff uploading (still doesn't give a useful response):
Gabriel Ebner [Sun, 4 May 2008 15:16:58 +0000 (15:16 +0000)]
api06: Fix diff uploading (still doesn't give a useful response):
Modification and deletion works fine now.  Rollback also works apparently.
Just auto increment doesn't get reset.

16 years agoThe current_way_nodes table is already an InnoDB table.
Tom Hughes [Sun, 4 May 2008 14:50:53 +0000 (14:50 +0000)]
The current_way_nodes table is already an InnoDB table.

16 years agoapi06: Fix diff uploading (creation works fine now)
Gabriel Ebner [Sun, 4 May 2008 14:37:12 +0000 (14:37 +0000)]
api06: Fix diff uploading (creation works fine now)

16 years agoapi06: Preliminary support for diff uploading. This will not return anything
Gabriel Ebner [Sun, 4 May 2008 13:52:43 +0000 (13:52 +0000)]
api06: Preliminary support for diff uploading.  This will not return anything
useful and the code will need some heavy refactoring.

16 years agoapi06: Fix tag parsing in the node-tags-normalization helper, as suggested by
Gabriel Ebner [Sun, 4 May 2008 13:51:45 +0000 (13:51 +0000)]
api06: Fix tag parsing in the node-tags-normalization helper, as suggested by
Jon Burgess.

16 years agoapi06: Use 2-byte ints and check malloc return value.
Gabriel Ebner [Sun, 4 May 2008 12:03:05 +0000 (12:03 +0000)]
api06: Use 2-byte ints and check malloc return value.

16 years agoapi06: Fix bounds check.
Gabriel Ebner [Sun, 4 May 2008 11:50:12 +0000 (11:50 +0000)]
api06: Fix bounds check.

16 years agoapi06: 013_populate_node_tags_and_remove_helper: Initialize memory.
Gabriel Ebner [Sun, 4 May 2008 11:44:36 +0000 (11:44 +0000)]
api06: 013_populate_node_tags_and_remove_helper: Initialize memory.

16 years agobuffer overrun fix
Frederik Ramm [Sun, 4 May 2008 11:43:04 +0000 (11:43 +0000)]
buffer overrun fix

16 years agoAdd timestamp indexes to current_ways and current_relations.
Tom Hughes [Sun, 4 May 2008 11:33:09 +0000 (11:33 +0000)]
Add timestamp indexes to current_ways and current_relations.

16 years agoStick with rails 2.0.1...
Tom Hughes [Sun, 4 May 2008 11:32:49 +0000 (11:32 +0000)]
Stick with rails 2.0.1...

16 years agoMerge 7649:7673 from trunk.
Tom Hughes [Sun, 4 May 2008 11:26:36 +0000 (11:26 +0000)]
Merge 7649:7673 from trunk.

16 years agoGo back to using user_id+k as the primary key for user preferences but
Tom Hughes [Sun, 4 May 2008 11:18:38 +0000 (11:18 +0000)]
Go back to using user_id+k as the primary key for user preferences but
actually using the composite primary key extension this time so that it
really works.

Also stop update_one tring to render a non-existent view, and add a
delete_one method to allow preferences to be deleted.

16 years agoapi06: Move add-changeset migr. to no. 16.
Gabriel Ebner [Sun, 4 May 2008 10:47:39 +0000 (10:47 +0000)]
api06: Move add-changeset migr. to no. 16.

16 years agoapi06: Merge changesets code from Frederik.
Gabriel Ebner [Sun, 4 May 2008 10:45:47 +0000 (10:45 +0000)]
api06: Merge changesets code from Frederik.

16 years agoinitial changeset support
Frederik Ramm [Sun, 4 May 2008 10:41:42 +0000 (10:41 +0000)]
initial changeset support

16 years agoWhen adding new primary keys, drop the old indexes which are no longer
Tom Hughes [Sun, 4 May 2008 10:35:59 +0000 (10:35 +0000)]
When adding new primary keys, drop the old indexes which are no longer
needed as they are a prefix of the new primary key.

16 years agoapi06: Fix the version-numbers-on-current-tables migration: We want the rows
Gabriel Ebner [Sun, 4 May 2008 10:04:07 +0000 (10:04 +0000)]
api06: Fix the version-numbers-on-current-tables migration:  We want the rows
in the current table to have the same version number as the latest one in the
history table (the latest version is kept in both the current and the history
tables.)

16 years agoapi06: Return version ids in XML responses.
Gabriel Ebner [Sun, 4 May 2008 10:01:23 +0000 (10:01 +0000)]
api06: Return version ids in XML responses.

16 years agoRename split_node_tags branch to api06.
Gabriel Ebner [Sun, 4 May 2008 09:14:41 +0000 (09:14 +0000)]
Rename split_node_tags branch to api06.

16 years agosplit_node_tags: Remove old unused files.
Gabriel Ebner [Sun, 4 May 2008 09:04:40 +0000 (09:04 +0000)]
split_node_tags: Remove old unused files.

16 years agosplit_node_tags: Merge changes in main branch up to r7649.
Gabriel Ebner [Sun, 4 May 2008 08:31:39 +0000 (08:31 +0000)]
split_node_tags: Merge changes in main branch up to r7649.

16 years agosplit_node_tags: Implement key constraints.
Gabriel Ebner [Sun, 4 May 2008 08:25:29 +0000 (08:25 +0000)]
split_node_tags: Implement key constraints.

16 years agosplit_node_tags: Forgot to migrate current_way_tags to InnoDB.
Gabriel Ebner [Sat, 3 May 2008 16:40:51 +0000 (16:40 +0000)]
split_node_tags: Forgot to migrate current_way_tags to InnoDB.

16 years agosplit_node_tags: Remove the left-over pre-merge files.
Gabriel Ebner [Sat, 3 May 2008 16:28:50 +0000 (16:28 +0000)]
split_node_tags: Remove the left-over pre-merge files.

16 years agosplit_node_tags:
Gabriel Ebner [Sat, 3 May 2008 16:27:49 +0000 (16:27 +0000)]
split_node_tags:
  - Use InnoDB.
  - Put version column on the current_* tables.
  - Use transactions (untested).

16 years agomerged node and old node models for normalised node tags
Nick Black [Sat, 3 May 2008 16:06:43 +0000 (16:06 +0000)]
merged node and old node models for normalised node tags

16 years agonode models for normalised node tags - pre merge
Nick Black [Sat, 3 May 2008 16:01:55 +0000 (16:01 +0000)]
node models for normalised node tags - pre merge

16 years agorails_port: fix migration to create a primary key with auto increment (don't
Gabriel Ebner [Sat, 3 May 2008 14:56:43 +0000 (14:56 +0000)]
rails_port: fix migration to create a primary key with auto increment (don't
know if that will actually generate valid keys if there is already data in the
table.)

16 years agofix migration to remove original stupid index hopefully
Steve Coast [Sat, 3 May 2008 14:45:15 +0000 (14:45 +0000)]
fix migration to remove original stupid index hopefully

16 years agoadds a temporary old_node object for use during migration
Nick Black [Sat, 3 May 2008 14:32:36 +0000 (14:32 +0000)]
adds a temporary old_node object for use during migration

16 years agosplit_node_tags: New migration (in C).
Gabriel Ebner [Sat, 3 May 2008 14:32:30 +0000 (14:32 +0000)]
split_node_tags: New migration (in C).

16 years agofix bug 871 - show a good error message if gps trace not found
Steve Coast [Sat, 3 May 2008 14:29:01 +0000 (14:29 +0000)]
fix bug 871 - show a good error message if gps trace not found

16 years agoadd a go button to the search form as in bug 589
Steve Coast [Sat, 3 May 2008 14:18:22 +0000 (14:18 +0000)]
add a go button to the search form as in bug 589

16 years agosplit_node_tags: Merge changes from main branch.
Gabriel Ebner [Sat, 3 May 2008 14:11:23 +0000 (14:11 +0000)]
split_node_tags: Merge changes from main branch.

16 years agomake public button a bit nicer
Steve Coast [Sat, 3 May 2008 14:07:48 +0000 (14:07 +0000)]
make public button a bit nicer

16 years agoadding node tag models
Nick Black [Sat, 3 May 2008 14:07:07 +0000 (14:07 +0000)]
adding node tag models

16 years agonicer reply messages, bug 529
Steve Coast [Sat, 3 May 2008 14:02:53 +0000 (14:02 +0000)]
nicer reply messages, bug 529

16 years agoability to delete messages
Steve Coast [Sat, 3 May 2008 13:25:34 +0000 (13:25 +0000)]
ability to delete messages

16 years agoadd individual user preference read/write, and default all new users to having public...
Steve Coast [Sat, 3 May 2008 12:57:48 +0000 (12:57 +0000)]
add individual user preference read/write, and default all new users to having public data

16 years agoOption to disable thick ways
Richard Fairhurst [Thu, 1 May 2008 08:27:14 +0000 (08:27 +0000)]
Option to disable thick ways

16 years agoInclude the marker on the larger map link during HTML export.
Tom Hughes [Thu, 1 May 2008 08:04:34 +0000 (08:04 +0000)]
Include the marker on the larger map link during HTML export.

16 years agoReduce the expiry for OpenLayers resources (which are not subject to
Tom Hughes [Thu, 1 May 2008 07:55:23 +0000 (07:55 +0000)]
Reduce the expiry for OpenLayers resources (which are not subject to
rails asset tagging) to one week, and set a one week expiry for the
new static HTML page used for HTML export.

16 years agoMerge HTML export branch to trunk.
Tom Hughes [Thu, 1 May 2008 07:49:28 +0000 (07:49 +0000)]
Merge HTML export branch to trunk.

16 years agolarger map link is now raw html for better google-linking capability, rather
Christopher Schmidt [Thu, 1 May 2008 00:00:20 +0000 (00:00 +0000)]
larger map link is now raw html for better google-linking capability, rather
than generated by javascript