CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-23 04:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,995 Commits 2 Branches 0 Tags
0e795ae31d8e5a1bd196973f3bcdda2396b6717c
Commit Graph

9995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quincy Morgan
0e795ae31d Updated the fast food and restaurant presets to use field inheritance 2019-01-15 14:34:37 -05:00
greenkeeper[bot]
dbd99730d8 chore(package): update mapillary-js to version 2.15.0 2019-01-15 14:31:08 -05:00
Quincy Morgan
8f6870336f Converted building presets to use field inheritance 2019-01-15 14:29:04 -05:00
Quincy Morgan
03f3dd5adb Merge pull request #5712 from openstreetmap/preset-field-inheritance 
Preset field inheritance
 2019-01-15 14:14:35 -05:00
Quincy Morgan
4252c5cb36 Presets no longer inherit fields for keys that define them 2019-01-15 13:52:03 -05:00
Quincy Morgan
4b2c380b18 Changed preset field inheritance to target specific presets rather than just the parent preset 2019-01-15 13:07:58 -05:00
Bryan Housel
a9b8cfd4dc Avoid warning in Firefox for padding-right: auto 2019-01-15 11:46:11 -05:00
Quincy Morgan
0da15efc10 Merge branch 'master' into preset-field-inheritance 
# Conflicts:
#	data/presets/presets.json
 2019-01-15 11:44:16 -05:00
Quincy Morgan
d1a7400ed7 Added a field for the building:material key 2019-01-15 11:42:55 -05:00
Quincy Morgan
1ba61140f5 Changed the material field to be non-universal 
Added the material field to the fields or moreFields properties of relevant presets
 2019-01-15 11:35:56 -05:00
Quincy Morgan
becc087a91 Moved the seamark/type field from a universal field to the fields or moreFields properties of relevant presets 2019-01-15 10:53:35 -05:00
Quincy Morgan
d1c4e22337 Added documentation for preset field inheritance behavior 2019-01-15 10:23:38 -05:00
Quincy Morgan
ae7c099c8a Moved field inheritance resolution from the data build to the preset initialization 
Removed the data build check for duplicate values between fields and moreFields
Renamed the shop field from Type to Shop Type
Renamed the beauty field from Shop Type to Beauty Specialty
Added the brand field to the shop preset under moreFields
 2019-01-15 09:53:26 -05:00
