Merge master with latest v3 code from upstream. #12
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix issue #6816
(closes #6996)
Use country-coder to code addresses (re: #6941)
# Conflicts: # modules/ui/preset_list.js
(closes #7013)
(closes #6933) We should not be adding unsearchable junction presets for every kind of junction as a hacky workaround to let `junction=yes` be an area. This should remove the special treatment of junction tag. * `junction=*` will not be treated as an area by default * `junction=*` will not trigger validator warnings that they should be closed * `junction=yes` mapped as an area _will_ need an `area=yes` now, which iD will add (afaik this is the only junction tag that should be treated as an area)
(closes #7007, closes #7106)
(closes #6985)
Localize address field in walkthrough without overwriting country coder function
…s since those are a different type of shelter than other shelter presets
Update various preset icons for temaki 2.3.0 Add term to stable preset Increase matchScore of Boatbuilder preset
# Conflicts: # data/presets/presets.json # data/taginfo.json
Deprecate amenity=research_institution
# Conflicts: # modules/ui/preset_list.js
Adding this field in the main ones, just like for street crossings, as it is very important for accessibility and safety.
add tactile paving to steps
Adding this field in the main ones, just like for street crossings, as it is very important for accessibility and safety.
Update uglify-js to 3.7.1 (close #7065) Update mapillary-js to 2.20.0 (close #7060)
Add Access Aisle preset and rendering (close #7083)
Deprecate power=marker
… #7085) Add documentation note about `prerequisiteTag` property getting ignored if a value is present
Add US-only field for `gnis:feature_id` (close #7086) Add tooltip to wikipedia field link button
# Conflicts: # data/presets/presets.json
Bonkles
added a commit
that referenced
this pull request
Dec 4, 2019
Merge master with latest v3 code from upstream.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.