CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-27 07:53:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,661 Commits 2 Branches 0 Tags
664c5ccaa6dcd857da43bd05c3a47e8a9e350eb9
Commit Graph

9661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bryan Housel
664c5ccaa6 Merge branch 'fields-flexbox' 2018-11-29 22:32:42 -05:00
Bryan Housel
50d204866b Flexbox the raw member, membership controls, finish tag editor 2018-11-29 22:31:58 -05:00
Bryan Housel
a8f477f256 Fix the restrictions editor to display as block, not flex 2018-11-29 14:43:00 -05:00
Bryan Housel
838407b351 Fix up the flex css for radio, access, structure, wiki 2018-11-29 13:50:23 -05:00
Bryan Housel
055b81c0d1 Merge pull request #5532 from RudyTheDev/railing-preset 
Adds preset for Railing
 2018-11-29 09:11:53 -05:00
RudyTheDev
52824d34ed Add preset for "Railing": barrier=fence; fence_type=railing 2018-11-29 15:58:05 +02:00
Bryan Housel
d0612ba519 Fix css for address and wikipedia fields, fix hover styles 2018-11-28 23:20:52 -05:00
Bryan Housel
958d7fac4f wip changing all fields to use flexbox everywhere 2018-11-28 18:15:38 -05:00
Bryan Housel
0b98811377 Avoid multiline variable declaration 2018-11-27 11:22:13 -05:00
Bryan Housel
4c2f14230b Merge pull request #5529 from huonw/arrows-for-cliffs 
Add one-sided triangular markers to ways with sides (e.g. natural=cliff).
 2018-11-27 11:15:48 -05:00
Bryan Housel
4533603a88 preset-input-wrap -> form-field-input-wrap 
This better describes what it does.
Also, took this opportunity to update a bunch of the uifield code
(no multi line variable declarations, prefix state variables with _,
eliminate unnecessray lodash, etc)
 2018-11-27 10:54:03 -05:00
Huon Wilson
dd0be84da4 Add one-sided triangular markers to ways with sides (e.g. natural=cliff). 
This generalizes the oneway arrow logic for adding SVG markers along a
line. Using that functionality, certain tags get arrows on their
right-hand side, indicating which side is "inside", e.g. the
right-side of a cliff is the lower side.

The list of tags considered to be sided (unless there's a
two_sided=yes tag) is:

- natural=cliff
- natural=coastline
- barrier=retaining_wall
- barrier=kerb
- barrier=guard_rail
- barrier=city_wall
- man_made=embankment

The triangles attempt to be reminiscent of the triangles used for
rendering cliffs on OSM (and elsewhere). The different tags get
different renderings (e.g. colors that match the main way, and
different spacings). In addition, natural=coastline is special-cased
to have blue markers (despite having a green way), to emphasise that
the "inside" of a coastline is the water.

Fixes https://github.com/openstreetmap/iD/issues/1475.
 2018-11-28 01:45:50 +11:00
Huon Wilson
f356c6ac49 test: add tests for adding oneway arrows to lines 2018-11-28 01:25:04 +11:00
Bryan Housel
7bf0af562c Make sure the form-field-label container has some height 
This seems necessary for the multilingual name fields, which start out
minimized and have no height.  They transition in, and the browser
can't figure out what height to make them.
 2018-11-27 09:24:46 -05:00
Bryan Housel
986b663c9e Get rid of extra form-label-button-wrap div 
Buttons can now be directly appended to the form-field-label flex container
 2018-11-27 09:14:11 -05:00
