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

Keep right QA #5201

Merged
merged 60 commits into from
Jan 5, 2019
Merged
Show file tree
Hide file tree
Changes from 56 commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
b3cffd7
added simple keepRight button under photoItems
thomas-hervey Jul 25, 2018
b969655
WIP: added schemas for errors and warnings
thomas-hervey Jul 28, 2018
75cff00
displaying keep right (currently as notes)
thomas-hervey Jul 28, 2018
31f35b0
added basics to sidebar
thomas-hervey Jul 28, 2018
1827837
WIP: identifying variables in errors
thomas-hervey Jul 31, 2018
3e7146c
WIP: menu with sub-layer buttons; TODO: bug fixes, ui updates, wiring…
thomas-hervey Aug 3, 2018
6dbea57
added back supported
thomas-hervey Aug 3, 2018
cbcdfc0
small UI change to header
thomas-hervey Aug 3, 2018
805dd39
added link for object in header
thomas-hervey Aug 6, 2018
1335549
cleaned map data UI; commented sub-layer filtering
thomas-hervey Aug 9, 2018
b5a316d
fixed: svg icon placement
thomas-hervey Aug 9, 2018
d095de0
updated comment UI, added stub for POST; TODO: finish links & POST
thomas-hervey Aug 10, 2018
e0d5391
added: entity links within descriptions
thomas-hervey Aug 10, 2018
ed34d52
updated: check entity type from second word as well
thomas-hervey Aug 10, 2018
d125c62
updated: variable and function names, html regex
thomas-hervey Aug 27, 2018
187d1ad
added: outline for KeepRight icon
thomas-hervey Aug 28, 2018
8489583
updated: punctuation and missing descriptions
thomas-hervey Aug 30, 2018
fbe3c94
updated: punctuation, some specialized QA error parsing
thomas-hervey Aug 31, 2018
bb89827
Use regex group capture to extract error details
kymckay Aug 31, 2018
424bebf
Convert preliminary amount of errors to regex
kymckay Aug 31, 2018
1527bbb
Fix missing and unnecessary semicolons
kymckay Sep 1, 2018
d054e9c
Convert all error message schema to regex
kymckay Sep 1, 2018
a2fe431
Add support for arbitrary number of details
kymckay Sep 2, 2018
e0e48b7
Fix parsing of error type 231
kymckay Sep 2, 2018
e77d779
Adhere to style guide for variables
kymckay Sep 2, 2018
2b1e37a
Handle simple error descriptions explicitly
kymckay Sep 2, 2018
005927d
Fix parsing of error type 211
kymckay Sep 2, 2018
da23bf7
Fix parsing of error type 294
kymckay Sep 3, 2018
9bd7727
Convert warnings to regex
kymckay Sep 3, 2018
1f7455f
Add missing error types 73, 74 and 75
kymckay Sep 3, 2018
ee00635
updated: some error colors; fixed: error 320, 220
thomas-hervey Sep 5, 2018
cedf695
added: notes and todos for keepRight
thomas-hervey Nov 19, 2018
f4e7181
added: help documentation
thomas-hervey Nov 19, 2018
c501c44
updated: KeepRight description text
thomas-hervey Nov 19, 2018
2deadd5
Fix merge issues
bhousel Dec 19, 2018
ca2d4e2
Fix layer test
bhousel Dec 19, 2018
7f669d2
Simplify KeepRight tile fetching code
bhousel Dec 20, 2018
177537f
Move coincident markers away from related geometry and from each other
bhousel Dec 20, 2018
6e1d6bc
Drop legacy translation keys
bhousel Dec 20, 2018
4eb0e4b
Remove more duplicate strings
bhousel Dec 20, 2018
f715000
Refactor things out of util with limited use, move more to service
bhousel Dec 21, 2018
3785ffb
Simplify translation strings
bhousel Dec 22, 2018
192b4da
Fix the strings I broke in 3785ffb15
bhousel Dec 29, 2018
d54d5bf
Move title into keepright error header
bhousel Dec 29, 2018
2ec02f3
Simplify regex matching - goal is to have fewer, simpler rules
bhousel Jan 2, 2019
9557c02
Relax some more regex for tag parsing, (to support 'key=*')
bhousel Jan 2, 2019
4494c3a
Fix comment box style, remove unused vars for eslint
bhousel Jan 2, 2019
ee92758
KeepRight only allows one anonymous comment per issue - simplify
bhousel Jan 2, 2019
69ce5ee
Remove user details and auth and adjust button texts for commenting
bhousel Jan 3, 2019
9e6497b
Update or remove the error after POSTing changes to server
bhousel Jan 3, 2019
0256ad7
Remove redundant CSS
bhousel Jan 3, 2019
46ebce2
Fix error reporting urls and make sure sidebar not showing stale data
bhousel Jan 3, 2019
35f8078
Reduce number of marker colors, increase contrast, tweak language
bhousel Jan 3, 2019
d0343c9
Reintroduce some error localization, fix some nagging parse issues
bhousel Jan 3, 2019
10ece54
Give missing maxspeed its own marker color style
bhousel Jan 3, 2019
67403a2
Style missing tracktype like missing maxspeed
bhousel Jan 4, 2019
cd92039
Use touch targets for notes, fix a few bugs with note dragging
bhousel Jan 4, 2019
0582faf
Convert KeepRight error 73 to regex
bhousel Jan 5, 2019
fadd8e2
Switch KeepRight markers to use touch targets
bhousel Jan 5, 2019
48cc06f
Adjust distance from KeepRight marker and underlying geometry
bhousel Jan 5, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions css/20_map.css
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,19 @@
pointer-events: none !important;
}

