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

Add Osmose issue detail fetching for UI

Browse Source 
Must fetch details per-issue to get the associated OSM elements for
highlighting and use in the error description.

Also fixes URL for error closure.
This commit is contained in:
SilentSpike
2019-12-28 21:45:45 +00:00
parent ebd206595a
commit b24b041335
5 changed files with 89 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/core.yaml
View File

@@ -857,9 +857,6 @@ en:
title: 'Highway intersecting highway'
1070-10:
title: 'Waterway intersecting waterway'
1080-1:
title: 'Orphan Nodes Cluster'
description: 'A culster of nodes with no tags is present.'
1150:
title: 'Overlapping Similar Areas'
description: '{0} and {1} overlap.'

1
data/qa_errors.json
View File

@@ -34,6 +34,7 @@
}
},
"osmose": {
"items": ["0", "1040", "1050", "1070", "1150", "1280"],
"errorTypes": {
"0-1": {
"icon": "maki-home"

4
dist/locales/en.json vendored
View File

@@ -1075,10 +1075,6 @@
"1070-10": {
"title": "Waterway intersecting waterway"
},
"1080-1": {
"title": "Orphan Nodes Cluster",
"description": "A culster of nodes with no tags is present."
},
"1280-1": {
"title": "Incorrect Speed Camera",
"description": "Speed camera should be on the highway or part of an \"enforcement\" relation."

41
modules/services/osmose.js
View File

@@ -92,7 +92,8 @@ export default {
loadErrors: function(projection) {
var params = {
level: '1,2,3'
level: '1,2,3',
item: services.osmose.items.join() // only interested in certain errors
};
// determine the needed tiles to cover the view
@@ -140,11 +141,6 @@ export default {
item: props.item // category of the issue for styling
});
// Variables used in the description
// d.replacements = elems.map(function(i) {
// return linkEntity(i);
// });
_erCache.data[d.id] = d;
_erCache.rtree.insert(encodeErrorRtree(d));
}
@@ -160,7 +156,36 @@ export default {
});
},
// todo: need to fetch specific error details upon UI loading for element IDs
loadErrorDetail: function(d, callback) {
// Error details only need to be fetched once
if (d.elems !== undefined) {
if (callback) callback(null, d);
return;
}
var url = _osmoseUrlRoot + 'en/api/0.3beta/issue/' + d.identifier;
var that = this;
d3_json(url)
.then(function(data) {
// Associated elements used for highlighting
// Assign directly for immediate use in the callback
d.elems = data.elems.map(function(e) {
return e.type.substring(0,1) + e.id;
});
// Element links used in the error description
d.replacements = d.elems.map(function(i) {
return linkEntity(i);
});
that.replaceError(d);
if (callback) callback(null, d);
})
.catch(function(err) {
if (callback) callback(err.message);
});
},
postUpdate: function(d, callback) {
if (_erCache.inflightPost[d.id]) {
@@ -170,7 +195,7 @@ export default {
var that = this;
// UI sets the status to either '/done' or '/false'
var url = _osmoseUrlRoot + 'issue/' + d.identifier + d.newStatus;
var url = _osmoseUrlRoot + 'en/api/0.3beta/issue/' + d.identifier + d.newStatus;
var controller = new AbortController();
_erCache.inflightPost[d.id] = controller;

105
modules/ui/osmose_details.js
View File

@@ -6,6 +6,7 @@ import {
import { dataEn } from '../../data';
import { modeSelect } from '../modes/select';
import { t } from '../util/locale';
import { services } from '../services';
import { utilDisplayName, utilEntityOrMemberSelector } from '../util';
@@ -57,65 +58,69 @@ export function uiOsmoseDetails(context) {
.append('h4')
.text(function() { return t('QA.keepRight.detail_description'); });
descriptionEnter
.append('div')
.attr('class', 'error-details-description-text')
.html(errorDetail);
services.osmose.loadErrorDetail(_error, function(err, d) {
if (d.elems === undefined) { return; }
// If there are entity links in the error message..
descriptionEnter.selectAll('.error_entity_link, .error_object_link')
.each(function() {
var link = d3_select(this);
var entityID = this.textContent;
var entity = context.hasEntity(entityID);
descriptionEnter
.append('div')
.attr('class', 'error-details-description-text')
.html(errorDetail);
// Add click handler
link
.on('mouseenter', function() {
context.surface().selectAll(utilEntityOrMemberSelector([entityID], context.graph()))
.classed('hover', true);
})
.on('mouseleave', function() {
context.surface().selectAll('.hover')
.classed('hover', false);
})
.on('click', function() {
d3_event.preventDefault();
var osmlayer = context.layers().layer('osm');
if (!osmlayer.enabled()) {
osmlayer.enabled(true);
}
// If there are entity links in the error message..
descriptionEnter.selectAll('.error_entity_link, .error_object_link')
.each(function() {
var link = d3_select(this);
var entityID = this.textContent;
var entity = context.hasEntity(entityID);
context.map().centerZoom(_error.loc, 20);
// Add click handler
link
.on('mouseenter', function() {
context.surface().selectAll(utilEntityOrMemberSelector([entityID], context.graph()))
.classed('hover', true);
})
.on('mouseleave', function() {
context.surface().selectAll('.hover')
.classed('hover', false);
})
.on('click', function() {
d3_event.preventDefault();
var osmlayer = context.layers().layer('osm');
if (!osmlayer.enabled()) {
osmlayer.enabled(true);
}
if (entity) {
context.enter(modeSelect(context, [entityID]));
} else {
context.loadEntity(entityID, function() {
context.map().centerZoom(d.loc, 20);
if (entity) {
context.enter(modeSelect(context, [entityID]));
});
} else {
context.loadEntity(entityID, function() {
context.enter(modeSelect(context, [entityID]));
});
}
});
// Replace with friendly name if possible
// (The entity may not yet be loaded into the graph)
if (entity) {
var name = utilDisplayName(entity); // try to use common name
if (!name) {
var preset = context.presets().match(entity, context.graph());
name = preset && !preset.isFallback() && preset.name(); // fallback to preset name
}
});
// Replace with friendly name if possible
// (The entity may not yet be loaded into the graph)
if (entity) {
var name = utilDisplayName(entity); // try to use common name
if (!name) {
var preset = context.presets().match(entity, context.graph());
name = preset && !preset.isFallback() && preset.name(); // fallback to preset name
if (name) {
this.innerText = name;
}
}
});
if (name) {
this.innerText = name;
}
}
});
// Don't hide entities related to this error - #5880
// context.features().forceVisible(_error.elems);
context.map().pan([0,0]); // trigger a redraw
// Don't hide entities related to this error - #5880
context.features().forceVisible(d.elems);
context.map().pan([0,0]); // trigger a redraw
});
}