CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-15 21:48:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add ImproveOSM error resolution

Browse Source
This commit is contained in:
SilentSpike
2019-01-21 16:24:53 +00:00
parent ac4cec1429
commit 9d2792836f
2 changed files with 191 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/services/improveOSM.js
+84 -3
View File
@@ -10,6 +10,7 @@ import { request as d3_request } from 'd3-request';
import { geoExtent } from '../geo';
import { impOsmError } from '../osm';
import { services } from './index';
import { t } from '../util/locale';
import { utilRebind, utilTiler, utilQsString } from '../util';
@@ -189,8 +190,14 @@ export default {
comments: null,
error_subtype: '',
error_type: k,
identifier: { // this is used to post changes to the error
wayId: feature.wayId,
fromNodeId: feature.fromNodeId,
toNodeId: feature.toNodeId
},
object_id: feature.wayId,
object_type: 'way'
object_type: 'way',
status: feature.status
});
//TODO include road type in description?
@@ -217,7 +224,12 @@ export default {
loc: pointAverage(feature.points),
comments: null,
error_subtype: geoType,
error_type: k
error_type: k,
identifier: {
x: feature.x,
y: feature.y
},
status: feature.status
});
d.replacements = {
@@ -251,8 +263,10 @@ export default {
comments: null,
error_subtype: '',
error_type: k,
identifier: feature.id,
object_id: via_node,
object_type: 'node'
object_type: 'node',
status: feature.status
});
// Variables used in the description
@@ -278,6 +292,73 @@ export default {
})
},
postUpdate: function(d, callback) {
if (!services.osm.authenticated()) { // Username required in payload
return callback({ message: 'Not Authenticated', status: -3}, d);
}
if (_erCache.inflight[d.id]) {
return callback({ message: 'Error update already inflight', status: -2 }, d);
}
var username = services.osm.userDetails(function(err, user) {
if (err) return '';
return user.display_name;
});
var that = this;
var type = d.error_type;
var payload = {};
payload.username = username;
// Each error type has different data for identification
if (type === 'ow') {
payload.roadSegments = [ d.identifier ];
} else if (type === 'mr') {
payload.tiles = [ d.identifier ];
} else if (type === 'tr') {
payload.targetIds = [ d.identifier ];
}
// Separate requests required to comment and change status
var url = _impOsmUrls[type] + '/comment';
// Comments don't currently work
// if (d.newComment !== undefined) {
// payload.text = d.newComment;
// _krCache.inflight[d.id] = d3_request(url)
// .header('Content-Type', 'application/json')
// .post(payload, function(back) {
// console.log(back);
// });
// }
if (d.newStatus !== d.status) {
payload.status = d.newStatus;
payload.text = 'status changed';
_erCache.inflight[d.id] = [d3_request(url)
.header('Content-Type', 'application/json')
.post(JSON.stringify(payload), function(err) {
delete _erCache.inflight[d.id];
if (d.newStatus === 'INVALID') {
that.removeError(d);
} else if (d.newStatus === 'SOLVED') {
that.removeError(d);
//TODO the identifiers are ugly and can't be used frontend, use error position instead?
// or perhaps don't track this at all?
//_erCache.closed[d.error_type + ':' + d.identifier] = true;
}
return callback(err, d);
})];
}
},
// get all cached errors covering the viewport
getErrors: function(projection) {
var viewport = projection.clipExtent();
modules/ui/improveOSM_editor.js
+107 -1
View File
@@ -76,7 +76,113 @@ export function uiImproveOsmEditor(context) {
.merge(editor)
.call(errorHeader.error(_error))
.call(quickLinks.choices(choices))
.call(errorDetails.error(_error));
.call(errorDetails.error(_error))
.call(improveOsmSaveSection);
}
function improveOsmSaveSection(selection) {
var isSelected = (_error && _error.id === context.selectedErrorID());
var isShown = (_error && (isSelected || _error.newComment || _error.comment));
var saveSection = selection.selectAll('.error-save')
.data(
(isShown ? [_error] : []),
function(d) { return d.id + '-' + (d.status || 0); }
);
// exit
saveSection.exit()
.remove();
// enter
var saveSectionEnter = saveSection.enter()
.append('div')
.attr('class', 'keepRight-save save-section cf');
// update
saveSection = saveSectionEnter
.merge(saveSection)
.call(errorSaveButtons);
}
function errorSaveButtons(selection) {
var isSelected = (_error && _error.id === context.selectedErrorID());
var buttonSection = selection.selectAll('.buttons')
.data((isSelected ? [_error] : []), function(d) { return d.status + d.id; });
// exit
buttonSection.exit()
.remove();
// enter
var buttonEnter = buttonSection.enter()
.append('div')
.attr('class', 'buttons');
// Comments don't currently work
// buttonEnter
// .append('button')
// .attr('class', 'button comment-button action')
// .text(t('QA.keepRight.save_comment'));
buttonEnter
.append('button')
.attr('class', 'button close-button action');
buttonEnter
.append('button')
.attr('class', 'button ignore-button action');
// update
buttonSection = buttonSection
.merge(buttonEnter);
// Comments don't currently work
// buttonSection.select('.comment-button')
// .attr('disabled', function(d) {
// return d.newComment === undefined ? true : null;
// })
// .on('click.comment', function(d) {
// this.blur(); // avoid keeping focus on the button - #4641
// var errorService = services.improveOSM;
// if (errorService) {
// errorService.postUpdate(d, function(err, error) {
// dispatch.call('change', error);
// });
// }
// });
buttonSection.select('.close-button')
.text(function(d) {
var andComment = (d.newComment !== undefined ? '_comment' : '');
return t('QA.keepRight.close' + andComment);
})
.on('click.close', function(d) {
this.blur(); // avoid keeping focus on the button - #4641
var errorService = services.improveOSM;
if (errorService) {
d.newStatus = 'SOLVED';
errorService.postUpdate(d, function(err, error) {
dispatch.call('change', error);
});
}
});
buttonSection.select('.ignore-button')
.text(function(d) {
var andComment = (d.newComment !== undefined ? '_comment' : '');
return t('QA.keepRight.ignore' + andComment);
})
.on('click.ignore', function(d) {
this.blur(); // avoid keeping focus on the button - #4641
var errorService = services.improveOSM;
if (errorService) {
d.newStatus = 'INVALID';
errorService.postUpdate(d, function(err, error) {
dispatch.call('change', error);
});
}
});
}
improveOsmEditor.error = function(val) {