From 3ed13e9a4aa871562b8de543527ed8b2c581371d Mon Sep 17 00:00:00 2001
From: SilentSpike <SilentSpike100+Github@gmail.com>
Date: Sun, 3 Feb 2019 12:58:09 +0000
Subject: [PATCH] Convert KeepRight to use generic error type

---
 modules/behavior/hover.js       |  7 ++-----
 modules/behavior/select.js      |  5 -----
 modules/osm/index.js            |  1 -
 modules/services/keepRight.js   | 17 ++++++++++-------
 modules/ui/view_on_keepRight.js |  6 +++---
 5 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/modules/behavior/hover.js b/modules/behavior/hover.js
index 04031afc7..c62d2bdd1 100644
--- a/modules/behavior/hover.js
+++ b/modules/behavior/hover.js
@@ -5,7 +5,7 @@ import {
     select as d3_select
 } from 'd3-selection';
 
-import { osmEntity, osmNote, krError, qaError } from '../osm';
+import { osmEntity, osmNote, qaError } from '../osm';
 import { utilKeybinding, utilRebind } from '../util';
 
 
@@ -112,10 +112,7 @@ export function behaviorHover(context) {
                 entity = datum;
                 selector = '.data' + datum.__featurehash__;
 
-            } else if (
-                datum instanceof qaError ||
-                datum instanceof krError
-            ) {
+            } else if (datum instanceof qaError) {
                 entity = datum;
                 selector = '.' + datum.source + '.error_id-' + datum.id;
 
diff --git a/modules/behavior/select.js b/modules/behavior/select.js
index e87318b6c..541535255 100644
--- a/modules/behavior/select.js
+++ b/modules/behavior/select.js
@@ -19,7 +19,6 @@ import {
 import {
     osmEntity,
     osmNote,
-    krError,
     qaError
 } from '../osm';
 
@@ -171,10 +170,6 @@ export function behaviorSelect(context) {
             context
                 .selectedNoteID(datum.id)
                 .enter(modeSelectNote(context, datum.id));
-        } else if (datum instanceof krError & !isMultiselect) {  // clicked a krError error
-            context
-                .selectedErrorID(datum.id)
-                .enter(modeSelectError(context, datum.id, datum.source));
         } else if (datum instanceof qaError & !isMultiselect) {  // clicked an external QA error
             context
                 .selectedErrorID(datum.id)
diff --git a/modules/osm/index.js b/modules/osm/index.js
index dd1397daa..c8e467001 100644
--- a/modules/osm/index.js
+++ b/modules/osm/index.js
@@ -1,6 +1,5 @@
 export { osmChangeset } from './changeset';
 export { osmEntity } from './entity';
-export { krError } from './keepRight';
 export { osmNode } from './node';
 export { osmNote } from './note';
 export { osmRelation } from './relation';
diff --git a/modules/services/keepRight.js b/modules/services/keepRight.js
index aa59acbaf..0995cab27 100644
--- a/modules/services/keepRight.js
+++ b/modules/services/keepRight.js
@@ -9,7 +9,7 @@ import { json as d3_json } from 'd3-request';
 import { request as d3_request } from 'd3-request';
 
 import { geoExtent, geoVecAdd } from '../geo';
-import { krError } from '../osm';
+import { qaError } from '../osm';
 import { t } from '../util/locale';
 import { utilRebind, utilTiler, utilQsString } from '../util';
 
@@ -71,7 +71,7 @@ function updateRtree(item, replace) {
 
 
 function tokenReplacements(d) {
-    if (!(d instanceof krError)) return;
+    if (!(d instanceof qaError)) return;
 
     var htmlRegex = new RegExp(/<\/[a-z][\s\S]*>/);
     var replacements = {};
@@ -375,14 +375,17 @@ export default {
                             coincident = _krCache.rtree.search(bbox).length;
                         } while (coincident);
 
-                        var d = new krError({
+                        var d = new qaError({
+                            // Required values
                             loc: loc,
+                            service: 'keepRight',
+                            error_type: errorType,
+                            // Extra values for this service
                             id: props.error_id,
                             comment: props.comment || null,
                             description: props.description || '',
                             error_id: props.error_id,
                             which_type: whichType,
-                            error_type: errorType,
                             parent_error_type: parentErrorType,
                             severity: whichTemplate.severity || 'error',
                             object_id: props.object_id,
@@ -468,7 +471,7 @@ export default {
 
     // replace a single error in the cache
     replaceError: function(error) {
-        if (!(error instanceof krError) || !error.id) return;
+        if (!(error instanceof qaError) || !error.id) return;
 
         _krCache.data[error.id] = error;
         updateRtree(encodeErrorRtree(error), true); // true = replace
@@ -478,7 +481,7 @@ export default {
 
     // remove a single error from the cache
     removeError: function(error) {
-        if (!(error instanceof krError) || !error.id) return;
+        if (!(error instanceof qaError) || !error.id) return;
 
         delete _krCache.data[error.id];
         updateRtree(encodeErrorRtree(error), false); // false = remove
@@ -496,4 +499,4 @@ export default {
         return Object.keys(_krCache.closed).sort();
     }
 
-};
+};
\ No newline at end of file
diff --git a/modules/ui/view_on_keepRight.js b/modules/ui/view_on_keepRight.js
index d0b28a4cb..8ac4a7931 100644
--- a/modules/ui/view_on_keepRight.js
+++ b/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;
-}
+}
\ No newline at end of file