]> git.openstreetmap.org Git - rails.git/log
rails.git
7 years agoInclude car profile for GraphHopper routing
Peter Karich [Mon, 22 May 2017 20:20:09 +0000 (22:20 +0200)]
Include car profile for GraphHopper routing

Closes #1547

7 years agoRefactor more changeset_controller tests to use factories.
Andy Allan [Wed, 24 May 2017 16:31:56 +0000 (17:31 +0100)]
Refactor more changeset_controller tests to use factories.

7 years agoRefactor some changesets controller tests to use factories.
Andy Allan [Wed, 24 May 2017 16:03:07 +0000 (17:03 +0100)]
Refactor some changesets controller tests to use factories.

7 years agoRefactor the changeset query tests to use factories.
Andy Allan [Wed, 24 May 2017 15:28:58 +0000 (16:28 +0100)]
Refactor the changeset query tests to use factories.

Unfortunately some references to fixtures have to remain until they
are finally removed.

7 years agoConvert more relation controller tests to use factories.
Andy Allan [Wed, 24 May 2017 14:52:31 +0000 (15:52 +0100)]
Convert more relation controller tests to use factories.

7 years agoConvert remaining node_controller tests to use factories.
Andy Allan [Wed, 17 May 2017 15:49:19 +0000 (16:49 +0100)]
Convert remaining node_controller tests to use factories.

