From a068cdfc5973e46249068a35fd1e52b95cbc7b78 Mon Sep 17 00:00:00 2001 From: SilentSpike Date: Mon, 30 Dec 2019 13:08:13 +0000 Subject: [PATCH] Tag changeset with Osmose issue closed counts This seems more useful than tagging with a list of joined coordinates which quickly becomes truncated due to tag value length. Adds a tag per issue type similar to iDs own validation. --- modules/services/osmose.js | 14 ++++++++------ modules/ui/commit.js | 6 +++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/modules/services/osmose.js b/modules/services/osmose.js index 8a495e982..b98c43df7 100644 --- a/modules/services/osmose.js +++ b/modules/services/osmose.js @@ -219,9 +219,11 @@ export default { that.removeError(d); if (d.newStatus === '/done') { - // No pretty identifier, so we just use coordinates - var closedID = d.loc[1].toFixed(5) + '/' + d.loc[0].toFixed(5); - _erCache.closed[d.error_type + ':' + closedID] = true; + // No error identifier, so we give a count of each category + if (!(d.item in _erCache.closed)) { + _erCache.closed[d.item] = 0; + } + _erCache.closed[d.item] += 1; } if (callback) callback(null, d); }) @@ -266,8 +268,8 @@ export default { updateRtree(encodeErrorRtree(error), false); // false = remove }, - // Used to populate `closed:osmose` changeset tag - getClosedIDs: function() { - return Object.keys(_erCache.closed).sort(); + // Used to populate `closed:osmose:*` changeset tags + getClosedCounts: function() { + return _erCache.closed; } }; \ No newline at end of file diff --git a/modules/ui/commit.js b/modules/ui/commit.js index 6f5e293d8..b2a764a88 100644 --- a/modules/ui/commit.js +++ b/modules/ui/commit.js @@ -150,9 +150,9 @@ export function uiCommit(context) { } } if (services.osmose) { - var osmoseClosed = services.osmose.getClosedIDs(); - if (osmoseClosed.length) { - tags['closed:osmose'] = osmoseClosed.join(';').substr(0, 255); + var osmoseClosed = services.osmose.getClosedCounts(); + for (var issueType in osmoseClosed) { + tags['closed:osmose:' + issueType] = osmoseClosed[issueType].toString().substr(0, 255); } }