Commit graph

155 commits

Author SHA1 Message Date
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
Tom Hughes
bee38e63a3 Make things work with multipart keys. 2008-01-23 09:53:35 +00:00
Steve Coast
ddd5b4cf19 make amf_controller use rails objects, and stuff, in the getway method. You need to install the multipart keys plugin now, see the README. 2008-01-22 15:00:54 +00:00
Gabriel Ebner
cfbdd3f7e1 Merge rails_port as of r4613 & fix tests. 2007-09-20 14:37:29 +00:00
Tom Hughes
603d1be4bd Get the timestamp outside the transactionso everything can see it. 2007-09-01 06:48:59 +00:00
Tom Hughes
b948dd6d52 Fix typo. 2007-09-01 06:39:10 +00:00
Tom Hughes
5fe7a5bbbc Split the transaction used for ways so that we recover more cleanly
without leaving rubbish in the database.
2007-08-31 23:10:33 +00:00
Frederik Ramm
6d07f5661a changed from nd id=... to nd ref=... 2007-08-31 22:33:27 +00:00
Tom Hughes
e15916ad5b Let exceptions propagate to the default handler for ways so they are logged. 2007-08-31 18:10:44 +00:00
Frederik Ramm
78b440ffc1 preliminary commit 0.5 API with relations / untested after entity-relation rename, some changes still in queue 2007-08-29 22:00:26 +00:00
Tom Hughes
3b751f79b8 Handle segments which do not exist correctly and indicate that the
preconditions for the way are not met.
2007-07-27 08:16:12 +00:00
Tom Hughes
4235bdf162 Bring some sort of sanity to sequence numbers for segments in a
way - now everything starts counting at one again and nothing starts
at zero.
2007-06-29 23:00:27 +00:00
Tom Hughes
fcc485725d Make negative caching of users work. 2007-06-27 18:16:04 +00:00
Tom Hughes
71606b34f0 Make sure we get the list of tags and segments to save before we do the
corresponding delete, as otherwise we might not have read them from the
database yet.
2007-06-24 11:12:52 +00:00
Tom Hughes
c184b20f9f Make sure the associations with segments and old ways are properly ordered. 2007-06-23 23:06:48 +00:00
Tom Hughes
c11d961f62 Close a number of holes in the API by making it validate changes
more carefully.
2007-06-19 23:20:39 +00:00
Tom Hughes
7ab154a0ae Return usernames correctly. 2007-06-19 11:23:12 +00:00
Steve Coast
21fd6d3126 updates to api 2007-05-10 19:37:33 +00:00
Steve Coast
6ccf25b347 various fixes 2007-05-09 17:31:11 +00:00
Steve Coast
89e976c6e5 updates from hacking day 2007-05-06 10:08:00 +00:00
Nick Burch
a926189c7f When calling .tags or .segs on a way, if it's an existing one, use the data from the database 2007-04-22 14:46:25 +00:00
Steve Coast
668f8020cc simplify grabbing of a xml base doc 2007-04-07 12:43:48 +00:00
Steve Coast
2f55a3f0a8 API returns user info if public 2007-04-07 12:17:11 +00:00
Dan Moore
d07277efba API 0.4 Updates - work on traces pages + pagination, edit tab, some API testing
* traces - added some routes, replicated data access / pagination, but presentation and pending file control not complete
* edit - setup so that applet can be loaded + token authorisation enabled
* API - tests out ok against applet, but had to change segment-node associations
* misc - gems version required upgraded to 1.2.3 (latest stable rails version), changed some find_first to find(:first... calls
2007-03-23 23:13:19 +00:00
Steve Coast
9189093997 precondition stuff 2006-12-13 16:05:37 +00:00
Steve Coast
e799022131 rails API support for history of node/segment/way + various bugfixes and cleanups 2006-11-30 18:44:40 +00:00
Steve Coast
2803612d9d various map API rails stuff 2006-11-27 15:06:34 +00:00