Rebase to 1.9.x #12

Open
wants to merge 348 commits into
from

Projects

None yet
@CloCkWeRX

2.0.0 changes things a bit, so this gets life a bit more up to date.

Might be worth pushing all of the stuff onto a feature branch and maintaining master with a squashed version of all of the changes instead.

substack and others added some commits Mar 3, 2016
@substack substack expand globs in Makefile to fix ordering issues on make >=3.82 e16f563
@bhousel bhousel Merge pull request #3012 from substack/expand-glob
Expand globs in Makefile to fix ordering issues on make >=3.82
5cdf25c
@bhousel bhousel Fix selector for .layer-background opacity
(fixes #3010)
643df21
@bhousel bhousel make translations 8c09c18
@bhousel bhousel 1.9.1 64dd2d6
@bhousel bhousel Update release instructions 88670a9
@bhousel bhousel Rename "Major Roads" -> "Traffic Roads", "Minor Roads" -> "Service Ro…
…ads"
8e94468
@bhousel bhousel Move `highway=unclassified` to major_roads feature filter 3ef05ca
@bhousel bhousel Rename major_roads -> traffic_roads, minor_roads -> service_roads c4fbacd
@kepta kepta Drag to adjust imagery offset
This patch allows to adjust imagery offset by
1. dragging
2. manually entering offset
3. fine tuning with buttons

(closes #1340)
46b3e3a
@kepta kepta Freeform lasso shapes
Allows iD to draw freeform lasso shapes
(closes #2937)
9c09af9
@bhousel bhousel Restore highway=unclassified to thick line rendering
(closes #3015)
c5143b3
@bhousel bhousel Return to browse mode and block ui while geolocating
(fixes #3016)
58e6ac0
@bhousel bhousel Exclude from areaKeys blacklist presets that are point/vertex only
(closes #3009)
83b324b
@bhousel bhousel Don't blacklist key-values for presets with both area and line geometry 309bfac
@bhousel bhousel Add Bird Hide preset
(closes #3026)
f98eb82
@bhousel bhousel Dispatch layer change events instead of hacky map pan
(fixes #3027, fixes #2804)
85d38de
@bhousel bhousel Include "Unclassified" with Minor Road, because people know it that way 404a45e
@bhousel bhousel Only set coalesceChanges flag when a real tag change has happened
(closes #3035)
e1cde03
@bhousel bhousel Set gpx labels on update selection, not enter selection
(closes #3032)
559d4ab
@bhousel bhousel Rename "Dock" -> "Wet Dock / Dry Dock" for en_US f69714f
@bhousel bhousel Merge branch 'freeform' of https://github.com/kepta/iD into kepta-fre…
…eform
3da6b21
@bhousel bhousel Minor style adjustments, code cleanups e0d7daa
@bhousel bhousel Start lasso on left button only, refactor `lassoed()` b643bf1
@bhousel bhousel Use offset coordinates instead of mousecoordinates when dragging
(re: #3003)
d130c51
@bhousel bhousel make translations 04755ef
@bhousel bhousel make imagery 0462832
@bhousel bhousel 1.9.2 188958e
@bhousel bhousel Add coffee shop preset
(closes #3042)
4e475b8
@zbycz zbycz FAQ: api url config in standalone iD 5083bf8
@bhousel bhousel Merge pull request #3048 from zbycz/patch-3
How to connect iD to custom OSM API
c7f573f
@bhousel bhousel Add nutrition supplements store preset
(closes #3043)
b7fa84e
@bhousel bhousel Add Code of Conduct
(closes #3051)
eebdad7
@bhousel bhousel Add link to CODE_OF_CONDUCT, request screenshots with bug reports 04a754c
@bhousel bhousel Add Code of Conduct, remove translation chart, other minor cleanups 3b461c0
@kepta kepta add multiselect preset 9261752
@bhousel bhousel Update Prerequesites section for Windows fa3f47c
@bhousel bhousel Normalize line endings to LF 9e60df9
@bhousel bhousel Don't rebuild d3 or lodash unless specifically asked to 3371355
@bhousel bhousel Improve Windows prerequisites section e590e88
@bhousel bhousel Install apache2 on Windows to fix svg mimetype issue 24b5b04
@bhousel bhousel Add fixWinSymlinks.bat and instructions to README
(closes #2574)
57b8369
@bhousel bhousel Unblacklist OpenCycleMap (because it has worldwide contours) 2ff7fd9
@bhousel bhousel Close imagery tile seams
(closes #3053)
f11f4bb
@bhousel bhousel Update imagery blacklist, remove items no longer needed 668d4e9
@bhousel bhousel Improve usability of Save, Cancel buttons
(closes #3040)
bd57b81
@bhousel bhousel Don't clean fields (trim whitespace) on every input event
Fields only really need to be fully cleaned when the user leaves the field (onChange, onBlur)
(closes #3045)
0759f17
@bhousel bhousel Set title attribute for tag keys/values, ensure combo options have title
This will show values as hover tooltips, in case the field is too narrow and the value is cut off.
(closes #3054)
a77e1b6
@bhousel bhousel Update taginfo tests to include `title` properties.
(see a77e1b6)
5122d1b
@bhousel bhousel Don't fetch overlay tiles or mapillary data around Null Island
(closes #2751)
2d987a3
@bhousel bhousel Update tests for mapillary service, blacklist Null Island data 1e97135
@bhousel bhousel Drop OpenCycleMap, add Thunderforest Landscape, Stamen Terrain 38177c0
@bhousel bhousel Merge branch 'offset' of https://github.com/kepta/iD into kepta-offset 215d83f
@bhousel bhousel Style adjustments, add offset value in meters to input field, remove …
…delays
01e87f2
@bhousel bhousel Fix imagery offset +/-, adjust text and style 5f3eae9
@bhousel bhousel Don't try to load gpx if drag and drop fileList empty 2e50422
@bhousel bhousel Fix member argument to ChangeMember when using raw member editor
(closes #2739)
02c65c7
@tmcw tmcw add a warning to the changeset page if a user mentions google 39429fb
@bhousel bhousel Merge pull request #3064 from openstreetmap/warn-on-google-mention
Add a warning to the changeset page if a user mentions google
6be94e7
@bhousel bhousel Merge pull request #3062 from openstreetmap/relation-corrupt
Fix member argument to ChangeMember when using raw member editor
7d5e14e
@bhousel bhousel Add caseSensitive option to d3.combobox ae15275
@bhousel bhousel Use case sensitive combo for changeset autocompletion
(closes #3039)
435e7b9
@bhousel bhousel Fix indent and remove extra opacity transition 1c871b8
@bhousel bhousel Modal Dialog and Save/Restore improvements
(closes #3036)

1. Fix the modal close button icon - was not visible
2. Use a blocking modal for the Save/Restore dialog
3. Don't allow `context.save()` while modal is visible
   (especially for `onbeforeunload` event - this would wipe user's saved
    history if browser is closed while the Save/Restore modal was visible)
4. Don't allow blocking modals to be dismissed by pressing escape
5. Don't show the close button icon for blocking modals
7930a0b
@bhousel bhousel Dedupe relations with same calculated name so d3.combobox will show them
(closes #2891)
4dd4ccb
@bhousel bhousel Add Debug flags ce3eb6c
@bhousel bhousel Add ability to show debug collision boxes around labels 53040f4
@kepta kepta Change studio preset 165b53e
@bhousel bhousel Merge pull request #3072 from kepta/studio
Update `studio=*` tagging
ea1f228
@kepta kepta Add prison preset e018839
@tmcw tmcw Be explicit about Transifex requirement for release. Fixes #2900 bff8322
@bhousel bhousel Merge pull request #3079 from openstreetmap/transifex-release
Be explicit about Transifex requirement for release. Fixes #2900
da618b2
@bhousel bhousel Merge branch 'chips' of https://github.com/kepta/iD into kepta-chips 9d8626a
@bhousel bhousel Set field.keys so that delete/undo buttons work
For multiselect fields,
field.key should have a ':' on the end of it - we use as the prefix, not the real key
field.keys should contain the array of real keys being modified

see https://github.com/openstreetmap/iD/blob/master/js/id/ui/preset.js#L17-L45

The address field preset works like this also..
It contains an array of key.fields for all the subfields that might be set.
For multiselect fields, we don't know ahead of time what all the subfields are,
so we append to the list in `change()` and rebuild list in `tags()`
1a9c111
@bhousel bhousel set minItems default in d3.combobox to 1 30df2c3
@bhousel bhousel Set minItems 1 only for multiselect field 1b73ce9
@bhousel bhousel Change Multiselect input placeholder text to translateable "Add" e24acfa
@bhousel bhousel Merge branch 'prison' of git://github.com/kepta/iD into kepta-prison 7ebd7a3
@bhousel bhousel 'access' -> 'address' aae8ddc
@bhousel bhousel Add "Choose language" placeholder value for Wikipedia language field
(closes #3071)
d92b7e3
@bhousel bhousel make translations 10c1e97
@bhousel bhousel make imagery 73c7030
@bhousel bhousel 1.9.3 cd8e37b
Nick Doiron support looking up languages by English or local names e932a17
@bhousel bhousel Merge pull request #3086 from mapmeld/lookup_languages
Look up languages by English or local names [closes #3023]
4c9da0d
@bhousel bhousel Lower popularity thresholds for taginfo lookups 84edbee
@bhousel bhousel Add multikeys taginfo function, filter out values with ';' 25862f3
@bhousel bhousel Add typeahead behavior to combo field
(closes #3089)
b9eeaa3
@bhousel bhousel Exclude name tag when validating whether a feature has tags
(closes #3091)
b9e24fb
@bhousel bhousel Adjust taginfo values filtering, update tests 03bb916
@bhousel bhousel Update Mapbox Satellite imagery request link
closes (#3092)
2654fcd
@bhousel bhousel Refactor combo.js and move @kepta's multiselect code into there. 5752207
@bhousel bhousel Adjust multiCombo styling fb2dd89
@bhousel bhousel Remove multiselect.js, remove test data
(all functionality in multiselect.js has been moved to combo.js)
8ecda6d
@bhousel bhousel Rename multiselect -> multicombo 4b76805
@bhousel bhousel Don't leave edit mode on pressing enter if a combobox is active ab3340e
@bhousel bhousel Avoid tabbing to field buttons in the entity editor 5c68b2c
@bhousel bhousel Retain focus on input when enter/tab with a value 980bd23
@bhousel bhousel Merge pull request #3080 from openstreetmap/kepta-chips
Add multiselect preset
f071b93
@bhousel bhousel Use multiCombo for fuel options
(closes #1987)
1495f45
bhousel and others added some commits May 17, 2016
@bhousel bhousel Cleanup space-click event handler, debounce key repeat, distance thre…
…shold

(closes #2784)
efd397b
@bhousel bhousel Merge branch 'master' of https://github.com/tanerochris/iD into taner…
…ochris-master
6d64fce
@bhousel bhousel Use d3.interpolateRgb to make save button warning colors
(closes #2749)
636ef82
@bhousel bhousel Lodash version bump
Lodash version bump to 4.12
9e61fae
@bhousel bhousel Never use the phantomjs binary that gets symlinked into node_modules/…
….bin
b7e4672
@bhousel bhousel Add tile debugging, redraw when debug flags change bd60ace
@bhousel bhousel Switch PhantomJS source on Travis to Medium github mirror 57b73ee
@tmcw tmcw Show CI page for master branch only, upgrade to SVG dafebef
@peterneubauer peterneubauer adding MapillaryJS, first stab. 8782c14
@bhousel bhousel Clean translated combo value when comparing to display value
(closes #3129)
0cea4e9
@1ec5 1ec5 Add wikidata asynchronously based on wikipedia
ref #2680
669cad7
@bhousel bhousel make translations c3d8177
@bhousel bhousel make imagery 67ac769
@bhousel bhousel 1.9.5 661c2d4
@kepta kepta Mapillary Js, second stab f81ff29
@bhousel bhousel Rename field function 0446275
@bhousel bhousel Update async wikidata tag if graph unchanged 0135fbe
@kepta kepta temporary css fixup 6b70cf3
@bhousel bhousel Initiate async wikidata lookup onchange only (not onblur), add tests db6234b
@bhousel bhousel Merge branch 'wikidata-new' bcb68df
@bhousel bhousel Smooth centerEase with duration param ee647c8
@bhousel bhousel Remove clearTimeout from queueRedraw, for long mousedrags or ease tra…
…nsitions

Old behavior would redraw only after the map stops moving for 300ms
New behavior will force redraw within 750ms, regardless of map stability
e6c440c
@bhousel bhousel Keep thumbnail on left
Jumpy left/right behavior is unnecessary now that centerEase works great
d13715e
@bhousel bhousel Don't show thumbnail when hovering over Mapillary markers 0eac0ff
@bhousel bhousel Allow Mapillary signs layer only if image layer is already enabled 368b861
@bhousel bhousel Remove static Mapillary thumbnail image
(Viewer object shows the image while loading)
d728059
@bhousel bhousel WIP: simplify code, attempt to preload viewer a99f54b
@bhousel bhousel Load mapillary viewer assets dynamically from CDN 6788f79
@bhousel bhousel WIP: preload viewer when layer enabled, still bad issues with slow lo…
…ad timing
e57914d
@bhousel bhousel Show loading spinner in loadchanged, update selection in nodechanged e364b7e
@bhousel bhousel Refactor click tracking into Mapillary service, addl cleanups ca79638
@bhousel bhousel Merge pull request #3128 from openstreetmap/mapillary_js
Replace static Mapillary thumbnail with mapillary-js viewer
30dfdeb
@bhousel bhousel Don't need devDependency for mapillary-js (loads from CDN) e68dff0
@kepta kepta Remove unused CSS animation e5eee4e
@bhousel bhousel Add left-hand-driving dataset
(For future use by turn lane editor)
7cb8e5a
@bhousel bhousel Improve imperial.json borders, drop coord precision to 5 digit 81c1f7b
@bhousel bhousel Add Mapillary Images, Mapillary Signs to imagery_used tag
(closes #3069)
a8ac9fa
@manfredbrandl manfredbrandl Update bbq.json
(closes #3139)
f1e3340
@bhousel bhousel Run Make 02ba1ae
@bhousel bhousel Limit number of pages to fetch from Mapillary search API
(closes #3149)
f2cde0b
@bhousel bhousel Transifex API is now https 8a99e3d
@bhousel bhousel Slow down Transifex
per: http://docs.transifex.com/api/#api-rate-limits
Rackspace seems to rate limit GET requests to 5/sec
8a578fc
@bhousel bhousel make translations e0dac94
@bhousel bhousel make imagery 2e43437
@bhousel bhousel Keep Mapillary viewer loading animation if canvas not yet created 4289afa
@bhousel bhousel 1.9.6 3f1141a
@kepta kepta Patch d3's mousewheeled function
(closes #2773)
71a3d3e
@kepta kepta add commit 71a3d3e to d3's patch list 5f7f378
@bhousel bhousel Merge pull request #3153 from kepta/d3-mousewheeled-fix
D3 mousewheeled fix
7668653
@bhousel bhousel More debug versatility 6314c27
@bhousel bhousel Pass projection to iD.svg.Layers in tests e22bd1e
@bhousel bhousel Add dataset debugging
(re: #3158)
eb19b17
@bhousel bhousel Add background imagery debug and debug legend 452df40
@bhousel bhousel Put tile and collision on the debug legend too c08774c
@bhousel bhousel Fix imperial units test in maxspeed
(closes #3156)
63fc7c4
@kepta kepta Add Macau and Hong Kong to drive-left data 87c321b
@bhousel bhousel Add a few points around Macau, Hong Kong, drop precision where not ne…
…eded
8d6c31d
@bhousel bhousel Explicitly test all the highway types for onewayness 9c1e9c9
@bhousel bhousel Remove mapillary-js source map c78b68b
@bhousel bhousel Remove reference to mapillary-js assets from dist/index.html
(This was a holdover from testing a while ago. Assets are loaded from CDN now)
c5f3777
@willemarcel willemarcel Add sidewalk preset to Path presets category e0ce02d
@bhousel bhousel Add sidewalk preset to Path presets category and run make 53db572
@jonnybarnes jonnybarnes When setting a form’s backgroun colour, also set the text colour a346a68
@homersimpsons homersimpsons Create stars.json 6a8bfe5
@homersimpsons homersimpsons Create rooms.json 89ee454
@homersimpsons homersimpsons Create Internet Access Fee field 0bf33a5
@homersimpsons homersimpsons Add stars, rooms, internet access fee fields to hotel preset 6206d74
@bhousel bhousel Add rooms, internet fields to guest_house, hostel, motel presets 8144903
@homersimpsons homersimpsons Create parallel_direction.json 8199d5e
@homersimpsons homersimpsons Update stop.json be68a80
@bhousel bhousel Add highway=give_way preset (yield sign) 65cd619
@bhousel bhousel Add stop type, direction forward/backward 63574fd
@bhousel bhousel Exclude imagery sources more than 20 years old
(closes #3190)
57836a4
@waldyrious waldyrious Add license title
It's not strictly required, but it's useful metadata, and part of the recommended license template text (see http://choosealicense.com/licenses/isc/ and https://opensource.org/licenses/isc-license)
7c25ff5
@bhousel bhousel Rename "Chemist" preset label to "Drugstore" for en_US
(closes #3201)

Don't worry - we will leave it as "Chemist" in the en_GB translation.
1e80527
@bhousel bhousel Switch from `sloped_curb=*` to `kerb=*`
(closes #3210)
d407530
@SatyaSudheer SatyaSudheer Adding man_made=bridge preset issue# 3183 7a51da0
@SatyaSudheer SatyaSudheer update man_made=bridge geometry = area 51157a4
@bhousel bhousel Remove unused language json files (fil and ko-KR)
(closes #3214)
d8f5ba8
@ramyaragupathy ramyaragupathy Add emergency=defibrillator preset
(closes #3202)
61cc5f7
@bhousel bhousel _.all doesn't exist anymore in the latest releases of lodash
(see 50bae40, closes #3155, thanks @tyrasd)
3c59c49
@bhousel bhousel Add statement of browser support to README cfa8c98
@bhousel bhousel Treat entities on addr:interpolation lines as points, not vertices
(closes #3241)
eee6dec
@bhousel bhousel 1.9.7 e651ff6
@boothym boothym Add ref field to post office preset
(closes #3232)
d86d9af
@bhousel bhousel make translations 897056e
@bhousel bhousel make imagery f67d104
@bhousel bhousel make suggestions 683867b
@bhousel bhousel 1.9.7 086fc69
@bhousel bhousel Ignore name suggestions if there is no corresponding preset 2ea3017
@paulmach paulmach Incorporate Slide Tool (http://labs.strava.com/slide) 0a30ab0
@paulmach paulmach Fix connection disconnect issue. add356d
@paulmach paulmach Update image paths af1d766
@paulmach paulmach Add OSM masked global heat layer de97d5a
@paulmach paulmach https globalheat 404bea3
@paulmach paulmach https logo d40c9fd
@paulmach paulmach Add blocking(true) to "sliding" message
Makes it so you can’t click outside to cancel
ddd8d79
@paulmach paulmach updated to https 5da60b8
@paulmach paulmach smooth -> slide sprite icon rename 1066065
@paulmach paulmach update readme 9738be7
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment