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

Use point averages for locations

Browse Source
This commit is contained in:
SilentSpike
2019-01-20 16:56:23 +00:00
parent ca290b5101
commit bea6f4dcfd
3 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
data/core.yaml
View File

@@ -663,17 +663,18 @@ en:
QA:
improveOSM:
title: ImproveOSM Error
error_parts:
path: path
parking_area: parking area
road: road
geometry_types:
path: paths
parking: parking areas
road: roads
both: roads and parking
error_types:
ow:
title: Missing One-way
description: 'Along this section of {highway}, {percentage}% of {num_trips} recorded trips travel in the same direction. There may be missing a "oneway" tag.'
mr:
title: Missing Geometry
description: Aggregate data suggests there may be an unmapped {var1} here.
description: '{num_trips} recorded trips in this area suggest there may be unmapped {geometry_type} here.'
tr:
title: Missing Turn Restriction
description: '{num_passed} of {num_trips} recorded trips make a turn from {from_way} to {to_way}. There may be a missing "{turn_restriction}" restriction.'

11
dist/locales/en.json vendored
View File

@@ -805,10 +805,11 @@
"QA": {
"improveOSM": {
"title": "ImproveOSM Error",
"error_parts": {
"path": "path",
"parking_area": "parking area",
"road": "road"
"geometry_types": {
"path": "paths",
"parking": "parking areas",
"road": "roads",
"both": "roads and parking"
},
"error_types": {
"ow": {
@@ -817,7 +818,7 @@
},
"mr": {
"title": "Missing Geometry",
"description": "Aggregate data suggests there may be an unmapped {var1} here."
"description": "{num_trips} recorded trips in this area suggest there may be unmapped {geometry_type} here."
},
"tr": {
"title": "Missing Turn Restriction",

62
modules/services/improveOSM.js
View File

@@ -26,14 +26,6 @@ var _impOsmUrls = {
tr: 'http://turnrestrictionservice.skobbler.net/turnRestrictionService'
};
var _missingTypes = {
PARKING: 'Unmapped parking',
ROAD: 'Unmapped road(s)',
BOTH: 'Unmapped road(s) and parking',
PATH: 'Unmapped path(s)',
WATER: 'Unmapped water feature' // ?
};
function abortRequest(i) {
_forEach(i, function(v) {
if (v) {
@@ -79,6 +71,21 @@ function linkEntity(d) {
return '<a class="kr_error_entity_link">' + d + '</a>';
}
function pointAverage(points) {
var x = 0;
var y = 0;
_forEach(points, function(v) {
x += v.lon;
y += v.lat;
});
x /= points.length;
y /= points.length;
return [x, y]
}
export default {
init: function() {
if (!_erCache) {
@@ -132,8 +139,6 @@ export default {
_forEach(_impOsmUrls, function(v, k) {
var url = v + '/search?' + utilQsString(params);
if (k == 'mr') return
requests[k] = d3_json(url,
function(err, data) {
delete _erCache.inflight[tile.id];
@@ -152,11 +157,8 @@ export default {
// Road segments at high zoom == oneways
if (data.roadSegments) {
data.roadSegments.forEach(function(feature) {
// todo: make this take midpoint?
var loc = feature.points[0];
var d = new impOsmError({
loc: [loc.lon, loc.lat],
loc: pointAverage(feature.points), // TODO: This isn't great for curved roads, would be better to find actual midpoint of segment
comments: null,
error_type: k,
object_id: feature.wayId,
@@ -177,23 +179,24 @@ export default {
}
// Tiles at high zoom == missing roads
// if (data.tiles) {
// data.tiles.forEach(function(feature) {
// // Get description based on type
// var desc = _missingTypes[feature.type];
if (data.tiles) {
data.tiles.forEach(function(feature) {
var d = new impOsmError({
loc: pointAverage(feature.points),
comments: null,
error_type: k,
geometry_type: feature.type
});
d.replacements = {
num_trips: feature.numberOfTrips,
geometry_type: t('QA.improveOSM.geometry_types.' + feature.type.toLowerCase())
};
// var d = new impOsmError({
// loc: [feature.x, feature.y],
// comment: null,
// error_type: k,
// geometry_type: feature.type
// });
// _erCache.data[d.id] = d;
// _erCache.rtree.insert(encodeErrorRtree(d));
// })
// }
_erCache.data[d.id] = d;
_erCache.rtree.insert(encodeErrorRtree(d));
})
}
// Entities at high zoom == turn restrictions
if (data.entities) {
@@ -216,6 +219,7 @@ export default {
});
// Variables used in the description
//TODO: Add direction of travel
d.replacements = {
num_passed: feature.numberOfPasses,
num_trips: feature.segments[0].numberOfTrips,