Bryan Housel
40dc938580
Merge pull request #4693 from openstreetmap/doubled_back_routes
...
Fixes for joining and splitting bugs
2018-01-18 17:01:38 -05:00
Bryan Housel
7c918ba161
Allow Relation.replaceMember to optionally preserve duplicates
...
(closes #4696 )
2018-01-18 16:52:23 -05:00
Bryan Housel
be9bbd9271
Add tests for member ordering: node, way, relation
2018-01-18 15:21:38 -05:00
Bryan Housel
d6afd399fc
Revised and expanded actionSplit tests to cover route splitting
2018-01-18 14:34:34 -05:00
Bryan Housel
8f9a46b75a
Change actionAddMember to rearrange indexed members in place
...
This allows it to work around issues where a relation may
not be completely downloaded
2018-01-17 22:59:55 -05:00
JamesKingdom
9bbb5db5ef
Rename garage landuse preset
...
(closes #4697 )
2018-01-17 17:45:36 +00:00
JamesKingdom
baa289c6c2
Add name and elevation fields to guidepost preset
...
(closes #4700 )
2018-01-17 17:22:58 +00:00
Bryan Housel
8c9a0eb2c1
Fix doubleclick on line to create a point
...
(closes #4691 )
2018-01-17 09:23:09 -05:00
Bryan Housel
4dc32343d7
npm run build to rebuild preset file
2018-01-17 08:03:53 -05:00
Bryan Housel
1fd1a7ca2a
Merge pull request #4684 from ltog/master
...
Add ref:isil=* for libraries
2018-01-17 07:52:53 -05:00
Bryan Housel
07495ebbb5
Merge pull request #4699 from bencostamagna/preset_boathouse
...
Added a boathouse preset
2018-01-17 07:50:49 -05:00
Benoit Costamagna
9fee9f01d6
Added a boathouse preset
2018-01-17 12:48:33 +01:00
Bryan Housel
3be577d8db
However we fix actionAddMember, it needs to work for incomplete relations
2018-01-16 21:37:43 -05:00
Bryan Housel
4abc5ccf35
Update rollup dependencies and switch to patch semver
2018-01-16 21:01:14 -05:00
greenkeeper[bot]
1b965666e2
chore(package): update shelljs to version 0.8.0
2018-01-16 20:53:46 -05:00
Bryan Housel
be46e85ec0
Move insert way pairing code from osmJoinWays to actionAddMember
...
(tests for actionAddMember now passing!)
2018-01-16 17:41:14 -05:00
Bryan Housel
221158e918
WIP: Add insertHint to actionAddMember, actionSplit
2018-01-15 23:13:59 -05:00
Bryan Housel
03fa6e7be9
Add tryInsert option to osmJoinWays
2018-01-15 22:02:43 -05:00
Bryan Housel
0382ce7d4b
Updated function doc
2018-01-14 21:45:25 -05:00
Bryan Housel
075b85c81d
Apply reversal actions in actionJoin
...
(closes #4688 )
2018-01-14 14:49:57 -05:00
Bryan Housel
8dbb6eb20c
Return reversal actions performed by osmJoinWays
...
(see #4688 )
2018-01-13 01:45:46 -05:00
Bryan Housel
0fd801d750
Prefer to join member ways in a way that preserves their order
...
(re #4589 )
Strongly prefer to generate a forward path that preserves the order
of the members array. For multipolygons and most relations, member
order does not matter - but for routes, it does. If we started this
sequence backwards (i.e. next member way attaches to the start node
and not the end node), reverse the initial way before continuing.
2018-01-12 17:23:56 -05:00
Lukas Toggenburger
4544bbc1f5
Shorten label of field ref:isil=*
2018-01-12 17:31:05 +01:00
Lukas Toggenburger
e8a68205ab
Add ref:isil=* for libraries
2018-01-12 11:58:58 +01:00
Bryan Housel
8f6cb207fc
Much expanded tests for osmJoinWays
2018-01-11 21:42:29 -05:00
Bryan Housel
07262fa711
Add tests for #4589
2018-01-09 23:57:44 -05:00
Bryan Housel
748abdb950
Code formatting
2018-01-09 17:46:15 -05:00
Bryan Housel
fdf1fa4fe7
Merge pull request #4675 from althio/master
...
remove addr:unit field for gb, ie, si, tr
2018-01-09 17:25:15 -05:00
Benoît
9ca0565f24
Merge pull request #1 from althio/althio-patch-addr_unit
...
remove addr:unit field for gb, ie, si, tr
2018-01-09 23:17:55 +01:00
Benoît
b1df1ca701
remove addr:unit field for gb, ie, si, tr
...
as per comments in #4235
2018-01-09 23:17:37 +01:00
Bryan Housel
239bc8ffb9
Merge pull request #4670 from openstreetmap/greenkeeper/marked-0.3.12
...
Update marked to the latest version 🚀
2018-01-09 11:08:26 -05:00
Bryan Housel
528739b9b0
Drop unit from default address format
2018-01-09 10:15:18 -05:00
Bryan Housel
f0a27bc1ec
Simplify way segmentation and fix bug with adjacent segment type
...
(closes #4669 )
Now instead of creating MultiLineString targets, we just create a bunch of
LineString targets. This makes the code simpler, and anyway the entity is
still there in `properties` for drawing code to decide what to do with the target.
Incidentally, this change allows iD to support an extrusion operation.
(Because each way segment has its own unique GeoJSON target now)
2018-01-09 10:12:29 -05:00
Bryan Housel
4c61fadb18
Merge pull request #4671 from Andygol/patch-2
...
Remove addr:unit for addresses in Ukraine
2018-01-09 07:34:04 -05:00
Andrey Golovin
f339c57838
Remove addr:unit for addresses in Ukraine
2018-01-09 13:26:54 +02:00
greenkeeper[bot]
fcb2a0aa85
fix(package): update marked to version 0.3.12
2018-01-09 00:20:41 +00:00
Bryan Housel
e661281e38
Prevent self intersecting lines without a junction node
...
(closes #4646 )
2018-01-08 19:17:50 -05:00
Bryan Housel
49eb46fefb
Add epsilon parameter to geoVecEqual
2018-01-08 17:04:56 -05:00
Bryan Housel
ea9643e08b
Allow Alt/option key to disable geometry check and nope cursor
...
(re: #4646 )
2018-01-08 15:47:29 -05:00
Bryan Housel
58eaca2aa0
Ignore area closing segment during move when validating geometry
...
(closes #4655 )
2018-01-08 12:09:17 -05:00
Bryan Housel
66e8ce1363
Merge pull request #4667 from althio/patch-1
...
Restore address format for ["fr", "lu", "mo"]
2018-01-08 10:42:01 -05:00
Bryan Housel
45ffa3b731
Merge pull request #4658 from openstreetmap/fix_duplicate_saves
...
Fix duplicate upload bug, improve upload performance
2018-01-08 10:31:15 -05:00
Bryan Housel
8472f99347
Zooming out should not exit save mode
...
(closes #4664 )
2018-01-08 09:49:32 -05:00
Benoît
6ec6c31948
Restore fr lu mo addressing
...
addr:unit is not standard in addressing for France
in France : 800 addr:unit / 4 000 000 addr:housenumber = 0,0002 (0,02%)
This partly reverts de6b4fb6a2https://github.com/openstreetmap/iD/pull/4235
2018-01-08 15:16:11 +01:00
Bryan Housel
1b973f3c9b
Be more careful about enter/update selection in conflict resolution ui
...
This fixes one of the issues in #4351 where the radio button was not
selected. This was likely introduced during the upgrade to d3 v4, now
that enter selections do not automatically flow into update anymore.
(the fix is to add a `merge` to ensure that the `selection.each` actually
has some things to iterate over)
2018-01-07 23:46:54 -05:00
Bryan Housel
590487d237
Fix escape keybind when conflicts ui is active
...
(re: 4351)
2018-01-06 23:16:48 -05:00
Bryan Housel
a22cfe64b8
Avoid loading circular relations by storing ids in _loaded object
...
(re: #3056 )
2018-01-06 00:30:26 -05:00
Bryan Housel
ac86869b4a
Add conflict checking progress, guard code for user authentication
2018-01-05 18:11:49 -05:00
Bryan Housel
a63c4a72fe
Improvements to save flow
...
- Attempt fast save first, only perform conflict resolution if necessary (re: #3056 )
- Block reentry of save, and dont keep focus on save button (closes #4641 )
- Refactor modeSave() for code clarity (avoid shared state in closure variables)
2018-01-05 15:11:44 -05:00
Bryan Housel
437893ebb8
Don't reenter putChangeset, allow reuse of open changeset id
...
We are going to start trying an opportunistic save, then only
start the conflict resolution stuff if the server returns a 409.
Reusing an already open changeset makes sense in this situation.
2018-01-04 23:27:00 -05:00
