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

51 commits

Author SHA1 Message Date
Matt Amos
afcb345014 Moved a bunch of time functions into UTC. Fixes bugs which we only see for 4 hours a year. 2009-03-29 01:31:04 +00:00
Matt Amos
be75a1504f Fixed a couple of bugs with changeset bounding box calculation when modifying or deleting. 2009-03-27 12:22:23 +00:00
Thomas Wood
6167bb6502 Shut up libxml's "Must specify a string with one or more characters" error on relation and way models. 2009-03-23 21:52:32 +00:00
Tom Hughes
c8ee135104 Merge 12304:14009 from trunk. 2009-03-08 13:02:37 +00:00
Tom Hughes
07c1cd6b98 Update to use libxml 1.0.0 gem. 2009-03-08 11:34:46 +00:00
Shaun McDonald
b7335940e2 Some improvements for the XML parsing, as there are somethings that we don't need, like timestamp and visibility, thus hopefully bringing a speedup in the xml parsing. Some more AMF controller fixes, plenty more to go though. 2008-12-09 18:44:11 +00:00
Shaun McDonald
e9527b363d Refactoring the amf controller, and all models so that save_with_history! is now private. Everyone should use create_with_history, delete_with_history, and update_from instead. Also gets the amf controller to do version checks in the node/way/relation models. Needs checked. This breaks Potlatch until #1376 is fixed. 2008-12-04 17:30:17 +00:00
Shaun McDonald
6e98e324e5 better handling of duplicate tags. Extra validation in the tests. 2008-11-28 17:38:23 +00:00
Matt Amos
299b671522 Moved transaction boundary to cover used-by tests on deletion so that the database can help prevent race conditions. 2008-11-26 14:49:56 +00:00
Shaun McDonald
8348493ccb Some improvements to the error messages that are returned by the api. 2008-11-25 18:59:35 +00:00
Shaun McDonald
1375095343 More model validations. Fixing one test. 2008-11-25 17:23:47 +00:00
Shaun McDonald
0ff1214f86 Make the role in relations optional, with a test to make sure it is. Also start moving the errors reading the xml to exceptions, thus making it possible to give meaningful error messages, when bad xml is sent (More work is required on this including doing the same for nodes and ways). With the latest gems update it seems that the lib xml handling was broken, using the newer method. Adding the content type for the exceptions. 2008-11-24 18:55:24 +00:00
Matt Amos
a90be5e69a Migration to add close-time to changesets. This replaces the boolean 'open' attribute. Added checks to ensure that the maximum lifetime and number of changes in a changeset are enforced. Added some tests. 2008-11-17 19:00:01 +00:00
Matt Amos
e79fd07638 Made relations ordered. Added some tests for this. Otherwise interface is unchanged. 2008-11-10 15:41:05 +00:00
Dave Stubbs
322d293007 update nodes/ways/relation XML to include user id as well as display name 2008-11-09 16:43:09 +00:00
Andy Allan
7058d836f7 use boolean flags when using boolean columns 2008-11-07 13:24:18 +00:00
Matt Amos
d43a327a95 Implemented changeset bounding box handling for relations, based on the conversation on the mailing list. Its a bit complex... 2008-11-06 17:56:24 +00:00
Matt Amos
02fbcf5f06 Added first attempt at bounding box support in changesets and tests for the same. 2008-11-04 15:52:22 +00:00
Matt Amos
dc2a959037 Added tests for changeset upload code. Refactored diff reading code and put it into /lib. Changed the route of a changeset upload to explicitly refer to the changeset it applies to (i.e: resource). 2008-10-23 15:14:17 +00:00
Matt Amos
b56f57ec43 Fixed up delete methods on nodes, ways and relations to return the new version number and added some more tests. 2008-10-14 14:27:12 +00:00
Matt Amos
cf24a5a3ee Added a bunch more tests on the API 0.6. Fixed node/way/relation from_xml code to disallow duplicate tag keys. 2008-10-13 17:50:15 +00:00
Shaun McDonald
fb5f39f19a Creating consistency check for creation of nodes, way and relations. Moving some creation code from the controller to the model, and adding error handling on create errors. 2008-10-13 15:39:21 +00:00
Matt Amos
127bb4523e Fixed problems with the relations functional tests. 2008-10-13 15:23:48 +00:00
Shaun McDonald
b91b514cf2 moving the check consistency to it's own file so that checks will be able to be loaded into the way and relation models, without loading the node stuff. 2008-10-13 14:34:04 +00:00
Shaun McDonald
3d24694add moving the conistency checks for updates and deletes to library, hopefully got the updates and deletes working now. 2008-10-09 16:22:05 +00:00
Shaun McDonald
2b7a40069f adding the controller code to be able to get a specific version of a node, way or relation. Add some node checks on update. Some code indentation cleanup. 2008-10-08 18:03:41 +00:00
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
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
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
Shaun McDonald
5f8ab9e924 Merge changes from trunk 7673:8632. 2008-07-03 13:06:24 +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
b72fedb162 Make the polymorphic relation association work properly. 2008-06-22 14:44:34 +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
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
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
df11677afd from_xml sets a version on nodes 2008-05-11 22:27:40 +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
Gabriel Ebner
bcbf417796 api06: Return version ids in XML responses. 2008-05-04 10:01:23 +00:00
Gabriel Ebner
6ae23bed90 split_node_tags: 
- Use InnoDB.
  - Put version column on the current_* tables.
  - Use transactions (untested).
 2008-05-03 16:27:49 +00:00
Steve Coast
ec264a935e nicer fix I think for nil / [] issue 2008-03-21 20:30:16 +00:00
Steve Coast
1f857565a6 more madness 2008-03-21 20:21:49 +00:00
Richard Fairhurst
740511066f fix problem with blank areas throwing a 500 2008-03-21 20:17:56 +00:00
Richard Fairhurst
ae142c554b Potlatch 0.8 - be afraid, be very, very afraid 2008-03-19 01:03:51 +00:00
Gabriel Ebner
cfbdd3f7e1 Merge rails_port as of r4613 & fix tests. 2007-09-20 14:37:29 +00:00