Commit graph

1527 commits

Author SHA1 Message Date
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
Matt Amos
2d373c6f20 Fix to_xml method of old_relation model. 2008-10-13 14:29:30 +00:00
Matt Amos
a2498928e4 Fixed node functional tests. A couple of changes to the old_node model and node controller for changesets. 2008-10-13 14:08:31 +00:00
Tom Hughes
3c24aa0a9b Make adding relations work again. Fix from RichardF. 2008-10-13 12:46:00 +00:00
Shaun McDonald
734cbb967d fixing the data browser to be able to cope with the changeset change. changeset browsing still needs to be implemented. Also giving a nice error message for 404 not found instead of rendering nothing. 2008-10-13 12:08:26 +00:00
Richard Fairhurst
e413ac3e46 disable z12 2008-10-13 06:50:02 +00:00
Tom Hughes
784e9c6b83 Send the new amf/read API call to the bulkapi queue - the write method
will fall through the main API queue.
2008-10-12 23:28:52 +00:00
Tom Hughes
2ccbc55236 Log the IP address used to create an account. 2008-10-12 23:20:28 +00:00
Richard Fairhurst
caa20ccc40 Potlatch 0.10e 2008-10-12 23:11:37 +00:00
Shaun McDonald
24b21e4a29 additional consistency checks. making the error message for the number of nodes use the configured number of nodes, rather than a hard coded number. minor improvements to the way controller functional tests. Not sure if they should be turned into integration tests. 2008-10-12 22:32:51 +00:00
Tom Hughes
c771557b38 Disambiguate order clause. 2008-10-12 18:42:34 +00:00
Tom Hughes
6a5749c55c Hide diary entries and comments made by deleted users. 2008-10-12 18:38:54 +00:00
Shaun McDonald
233a97bfcb fix indentation. Get teh api version from the constant, rather than hard coding it. Using right save method, so that exception is thrown. Some comment questions. 2008-10-10 18:24:07 +00:00
Shaun McDonald
4da22eee1a reverting the javascript change in changeset 10926, that needs to be specific to each rails setup (if run out of another dir), until we turn the file into an erb that can insert the rails root into the javascript file 2008-10-10 13:27:21 +00:00
Shaun McDonald
34bc4686cd Some comment about where to add code to get some more of the functional changesets working. 2008-10-10 07:58:33 +00:00
Grant Slater
b13278c815 Block bots from /trace/, so they don't attempt to eat all the GPX data. 2008-10-09 18:31:36 +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
a8b5e2b87d Backporting the change that I made to the api06 branch to bring the classic_pagination into our svn. This will make it easier for people to setup a rails version of the server. 2008-10-09 13:40:08 +00:00
Tom Hughes
0b8449d2c9 Set the displayProjection on the map. 2008-10-09 11:51:51 +00:00
Matt Amos
2c5f6740c7 Small fixes to unit tests where user_id has become changeset_id. 2008-10-09 10:19:16 +00:00
Tom Hughes
63c2d9a529 Make data browser work with OpenLayers 2.7. 2008-10-08 23:38:45 +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
2347761266 some useful notes in code for ideas that require implementing. 2008-10-07 23:49:53 +00:00
Shaun McDonald
6bf25141de Adding the classic_pagination to svn as the svn external is no longer working 2008-10-07 22:59:59 +00:00
Shaun McDonald
b6a3e9671c Updating the fixtures for the new changesets 2008-10-07 22:40:28 +00:00
Shaun McDonald
5adc9a45ef folder empty and components are dead and gone with rails 2 anyway, so deleting this folder. 2008-10-07 22:11:05 +00:00
Tom Hughes
7d8bd4f4bd More changes from the live server. 2008-10-06 23:31:41 +00:00
Tom Hughes
62847c92f5 Commit updated dispatch rules from live server. 2008-10-06 23:27:36 +00:00
Tom Hughes
53205dbb07 Update cross domain policy to only allow API access. 2008-10-06 23:21:57 +00:00
Richard Fairhurst
ed2b100969 add railway=platform 2008-10-05 22:20:04 +00:00
Richard Fairhurst
8f3a0f2fa2 slight fix to prevent empty tag values 2008-10-05 14:51:43 +00:00
Richard Fairhurst
97726826e1 Potlatch 0.10d 2008-10-05 00:21:35 +00:00
Tom Hughes
98ed7a815c Update to OpenLayers 2.7. 2008-10-04 23:45:08 +00:00
Tom Hughes
fb1d36623b Make sure the zoom level is valid when positioning the map. Closes #1158. 2008-10-04 23:44:41 +00:00
Tom Hughes
fe37259e01 Fix test for errors from geocoder.ca to work properly. Closes #1213. 2008-10-04 23:20:58 +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
5daeb1b063 Changing if not to unless to make code more readable. 2008-10-03 13:57:20 +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
d19076d0ed wrong foreign key command in the migration 2008-09-30 15:52:54 +00:00
Shaun McDonald
7252ffa820 wrong foreign key command in the migration 2008-09-30 15:44:55 +00:00
Shaun McDonald
d7289a06de using the wrong field name in one of the migrations 2008-09-30 15:24:25 +00:00
Shaun McDonald
20022e457f changing the changesets migrations, so that the user id is now the changeset id for the nodes/ways/relations 2008-09-30 14:29:44 +00:00
Shaun McDonald
0ec26f14a0 adding some version reading for the nodes 2008-09-29 16:28:51 +00:00
Grant Slater
3e1c421852 Add Flash crossdomain.xml policy file 2008-09-27 17:55:54 +00:00
Shaun McDonald
56c972577b fixing hard coded images/scripts, so that the site works better when deploy as a sub directory using passenger phusion. 2008-09-26 15:17:30 +00:00
Shaun McDonald
6dfc83da03 fixing the test that was broken in the resync 2008-09-25 16:20:36 +00:00
Shaun McDonald
629843b96b Minor fix for the migration that was moved 2008-09-25 15:57:59 +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
c2854a8056 Get rails to do asset tagging for the SWF file. 2008-09-25 03:58:18 +00:00