cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2224 commits 4 branches 1 tag 499 MiB
Commit graph

379 commits

Author SHA1 Message Date
Shaun McDonald
e1b205913c Fix the data config, so that the development database is not the same as the test database. Make a good stab at getting the creates and updates for relations working, adding some new error exceptions. Some code indentation cleanup. 2008-10-08 15:42:42 +00:00
Shaun McDonald
2347761266 some useful notes in code for ideas that require implementing. 2008-10-07 23:49:53 +00:00
Shaun McDonald
328d47e506 Fixing a bug in my foreign keys. I can now upload and download nodes and ways using JOSM in the new API. 2008-10-03 17:09:58 +00:00
Shaun McDonald
40414cf324 changing the belongs_to and has_many items in the models to reflect the new foriegn keys in the db and the fact that a (old)node/way/relation now belong to a changeset, which in turn has a user. 2008-09-30 18:21:56 +00:00
Shaun McDonald
d9e070e069 Doing a resync from mainline 8633:10895. There was one simple to resolve conflict on app/models/node.rb. Also moving the migrations for API0.6 to new sequence numbers since there was some new migrations added to mainline, where the migration numbers would conflict if not moved. 2008-09-25 15:06:05 +00:00
Tom Hughes
34189cf761 Add basic support for logically deleting a user. 2008-08-24 16:53:42 +00:00
Tom Hughes
64ecd02f0b Allow users to change their email address. Closes #546. 2008-08-13 11:39:33 +00:00
Tom Hughes
f8367c3ee1 Allow a user's email address to be marked invalid, and suppress most 
notification mails for such users.
 2008-08-13 10:45:49 +00:00
Tom Hughes
6d7e69d4d3 Make the location of the GPX traces configurable. 2008-08-07 11:31:42 +00:00
Tom Hughes
8dbaf76e7c Ignore any files in an __MACOSX folder in a zip file, as these are 
metadata files added by the MAC OS X zip tool.
 2008-07-31 08:06:09 +00:00
Tom Hughes
fb5f6bb4a2 Rework GPX import daemon to use libxml2 for speed. 2008-07-30 08:37:05 +00:00
Shaun McDonald
1bcc2242c0 Make sure that there is a sender and a recipient of a message. New test to make sure that there a message also has a sender and a recipient, as the validates_associated doesn't do anything if they are nil. 2008-07-18 16:44:14 +00:00
Tom Hughes
b9fc5e662b Cope with being asked to find relations for any empty set of objects. 2008-07-18 13:13:28 +00:00
Tom Hughes
d6e047d7d4 Optimise finding of relations, partially reversing change #8443 but in 
a more rails like way.
 2008-07-16 23:42:59 +00:00
Tom Hughes
34d9360bee Minor tidyups. 2008-07-15 18:23:00 +00:00
Tom Hughes
6fa8647855 Rename unique_nodes to unshared_node_ids to make it's purpose a bit clearer 
and rework it to be a bit tidier.
 2008-07-15 18:18:37 +00:00
Richard Fairhurst
62a1ec4748 Potlatch 0.10 2008-07-09 22:19:48 +00:00
Shaun McDonald
c9a171c745 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. 2008-07-08 18:17:08 +00:00
Tom Hughes
700da2b347 Tidy up a bit after shaun's merge... 2008-07-07 16:16:05 +00:00
Shaun McDonald
64a5e21f53 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. 2008-07-07 14:20:27 +00:00
Shaun McDonald
5f8ab9e924 Merge changes from trunk 7673:8632. 2008-07-03 13:06:24 +00:00
Shaun McDonald
0a459023d3 Now all the unit tests work 2008-07-03 10:56:17 +00:00
Tom Hughes
97aefa23d0 Merge data browser branch to trunk. 2008-06-27 23:09:05 +00:00
Tom Hughes
def60c1935 Railsify relation selection (aka ripping out the f***in SQL). 2008-06-24 23:42:39 +00:00
Tom Hughes
398d5fa329 Improve the layout of the object browser views. 2008-06-24 16:44:45 +00:00
Tom Hughes
d69a518b9e Merge 8377:8381 from trunk. 2008-06-22 14:46:46 +00:00
Tom Hughes
b72fedb162 Make the polymorphic relation association work properly. 2008-06-22 14:44:34 +00:00
Tom Hughes
960d13488a Merge 7922:8377 from trunk. 2008-06-22 12:23:43 +00:00
Tom Hughes
b527d27674 Use a polymorphic association to model relation members and add 
associations for upward links from objects to relations that they
are a part of.
 2008-06-21 17:38:17 +00:00
Tom Hughes
a21824f754 Removed bogus belongs_to user declaration. 2008-06-21 16:19:36 +00:00
Tom Hughes
7d9bf3634c Work around the fact that exists? no longer works for models with 
no primary key.
 2008-06-07 22:40:39 +00:00
Shaun McDonald
b8a7d956bf Fixing indentation 2008-06-02 15:22:17 +00:00
Shaun McDonald
0c2d503f1e Fixing indentation 2008-06-02 15:13:29 +00:00
Tom Hughes
88105d9c64 Merge 7744:7922 from trunk. 2008-05-28 16:37:31 +00:00
Shaun McDonald
de5e96585b 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 2008-05-20 15:25:18 +00:00
Gabriel Ebner
ea1961e3ce api06: s/delete_with_relations_and_history/delete_with_history/g 2008-05-12 21:10:38 +00:00
Gabriel Ebner
86b4d1bc2c api06: Move version-checking into the models, raising an exception on mismatch 
(still not implemented for delete requests though.)
 2008-05-12 21:05:11 +00:00
Christopher Schmidt
697449d6f1 node.tags is now (apparently) the same as tags_as_hash. 2008-05-12 01:22:04 +00:00
Christopher Schmidt
97cb1fd7fa undo composite keys change on old_ndoe 2008-05-11 23:02:06 +00:00
Christopher Schmidt
df11677afd from_xml sets a version on nodes 2008-05-11 22:27:40 +00:00
Christopher Schmidt
e9b86e914d add to_xml method for oldnode 2008-05-11 22:26:46 +00:00
Christopher Schmidt
604f9ddd46 spit out whether the changeset is open in the xml 2008-05-11 22:26:11 +00:00
Christopher Schmidt
9cbc370a7e add FIXME FIXME FIXME for serializing changes in a changeset 2008-05-11 20:07:47 +00:00
Christopher Schmidt
e48cbc6a5f Add support for accessing changesets as XML through the API via the 
changeset controller "read" method
 2008-05-11 20:03:17 +00:00
Tom Hughes
5620d7263a Merge 7452:7744 from trunk. 2008-05-09 23:22:26 +00:00
Gabriel Ebner
013ef53c97 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.)
 2008-05-05 22:41:32 +00:00
Gabriel Ebner
6ebb7045fe 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.
 2008-05-04 15:16:58 +00:00
Gabriel Ebner
3d6e1c67fb api06: Preliminary support for diff uploading. This will not return anything 
useful and the code will need some heavy refactoring.
 2008-05-04 13:52:43 +00:00
Tom Hughes
cf304fe60f Merge 7649:7673 from trunk. 2008-05-04 11:26:36 +00:00
Tom Hughes
02efd7ba4a 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.
 2008-05-04 11:18:38 +00:00