From 35f8078f98e369ba716da491c938c939f9f2a449 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 3 Jan 2019 15:30:36 -0500 Subject: [PATCH] Reduce number of marker colors, increase contrast, tweak language --- css/65_data.css | 165 ++++++++------------------------- data/core.yaml | 18 ++-- data/keepRight.json | 2 +- dist/locales/en.json | 18 ++-- modules/services/keepRight.js | 12 ++- modules/svg/keepRight.js | 2 +- modules/ui/keepRight_header.js | 2 +- 7 files changed, 67 insertions(+), 152 deletions(-) diff --git a/css/65_data.css b/css/65_data.css index b4159ddd6..42905af5c 100644 --- a/css/65_data.css +++ b/css/65_data.css @@ -67,159 +67,72 @@ /* Keep Right Errors ------------------------------------------------------- */ +.kr_error_type_20, /* multiple nodes on same spot */ .kr_error_type_40, /* impossible oneways */ -.kr_error_type_41, -.kr_error_type_42, -.kr_error_type_43 { - color: #fd007f; +.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: #c827fe; + color: #88f; } -.kr_error_type_70, /* missing tags */ -.kr_error_type_71, -.kr_error_type_72 { - color: #74aeaf; +.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_300, /* missing maxspeed */ +.kr_error_type_380, /* non-physical sport tag */ +.kr_error_type_390 { /* missing tracktype */ + color: #5d0; } -.kr_error_type_90 { /* motorway without ref */ - color: #3124af; -} - -.kr_error_type_100 { /* place of worship without religion */ - color: #a80000; -} - -.kr_error_type_110 { /* poi without name */ - color: #44650b; -} - -.kr_error_type_120 { /* way without nodes */ - color: #99274d; -} - -.kr_error_type_130 { /* disconnected way */ - color: #eb7310; -} - -.kr_error_type_150 { /* railway crossing without tag */ - color: #7218c1; -} - -.kr_error_type_160 { /* wrong railway tag */ - color: #c903ae; +.kr_error_type_130 { /* disconnected ways */ + color: #fa3; } .kr_error_type_170 { /* FIXME tag */ - color: #07d40b; + color: #ff0; } -.kr_error_type_180 { /* relation without type */ - color: #01ff0a; +.kr_error_type_190 { /* intersection without junction */ + color: #f33; } -.kr_error_type_190, -.kr_error_type_191, -.kr_error_type_192, -.kr_error_type_193, -.kr_error_type_194, -.kr_error_type_195, -.kr_error_type_196, -.kr_error_type_197, -.kr_error_type_198 { /* intersection without junction */ - color: #e6fcb0; -} - -.kr_error_type_200, -.kr_error_type_201, -.kr_error_type_202, -.kr_error_type_203, -.kr_error_type_204, -.kr_error_type_205, -.kr_error_type_206, -.kr_error_type_207, -.kr_error_type_208 { /* overlapping ways */ +.kr_error_type_200 { /* overlapping ways */ color: #fdbf6f; } -.kr_error_type_210, -.kr_error_type_211, -.kr_error_type_212 { /* self intersecting ways */ - color: #4a7601; +.kr_error_type_160, /* railway layer conflict */ +.kr_error_type_230 { /* layer conflict */ + color: #b60; } -.kr_error_type_220, -.kr_error_type_221 { /* misspelled tag */ - color: #ef7cf2; -} - -.kr_error_type_230, -.kr_error_type_231, -.kr_error_type_232 { /* layer conflict */ - color: #b15928; -} - -.kr_error_type_270 { /* unusual motorway connection */ - color: #2aaf92; -} - -.kr_error_type_280, /* boundary issue */ -.kr_error_type_281, -.kr_error_type_282, -.kr_error_type_283, -.kr_error_type_284, -.kr_error_type_285 { +.kr_error_type_280 { /* boundary issues */ color: #5f47a0; } -.kr_error_type_290, /* restriction issue */ -.kr_error_type_291, -.kr_error_type_292, -.kr_error_type_293, -.kr_error_type_294, -.kr_error_type_295, -.kr_error_type_296, -.kr_error_type_297, -.kr_error_type_298 { - color: #a6cee3; +.kr_error_type_180, /* relation without type */ +.kr_error_type_290 { /* turn restriction issues */ + color: #ace; } -.kr_error_type_310, /* roundabout issue */ -.kr_error_type_311, -.kr_error_type_312, -.kr_error_type_313 { - color: #0550e8; +.kr_error_type_360, /* language unknown */ +.kr_error_type_370, /* doubled places */ +.kr_error_type_410 { /* website issues */ + color: #f9b; } -.kr_error_type_320 { /* improper _link */ - color: #28d9bb; -} - -.kr_error_type_350 { /* improper bridge tag */ - color: #ffff99; -} - -.kr_error_type_370 { /* doubled places */ - color: #ff8fdf; -} - -.kr_error_type_380 { /* non-physical sport tag */ - color: #b3b465; -} - -.kr_error_type_400, /* geometry / turn angles */ -.kr_error_type_401, -.kr_error_type_402 { - color: #b64f69; -} - -.kr_error_type_410, /* website issue */ -.kr_error_type_411, -.kr_error_type_412, -.kr_error_type_413 { - color: #b07f7e; +.kr_error_type_120, /* way without nodes */ +.kr_error_type_400 { /* geometry / turn angles */ + color: #c35; } diff --git a/data/core.yaml b/data/core.yaml index eaf6a52dd..03e6c35bc 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -717,7 +717,7 @@ en: title: 'Railway crossing without tag' description: 'This crossing of a highway and a railway needs to be tagged as "railway=crossing" or "railway=level_crossing".' 160: - title: 'Wrongly used railway tag' + title: 'Railway layer conflict' description: 'There are ways in different layers (e.g. tunnel or bridge) meeting at this railway crossing.' 170: title: 'FIXME tagged items' @@ -744,7 +744,7 @@ en: 221: description: 'This {var1} has a tag with key "{var2}".' 230: - title: 'Layer Conflict' + title: 'Layer conflict' description: 'This node is a junction of ways on different layers.' 231: description: 'This node is a junction of ways on different layers: {var1}.' @@ -777,7 +777,7 @@ en: description: 'There is an unspecified issue with this restriction.' 291: title: 'Restriction missing type' - description: 'This turn restriction has no known restriction type.' + description: 'This turn restriction has an unrecognized restriction type.' 292: title: 'Restriction missing "from" way' description: 'A turn restriction needs exactly one "from" member. This one has {var1}.' @@ -788,10 +788,10 @@ en: title: 'Restriction "from" or "to" is not a way' description: '"from" and "to" members of turn restrictions need to be ways. {var1}.' 295: - title: 'Restriction "via" is not on the way ends' + title: 'Restriction "via" is not an endpoint' description: '"via" (node {var1}) is not the first or the last member of "{var2}" (way {var3}).' 296: - title: 'Wrong restriction angle' + title: 'Unusual restriction angle' description: 'Restriction type is "{var1}" but angle is {var2} degrees. Maybe the restriction type is not appropriate?' 297: title: 'Wrong direction of to member' @@ -801,16 +801,16 @@ en: description: 'Entry already prohibited by "oneway" tag on {var1}.' 300: title: 'Missing maxspeed' - description: 'Missing maxspeed tag.' + description: 'This road is missing a "maxspeed" tag and is tagged as motorway, trunk, primary, or secondary.' 310: title: 'Roundabout issue' description: 'There is an unspecified issue with this roundabout.' 311: title: 'Roundabout not closed loop' - description: 'This way is part of a roundabout but is not closed-loop. (split carriageways approaching a roundabout should not be tagged as roundabout).' + description: 'This way is part of a roundabout but is not closed-loop. (Split carriageways approaching a roundabout should not be tagged as roundabout).' 312: title: 'Roundabout wrong direction' - description: 'If this {var1} is in a country with {var2}-hand traffic then its orientation goes the wrong way around' + description: 'If this {var1} is in a country with {var2}-hand traffic then its orientation goes the wrong way around.' 313: title: 'Roundabout weakly connected' description: 'This roundabout has only {var1} other road(s) connected. Roundabouts typically have 3 or more.' @@ -849,7 +849,7 @@ en: 412: description: 'Possible domain squatting: The URL has suspicious text: "{var1}".' 413: - description: 'Possible non-match. Content of the URL did not contain these keywords: ({var1}).' + description: 'Possible non-match. Content of the URL did not contain these keywords: ({var1}).' streetside: tooltip: "Streetside photos from Microsoft" title: "Photo Overlay (Bing Streetside)" diff --git a/data/keepRight.json b/data/keepRight.json index cf9b3fcb7..0f9cdec9a 100644 --- a/data/keepRight.json +++ b/data/keepRight.json @@ -45,7 +45,7 @@ "regex": "way #(\\d+)" }, "60": { - "title": "depreciated tags", + "title": "deprecated tags", "severity": "warning", "description": "This $1 uses deprecated tag $2. Please use $3 instead!", "regex": "This (node|way|relation) uses deprecated tag '(.+)'\\. Please use "(.+)"" diff --git a/dist/locales/en.json b/dist/locales/en.json index 65609b06d..724bb79bf 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -878,7 +878,7 @@ "description": "This crossing of a highway and a railway needs to be tagged as \"railway=crossing\" or \"railway=level_crossing\"." }, "160": { - "title": "Wrongly used railway tag", + "title": "Railway layer conflict", "description": "There are ways in different layers (e.g. tunnel or bridge) meeting at this railway crossing." }, "170": { @@ -915,7 +915,7 @@ "description": "This {var1} has a tag with key \"{var2}\"." }, "230": { - "title": "Layer Conflict", + "title": "Layer conflict", "description": "This node is a junction of ways on different layers." }, "231": { @@ -959,7 +959,7 @@ }, "291": { "title": "Restriction missing type", - "description": "This turn restriction has no known restriction type." + "description": "This turn restriction has an unrecognized restriction type." }, "292": { "title": "Restriction missing \"from\" way", @@ -974,11 +974,11 @@ "description": "\"from\" and \"to\" members of turn restrictions need to be ways. {var1}." }, "295": { - "title": "Restriction \"via\" is not on the way ends", + "title": "Restriction \"via\" is not an endpoint", "description": "\"via\" (node {var1}) is not the first or the last member of \"{var2}\" (way {var3})." }, "296": { - "title": "Wrong restriction angle", + "title": "Unusual restriction angle", "description": "Restriction type is \"{var1}\" but angle is {var2} degrees. Maybe the restriction type is not appropriate?" }, "297": { @@ -991,7 +991,7 @@ }, "300": { "title": "Missing maxspeed", - "description": "Missing maxspeed tag." + "description": "This road is missing a \"maxspeed\" tag and is tagged as motorway, trunk, primary, or secondary." }, "310": { "title": "Roundabout issue", @@ -999,11 +999,11 @@ }, "311": { "title": "Roundabout not closed loop", - "description": "This way is part of a roundabout but is not closed-loop. (split carriageways approaching a roundabout should not be tagged as roundabout)." + "description": "This way is part of a roundabout but is not closed-loop. (Split carriageways approaching a roundabout should not be tagged as roundabout)." }, "312": { "title": "Roundabout wrong direction", - "description": "If this {var1} is in a country with {var2}-hand traffic then its orientation goes the wrong way around" + "description": "If this {var1} is in a country with {var2}-hand traffic then its orientation goes the wrong way around." }, "313": { "title": "Roundabout weakly connected", @@ -1056,7 +1056,7 @@ "description": "Possible domain squatting: The URL has suspicious text: \"{var1}\"." }, "413": { - "description": "Possible non-match. Content of the URL did not contain these keywords: ({var1})." + "description": "Possible non-match. Content of the URL did not contain these keywords: ({var1})." } } } diff --git a/modules/services/keepRight.js b/modules/services/keepRight.js index 9bae8840e..23d7d47c6 100644 --- a/modules/services/keepRight.js +++ b/modules/services/keepRight.js @@ -23,11 +23,13 @@ var _krCache; var _krZoom = 14; var apibase = 'https://www.keepright.at/'; var defaultRuleset = [ - 0, 30, 40, 50, 70, 90, 100, 110, 120, 130, 150, 160, 170, 180, - 191, 192, 193, 194, 195, 196, 197, 198, 201, 202, 203, 204, 205, - 206, 207, 208, 210, 220, 231, 232, 270, 281, 282, 283, 284, 285, - 291, 292 ,293, 294, 295, 296, 297, 298, 311, 312, 313, 320, 350, - 370, 380, 401, 402, 411, 412, 413 + // no 20 - multiple node on same spot - these are mostly boundaries overlapping roads + 30, 40, 50, 60, 70, 90, 100, 110, 120, 130, 150, 160, 170, 180, + 190, 191, 192, 193, 194, 195, 196, 197, 198, + 200, 201, 202, 203, 204, 205, 206, 207, 208, 210, 220, + 230, 231, 232, 270, 280, 281, 282, 283, 284, 285, + 290, 291, 292, 293, 294, 295, 296, 297, 298, 300, 310, 311, 312, 313, + 320, 350, 360, 370, 380, 390, 400, 401, 402, 410, 411, 412, 413 ]; diff --git a/modules/svg/keepRight.js b/modules/svg/keepRight.js index 0ef3c6146..8e294bb18 100644 --- a/modules/svg/keepRight.js +++ b/modules/svg/keepRight.js @@ -97,7 +97,7 @@ export function svgKeepRight(projection, context, dispatch) { var kr_errorsEnter = kr_errors.enter() .append('g') .attr('class', function(d) { - return 'kr_error kr_error-' + d.id + ' kr_error_type_' + d.error_type; } + return 'kr_error kr_error-' + d.id + ' kr_error_type_' + d.parent_error_type; } ); kr_errorsEnter diff --git a/modules/ui/keepRight_header.js b/modules/ui/keepRight_header.js index e2a63e2f4..1c8d9533c 100644 --- a/modules/ui/keepRight_header.js +++ b/modules/ui/keepRight_header.js @@ -49,7 +49,7 @@ export function uiKeepRightHeader() { iconEnter .append('div') .attr('class', function(d) { - return 'preset-icon-28 kr_error kr_error-' + d.id + ' kr_error_type_' + d.error_type; + return 'preset-icon-28 kr_error kr_error-' + d.id + ' kr_error_type_' + d.parent_error_type; }) .call(svgIcon('#iD-icon-bolt', 'kr_error-fill'));