Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

First update of upstream master (v3) into our own master branch. #81

Merged
merged 1,059 commits into from
Dec 4, 2019
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Oct 21, 2019

  1. Merge pull request #6955 from simonbilskyrollins/brewing-preset

    Add brewing supply store preset
    quincylvania committed Oct 21, 2019
    Configuration menu
    Copy the full SHA
    9a64c65 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f6bd204 View commit details
    Browse the repository at this point in the history
  3. Merge branch '2.15'

    quincylvania committed Oct 21, 2019
    Configuration menu
    Copy the full SHA
    c2db471 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8cfb83f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2576f58 View commit details
    Browse the repository at this point in the history
  6. Merge branch '2.15'

    quincylvania committed Oct 21, 2019
    Configuration menu
    Copy the full SHA
    f92a4b6 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2019

  1. Update to temaki v2.0.0

    bhousel committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    bd9b4ed View commit details
    Browse the repository at this point in the history
  2. Swqp temaki-gas -> temaki-propane_tank icon

    (the one breaking change from v2.0.0)
    bhousel committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    2211e7b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    36f4ebc View commit details
    Browse the repository at this point in the history
  4. Use several of the new icons

    bhousel committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    213709a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2896a84 View commit details
    Browse the repository at this point in the history
  6. Merge branch '2.15'

    bhousel committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    3595073 View commit details
    Browse the repository at this point in the history
  7. Don't suggest adding "train=yes" to "railway=station" since it could …

    …be subway, light rail, etc.
    
    Use the "station" tag to add public transport type tags like "subway=yes" (close #6948)
    quincylvania committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    8f61b73 View commit details
    Browse the repository at this point in the history
  8. Merge branch '2.15'

    quincylvania committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    cc63707 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    9a7e901 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    7c846ba View commit details
    Browse the repository at this point in the history
  11. Merge branch '2.15'

    quincylvania committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    151fae4 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    99e5880 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    1728745 View commit details
    Browse the repository at this point in the history
  14. Merge pull request #6963 from openstreetmap/no-unsearchable-terms

    Remove "terms" property from all unsearchable presets and fields and their derived data
    quincylvania committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    c121ecc View commit details
    Browse the repository at this point in the history
  15. Merge branch '2.15'

    # Conflicts:
    #	dist/locales/en.json
    quincylvania committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    87ca6d7 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    6432f4d View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2019

  1. Configuration menu
    Copy the full SHA
    ab14ee6 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2019

  1. Configuration menu
    Copy the full SHA
    e68261e View commit details
    Browse the repository at this point in the history
  2. Add presets for shop=telecommunication and shop=electrical

    For new brands added in name-suggestion-index v3.3.0
    bhousel committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    fa8ba10 View commit details
    Browse the repository at this point in the history
  3. Merge branch '2.15'

    bhousel committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    205eff2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    cb12712 View commit details
    Browse the repository at this point in the history
  5. npm run imagery

    bhousel committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    8aa553a View commit details
    Browse the repository at this point in the history
  6. npm run translations

    bhousel committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    b312c12 View commit details
    Browse the repository at this point in the history
  7. v2.16.0

    bhousel committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    dbe016a View commit details
    Browse the repository at this point in the history
  8. Merge branch '2.15'

    bhousel committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    c4cc2ed View commit details
    Browse the repository at this point in the history
  9. Upgrade osm-community-index to 1.0.0

    (closes #6967)
    bhousel committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    ee68029 View commit details
    Browse the repository at this point in the history
  10. npm run build

    bhousel committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    889ec37 View commit details
    Browse the repository at this point in the history
  11. Merge branch '2.15'

    bhousel committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    c782a6c View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    af4e59f View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    8e2c5b9 View commit details
    Browse the repository at this point in the history
  14. Update rollup to 1.25.2

    (closes #6947)
    bhousel committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    60f5ee3 View commit details
    Browse the repository at this point in the history
  15. Merge branch 'advertising' of https://github.com/hikemaniac/iD into h…

    …ikemaniac-advertising
    bhousel committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    db153b3 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    c290015 View commit details
    Browse the repository at this point in the history
  17. Merge branch '2.x'

    bhousel committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    bd5c49c View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    3886f2d View commit details
    Browse the repository at this point in the history
  19. Merge branch '2.x'

    bhousel committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    85c5414 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    b4137c1 View commit details
    Browse the repository at this point in the history
  21. Merge branch '2.x'

    bhousel committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    ba9cc97 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    dd10f4f View commit details
    Browse the repository at this point in the history
  23. Merge branch '2.x'

    bhousel committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    defcbe7 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2019

  1. fix(mode/rotate): polygonHull sometimes returns array of length 2 whi…

    …ch polygonCentroid cannot handle
    hackily authored and bhousel committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    b5fac63 View commit details
    Browse the repository at this point in the history
  2. Fix lint

    hackily authored and bhousel committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    b40d4ac View commit details
    Browse the repository at this point in the history
  3. Merge branch '2.x'

    bhousel committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    3e5b007 View commit details
    Browse the repository at this point in the history
  4. Link to the talk

    bhousel committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    d6b7563 View commit details
    Browse the repository at this point in the history
  5. Merge branch '2.x'

    bhousel committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    4c61354 View commit details
    Browse the repository at this point in the history
  6. Updated readme urls to https to avoid redirect[v2]

    Changed the urls linking to the preview branch from http to https to avoid an automatic redirect to the https version.
    
    Sorry for my mistake earlier!
    
    (Redid openstreetmap/iD#6983 (comment) on the correct branch)
    mbrickn committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    d63b645 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #6984 from mbrickn/patch-2

    Updated readme urls to https to avoid redirect [v2]
    bhousel committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    9f65425 View commit details
    Browse the repository at this point in the history
  8. Update rollup to the latest version

    (closes #6976)
    bhousel committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    0cccff4 View commit details
    Browse the repository at this point in the history
  9. Merge branch '2.x'

    bhousel committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    a4ffc2a View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2019

  1. disable circularize if object is already circular

    Katarzyna Król committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    3feb20c View commit details
    Browse the repository at this point in the history
  2. translatable string: already_circular

    Katarzyna Król committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    c942ac1 View commit details
    Browse the repository at this point in the history
  3. Allow natural=cape on vertex geometry

    (closes #6982)
    bhousel committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    036c5fa View commit details
    Browse the repository at this point in the history
  4. Merge branch '2.x'

    bhousel committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    6d25ed0 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    df5f859 View commit details
    Browse the repository at this point in the history
  6. Merge branch '2.x'

    quincylvania committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    fc4ec2e View commit details
    Browse the repository at this point in the history
  7. improve checking circularity and unit tests

    Katarzyna Król committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    48ccc79 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2019

  1. Configuration menu
    Copy the full SHA
    d7b6c5c View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2019

  1. Add derived data

    quincylvania committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    32be71b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2698833 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    779be49 View commit details
    Browse the repository at this point in the history
  4. Update to abortcontroller-polyfill 1.4.0

    (closes #6996)
    bhousel committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    9224b0a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5cb3891 View commit details
    Browse the repository at this point in the history
  6. Add country-coder as a dependency

    Use country-coder to code addresses (re: #6941)
    quincylvania committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    51dbdb4 View commit details
    Browse the repository at this point in the history
  7. Add shift modifier to A and D shortcuts so that they don't collide wi…

    …th new iD v3 shortcuts. Also fix up road picker so that add/remove works correctly.
    Bonkles committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    2c42093 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    b4f1fa8 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    506ac26 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    8534c81 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    8c07401 View commit details
    Browse the repository at this point in the history
  12. Merge branch '2.x'

    # Conflicts:
    #	modules/ui/preset_list.js
    quincylvania committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    87bc99d View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    bd52e0f View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2019

  1. Configuration menu
    Copy the full SHA
    f9c7d0f View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2019

  1. Drop default oneway=yes for highway=motorway_link

    (closes #7013)
    bhousel committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    57ec15d View commit details
    Browse the repository at this point in the history
  2. Merge branch '2.x'

    bhousel committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    a81b66c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cca6334 View commit details
    Browse the repository at this point in the history
  4. Merge branch '2.x'

    bhousel committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    5d82afe View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    86a5652 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    88a4e73 View commit details
    Browse the repository at this point in the history
  7. Merge branch '2.x'

    bhousel committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    7618da1 View commit details
    Browse the repository at this point in the history
  8. Ignore junction in areaKeys code and remove the unsearchable presets

    (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)
    bhousel committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    6dfdec0 View commit details
    Browse the repository at this point in the history
  9. Alpha version of RapiD v3.

    Bonkles committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    8ee4c4a View commit details
    Browse the repository at this point in the history
  10. Merge branch '2.x'

    bhousel committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    b8ac94e View commit details
    Browse the repository at this point in the history
  11. Update dependencies

    (closes #7007, closes #7106)
    bhousel committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    74cb337 View commit details
    Browse the repository at this point in the history
  12. Update several communications mast and tower icons

    (closes #6985)
    bhousel committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    2a4841f View commit details
    Browse the repository at this point in the history
  13. Merge branch '2.x'

    bhousel committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    af4ea2c View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2019

  1. Update country-coder to 2.0.0 (close #7029)

    Localize address field in walkthrough without overwriting country coder function
    quincylvania committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    d89996e View commit details
    Browse the repository at this point in the history
  2. Merge branch 2.x

    quincylvania committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    6f97389 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8c67d7e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    538829d View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f45670a View commit details
    Browse the repository at this point in the history
  6. Merge branch '2.x'

    # Conflicts:
    #	data/presets/presets.json
    quincylvania committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    c89b06d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    de22c77 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    9d367d1 View commit details
    Browse the repository at this point in the history
  9. Fix lint warnings

    quincylvania committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    71bfeb5 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    263c3ad View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    0bbe9dd View commit details
    Browse the repository at this point in the history
  12. Testing out multiple build targets in build_src..

    Also silence warnings - closes #4120
    bhousel committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    4a07ae7 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    5da962a View commit details
    Browse the repository at this point in the history
  14. pacify eslint

    bhousel committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    05b3d02 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    e172a86 View commit details
    Browse the repository at this point in the history
  16. Merge branch '2.x'

    bhousel committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    791701f View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2019

  1. Configuration menu
    Copy the full SHA
    0c1dd82 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    73e8b2c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e73ca63 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    271a4cb View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e8e95c6 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3f35a35 View commit details
    Browse the repository at this point in the history
  7. Update d3 to v5.12.0

    (closes #6776)
    bhousel committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    3677d20 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    14ba67c View commit details
    Browse the repository at this point in the history
  9. Merge branch '2.x'

    bhousel committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    cd6d9d1 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    433efd6 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    67b283c View commit details
    Browse the repository at this point in the history
  12. Merge branch '2.x'

    quincylvania committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    76939dd View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    d986d1b View commit details
    Browse the repository at this point in the history
  14. Merge branch '2.x'

    bhousel committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    b22c90e View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2019

  1. Merge pull request #7031 from scaidermern/shop-spices

    Add preset for `shop=spices`
    quincylvania committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    e6df233 View commit details
    Browse the repository at this point in the history
  2. Add preset for shop=spices

    scaidermern authored and quincylvania committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    e348b7b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f3f6f15 View commit details
    Browse the repository at this point in the history
  4. Merge branch '2.x'

    # Conflicts:
    #	data/presets/presets/shop/spices.json
    quincylvania committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    d7a646b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    87f4f35 View commit details
    Browse the repository at this point in the history
  6. Include default field values when upgrading a preset with a specific …

    …replacement (close #7033)
    quincylvania committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    e85b6b9 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    40edee1 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    138a0ba View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    bc39b0e View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    a1fadfe View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    719ee3e View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    c32cca2 View commit details
    Browse the repository at this point in the history
  13. Merge branch '2.x'

    quincylvania committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    445fb2c View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    25772d2 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    7b2f85d View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    08a540d View commit details
    Browse the repository at this point in the history
  17. Remove object-inspect, workaround seems fixed now

    (closes #7036, re: 3bc1859)
    bhousel committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    9908238 View commit details
    Browse the repository at this point in the history
  18. Merge branch '2.x'

    bhousel committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    6d77f6f View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    428e274 View commit details
    Browse the repository at this point in the history
  20. I guess this workaround is still needed for Node 10+

    (really closes #7036)
    bhousel committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    2f3a9ea View commit details
    Browse the repository at this point in the history
  21. Merge branch '2.x'

    bhousel committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    3766cfa View commit details
    Browse the repository at this point in the history
  22. Merge pull request #7039 from hikemaniac/attractions

    Add more attraction presets
    bhousel committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    faee3d5 View commit details
    Browse the repository at this point in the history
  23. Added more attraction presets

    hikemaniac authored and bhousel committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    c0d7048 View commit details
    Browse the repository at this point in the history
  24. Changed log flume icon to maki-ferry

    hikemaniac authored and bhousel committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    0462da6 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    9906245 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    693661a View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    43aeb7c View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    a1a1dcf View commit details
    Browse the repository at this point in the history
  29. Merge branch '2.x'

    bhousel committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    9b84832 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2019

  1. Rename Network Type network fields to Network Class to avoid collid…

    …ing with `network:type` field (re: #6992)
    quincylvania committed Nov 12, 2019
    Configuration menu
    Copy the full SHA
    88da0c5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4b84ce2 View commit details
    Browse the repository at this point in the history
  3. Merge branch '2.x'

    # Conflicts:
    #	data/presets/presets.json
    #	data/taginfo.json
    quincylvania committed Nov 12, 2019
    Configuration menu
    Copy the full SHA
    ca66b63 View commit details
    Browse the repository at this point in the history
  4. Lower the match score on network:type=node_network preset in case t…

    …he node is also a stop sign, trailhead, etc.
    quincylvania committed Nov 12, 2019
    Configuration menu
    Copy the full SHA
    5438ec5 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2019

  1. Configuration menu
    Copy the full SHA
    24c72b6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    96c8bcb View commit details
    Browse the repository at this point in the history
  3. Merge branch '2.x'

    # Conflicts:
    #	data/presets/presets.json
    #	modules/validations/missing_tag.js
    #	modules/validations/unsquare_way.js
    quincylvania committed Nov 13, 2019
    Configuration menu
    Copy the full SHA
    d51695c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a397b0c View commit details
    Browse the repository at this point in the history
  5. Merge branch '2.x'

    quincylvania committed Nov 13, 2019
    Configuration menu
    Copy the full SHA
    944a260 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    bc0d83b View commit details
    Browse the repository at this point in the history
  7. Merge branch '2.x'

    quincylvania committed Nov 13, 2019
    Configuration menu
    Copy the full SHA
    b567d62 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2019

  1. Configuration menu
    Copy the full SHA
    d2c73f8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    26d21c6 View commit details
    Browse the repository at this point in the history
  3. Merge branch '2.x'

    # Conflicts:
    #	docs/statistics.html
    quincylvania committed Nov 18, 2019
    Configuration menu
    Copy the full SHA
    7324591 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    010c694 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b2611a9 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    1f5cce9 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2019

  1. Switch icon for shop=chocolate

    (closes #7051)
    bhousel committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    4e14d3e View commit details
    Browse the repository at this point in the history
  2. Merge branch '2.x'

    bhousel committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    360dcea View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0a3c54d View commit details
    Browse the repository at this point in the history
  4. Merge branch '2.x'

    quincylvania committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    f90bd2b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f7d8c51 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    d84c7f5 View commit details
    Browse the repository at this point in the history
  7. Merge branch '2.x'

    quincylvania committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    0dd2a48 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    4dbc81e View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2019

  1. Configuration menu
    Copy the full SHA
    fe98b36 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8741aa8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3e022b8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5ed22cc View commit details
    Browse the repository at this point in the history
  5. Simplify some "add bridge or tunnel" fix code (re: #7055)

    Add endpoint to actionSplit to get the created ways after running the action
    Change "Use bridge" or "tunnel" fix labels to "Add a bridge" or "tunnel"
    Add layer tags on structure feature when adding a bridge or tunnel via a fix
    Select all components of the split way when adding a bridge or tunnel via a fix
    Don't recommend adding a bridge to a waterway
    Don't show "change layers" fixes along with "add structure" fixes
    Don't split or change the tags of coincident ways when adding a bridge or tunnel
    quincylvania committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    5640d78 View commit details
    Browse the repository at this point in the history
  6. Merge 2.x into master

    quincylvania committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    091613a View commit details
    Browse the repository at this point in the history
  7. Use existing vertices for "add a bridge/tunnel" endpoints if the edge…

    … is too short to add a new vertex (re: #7055)
    
    Avoid creating very short edges from splitting too close to another node when adding a bridge or tunnel via fix
    Fix possible "entity not found" error
    quincylvania committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    e791b75 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    ff6eb88 View commit details
    Browse the repository at this point in the history
  9. Merge branch '2.x'

    quincylvania committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    2451001 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    a596db6 View commit details
    Browse the repository at this point in the history
  11. Improve "add a bridge/tunnel" fix variable names somewhat (re: #7055)

    Add a minimum structure length as derived from the crossing feature's width
    quincylvania committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    7cd5778 View commit details
    Browse the repository at this point in the history
  12. Merge branch '2.x'

    quincylvania committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    16adeb1 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2019

  1. Configuration menu
    Copy the full SHA
    2712cae View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f02c0cc View commit details
    Browse the repository at this point in the history
  3. Merge branch '2.x'

    quincylvania committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    7e3c3b9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4297b0d View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    588fa36 View commit details
    Browse the repository at this point in the history
  6. Add unit test for single-member multipolygon collapse behavior except…

    …ion for conflicting tags in actionJoin (re: f7d8c51)
    quincylvania committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    95a14ea View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    bc502e3 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2019

  1. Merge pull request #7059 from ToastHawaii/master

    Add support for big open air chess board.
    quincylvania committed Nov 22, 2019
    Configuration menu
    Copy the full SHA
    3eba9e2 View commit details
    Browse the repository at this point in the history
  2. Cherry pick giant chess board

    ToastHawaii authored and quincylvania committed Nov 22, 2019
    Configuration menu
    Copy the full SHA
    a498ae5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0ce99bc View commit details
    Browse the repository at this point in the history
  4. Merge branch '2.x'

    # Conflicts:
    #	data/presets.yaml
    #	data/presets/presets.json
    #	data/presets/presets/leisure/pitch/chess.json
    #	data/taginfo.json
    #	dist/locales/en.json
    quincylvania committed Nov 22, 2019
    Configuration menu
    Copy the full SHA
    ffe21d2 View commit details
    Browse the repository at this point in the history
  5. Don't list non-global imagery sources at low zooms (close #7062)

    Always show the currently selected background in the list (close #7061)
    quincylvania committed Nov 22, 2019
    Configuration menu
    Copy the full SHA
    b5a5dfc View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    4b9b086 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    d0c5add View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    45ac186 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    59f0c04 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    7945f5d View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    22266c6 View commit details
    Browse the repository at this point in the history
  12. Fix issue where crossing ways layer fix would set layer tag as a numb…

    …er instead of a string (re: #6911)
    quincylvania committed Nov 22, 2019
    Configuration menu
    Copy the full SHA
    62865db View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    b62162b View commit details
    Browse the repository at this point in the history
  14. Don't close unclosed multipolygon parts with fewer than three nodes w…

    …hen generating geojson
    
    Update multipolygon geojson code tests
    quincylvania committed Nov 22, 2019
    Configuration menu
    Copy the full SHA
    81b561f View commit details
    Browse the repository at this point in the history
  15. Merge branch '2.x'

    quincylvania committed Nov 22, 2019
    Configuration menu
    Copy the full SHA
    8ea4991 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    6f09c3f View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2019

  1. Configuration menu
    Copy the full SHA
    9f8e88a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    be6e69c View commit details
    Browse the repository at this point in the history
  3. Add man_made=water_tap preset (close #7066)

    Add fields for `fountain`, `pump`, and `drinking_water` tags to relevant presets
    Add fields and terms to various water source presets
    Deprecate `man_made=village_pump`
    quincylvania committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    5d5e29a View commit details
    Browse the repository at this point in the history
  4. Update names for attraction=pirate_ship and `attraction=river_rafti…

    …ng` presets to indicate they're rides
    quincylvania committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    5c52cfa View commit details
    Browse the repository at this point in the history
  5. Merge branch '2.x'

    # Conflicts:
    #	data/presets/presets.json
    #	data/taginfo.json
    quincylvania committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    16880c0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    618937b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    25a4174 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    e76ffc5 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2019

  1. Update temaki to v2.2.0 (close #7069)

    Update cattle grid icon (close #6489)
    Update gate icons (close #6814)
    Update icons for bike lockers, lean-to, picnic shelter, public transport shelter, animal boarding, animal shelter, bicycle rental, boat rental, chain, turnstile, barn, firepit, water tower, and storage rental
    quincylvania committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    e5275f5 View commit details
    Browse the repository at this point in the history
  2. Merge branch '2.x'

    # Conflicts:
    #	data/presets/presets.json
    #	data/taginfo.json
    quincylvania committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    7550adb View commit details
    Browse the repository at this point in the history
  3. Don't use temaki-dog_shelter icon for shelters and boarding facilitie…

    …s since those are a different type of shelter than other shelter presets
    quincylvania committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    8d02a1a View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2019

  1. Add workaround for missing ArrayBuffer.isView in PhantomJS

    (closes #7072)
    bhousel committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    b9f41bb View commit details
    Browse the repository at this point in the history
  2. Merge branch '2.x'

    bhousel committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    ae3e47d View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2019

  1. Update temaki to v2.3.0 (close #7074)

    Update various preset icons for temaki 2.3.0
    Add term to stable preset
    Increase matchScore of Boatbuilder preset
    quincylvania committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    0e7d888 View commit details
    Browse the repository at this point in the history
  2. Merge branch '2.x'

    # Conflicts:
    #	data/presets/presets.json
    #	data/taginfo.json
    quincylvania committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    a5e542b View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2019

  1. Configuration menu
    Copy the full SHA
    8c6bb82 View commit details
    Browse the repository at this point in the history
  2. Add preset for amenity=research_institute (close #7078)

    Deprecate amenity=research_institution
    quincylvania committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    995bfc3 View commit details
    Browse the repository at this point in the history
  3. Merge branch '2.x'

    quincylvania committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    7a55769 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1217b04 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    80a4cec View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    16ff2b1 View commit details
    Browse the repository at this point in the history
  7. Merge branch '2.x'

    # Conflicts:
    #	modules/ui/preset_list.js
    quincylvania committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    feeee4b View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2019

  1. 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.
    stragu committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    5befa24 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #7082 from stragu/patch-1

    add tactile paving to steps
    quincylvania committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    7f82bb4 View commit details
    Browse the repository at this point in the history
  3. 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.
    stragu authored and quincylvania committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    49c6e44 View commit details
    Browse the repository at this point in the history
  4. Add derived data

    quincylvania committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    d715ce1 View commit details
    Browse the repository at this point in the history
  5. Update fast-deep-equal to 3.1.1 (close #7076)

    Update uglify-js to 3.7.1 (close #7065)
    Update mapillary-js to 2.20.0 (close #7060)
    quincylvania committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    707c275 View commit details
    Browse the repository at this point in the history
  6. Merge branch '2.x'

    quincylvania committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    b7daa03 View commit details
    Browse the repository at this point in the history
  7. Update temaki to 3.1.0 (close #7084)

    Add Access Aisle preset and rendering (close #7083)
    quincylvania committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    e48c469 View commit details
    Browse the repository at this point in the history
  8. Merge branch '2.x'

    quincylvania committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    e363b64 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #11 from bonkles-worldai/id_v3_merge-2

    Id v3 merge 2
    Bonkles committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    99152ab View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    aa0a440 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    6e28e70 View commit details
    Browse the repository at this point in the history
  12. Merge branch '2.x'

    quincylvania committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    247f20b View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2019

  1. Add countryCodes and notCountryCodes properties for fields (close…

    … #7085)
    
    Add documentation note about `prerequisiteTag` property getting ignored if a value is present
    quincylvania committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    1647b9a View commit details
    Browse the repository at this point in the history
  2. Add identifier field for tags linking features to external databases

    Add US-only field for `gnis:feature_id` (close #7086)
    Add tooltip to wikipedia field link button
    quincylvania committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    6c7d8b6 View commit details
    Browse the repository at this point in the history
  3. Merge branch '2.x'

    # Conflicts:
    #	data/presets/presets.json
    quincylvania committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    f2b4ed4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    00209de View commit details
    Browse the repository at this point in the history
  5. Merge pull request #12 from bonkles-worldai/v3_merge

    Merge master with latest v3 code from upstream.
    Bonkles committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    189a6d1 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #12 from bonkles-worldai/v3_merge

    Merge master with latest v3 code from upstream.
    Bonkles committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    07a8e92 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    bfed5ab View commit details
    Browse the repository at this point in the history