Bryan Housel
d2687d9068 pacify eslint 2018-11-26 22:13:38 -05:00
Bryan Housel
822917466c Display name suggestion presets on 2 lines 
(closes #5514)
 2018-11-26 21:55:13 -05:00
Bryan Housel
b719a45e1e wikidata -> Wikidata 2018-11-26 17:53:32 -05:00
Bryan Housel
7170e93b39 Adjust tooltip 2018-11-26 17:35:38 -05:00
Bryan Housel
df91eb2959 Cleanup style, make sure multilingual fields always render 2018-11-26 17:13:55 -05:00
Bryan Housel
9341e477a6 Merge remote-tracking branch 'origin/master' into brand-name-protection 2018-11-26 15:27:56 -05:00
Bryan Housel
f6f146f79b Lock down some fields when a brand preset has been chosen 2018-11-26 15:13:40 -05:00
Bryan Housel
da9ce2a3bf Show name and brand for Car Dealer, Motorcycle Dealer, Motel 2018-11-26 15:13:02 -05:00
Bryan Housel
c1b19e7c9e Generate unique _id for each tooltip 
This lets allows multiple tooltips around nested elements.
The previous code did a bunch of  .selectAll('.tooltip') that would
break if it matched multiple tooltips.
 2018-11-26 14:14:19 -05:00
Bryan Housel
4972fed136 Don't show the combobox control for a readonly input field 2018-11-26 11:18:04 -05:00
Bryan Housel
648996bd83 Merge pull request #5528 from RudyTheDev/guard-rail-preset 
Added guard rail preset
 2018-11-25 20:13:17 -05:00
RudyTheDev
c8c7064d43 Guard rail not valid on vertex 2018-11-26 02:59:56 +02:00
Bryan Housel
cec5ce511a Merge pull request #5526 from hikemaniac/leisure-rendering 
Add rendering for more leisure objects
 2018-11-25 19:19:44 -05:00
Quincy Morgan
b3e71c7522 Manual removal of the hover-highlight styling when clicking on a relation or member in the sidebar. 
Closes #5521
 2018-11-25 18:15:33 -05:00
RudyTheDev
c9927a6dd8 Manually readd new named stuff preset stuff that seems to not be auto-generated to inquire for PR 2018-11-25 23:29:10 +02:00
RudyTheDev
27f874acab Add guard rail preset for barrier=guard_rail (keep auto-built presets.json with missing recently added stuff) 2018-11-25 23:26:34 +02:00
hikemaniac
c60db872fb Merge branch 'master' into leisure-rendering 2018-11-25 18:11:22 +01:00
hikemaniac
3b4330304f Add rendering for more leisure objects 2018-11-25 17:57:00 +01:00
Bryan Housel
329f54ff5e Merge pull request #5522 from hikemaniac/water_slide 
Add rendering for attraction=water_slide
 2018-11-24 22:43:50 -05:00
Bryan Housel
550ac8901b Merge pull request #5524 from jguthrie100/localise_taginfo_requests 
Amend TagInfo API calls to use current locale
 2018-11-24 22:42:31 -05:00
J Guthrie
3dbcdc97e4 Remove locale param from #docs which returns all locales by default 2018-11-24 21:41:22 +00:00
J Guthrie
a23c975232 Fix specs 2018-11-24 21:27:20 +00:00
J Guthrie
ed66968308 Add localised lang param to API url call 2018-11-24 21:12:51 +00:00
hikemaniac
8ac60c7087 Simplify CSS 2018-11-24 17:40:32 +01:00
hikemaniac
49421b1322 Add rendering for attraction=water_slide 2018-11-24 17:10:33 +01:00
Bryan Housel
ae063e9616 Make name and brand fields readonly on suggestion presets 
(re #5515)
 2018-11-23 23:44:52 -05:00
Quincy Morgan
8637dd6209 Changes "Multilingual name" label to "Multilingual Name" to match other field labels 2018-11-22 12:59:19 -05:00
Quincy Morgan
4aff7a9485 Updates the Slipway preset with Name and Fee fields and Vertex geometry 2018-11-22 12:47:02 -05:00
Quincy Morgan
3d14cb0529 Adds terms for the Parking Lot preset 
Closes #5519
 2018-11-22 11:47:06 -05:00
Quincy Morgan
5fd118ed4f Merge pull request #5518 from quincylvania/name-suggestion-index-v1-presets 
Adds the missing presets for name-suggestion-index v1.
 2018-11-22 10:05:41 -05:00
Quincy Morgan
51e5e59546 Adds the missing presets for name-suggestion-index v1. 
Closes #5510
 2018-11-22 10:04:35 -05:00
Bryan Housel
4cf7e8cdf9 Merge pull request #5516 from quincylvania/shift-option-alt-scroll-to-zoom 
Trackpad scroll-to-zoom while holding Shift or Option/Alt
 2018-11-22 01:08:21 -05:00
Quincy Morgan
d6ea64241b Trackpad scroll-to-zoom while holding Shift or Option/Alt 2018-11-21 20:55:30 -05:00
Quincy Morgan
e2b2649976 Merge pull request #5498 from quincylvania/form-field-flexbox 
Flexbox preset field, member, and membership UI
 2018-11-21 20:14:36 -05:00
Bryan Housel
ea9e3008a5 addTags() -> setTags() / removeTags() -> unsetTags() 
This avoids overriding the `addTags` and `removeTags` objects with functions
 2018-11-21 12:59:43 -05:00