CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 01:02:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for more Osmose error types

Browse Source 
- Unconnected level crossings
- Unconnected highway features/barries
- Unexpected punctuation/symbols in tag values
- Unbalanced parentheses/quotes in name values
- Invalid date formats
- Access tagging that permits all transport modes
- Elements with a "name" tag and no main tagging
- Relations missing a "type" value
This commit is contained in:
SilentSpike
2019-12-31 18:16:36 +00:00
parent cc3039033f
commit c13eb15691
10 changed files with 165 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
css/65_data.css
View File

@@ -165,12 +165,19 @@
.osmose.category-1070,
.osmose.category-1080,
.osmose.category-1150,
.osmose.category-1190,
.osmose.category-1280 {
color: #DCB000;
}
.osmose.category-2110 {
color: #2CDCDC;
}
.osmose.category-3040,
.osmose.category-3090,
.osmose.category-3161,
.osmose.category-3220,
.osmose.category-3250 {
color: #2D9359;
}
@@ -179,7 +186,12 @@
color: #F2F230;
}
.osmose.category-7040 {
.osmose.category-5070 {
color: #EC0000;
}
.osmose.category-7040,
.osmose.category-7090 {
color: #9F16B4;
}

32
data/core.yaml
View File

@@ -860,21 +860,45 @@ en:
1150:
title: 'Overlapping Similar Areas'
description: '{0} and {1} overlap.'
1190:
title: 'Approximate Way'
description: '{0} looks like it could be mapped more accurately.'
1280-1:
title: 'Incorrect Speed Camera'
description: '{0} should be on the highway or part of an "enforcement" relation.'
2110-21101:
title: 'Unknown Named Object'
description: '{0} has a name but no main tag.'
2110-21102:
title: 'Missing Relation Type'
description: '{0} is missing a "type" tag.'
3040-3040:
title: 'Unusual Tagging'
description: '{0} has a non-conventional tag value: {1}.'
description: '{0} has a non-conventional tag value: "{1}".'
3090-3090:
title: 'Invalid Date'
description: '{0} is tagged with an invalid date value: "{1}".'
3161:
title: 'Missing Parking Access'
description: 'There is no highway leading to {0}.'
3220:
title: 'All Access Allowed'
description: '{0} has an "access=yes" or "access=permissive" tag which permits use by all transport modes (ski, horse, hazmat, etc.).'
3250-32501:
title: 'Invalid Opening Hours'
description: '{0} has an invalid value for the "opening_hours" tag.'
4080:
title: 'Object Mapped Twice'
description: '{0} and {1} both appear to represent the same object.'
5070-50703:
title: 'Unexpected Symbol'
description: '{0} has an unexpected symbol, {2}, in the "{1}" tag.'
5070-50704:
title: 'Unbalanced Punctuation'
description: '{0} has an unbalanced {1} character in its name.'
5070-50705:
title: 'Unexpected Punctuation'
description: '{0} has an unexpected {1} character in its name.'
7040:
title: 'Unfinished Power Line'
description: 'A power line appears to be unfinished at {0}.'
@@ -884,6 +908,12 @@ en:
7040-4:
title: 'Extra Power Line Node'
description: 'Power lines should only have nodes at supports and {0} is not tagged as a pole or tower.'
7090-1:
title: 'Disconnected Level Crossing'
description: '{0} is a level crossing at a non-junction node.'
7090-3:
title: 'Disconnected Highway Feature'
description: '{0} is highway feature or barrier with no connected highway.'
8300:
title: 'Traffic Sign Suggestion'
description: 'Traffic signs detected by Mapillary suggest there may be an unmapped {0} nearby.'

61
data/qa_errors.json
View File

@@ -34,7 +34,27 @@
}
},
"osmose": {
"items": ["0", "1040", "1050", "1070", "1150", "1280", "3040", "3161", "3250", "4080", "7040", "8300", "8360"],
"items": [
"0",
"1040",
"1050",
"1070",
"1150",
"1190",
"1280",
"2110",
"3040",
"3090",
"3161",
"3220",
"3250",
"4080",
"7040",
"7090",
"5070",
"8300",
"8360"
],
"errorTypes": {
"0-1": {
"icon": "maki-home"
@@ -75,18 +95,42 @@
"1150-3": {
"icon": "far-clone"
},
"1190-10": {
"icon": "fas-share-alt"
},
"1190-20": {
"icon": "fas-share-alt"
},
"1190-30": {
"icon": "fas-share-alt"
},
"1280-1": {
"icon": "maki-attraction"
},
"2110-21101": {
"icon": "temaki-plaque"
},
"2110-21102": {
"icon": "fas-shapes"
},
"3040-3040": {
"icon": "far-times-circle"
},
"3090-3090": {
"icon": "fas-calendar-alt"
},
"3161-1": {
"icon": "maki-parking"
},
"3161-2": {
"icon": "maki-parking"
},
"3220-32200": {
"icon": "maki-roadblock"
},
"3220-32201": {
"icon": "maki-roadblock"
},
"3250-32501": {
"icon": "maki-watch"
},
@@ -99,6 +143,15 @@
"4080-3": {
"icon": "far-dot-circle"
},
"5070-50703": {
"icon": "fas-tint-slash"
},
"5070-50704": {
"icon": "fas-code"
},
"5070-50705": {
"icon": "fas-question"
},
"7040-1": {
"icon": "temaki-power_tower"
},
@@ -111,6 +164,12 @@
"7040-6": {
"icon": "temaki-power"
},
"7090-1": {
"icon": "maki-rail"
},
"7090-3": {
"icon": "maki-circle"
},
"8300-1": {
"icon": "fas-tachometer-alt"
},

42
dist/locales/en.json vendored
View File

@@ -1046,10 +1046,18 @@
"title": "Overlapping Similar Areas",
"description": "{0} and {1} overlap."
},
"1190": {
"title": "Approximate Way",
"description": "{0} looks like it could be mapped more accurately."
},
"3161": {
"title": "Missing Parking Access",
"description": "There is no highway leading to {0}."
},
"3220": {
"title": "All Access Allowed",
"description": "{0} has an \"access=yes\" or \"access=permissive\" tag which permits use by all transport modes (ski, horse, hazmat, etc.)."
},
"4080": {
"title": "Object Mapped Twice",
"description": "{0} and {1} both appear to represent the same object."
@@ -1114,14 +1122,38 @@
"title": "Incorrect Speed Camera",
"description": "{0} should be on the highway or part of an \"enforcement\" relation."
},
"2110-21101": {
"title": "Unknown Named Object",
"description": "{0} has a name but no main tag."
},
"2110-21102": {
"title": "Missing Relation Type",
"description": "{0} is missing a \"type\" tag."
},
"3040-3040": {
"title": "Unusual Tagging",
"description": "{0} has a non-conventional tag value: {1}."
"description": "{0} has a non-conventional tag value: \"{1}\"."
},
"3090-3090": {
"title": "Invalid Date",
"description": "{0} is tagged with an invalid date value: \"{1}\"."
},
"3250-32501": {
"title": "Invalid Opening Hours",
"description": "{0} has an invalid value for the \"opening_hours\" tag."
},
"5070-50703": {
"title": "Unexpected Symbol",
"description": "{0} has an unexpected symbol, {2}, in the \"{1}\" tag."
},
"5070-50704": {
"title": "Unbalanced Punctuation",
"description": "{0} has an unbalanced {1} character in its name."
},
"5070-50705": {
"title": "Unexpected Punctuation",
"description": "{0} has an unexpected {1} character in its name."
},
"7040-1": {
"title": "Lone Power Support",
"description": "{0} is a power tower or pole with no connected power lines."
@@ -1129,6 +1161,14 @@
"7040-4": {
"title": "Extra Power Line Node",
"description": "Power lines should only have nodes at supports and {0} is not tagged as a pole or tower."
},
"7090-1": {
"title": "Disconnected Level Crossing",
"description": "{0} is a level crossing at a non-junction node."
},
"7090-3": {
"title": "Disconnected Highway Feature",
"description": "{0} is highway feature or barrier with no connected highway."
}
}
},

21
modules/services/osmose.js
View File

@@ -174,6 +174,7 @@ export default {
});
},
// todo: &item=1090%2C1110%2C1120%2C3010%2C3020%2C3032%2C3050%2C3060%2C3091%2C3092%2C3150%2C3180%2C3190%2C3200%2C3210%2C4010%2C4030%2C5010%2C5020%2C5030%2C5040%2C5050%2C5080%2C6030%2C9000%2C9001%2C9004%2C9005%2C9010
loadErrorDetail(d, callback) {
// Error details only need to be fetched once
if (d.elems !== undefined) {
@@ -192,12 +193,20 @@ export default {
// Element links used in the error description
d.replacements = d.elems.map(linkEntity);
// Special handling for some error types
switch (d.item) {
case 3040: {
let [, key_value] = /Bad value for (.+)/i.exec(data.subtitle);
d.replacements.push(key_value);
break;
// Some error types have details in their subtitle
const special = {
'3040-3040': /Bad value for (.+)/i,
'3090-3090': /Incorrect date "(.+)"/i,
'5070-50703': /"(.+)"=".+" unexpected symbol char \(.+, (.+)\)/i,
'5070-50704': /Umbalanced (.+)/i,
'5070-50705': /Unexpected char (.+)/i
};
if (d.error_type in special) {
let [, ...details] = special[d.error_type].exec(data.subtitle);
d.replacements.push(...details);
if (d.error_type === '5070-50703') {
d.replacements[2] = String.fromCharCode(details[1]);
}
}

1
svg/fontawesome/fas-calendar-alt.svg Normal file
View File

@@ -0,0 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="calendar-alt" class="svg-inline--fa fa-calendar-alt fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M0 464c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V192H0v272zm320-196c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12v-40zm0 128c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12v-40zM192 268c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12v-40zm0 128c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12v-40zM64 268c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12H76c-6.6 0-12-5.4-12-12v-40zm0 128c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12H76c-6.6 0-12-5.4-12-12v-40zM400 64h-48V16c0-8.8-7.2-16-16-16h-32c-8.8 0-16 7.2-16 16v48H160V16c0-8.8-7.2-16-16-16h-32c-8.8 0-16 7.2-16 16v48H48C21.5 64 0 85.5 0 112v48h448v-48c0-26.5-21.5-48-48-48z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

1
svg/fontawesome/fas-question.svg Normal file
View File

@@ -0,0 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="question" class="svg-inline--fa fa-question fa-w-12" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path fill="currentColor" d="M202.021 0C122.202 0 70.503 32.703 29.914 91.026c-7.363 10.58-5.093 25.086 5.178 32.874l43.138 32.709c10.373 7.865 25.132 6.026 33.253-4.148 25.049-31.381 43.63-49.449 82.757-49.449 30.764 0 68.816 19.799 68.816 49.631 0 22.552-18.617 34.134-48.993 51.164-35.423 19.86-82.299 44.576-82.299 106.405V320c0 13.255 10.745 24 24 24h72.471c13.255 0 24-10.745 24-24v-5.773c0-42.86 125.268-44.645 125.268-160.627C377.504 66.256 286.902 0 202.021 0zM192 373.459c-38.196 0-69.271 31.075-69.271 69.271 0 38.195 31.075 69.27 69.271 69.27s69.271-31.075 69.271-69.271-31.075-69.27-69.271-69.27z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 816 B

1
svg/fontawesome/fas-shapes.svg Normal file
View File

@@ -0,0 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="shapes" class="svg-inline--fa fa-shapes fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M512 320v160c0 17.67-14.33 32-32 32H320c-17.67 0-32-14.33-32-32V320c0-17.67 14.33-32 32-32h160c17.67 0 32 14.33 32 32zm-384-64C57.31 256 0 313.31 0 384s57.31 128 128 128 128-57.31 128-128-57.31-128-128-128zm351.03-32c25.34 0 41.18-26.67 28.51-48L412.51 16c-12.67-21.33-44.35-21.33-57.02 0l-95.03 160c-12.67 21.33 3.17 48 28.51 48h190.06z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 569 B

1
svg/fontawesome/fas-share-alt.svg Normal file
View File

@@ -0,0 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="share-alt" class="svg-inline--fa fa-share-alt fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M352 320c-22.608 0-43.387 7.819-59.79 20.895l-102.486-64.054a96.551 96.551 0 0 0 0-41.683l102.486-64.054C308.613 184.181 329.392 192 352 192c53.019 0 96-42.981 96-96S405.019 0 352 0s-96 42.981-96 96c0 7.158.79 14.13 2.276 20.841L155.79 180.895C139.387 167.819 118.608 160 96 160c-53.019 0-96 42.981-96 96s42.981 96 96 96c22.608 0 43.387-7.819 59.79-20.895l102.486 64.054A96.301 96.301 0 0 0 256 416c0 53.019 42.981 96 96 96s96-42.981 96-96-42.981-96-96-96z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 694 B

1
svg/fontawesome/fas-tint-slash.svg Normal file
View File

@@ -0,0 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="tint-slash" class="svg-inline--fa fa-tint-slash fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M633.82 458.1L494.97 350.78c.52-5.57 1.03-11.16 1.03-16.87 0-111.76-99.79-153.34-146.78-311.82-7.94-28.78-49.44-30.12-58.44 0-15.52 52.34-36.87 91.96-58.49 125.68L45.47 3.37C38.49-2.05 28.43-.8 23.01 6.18L3.37 31.45C-2.05 38.42-.8 48.47 6.18 53.9l588.36 454.73c6.98 5.43 17.03 4.17 22.46-2.81l19.64-25.27c5.41-6.97 4.16-17.02-2.82-22.45zM144 333.91C144 432.35 222.72 512 320 512c44.71 0 85.37-16.96 116.4-44.7L162.72 255.78c-11.41 23.5-18.72 48.35-18.72 78.13z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 700 B