Merge branch 'unify' of https://github.com/SilentSpike/iD into SilentSpike-unify

modules/ui/improveOSM_details.js

@@ -17,7 +17,7 @@ export function uiImproveOsmDetails(context) {
         var unknown = t('inspector.unknown');
 
         if (!d) return unknown;
-        var errorType = d.error_type;
+        var errorType = d.error_key;
         var et = dataEn.QA.improveOSM.error_types[errorType];
 
         var detail;
@@ -124,4 +124,4 @@ export function uiImproveOsmDetails(context) {
 
 
     return improveOsmDetails;
-}
+}

modules/ui/improveOSM_header.js

@@ -10,7 +10,7 @@ export function uiImproveOsmHeader() {
         var unknown = t('inspector.unknown');
 
         if (!d) return unknown;
-        var errorType = d.error_type;
+        var errorType = d.error_key;
         var et = dataEn.QA.improveOSM.error_types[errorType];
 
         if (et && et.title) {
@@ -46,7 +46,14 @@ export function uiImproveOsmHeader() {
             .attr('height', '30px')
             .attr('viewbox', '0 0 20 30')
             .attr('class', function(d) {
-                return 'preset-icon-28 qa_error ' + d.source + ' error_id-' + d.id + ' error_type-' + d.error_type + '-' + d.error_subtype;
+                return [
+                    'preset-icon-28',
+                    'qa_error',
+                    d.service,
+                    'error_id-' + d.id,
+                    'error_type-' + d.error_type,
+                    'category-' + d.category
+                ].join(' ');
             });
 
         svgEnter
@@ -87,4 +94,4 @@ export function uiImproveOsmHeader() {
 
 
     return improveOsmHeader;
-}
+}

modules/ui/keepRight_header.js

@@ -49,7 +49,7 @@ export function uiKeepRightHeader() {
         iconEnter
             .append('div')
             .attr('class', function(d) {
-                return 'preset-icon-28 qa_error ' + d.source + ' error_id-' + d.id + ' error_type-' + d.parent_error_type;
+                return 'preset-icon-28 qa_error ' + d.service + ' error_id-' + d.id + ' error_type-' + d.parent_error_type;
             })
             .call(svgIcon('#iD-icon-bolt', 'qa_error-fill'));
 
@@ -68,4 +68,4 @@ export function uiKeepRightHeader() {
 
 
     return keepRightHeader;
-}
+}

modules/ui/sidebar.js

@@ -9,7 +9,7 @@ import {
     selectAll as d3_selectAll
 } from 'd3-selection';
 
-import { osmEntity, osmNote, iOsmError, krError } from '../osm';
+import { osmEntity, osmNote, qaError } from '../osm';
 import { services } from '../services';
 import {
     uiDataEditor,
@@ -31,8 +31,7 @@ export function uiSidebar(context) {
     var _current;
     var _wasData = false;
     var _wasNote = false;
-    var _wasIOsmError = false;
-    var _wasKRError = false;
+    var _wasQAError = false;
 
 
     function sidebar(selection) {
@@ -140,36 +139,23 @@ export function uiSidebar(context) {
                 selection.selectAll('.sidebar-component')
                     .classed('inspector-hover', true);
 
-            } else if (datum instanceof iOsmError) {
-                _wasIOsmError = true;
+            } else if (datum instanceof qaError) {
+                _wasQAError = true;
 
-                var improveOSM = services.improveOSM;
-                if (improveOSM) {
-                    datum = improveOSM.getError(datum.id);
+                var errService = services[datum.service];
+                if (errService) {
+                    // marker may contain stale data - get latest
+                    datum = errService.getError(datum.id);
                 }
 
-                d3_selectAll('.iOSM.qa_error')
+                // Temporary solution while only two services
+                var errEditor = (datum.service === 'keepRight') ? keepRightEditor : improveOsmEditor;
+
+                d3_selectAll('.qa_error.' + datum.service)
                     .classed('hover', function(d) { return d.id === datum.id; });
 
                 sidebar
-                    .show(improveOsmEditor.error(datum));
-
-                selection.selectAll('.sidebar-component')
-                    .classed('inspector-hover', true);
-
-            } else if (datum instanceof krError) {
-                _wasKRError = true;
-
-                var keepRight = services.keepRight;
-                if (keepRight) {
-                    datum = keepRight.getError(datum.id);   // marker may contain stale data - get latest
-                }
-
-                d3_selectAll('.kr.qa_error')
-                    .classed('hover', function(d) { return d.id === datum.id; });
-
-                sidebar
-                    .show(keepRightEditor.error(datum));
+                    .show(errEditor.error(datum));
 
                 selection.selectAll('.sidebar-component')
                     .classed('inspector-hover', true);
@@ -199,13 +185,12 @@ export function uiSidebar(context) {
                 inspector
                     .state('hide');
 
-            } else if (_wasData || _wasNote || _wasIOsmError || _wasKRError) {
+            } else if (_wasData || _wasNote || _wasQAError) {
                 _wasNote = false;
                 _wasData = false;
-                _wasIOsmError = false;
-                _wasKRError = false;
+                _wasQAError = false;
                 d3_selectAll('.note').classed('hover', false);
-                d3_selectAll('.kr_error').classed('hover', false);
+                d3_selectAll('.qa_error').classed('hover', false);
                 sidebar.hide();
             }
         }
@@ -366,4 +351,4 @@ export function uiSidebar(context) {
     sidebar.toggle = function() {};
 
     return sidebar;
-}
+}

modules/ui/view_on_keepRight.js

@@ -1,7 +1,7 @@
 import { t } from '../util/locale';
 import { services } from '../services';
 import { svgIcon } from '../svg';
-import { krError } from '../osm';
+import { qaError } from '../osm';
 
 
 export function uiViewOnKeepRight() {
@@ -10,7 +10,7 @@ export function uiViewOnKeepRight() {
 
     function viewOnKeepRight(selection) {
         var url;
-        if (services.keepRight && (_error instanceof krError)) {
+        if (services.keepRight && (_error instanceof qaError)) {
             url = services.keepRight.errorURL(_error);
         }
 
@@ -42,4 +42,4 @@ export function uiViewOnKeepRight() {
     };
 
     return viewOnKeepRight;
-}
+}