7 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Sun, 21 May 2017 07:56:50 +0000 (09:56 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Sat, 20 May 2017 09:04:19 +0000 (11:04 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoPlay a bit of whack-an-seo-mole
Tom Hughes [Thu, 18 May 2017 14:02:21 +0000 (15:02 +0100)]
Play a bit of whack-an-seo-mole

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1521'
Tom Hughes [Wed, 17 May 2017 19:37:01 +0000 (20:37 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1521'

7 years agoEnsure invisible_way is actually deleted
Andy Allan [Wed, 17 May 2017 15:05:23 +0000 (16:05 +0100)]
Ensure invisible_way is actually deleted

7 years agoUpdate more relation_controller tests to use factories.
Andy Allan [Wed, 17 May 2017 10:59:22 +0000 (11:59 +0100)]
Update more relation_controller tests to use factories.

7 years agoRefactor some relation_controller tests to use factories.
Andy Allan [Wed, 17 May 2017 10:29:11 +0000 (11:29 +0100)]
Refactor some relation_controller tests to use factories.

7 years agoRefactor the relation_for_nwr tests to use factories
Andy Allan [Wed, 17 May 2017 10:11:04 +0000 (11:11 +0100)]
Refactor the relation_for_nwr tests to use factories

This is a bit verbose, since the original tests assumed various other
entities were silently not selected. This also improves the tests
since it considers the case of how to handle a relation with the
target member appearing more than once.

7 years agoRefactor get_nodes_undelete test to use factories instead of fixtures.
Andy Allan [Wed, 17 May 2017 09:30:28 +0000 (10:30 +0100)]
Refactor get_nodes_undelete test to use factories instead of fixtures.

7 years agoRefactor remaining way model tests to use factories.
Andy Allan [Wed, 17 May 2017 08:56:44 +0000 (09:56 +0100)]
Refactor remaining way model tests to use factories.

Note that test_max_nodes_per_way_limit still has issues - see #1516

7 years agoUpdate to iD v2.2.1
Bryan Housel [Fri, 12 May 2017 14:42:31 +0000 (10:42 -0400)]
Update to iD v2.2.1

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 11 May 2017 06:51:49 +0000 (08:51 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoMore amf_controller tests converted to use factories.
Andy Allan [Wed, 10 May 2017 17:14:15 +0000 (18:14 +0100)]
More amf_controller tests converted to use factories.

7 years agoRefactor more amf_controller tests to use factories.
Andy Allan [Wed, 10 May 2017 16:34:16 +0000 (17:34 +0100)]
Refactor more amf_controller tests to use factories.

7 years agoRefactor putway method tests to use factories
Andy Allan [Wed, 10 May 2017 16:14:13 +0000 (17:14 +0100)]
Refactor putway method tests to use factories

This involved decoding a lot of magic numbers, to figure out which
were node_ids and which were other things (versions, coordinates etc)

7 years agoRefactor some more amf_controller tests to use factories.
Andy Allan [Wed, 10 May 2017 15:57:29 +0000 (16:57 +0100)]
Refactor some more amf_controller tests to use factories.

The timestamp truncation thing was a pain to figure out.

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1538'
Tom Hughes [Wed, 10 May 2017 16:01:06 +0000 (17:01 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1538'

7 years agoRefactor old_relation_controller tests to use factories.
Andy Allan [Wed, 10 May 2017 12:53:35 +0000 (13:53 +0100)]
Refactor old_relation_controller tests to use factories.

7 years agoUpdate old_ways_controller tests to use factories.
Andy Allan [Wed, 10 May 2017 12:38:10 +0000 (13:38 +0100)]
Update old_ways_controller tests to use factories.

7 years agoConvert remaining old_node_controller tests to use factories.
Andy Allan [Wed, 10 May 2017 10:47:10 +0000 (11:47 +0100)]
Convert remaining old_node_controller tests to use factories.

7 years agoEnsure the old nodes are created with the same changeset
Andy Allan [Wed, 10 May 2017 09:51:49 +0000 (10:51 +0100)]
Ensure the old nodes are created with the same changeset

Not often important, but the most recent old_node should definitely
have the same changeset as the node itself.

7 years agoRefactor remaining api_controller tests to use factories.
Andy Allan [Wed, 26 Apr 2017 07:45:34 +0000 (09:45 +0200)]
Refactor remaining api_controller tests to use factories.

7 years agoUpdate mailmap
Tom Hughes [Wed, 10 May 2017 10:51:16 +0000 (11:51 +0100)]
Update mailmap

7 years agoBlock anything in the here.com domain
Simon Poole [Wed, 10 May 2017 10:19:15 +0000 (12:19 +0200)]
Block anything in the here.com domain

Fixes #1536
Closes #1537

7 years agoParse asset map JSON before passing it to iD
Tom Hughes [Wed, 10 May 2017 08:14:09 +0000 (09:14 +0100)]
Parse asset map JSON before passing it to iD

7 years agoUpdate to iD v2.2.0
Bryan Housel [Tue, 9 May 2017 14:43:31 +0000 (10:43 -0400)]
Update to iD v2.2.0

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 4 May 2017 05:57:14 +0000 (07:57 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Tue, 2 May 2017 06:08:50 +0000 (08:08 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoUse POST when editing GPX trace details
Tom Hughes [Mon, 1 May 2017 15:51:09 +0000 (16:51 +0100)]
Use POST when editing GPX trace details

Fixes #1533

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 27 Apr 2017 06:25:14 +0000 (08:25 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoRefactor remaining way_controller tests to use factories.
Andy Allan [Wed, 26 Apr 2017 07:01:48 +0000 (09:01 +0200)]
Refactor remaining way_controller tests to use factories.

7 years agoRefactor more way_controller tests to use factories.
Andy Allan [Wed, 26 Apr 2017 06:50:39 +0000 (08:50 +0200)]
Refactor more way_controller tests to use factories.

7 years agoAdd a way_with_nodes factory, and use it in the way_controller tests.
Andy Allan [Wed, 26 Apr 2017 06:34:01 +0000 (08:34 +0200)]
Add a way_with_nodes factory, and use it in the way_controller tests.

7 years agoRefactor deletion tests in way_controller_test to use factories.
Andy Allan [Wed, 26 Apr 2017 06:33:29 +0000 (08:33 +0200)]
Refactor deletion tests in way_controller_test to use factories.

7 years agoRefactor some way_controller tests to use factories.
Andy Allan [Tue, 25 Apr 2017 16:42:59 +0000 (18:42 +0200)]
Refactor some way_controller tests to use factories.

7 years agoRefactor some amf_controller tests to use factories.
Andy Allan [Tue, 25 Apr 2017 15:47:28 +0000 (17:47 +0200)]
Refactor some amf_controller tests to use factories.

7 years agoUse factories for all factory associations.
Andy Allan [Tue, 25 Apr 2017 14:52:29 +0000 (16:52 +0200)]
Use factories for all factory associations.

7 years agoCreate an old_way_node factory, and start using it for tests.
Andy Allan [Tue, 25 Apr 2017 14:24:21 +0000 (16:24 +0200)]
Create an old_way_node factory, and start using it for tests.

7 years agoCreate an old_way factory, and start using it for tests.
Andy Allan [Tue, 25 Apr 2017 13:53:52 +0000 (15:53 +0200)]
Create an old_way factory, and start using it for tests.

7 years agoCreate an old_relation_member factory, and start using it for tests.
Andy Allan [Tue, 25 Apr 2017 13:42:30 +0000 (15:42 +0200)]
Create an old_relation_member factory, and start using it for tests.

7 years agoCreate an old_relation factory, and start using it for tests.
Andy Allan [Tue, 25 Apr 2017 13:19:25 +0000 (15:19 +0200)]
Create an old_relation factory, and start using it for tests.

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1527'
Tom Hughes [Mon, 24 Apr 2017 20:05:23 +0000 (21:05 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1527'

7 years agoMove list of containing relations to top of browse views
daganzdaanda [Mon, 24 Apr 2017 19:23:46 +0000 (20:23 +0100)]
Move list of containing relations to top of browse views

Moves the list of containing relations to above the list of
members for ways and relations - nodes have no equivalent list
so no change is needed there.

Fixes #794
Closes #1501

7 years agoConvert the node_controller update tests to use factories.
Andy Allan [Mon, 24 Apr 2017 18:42:08 +0000 (20:42 +0200)]
Convert the node_controller update tests to use factories.

7 years agoConvert the duplicate_tags node controller test to use factories.
Andy Allan [Mon, 24 Apr 2017 18:41:43 +0000 (20:41 +0200)]
Convert the duplicate_tags node controller test to use factories.

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 24 Apr 2017 17:59:18 +0000 (19:59 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoCredit the whole of UCL, rather than just the Bartlett / VR centre.
Matt Amos [Sat, 22 Apr 2017 10:47:12 +0000 (11:47 +0100)]
Credit the whole of UCL, rather than just the Bartlett / VR centre.

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 20 Apr 2017 05:41:04 +0000 (07:41 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 17 Apr 2017 07:41:24 +0000 (09:41 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoUpdate Potlatch 2 to 2.5-7-gbd74430 build
Tom Hughes [Thu, 13 Apr 2017 17:41:58 +0000 (18:41 +0100)]
Update Potlatch 2 to 2.5-7-gbd74430 build

7 years agoRemember user's choice of directions engine
Dan Stowell [Tue, 11 Apr 2017 18:42:37 +0000 (19:42 +0100)]
Remember user's choice of directions engine

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 10 Apr 2017 05:27:21 +0000 (07:27 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1510'
Tom Hughes [Sat, 8 Apr 2017 15:36:48 +0000 (16:36 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1510'

7 years agoFix indentation in email template
Herve Saint-Amand [Fri, 31 Mar 2017 20:16:29 +0000 (20:16 +0000)]
Fix indentation in email template

The plain text templates had nice indentation in the source however that
got reflected in the output, which was visibly and needlessly indented.

Closes #1512

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 6 Apr 2017 05:25:43 +0000 (07:25 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoUse node and relation_member factories for testing containing_relations and containin...
Andy Allan [Wed, 5 Apr 2017 10:33:33 +0000 (11:33 +0100)]
Use node and relation_member factories for testing containing_relations and containing_relation_members

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 3 Apr 2017 05:38:26 +0000 (07:38 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoConvert more node fixtures to factories
Andy Allan [Fri, 31 Mar 2017 09:51:18 +0000 (10:51 +0100)]
Convert more node fixtures to factories

7 years agoAdd the closed trait to changeset factories.
Andy Allan [Fri, 31 Mar 2017 09:47:28 +0000 (10:47 +0100)]
Add the closed trait to changeset factories.

7 years agoAdd factories for relations, relation_members, ways and way_nodes
Andy Allan [Fri, 31 Mar 2017 09:40:49 +0000 (10:40 +0100)]
Add factories for relations, relation_members, ways and way_nodes

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1508'
Tom Hughes [Thu, 30 Mar 2017 14:45:37 +0000 (15:45 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1508'

7 years agoUpdate mapzen directions credit link
Andy Allan [Thu, 30 Mar 2017 14:18:16 +0000 (15:18 +0100)]
Update mapzen directions credit link

Rather than pointing at a redirect, point at the target of the
redirect. Refs #1388

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1507'
Tom Hughes [Thu, 30 Mar 2017 14:18:14 +0000 (15:18 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1507'

7 years agoFix tests that referred to node lat and lons
Andy Allan [Thu, 30 Mar 2017 14:13:22 +0000 (15:13 +0100)]
Fix tests that referred to node lat and lons

7 years agoFormat latitudes and longitudes as %7f in XML output
Andy Allan [Thu, 30 Mar 2017 13:30:54 +0000 (14:30 +0100)]
Format latitudes and longitudes as %7f in XML output

This matches the double formatting in XML from cgimap. Fixes #341.

7 years agoUse node factories for browse_controller tests.
Andy Allan [Thu, 30 Mar 2017 12:57:30 +0000 (13:57 +0100)]
Use node factories for browse_controller tests.

7 years agoFor deleted nodes created via factories, make sure the most recent old_node is also...
Andy Allan [Thu, 30 Mar 2017 12:57:07 +0000 (13:57 +0100)]
For deleted nodes created via factories, make sure the most recent old_node is also deleted

7 years agoUse factories for nodes in browse_helper tests.
Andy Allan [Thu, 30 Mar 2017 12:19:15 +0000 (13:19 +0100)]
Use factories for nodes in browse_helper tests.

7 years agoAdd a with_history trait for node factories, to automatically create corresponding...
Andy Allan [Thu, 30 Mar 2017 08:31:22 +0000 (09:31 +0100)]
Add a with_history trait for node factories, to automatically create corresponding old_nodes

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 30 Mar 2017 05:57:50 +0000 (07:57 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 27 Mar 2017 06:27:45 +0000 (08:27 +0200)]
Localisation updates from https://translatewiki.net.

7 years agoFix typo
John Daly [Sun, 26 Mar 2017 20:27:53 +0000 (21:27 +0100)]
Fix typo

Closes #1502

7 years agoUpdate Potlatch 2 to 2.5 build
Tom Hughes [Fri, 24 Mar 2017 19:31:44 +0000 (19:31 +0000)]
Update Potlatch 2 to 2.5 build

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 23 Mar 2017 07:44:53 +0000 (08:44 +0100)]
Localisation updates from https://translatewiki.net.

7 years agoAdd explicit tests for lat/lon methods on node models
Tom Hughes [Wed, 22 Mar 2017 20:43:39 +0000 (20:43 +0000)]
Add explicit tests for lat/lon methods on node models

7 years agoUse changeset factory for association in node factory
Tom Hughes [Wed, 22 Mar 2017 20:31:25 +0000 (20:31 +0000)]
Use changeset factory for association in node factory

7 years agoSet canonical port based on protocol
Tom Hughes [Wed, 22 Mar 2017 19:28:57 +0000 (19:28 +0000)]
Set canonical port based on protocol

7 years agoRemove various osm.org email addresses from example configuration
Tom Hughes [Wed, 22 Mar 2017 19:25:47 +0000 (19:25 +0000)]
Remove various osm.org email addresses from example configuration

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1496'
Tom Hughes [Wed, 22 Mar 2017 19:19:59 +0000 (19:19 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1496'

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1495'
Tom Hughes [Wed, 22 Mar 2017 19:11:04 +0000 (19:11 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1495'

7 years agoMake the publisher URL configurable, with no default
Tom Hughes [Wed, 22 Mar 2017 18:42:58 +0000 (18:42 +0000)]
Make the publisher URL configurable, with no default

7 years agoAdd server_protocol configuration option
Tom Hughes [Wed, 22 Mar 2017 18:22:24 +0000 (18:22 +0000)]
Add server_protocol configuration option

7 years agoUse node and old_node factories for redaction model tests.
Andy Allan [Wed, 22 Mar 2017 18:19:16 +0000 (18:19 +0000)]
Use node and old_node factories for redaction model tests.

7 years agoUse canonical-rails gem to generate canonical URLs
Tom Hughes [Wed, 22 Mar 2017 18:16:53 +0000 (18:16 +0000)]
Use canonical-rails gem to generate canonical URLs

7 years agoCreate a node factory, and use it for most node model tests
Andy Allan [Wed, 22 Mar 2017 17:50:10 +0000 (17:50 +0000)]
Create a node factory, and use it for most node model tests

7 years agoSet server_url in the test environment
Tom Hughes [Wed, 22 Mar 2017 17:24:28 +0000 (17:24 +0000)]
Set server_url in the test environment

7 years agoComment out server_url in the default configuration
Tom Hughes [Wed, 22 Mar 2017 17:19:08 +0000 (17:19 +0000)]
Comment out server_url in the default configuration

7 years agoAdd a canonical URL to the head
Tom Hughes [Wed, 22 Mar 2017 17:14:55 +0000 (17:14 +0000)]
Add a canonical URL to the head

7 years agoUse old_node factory for OldNode model tests.
Andy Allan [Wed, 22 Mar 2017 17:10:48 +0000 (17:10 +0000)]
Use old_node factory for OldNode model tests.

The valid/invalid tests were simplified, since there is little to be
gained from inserting (invalid) nodes into the database and comparing
the node with another copy of itself.

7 years agoRework the changeset helper tests to use factories.
Andy Allan [Wed, 22 Mar 2017 11:42:29 +0000 (11:42 +0000)]
Rework the changeset helper tests to use factories.

7 years agoUse changeset factory for factory associations
Andy Allan [Wed, 22 Mar 2017 11:09:52 +0000 (11:09 +0000)]
Use changeset factory for factory associations

One test needed updating since it assumed the comments were being
created on a particular changeset.

7 years agoCreate a changeset factory, and use it for model tests.
Andy Allan [Wed, 22 Mar 2017 10:47:24 +0000 (10:47 +0000)]
Create a changeset factory, and use it for model tests.

7 years agoRemove the api_fixtures call from changeset model tests, since they do not need the...
Andy Allan [Wed, 22 Mar 2017 10:40:13 +0000 (10:40 +0000)]
Remove the api_fixtures call from changeset model tests, since they do not need the fixtures.

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 20 Mar 2017 06:38:24 +0000 (07:38 +0100)]
Localisation updates from https://translatewiki.net.