Add Osmose Q/A layer

css/65_data.css

@@ -3,7 +3,8 @@
 
 .error-header-icon .qa_error-fill,
 .layer-keepRight .qa_error .qa_error-fill,
-.layer-improveOSM .qa_error .qa_error-fill {
+.layer-improveOSM .qa_error .qa_error-fill,
+.layer-osmose .qa_error .qa_error-fill {
     stroke: #333;
     stroke-width: 1.3px;  /* NOTE: likely a better way to scale the icon stroke */
 }
@@ -152,7 +153,6 @@
     color: #EC1C24;
 }
 
-
 /* Custom Map Data (geojson, gpx, kml, vector tile) */
 .layer-mapdata {
     pointer-events: none;
@@ -211,4 +211,4 @@
     stroke: #000;
     stroke-width: 5px;
     stroke-miterlimit: 1;
-}
+}

css/80_app.css

@@ -2734,25 +2734,44 @@ input.key-trap {
     padding-top: 20px;
 }
 
-.error-details {
-    padding: 10px;
-}
 .error-details-container {
     background: #ececec;
     padding: 10px;
     margin-top: 20px;
     border-radius: 4px;
     border: 1px solid #ccc;
+    display: flex;
+    flex-direction: column;
 }
 .error-details-description {
     margin-bottom: 10px;
+    display: flex;
+    flex-direction: column;
 }
 .error-details-description-text::first-letter {
     text-transform: capitalize;
 }
 [dir='rtl'] .error-details-description-text::first-letter {
     text-transform: none;  /* #5877 */
 }
+.error-details-subsection h4 {
+    padding-top: 10px;
+    padding-bottom: 0;
+}
+.error-details code {
+    padding: .2em .4em;
+    margin: 0;
+    font-size: 85%;
+    font-family: monospace;
+    background-color: rgba(27,31,35,.05);
+    border-radius: 3px;
+}
+.error-details + .translation-link {
+    margin-top: 5px;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+}
 
 .note-save .new-comment-input,
 .error-save .new-comment-input {
@@ -5590,4 +5609,4 @@ li.hide + li.version .badge .tooltip .popover-arrow {
 }
 [dir='rtl'] .list-item-photos.list-item-mapillary-map-features .request-data-link {
     float: left;
-}
+}

data/core.yaml

@@ -625,11 +625,14 @@ en:
         tooltip: Note data from OpenStreetMap
         title: OpenStreetMap notes
       keepRight:
-        tooltip: Automatically detected map issues from keepright.at
+        tooltip: Data issues detected by keepright.at
         title: KeepRight Issues
       improveOSM:
-        tooltip: Missing data automatically detected by improveosm.org
+        tooltip: Missing data detected by improveosm.org
         title: ImproveOSM Issues
+      osmose:
+        tooltip: Data issues detected by osmose.openstreetmap.fr
+        title: Osmose Issues
       custom:
         tooltip: "Drag and drop a data file onto the page, or click the button to setup"
         title: Custom Map Data
@@ -824,6 +827,13 @@ en:
   cannot_zoom: "Cannot zoom out further in current mode."
   full_screen: Toggle Full Screen
   QA:
+    osmose:
+      title: Osmose Issue
+      detail_title: Details
+      elems_title: Features
+      fix_title: Fix Guidelines
+      trap_title: Common Mistakes
+      translation: Translations provided by Osmose
     improveOSM:
       title: ImproveOSM Detection
       geometry_types:
@@ -1343,7 +1353,7 @@ en:
       title: Quality Assurance
       intro: "*Quality Assurance* (Q/A) tools can find improper tags, disconnected roads, and other issues with OpenStreetMap, which mappers can then fix. To view existing Q/A issues, click the {data} **Map data** panel to enable a specific Q/A layer."
       tools_h: "Tools"
-      tools: "The following tools are currently supported: [KeepRight](https://www.keepright.at/) and [ImproveOSM](https://improveosm.org/en/). Expect iD to support [Osmose](https://osmose.openstreetmap.fr/) and more Q/A tools in the future."
+      tools: "The following tools are currently supported: [KeepRight](https://www.keepright.at/), [ImproveOSM](https://improveosm.org/en/) and [Osmose](https://osmose.openstreetmap.fr/)."
       issues_h: "Handling Issues"
       issues: "Handling Q/A issues is similar to handling notes. Click on a marker to view the issue details in the sidebar. Each tool has its own capabilities, but generally you can comment and/or close an issue."
     field:
@@ -2058,4 +2068,4 @@ en:
   wikidata:
     identifier: "Identifier"
     label: "Label"
-    description: "Description"
+    description: "Description"

data/qa_errors.json

