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

81 commits

Author SHA1 Message Date
Shaun McDonald
b051dd11af Making amf controller act more like the xml apis 2008-12-11 17:22:15 +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
e989b1a880 ensure that uploads that don't supply a lat and lon for a node. Adding related test and fixing other tests. 2008-12-01 18:32:54 +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
1375095343 More model validations. Fixing one test. 2008-11-25 17:23:47 +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
Shaun McDonald
c8b70c1c72 Adding some more unit test stubs that need filling out. Adding changeset tags fixture. Indentation fix in way model. 2008-11-14 02:06:04 +00:00
Richard Fairhurst
3065af398d 0.6-friendly Potlatch (work in progress). DO NOT SET POTLATCH_USE_SQL=false as it won't work 2008-11-09 23:50:03 +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
Frederik Ramm
5ff5bf60e5 mini fix 2008-11-09 12:06:05 +00:00
Andy Allan
7058d836f7 use boolean flags when using boolean columns 2008-11-07 13:24:18 +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
Shaun McDonald
635daf1773 Adding a restriction to prevent more than 2000 nodes to be added to any way. Tests still need to be written. Capabilities api request also updated. 2008-11-03 00:12:18 +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
6339473cb7 Added tests for ways_for_node. Altered behaviour to not return deleted ways. Fixed ways fixture where most recent history != current. 2008-10-21 10:52:52 +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
9e1946b283 now you will actually save the changeset on updating ways. Showing the changeset in the data browser detail. 2008-10-13 17:05:52 +00:00
Matt Amos
3549d8900f All API 0.6 functional tests now pass. 2008-10-13 15:46:22 +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
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
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
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
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
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
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
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
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
Richard Fairhurst
112950ca3a various relations fixes 2008-03-21 19:00:39 +00:00
Steve Coast
d1f2b4ece9 remove deleteway logic from amf_controller (yay!) TomH: check with RichardF this is sane before deploying. worksforme. 2008-02-23 16:05:45 +00:00
Tom Hughes
d04c6d6ccd Optimise the Potlatch whichways and getway calls a bit. 2008-02-03 12:56:25 +00:00
Tom Hughes
b8f87e0466 Fix typo. 2008-01-28 08:44:03 +00:00
Steve Coast
a855d20ba4 Most of a method to delete a way and all its nodes - but I'm waiting on splitting node tags out to their own table before finishing it. 2008-01-25 15:24:04 +00:00
Steve Coast
bbd769304c dont eager load tags (false primary key fucks all sorts of things up) and move delete way logic to model so that amf_controller can use it (plan is to do this with all of the methods. sigh.) 2008-01-25 14:32:45 +00:00
Steve Coast
3bd92c1670 move potlatch presets to only be generated once, and allow pulling in way_tags in a way via a false primary key 2008-01-24 10:52:10 +00:00