Quincy Morgan
78853e1dc1 Added mechanism for presets to inherit their fields and moreFields values 2019-01-14 18:27:50 -05:00
Bryan Housel
59795e41ab Don't style the active vertex in line drawing mode as a large endpoint 
(closes #5711)
 2019-01-14 17:30:20 -05:00
Quincy Morgan
92e514f891 Make the preset browser appear upon adding a new relation. 
Closes #5656
 2019-01-14 16:25:43 -05:00
Bryan Housel
18ea434d02 Update water area presets to use natural=water + water=* 
(closes #5591)
 2019-01-14 13:09:46 -05:00
Bryan Housel
bf79a714f1 "Forest" -> "Managed Forest" 
(closes #5709)
 2019-01-14 11:42:32 -05:00
Bryan Housel
67ef2bce1c Simplify and fix a few typos 2019-01-14 11:15:56 -05:00
Bryan Housel
fd23d13563 Distinguish between "This highway" and "highway" forms of error parts. 
(closes #5703)
 2019-01-14 10:59:45 -05:00
Bryan Housel
3090b5c875 Merge pull request #5708 from iriman/context-menu-rtl 
[RTL] place tooltip under #id-container to inherit rtl
 2019-01-14 09:07:12 -05:00
iriman
bc9a64058f [RTL] place edit menu under #id-container to inherit rtl 2019-01-14 15:50:31 +03:30
Bryan Housel
14fc2c82c2 Merge pull request #5704 from iriman/rtl-issues--iriman 
fix for some rtl issues
 2019-01-13 13:51:47 -05:00
iriman
a8fb9fc622 [RTL] right padding for .member-entity-name 2019-01-13 20:12:14 +03:30
iriman
7b53d0aa5a [RTL] pick appropriate class for .field-help-title > h2 2019-01-13 19:44:49 +03:30
Bryan Housel
ff296134ba Merge pull request #5700 from iriman/patch-1 
margin-right for keyhints in rtl locale
 2019-01-12 08:39:35 -05:00
Iman
36a6596897 margin-right for keyhints 2019-01-12 13:11:26 +03:30
Bryan Housel
1f69661b91 Add a preset "RV Dealership" for shop=caravan 2019-01-11 18:02:17 -05:00
Bryan Housel
09e574983f Don't call formFields.tagsChanged() when presetEditor.tags change 
(closes #5690)

This change also makes sure to use the latest copy of the entity in
field.isAllowed() to ensure the prerequisite field check works
and fieldsArr is filtered properly for #5583
 2019-01-11 17:42:34 -05:00
Bryan Housel
b575ee8500 Move formFields klass from an argument to a state variable 
(maybe needed in case render can get called different ways)
 2019-01-11 13:56:16 -05:00
Bryan Housel
6c9a57ffce Merge pull request #5693 from iriman/iriman-patch-1 
fix for first part of #5687
 2019-01-11 11:21:57 -05:00
Bryan Housel
55a92ca79d Add closed:note changeset tag for closed OSM notes 2019-01-11 10:14:55 -05:00
greenkeeper[bot]
46dd90c5e5 chore(package): update rollup to version 1.1.0 2019-01-11 09:50:35 -05:00
Bryan Housel
75c1448342 Merge pull request #5695 from tordans/patch-5 
Nicify grid for save area of notes and keepright.
 2019-01-11 09:26:47 -05:00
Tobias
d512b4b114 Update 80_app.css 
Nicify grid for save area of notes and keepright.
 2019-01-11 12:18:51 +01:00
Bryan Housel
5ebe0976fe Add closed:keepright changeset tag for closed issues 
The issues are written as `schema:error_id` and semicolon delimited
e.g.  `closed:keepright=56:102661142`
closes this issue:
https://www.keepright.at/report_map.php?schema=56&error=102661142
 2019-01-10 23:27:55 -05:00
Bryan Housel
623f96449e z-sort errors above warnings 2019-01-10 21:47:37 -05:00
Bryan Housel
ae8dffa43c Improve URL error messages 411, 412, 413 2019-01-10 21:35:13 -05:00
Bryan Housel
7f321abbaf Add links to the main error object in KeepRight error messages 
re: https://github.com/openstreetmap/iD/issues/5679#issuecomment-452281850
 2019-01-10 17:38:09 -05:00
Iman
7475bcdf2f geocode-item centering for rtl 2019-01-10 14:52:13 +03:30
Bryan Housel
98c08a02ef Add "zoom to this" quicklink and keybind for keepright editor 
(re #5169)
 2019-01-09 22:59:44 -05:00
Bryan Housel
9282a51795 Add "zoom to this" quicklink and keybind for data editor 
(re #5169)
 2019-01-09 22:49:51 -05:00
Bryan Housel
6efbbb8aa3 Add "zoom to this" quicklink and keybind for note editor 
(closes #5169)
 2019-01-09 22:24:52 -05:00
Bryan Housel
9c190e83e9 Add quickLinks to preset editor, zoom to selected feature 2019-01-09 21:56:08 -05:00
Bryan Housel
5c6406ea63 Remove section borders from inspector 
There is enough separation with the disclosure headings that we
don't need to break the sidebar up with lines
 2019-01-08 14:04:07 -05:00
Bryan Housel
6c5ea96ab6 Adjust generic name validation to better check tag values 
e.g. "name=Fast Food" should match "amenity=fast_food"
 2019-01-08 13:43:40 -05:00
Bryan Housel
d9ee93e578 Fix secondary color in circularize icon 
It was hardcoded blue instead of using `currentColor`, preventing
it from showing grey for disabled style
 2019-01-08 12:05:36 -05:00
Bryan Housel
5f2d80c7a6 pacify eslint 2019-01-08 10:58:47 -05:00
Bryan Housel
5f20218f1f Add validation warning for generic names 
(closes #5590)
 2019-01-08 02:15:28 -05:00
Bryan Housel
528cbb29e1 Store the transform and selectedIDs with the rest of the history 
(closes #5664)
 2019-01-08 00:36:41 -05:00