/* NOTE: when more QA layers are added, replace kr_error with generic QA layer selector */
/* points, notes & QA */

/* points & notes */
g.kr_error .stroke,
g.note .stroke {
stroke: #222;
stroke-width: 1;
fill: #222;
opacity: 0.6;
}

g.kr_error.active .stroke,
g.note.active .stroke {
stroke: #222;
stroke-width: 1;
Expand All @@ -97,6 +101,7 @@ g.point .stroke {
fill: #fff;
}

g.kr_error .shadow,
g.point .shadow,
g.note .shadow {
fill: none;
Expand All @@ -105,13 +110,16 @@ g.note .shadow {
stroke-opacity: 0;
}

g.kr_error.related:not(.selected) .shadow,
g.kr_error.hover:not(.selected) .shadow,
g.note.related:not(.selected) .shadow,
g.note.hover:not(.selected) .shadow,
g.point.related:not(.selected) .shadow,
g.point.hover:not(.selected) .shadow {
stroke-opacity: 0.5;
}

g.kr_error.selected .shadow,
g.note.selected .shadow,
g.point.selected .shadow {
stroke-opacity: 0.7;
Expand Down
90 changes: 87 additions & 3 deletions css/65_data.css
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@

/* OSM Notes Layer */
/* OSM Notes and KeepRight Layers */
.layer-keepRight,
.layer-notes {
pointer-events: none;
}
.layer-keepRight .kr_error,
.layer-notes .note * {
pointer-events: none;
}
.mode-browse .layer-notes .note .note-fill,
.mode-select .layer-notes .note .note-fill,
.mode-select-data .layer-notes .note .note-fill,
.mode-select-note .layer-notes .note .note-fill {
.mode-select-note .layer-notes .note .note-fill,
.layer-keepRight .kr_error .kr_error-fill,
.layer-notes .note .note-fill {
pointer-events: visible;
cursor: pointer; /* Opera */
cursor: url(img/cursor-select-point.png), pointer; /* FF */
Expand All @@ -19,6 +23,13 @@
.layer-notes .note .note-shadow {
color: #000;
}

.kr_error-header-icon .kr_error-fill,
.layer-keepRight .kr_error .kr_error-fill {
stroke: #333;
stroke-width: 1.3px; /* NOTE: likely a better way to scale the icon stroke */
}

.note-header-icon .note-fill,
.layer-notes .note .note-fill {
color: #ff3300;
Expand Down Expand Up @@ -54,8 +65,81 @@
}


/* Custom Map Data (geojson, gpx, kml, vector tile) */
/* Keep Right Errors
------------------------------------------------------- */
.kr_error_type_20, /* multiple nodes on same spot */
.kr_error_type_40, /* impossible oneways */
.kr_error_type_210, /* self intersecting ways */
.kr_error_type_270, /* unusual motorway connection */
.kr_error_type_310, /* roundabout issues */
.kr_error_type_320, /* improper _link */
.kr_error_type_350 { /* improper bridge tag */
color: #ff9;
}

.kr_error_type_50 { /* almost junctions */
color: #88f;
}

.kr_error_type_60, /* deprecated tags */
.kr_error_type_70, /* tagging issues */
.kr_error_type_90, /* motorway without ref */
.kr_error_type_100, /* place of worship without religion */
.kr_error_type_110, /* poi without name */
.kr_error_type_150, /* railway crossing without tag */
.kr_error_type_220, /* misspelled tag */
.kr_error_type_380 { /* non-physical sport tag */
color: #5d0;
}

.kr_error_type_130 { /* disconnected ways */
color: #fa3;
}

.kr_error_type_170 { /* FIXME tag */
color: #ff0;
}

.kr_error_type_190 { /* intersection without junction */
color: #f33;
}

.kr_error_type_200 { /* overlapping ways */
color: #fdbf6f;
}

.kr_error_type_160, /* railway layer conflict */
.kr_error_type_230 { /* layer conflict */
color: #b60;
}

.kr_error_type_280 { /* boundary issues */
color: #5f47a0;
}

.kr_error_type_180, /* relation without type */
.kr_error_type_290 { /* turn restriction issues */
color: #ace;
}

.kr_error_type_300, /* missing maxspeed */
.kr_error_type_390 { /* missing tracktype */
color: #090;
}

.kr_error_type_360, /* language unknown */
.kr_error_type_370, /* doubled places */
.kr_error_type_410 { /* website issues */
color: #f9b;
}

.kr_error_type_120, /* way without nodes */
.kr_error_type_400 { /* geometry / turn angles */
color: #c35;
}


/* Custom Map Data (geojson, gpx, kml, vector tile) */
.layer-mapdata {
pointer-events: none;
}
Expand Down
43 changes: 34 additions & 9 deletions css/80_app.css
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,7 @@ button.add-note svg.icon {
.field-help-title button.close,
.sidebar-component .header button.data-editor-close,
.sidebar-component .header button.note-editor-close,
.sidebar-component .header button.keepRight-editor-close,
.entity-editor-pane .header button.preset-close,
.preset-list-pane .header button.preset-choose {
position: absolute;
Expand All @@ -595,6 +596,7 @@ button.add-note svg.icon {
[dir='rtl'] .field-help-title button.close,
[dir='rtl'] .sidebar-component .header button.data-editor-close,
[dir='rtl'] .sidebar-component .header button.note-editor-close,
[dir='rtl'] .sidebar-component .header button.keepRight-editor-close,
[dir='rtl'] .entity-editor-pane .header button.preset-close,
[dir='rtl'] .preset-list-pane .header button.preset-choose {
left: 0;
Expand Down Expand Up @@ -2429,9 +2431,10 @@ input.key-trap {
}


/* OSM Note Editor
/* OSM Note / KeepRight Editors
------------------------------------------------------- */
.note-header {
.note-header,
.kr_error-header {
background-color: #f6f6f6;
border-radius: 5px;
border: 1px solid #ccc;
Expand All @@ -2440,7 +2443,8 @@ input.key-trap {
align-items: center;
}

.note-header-icon {
.note-header-icon,
.kr_error-header-icon {
background-color: #fff;
padding: 10px;
flex: 0 0 62px;
Expand All @@ -2450,26 +2454,30 @@ input.key-trap {
border-right: 1px solid #ccc;
border-radius: 5px 0 0 5px;
}
[dir='rtl'] .note-header-icon {
[dir='rtl'] .note-header-icon,
[dir='rtl'] .kr_error-header-icon {
border-right: unset;
border-left: 1px solid #ccc;
border-radius: 0 5px 5px 0;
}

.note-header-icon .icon-wrap {
.note-header-icon .icon-wrap,
.kr_error-header-icon .icon-wrap {
position: absolute;
top: 0px;
}

.note-header-label {
.note-header-label,
.kr_error-header-label {
background-color: #f6f6f6;
padding: 0 15px;
flex: 1 1 100%;
font-size: 14px;
font-weight: bold;
border-radius: 0 5px 5px 0;
}
[dir='rtl'] .note-header-label {
[dir='rtl'] .note-header-label,
[dir='rtl'] .kr_error-header-label {
border-radius: 5px 0 0 5px;
}

Expand Down Expand Up @@ -2535,17 +2543,22 @@ input.key-trap {
border-left: none;
}

.note-save {
.note-save,
.keepRight-save,
.kr_error-details,
.kr_error-comment-container {
padding: 10px;
}

.note-save #new-comment-input {
.keepRight-save .new-comment-input,
.note-save .new-comment-input {
width: 100%;
height: 100px;
max-height: 300px;
min-height: 100px;
}

.keepRight-save .detail-section,
.note-save .detail-section {
margin: 10px 0;
}
Expand All @@ -2554,6 +2567,18 @@ input.key-trap {
float: right;
}

.kr_error-details-container {
background: #ececec;
padding: 10px;
margin-top: 20px;
border-radius: 4px;
border: 1px solid #ccc;
}

.kr_error-details-description {
margin-bottom: 10px;
}


/* Custom Data Editor
------------------------------------------------------- */
Expand Down
Loading