Commit Graph

1231 Commits

Author SHA1 Message Date
Bryan Housel 2e6799ac60 Don't reverse cardinal direction roles on relations anymore
re: https://github.com/openstreetmap/iD/pull/2004#issuecomment-407995998

Per thread https://twitter.com/bhousel/status/1025805098063208448
JOSM has stopped doing this too
2018-08-04 21:55:14 -04:00
Bryan Housel 89ad643977 Let new note generate its own id, instead of using -1
Also stringify the note id (because existing notes from OSM are this way)
Also make sure comments is initialized as an Array not an Object
Also clarify some of the tests
2018-07-24 14:11:08 -04:00
Thomas Hervey e1cb25d824 merge from 'master' 2018-07-23 18:24:02 -04:00
Thomas Hervey 26f045b16c added/updated service/osm, osm/note, mode/add_note tests 2018-07-23 16:17:48 -04:00
Bryan Housel 119792fd22 Cleanups to Detach Node feature
This commit includes a bunch of minor things:
- change keyboard shortcut to 'E' to not conflict with anything
- move `disabled` check from operation into action and simplify
- use `actionMoveNode` to place the detached node at the mouse cursor
- disable the operation if the node is connected to hidden features
- lots of code simplification
- make the icon more centered
2018-07-23 13:36:34 -04:00
Bryan Housel 94b0affe8c Merge branch '4320' of https://github.com/Psigio/iD into Psigio-4320 2018-07-23 08:44:19 -04:00
Jon D 90bc0b8537 Update to prevent detachment of node when either a via or
location_hint role in a turn restriction.
Update to move any other relation to new node.
2018-07-22 19:35:29 +01:00
Bryan Housel 2fa593421f Rename scaleExtent to zoomExtent, slightly simplify getTiles() 2018-07-22 01:15:44 -04:00
Thomas Hervey baad5f0cc5 added tests for osm/note 2018-07-21 21:44:07 -04:00
Bryan Housel 4c9ef45448 Merge pull request #5149 from vershwal/mvt_test
Some mvt tests.
2018-07-17 01:15:28 -04:00
Bryan Housel 73d0f30453 Merge branch 'notes' 2018-07-16 16:59:35 -04:00
vershwal 213fa3706d Created new file for pbf test in test/data. 2018-07-16 22:10:59 +05:30
Thomas Hervey 7ad765d408 added simple tests for loading and retrieving notes 2018-07-16 10:54:40 -04:00
vershwal 0b32f4c4ee Some mvt tests. 2018-07-15 22:20:43 +05:30
Thomas Hervey bd1586500e added tests for notes service 2018-07-13 15:01:43 -04:00
Bryan Housel 4fda478f57 Merge branch 'check' of https://github.com/vershwal/iD into vershwal-check 2018-07-09 09:32:15 -04:00
Bryan Housel de12396654 Fix projection so the map is where the point is
Also remove gj redundancy
2018-07-08 00:50:26 -04:00
Bryan Housel ef771211b7 Merge branch 'gpxtext' of https://github.com/vershwal/iD into vershwal-gpxtext 2018-07-07 23:28:48 -04:00
Jon D dd3de593ca Add tests for Detach Node operation 2018-07-07 11:34:14 +01:00
Jon D 3bad09d497 Merge Work-In-Progress 4320 to 4320 2018-07-06 22:20:19 +01:00
Bryan Housel 416ae66f71 Support more direction tags for reversal in Reverse action
(closes #5121)

This commit also refactors some of the logic to make it simpler and more efficient
(removes lodash _transform too) and updates the comment that was out of date.
2018-07-05 14:47:56 -04:00
Tom Hughes d617d9c588 Fix wikipedia UI tests to mock XHR instead of JSONP 2018-07-04 17:07:27 +01:00
vershwal 73ac628880 gpx tests. 2018-07-04 19:56:51 +05:30
Bryan Housel 535208beb5 Move tests to spec/services/osm.js and remove old notes.js files 2018-07-01 23:35:10 -04:00
Bryan Housel 9517635d4d Merge branch 'master' into notes 2018-06-29 21:54:24 -04:00
Bryan Housel 76d21c8293 stub test/spec/svg/gpx.js 2018-06-29 02:23:42 -04:00
Bryan Housel 3943364852 Merge pull request #5106 from openstreetmap/remove_test_user_mocks
removed: user mocks from image service test specs
2018-06-26 21:11:23 -04:00
Thomas Hervey dab46d2778 updated: notes rendering 2018-06-22 17:43:07 -04:00
Bryan Housel 0c34ebdfed Dont fetch margin tiles when testing
(spy should be called 1 time, not 25 times)
2018-06-22 15:32:35 -04:00
Thomas Hervey db1c896ef2 removed: user mocks from image service test specs 2018-06-22 14:00:52 -04:00
Thomas Hervey e16b411576 added: first test (failing) 2018-06-21 15:26:05 -04:00
Thomas Hervey db0fe7e539 merged from master 2018-06-21 11:06:57 -04:00
Bryan Housel 4458b94fc5 Add test coverage for streetside service
(closes #5081)
2018-06-19 23:09:06 -04:00
Thomas Hervey 1ed915e69c added: map data notes toggle 2018-06-19 10:31:26 -04:00
Bryan Housel 7de54a3c2b Fix feature test - amenity=shelter no longer matches building rule 2018-06-18 13:58:49 -04:00
vershwal 7919f59a53 Fixed test file layers.js. 2018-06-18 01:30:21 +05:30
Bryan Housel d24790f17a Merge branch 'master' into jharpster-streetside 2018-06-11 23:51:23 -04:00
Bryan Housel 470835b38f Extract all graphics from iD sprite, reassemble with svg-sprite
All iD sprite graphics are now prefixed with `iD-`
Also includes support for sending the preset logos to taginfo
2018-06-08 16:06:46 -04:00
Bryan Housel e149c6be8e Remove old Mapillary signs code and assets
(closes #4145)
2018-06-07 01:35:12 -04:00
Bryan Housel b7997d3c64 Begin replacing mapillary signs html with svg spritesheet
(re: #4145)
2018-06-06 23:16:49 -04:00
Bryan Housel 91dbd6c9c4 Merge branch 'streetside' of https://github.com/jharpster/iD into jharpster-streetside
(also cleanup whitespace and lint)
2018-05-25 16:52:28 -04:00
Bryan Housel 6ed20d7762 actionMergeNodes can just use actionConnect 2018-04-25 22:26:34 -04:00
Bryan Housel 2909162158 Rename merge_way_nodes to merge_nodes, update tests 2018-04-25 20:57:40 -04:00
Bryan Housel 9bf4799b56 Merge branch 'merge-way-nodes-feature' of https://github.com/ferdibiflator/iD into ferdibiflator-merge-way-nodes-feature 2018-04-25 16:19:32 -04:00
Bryan Housel 00e5e8efa0 Avoid reversing osmWays in order to "prefer a forward path"
(closes #4872, related #4859)
2018-04-18 23:43:19 -04:00
Bryan Housel 0efa81f1e8 Fix hover/target cursor tests
(re #4887)
2018-04-18 22:40:26 -04:00
Bryan Housel ce77538185 Allow connecting FROM nodes to TO nodes if it's a u-turn 2018-04-16 08:00:44 -04:00
Bryan Housel b2df343f2d Allow connecting to nodes in the turn restriction from outside 2018-04-14 23:12:19 -04:00
Bryan Housel 87841fc403 Stricter checks to prevent turn restriction breakage when dragging
(re: #4921)
2018-04-13 22:50:51 -04:00
Bryan Housel 8fb083578f Prevent drag/connect which could damage relations
(closes #4921)
2018-04-12 17:32:16 -04:00