@@ -1,36 +1,92 @@
 {
     "services": {
         "improveOSM": {
-            "errorTypes": {
-                "ow": {
-                    "icon": "fas-long-arrow-alt-right",
-                    "category": "routing"
-                },
-                "mr-both": {
-                    "icon": "maki-car",
-                    "category": "geometry"
-                },
-                "mr-parking": {
-                    "icon": "maki-parking",
-                    "category": "geometry"
-                },
-                "mr-path": {
-                    "icon": "maki-shoe",
-                    "category": "geometry"
-                },
-                "mr-road": {
-                    "icon": "maki-car",
-                    "category": "geometry"
-                },
-                "tr": {
-                    "icon": "temaki-junction",
-                    "category": "routing"
-                }
+            "errorIcons": {
+                "ow": "fas-long-arrow-alt-right",
+                "mr-both": "maki-car",
+                "mr-parking": "maki-parking",
+                "mr-path": "maki-shoe",
+                "mr-road": "maki-car",
+                "tr": "temaki-junction"
             }
         },
-        "keepRight": {
-            "errorTypes": {
-
+        "osmose": {
+            "errorIcons": {
+                "0-1": "maki-home",
+                "0-2": "maki-home",
+                "1040-1": "maki-square-stroked",
+                "1050-1": "maki-circle-stroked",
+                "1050-1050": "maki-circle-stroked",
+                "1070-1": "maki-home",
+                "1070-4": "maki-dam",
+                "1070-5": "maki-dam",
+                "1070-8": "maki-cross",
+                "1070-10": "maki-cross",
+                "1150-1": "far-clone",
+                "1150-2": "far-clone",
+                "1150-3": "far-clone",
+                "1190-10": "fas-share-alt",
+                "1190-20": "fas-share-alt",
+                "1190-30": "fas-share-alt",
+                "1280-1": "maki-attraction",
+                "2110-21101": "temaki-plaque",
+                "2110-21102": "fas-shapes",
+                "3040-3040": "far-times-circle",
+                "3090-3090": "fas-calendar-alt",
+                "3161-1": "maki-parking",
+                "3161-2": "maki-parking",
+                "3200-32001": "fas-vector-square",
+                "3200-32002": "fas-vector-square",
+                "3200-32003": "fas-vector-square",
+                "3220-32200": "maki-roadblock",
+                "3220-32201": "maki-roadblock",
+                "3250-32501": "maki-watch",
+                "4010-4010": "maki-waste-basket",
+                "4010-40102": "maki-waste-basket",
+                "4030-900": "fas-yin-yang",
+                "4080-1": "far-dot-circle",
+                "4080-2": "far-dot-circle",
+                "4080-3": "far-dot-circle",
+                "5010-803": "fas-sort-alpha-up",
+                "5010-903": "fas-rocket",
+                "5070-50703": "fas-tint-slash",
+                "5070-50704": "fas-code",
+                "5070-50705": "fas-question",
+                "7040-1": "temaki-power_tower",
+                "7040-2": "temaki-power",
+                "7040-4": "maki-marker",
+                "7040-6": "temaki-power",
+                "7090-1": "maki-rail",
+                "7090-3": "maki-circle",
+                "8300-1": "fas-tachometer-alt",
+                "8300-2": "fas-tachometer-alt",
+                "8300-3": "fas-tachometer-alt",
+                "8300-4": "fas-tachometer-alt",
+                "8300-5": "fas-tachometer-alt",
+                "8300-6": "fas-tachometer-alt",
+                "8300-7": "fas-tachometer-alt",
+                "8300-8": "fas-tachometer-alt",
+                "8300-9": "fas-tachometer-alt",
+                "8300-10": "fas-tachometer-alt",
+                "8300-11": "fas-tachometer-alt",
+                "8300-12": "fas-tachometer-alt",
+                "8300-13": "fas-tachometer-alt",
+                "8300-14": "fas-tachometer-alt",
+                "8300-15": "fas-tachometer-alt",
+                "8300-16": "fas-tachometer-alt",
+                "8300-17": "fas-tachometer-alt",
+                "8300-20": "temaki-height_restrictor",
+                "8300-21": "fas-weight-hanging",
+                "8300-32": "maki-circle-stroked",
+                "8300-34": "temaki-diamond",
+                "8300-39": "temaki-pedestrian",
+                "8360-1": "temaki-bench",
+                "8360-2": "maki-bicycle",
+                "8360-3": "temaki-security_camera",
+                "8360-4": "temaki-fire_hydrant",
+                "8360-5": "temaki-traffic_signals",
+                "9010-9010001": "fas-tags",
+                "9010-9010003": "temaki-plaque"
             }
         }
     }

dist/locales/en.json

@@ -775,13 +775,17 @@
                     "title": "OpenStreetMap notes"
                 },
                 "keepRight": {
-                    "tooltip": "Automatically detected map issues from keepright.at",
+                    "tooltip": "Data issues detected by keepright.at",
                     "title": "KeepRight Issues"
                 },
                 "improveOSM": {
-                    "tooltip": "Missing data automatically detected by improveosm.org",
+                    "tooltip": "Missing data detected by improveosm.org",
                     "title": "ImproveOSM Issues"
                 },
+                "osmose": {
+                    "tooltip": "Data issues detected by osmose.openstreetmap.fr",
+                    "title": "Osmose Issues"
+                },
                 "custom": {
                     "tooltip": "Drag and drop a data file onto the page, or click the button to setup",
                     "title": "Custom Map Data",
@@ -1027,6 +1031,14 @@
         "cannot_zoom": "Cannot zoom out further in current mode.",
         "full_screen": "Toggle Full Screen",
         "QA": {
+            "osmose": {
+                "title": "Osmose Issue",
+                "detail_title": "Details",
+                "elems_title": "Features",
+                "fix_title": "Fix Guidelines",
+                "trap_title": "Common Mistakes",
+                "translation": "Translations provided by Osmose"
+            },
             "improveOSM": {
                 "title": "ImproveOSM Detection",
                 "geometry_types": {
@@ -1653,7 +1665,7 @@
                 "title": "Quality Assurance",
                 "intro": "*Quality Assurance* (Q/A) tools can find improper tags, disconnected roads, and other issues with OpenStreetMap, which mappers can then fix. To view existing Q/A issues, click the {data} **Map data** panel to enable a specific Q/A layer.",
                 "tools_h": "Tools",
-                "tools": "The following tools are currently supported: [KeepRight](https://www.keepright.at/) and [ImproveOSM](https://improveosm.org/en/). Expect iD to support [Osmose](https://osmose.openstreetmap.fr/) and more Q/A tools in the future.",
+                "tools": "The following tools are currently supported: [KeepRight](https://www.keepright.at/), [ImproveOSM](https://improveosm.org/en/) and [Osmose](https://osmose.openstreetmap.fr/).",
                 "issues_h": "Handling Issues",
                 "issues": "Handling Q/A issues is similar to handling notes. Click on a marker to view the issue details in the sidebar. Each tool has its own capabilities, but generally you can comment and/or close an issue."
             },

modules/modes/select_error.js

@@ -15,6 +15,7 @@ import { modeDragNode } from './drag_node';
 import { modeDragNote } from './drag_note';
 import { uiImproveOsmEditor } from '../ui/improveOSM_editor';
 import { uiKeepRightEditor } from '../ui/keepRight_editor';
+import { uiOsmoseEditor } from '../ui/osmose_editor';
 import { utilKeybinding } from '../util';
 
 
@@ -49,6 +50,16 @@ export function modeSelectError(context, selectedErrorID, selectedErrorService)
                     .show(errorEditor.error(error));
             });
             break;
+        case 'osmose':
+            errorEditor = uiOsmoseEditor(context)
+            .on('change', function() {
+                context.map().pan([0,0]);  // trigger a redraw
+                var error = checkSelectedID();
+                if (!error) return;
+                context.ui().sidebar
+                    .show(errorEditor.error(error));
+            });
+            break;
     }
 
 
@@ -154,4 +165,4 @@ export function modeSelectError(context, selectedErrorID, selectedErrorService)
 
 
     return mode;
-}
+}

modules/osm/qa_error.js

@@ -44,13 +44,8 @@ Object.assign(qaError.prototype, {
         if (this.service && this.error_type) {
             var serviceInfo = services[this.service];
 
-            if (serviceInfo) {
-                var errInfo = serviceInfo.errorTypes[this.error_type];
-
-                if (errInfo) {
-                    this.icon = errInfo.icon;
-                    this.category = errInfo.category;
-                }
+            if (serviceInfo && serviceInfo.errorIcons) {
+                this.icon = serviceInfo.errorIcons[this.error_type];
             }
         }
 
@@ -65,4 +60,4 @@ Object.assign(qaError.prototype, {
     update: function(attrs) {
         return qaError(this, attrs); // {v: 1 + (this.v || 0)}
     }
-});
+});

modules/services/improveOSM.js

@@ -436,9 +436,11 @@ export default {
                     } else {
                         that.removeError(d);
                         if (d.newStatus === 'SOLVED') {
-                            // No pretty identifier, so we just use coordinates
-                            var closedID = d.loc[1].toFixed(5) + '/' + d.loc[0].toFixed(5);
-                            _erCache.closed[key + ':' + closedID] = true;
+                            // No error identifier, so we give a count of each category
+                            if (!(d.error_key in _erCache.closed)) {
+                                _erCache.closed[d.error_key] = 0;
+                            }
+                            _erCache.closed[d.error_key] += 1;
                         }
                     }
                     if (callback) callback(null, d);
@@ -486,7 +488,7 @@ export default {
     },
 
     // Used to populate `closed:improveosm` changeset tag
-    getClosedIDs: function() {
-        return Object.keys(_erCache.closed).sort();
+    getClosedCounts: function() {
+        return _erCache.closed;
     }
-};
+};