]> git.openstreetmap.org Git - rails.git/log
rails.git
16 years agoFixing indentation
Shaun McDonald [Mon, 2 Jun 2008 15:13:29 +0000 (15:13 +0000)]
Fixing indentation

16 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

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

16 years agoPotlatch 0.8c
Richard Fairhurst [Wed, 30 Apr 2008 22:59:30 +0000 (22:59 +0000)]
Potlatch 0.8c

16 years agolink goes into external frame, not in the iframe
Christopher Schmidt [Wed, 30 Apr 2008 11:45:28 +0000 (11:45 +0000)]
link goes into external frame, not in the iframe

16 years agoTidy things up a bit.
Tom Hughes [Wed, 30 Apr 2008 08:44:57 +0000 (08:44 +0000)]
Tidy things up a bit.

16 years agoadd support for showing osmarender layer instead of mapnik layer, style the vector...
Christopher Schmidt [Wed, 30 Apr 2008 03:11:47 +0000 (03:11 +0000)]
add support for showing osmarender layer instead of mapnik layer, style the vector layer so it looks like a marker.

16 years agoadd support for setting a specific marker location on the map.
Christopher Schmidt [Wed, 30 Apr 2008 02:50:53 +0000 (02:50 +0000)]
add support for setting a specific marker location on the map.

16 years agoSimplify a couple things that no longer need to be so complex.
Christopher Schmidt [Wed, 30 Apr 2008 02:48:26 +0000 (02:48 +0000)]
Simplify a couple things that no longer need to be so complex.

16 years agoimprovements to embed.html, now uses bbox instead of lon/lat/zoom, and has more human...
Christopher Schmidt [Wed, 30 Apr 2008 01:00:40 +0000 (01:00 +0000)]
improvements to embed.html, now uses bbox instead of lon/lat/zoom, and has more human readable layer definition, and has support for marker other than the middle of the map.

16 years agoFix attribution strings.
Tom Hughes [Tue, 29 Apr 2008 17:23:22 +0000 (17:23 +0000)]
Fix attribution strings.

16 years agoCosmetic tidy up, and fix hardcoding of server name.
Tom Hughes [Tue, 29 Apr 2008 17:11:22 +0000 (17:11 +0000)]
Cosmetic tidy up, and fix hardcoding of server name.

16 years agoround numbers
Christopher Schmidt [Tue, 29 Apr 2008 14:41:59 +0000 (14:41 +0000)]
round numbers

16 years agoadd support for HTML export to export tabk
Christopher Schmidt [Tue, 29 Apr 2008 13:57:26 +0000 (13:57 +0000)]
add support for HTML export to export tabk

16 years agostart of work on UI
Christopher Schmidt [Tue, 29 Apr 2008 13:19:24 +0000 (13:19 +0000)]
start of work on UI

16 years agoAdd static embed-friendly html page.
Christopher Schmidt [Tue, 29 Apr 2008 13:08:26 +0000 (13:08 +0000)]
Add static embed-friendly html page.

16 years agoCreate branch for HTML export from export tab.
Christopher Schmidt [Tue, 29 Apr 2008 11:58:12 +0000 (11:58 +0000)]
Create branch for HTML export from export tab.

16 years agopreset typo
Richard Fairhurst [Tue, 29 Apr 2008 10:34:20 +0000 (10:34 +0000)]
preset typo

16 years agoIE was getting confused by having a div with an id of "map" and a
Tom Hughes [Mon, 28 Apr 2008 09:49:27 +0000 (09:49 +0000)]
IE was getting confused by having a div with an id of "map" and a
link anchor with a name of "map". Closes #865.

16 years agoadd turning_circle to autocomplete
Richard Fairhurst [Sun, 27 Apr 2008 22:00:48 +0000 (22:00 +0000)]
add turning_circle to autocomplete

16 years agoUnderline links in the SOTM box.
Tom Hughes [Sun, 27 Apr 2008 15:40:48 +0000 (15:40 +0000)]
Underline links in the SOTM box.

16 years agoMake sure the recorded first point for a trace really is the first
Tom Hughes [Sun, 27 Apr 2008 12:27:46 +0000 (12:27 +0000)]
Make sure the recorded first point for a trace really is the first
point and not the last. Closes #709.

16 years agoAdvise new users to signup on the wiki as well. Closes #738.
Tom Hughes [Sun, 27 Apr 2008 12:26:10 +0000 (12:26 +0000)]
Advise new users to signup on the wiki as well. Closes #738.

16 years agoReport a friendly error for attempts to reference a user that does
Tom Hughes [Sun, 27 Apr 2008 12:21:32 +0000 (12:21 +0000)]
Report a friendly error for attempts to reference a user that does
not exist. Closes #805.

16 years agoInclude tags in GPX success and failure mails. Closes #480.
Tom Hughes [Sun, 27 Apr 2008 12:18:19 +0000 (12:18 +0000)]
Include tags in GPX success and failure mails. Closes #480.

16 years agoattempted fix for access from osm.org (as opposed to www.osm.org)
Richard Fairhurst [Sun, 27 Apr 2008 11:47:19 +0000 (11:47 +0000)]
attempted fix for access from osm.org (as opposed to www.osm.org)

16 years agomight help if I committed the SWF...
Richard Fairhurst [Sat, 26 Apr 2008 12:43:40 +0000 (12:43 +0000)]
might help if I committed the SWF...

16 years agoUnbreak Richard's warning messages. Closes #864.
Tom Hughes [Fri, 25 Apr 2008 09:04:56 +0000 (09:04 +0000)]
Unbreak Richard's warning messages. Closes #864.

16 years agoavoid inducing despair in relations-related circumstances
Richard Fairhurst [Wed, 23 Apr 2008 23:44:01 +0000 (23:44 +0000)]
avoid inducing despair in relations-related circumstances

16 years agoTidy up RSS links a bit.
Tom Hughes [Wed, 23 Apr 2008 17:39:09 +0000 (17:39 +0000)]
Tidy up RSS links a bit.