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

Add direction of travel to turn restriction errors

Browse Source
This commit is contained in:
SilentSpike
2019-01-20 22:07:07 +00:00
parent 9600d67fc6
commit 39880e559b
3 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/core.yaml
+10 -1
View File
@@ -668,6 +668,15 @@ en:
parking: parking areas
road: roads
both: roads and parking
directions:
east: east
north: north
northeast: northeast
northwest: northwest
south: south
southeast: southeast
southwest: southwest
west: west
error_types:
ow:
title: Missing One-way
@@ -677,7 +686,7 @@ en:
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.'
description: '{num_passed} of {num_trips} recorded trips (travelling {travel_direction}) make a turn from {from_way} to {to_way}. There may be a missing "{turn_restriction}" restriction.'
keepRight:
title: KeepRight Error
detail_title: Error
dist/locales/en.json
Vendored
+11 -1
View File
@@ -811,6 +811,16 @@
"road": "roads",
"both": "roads and parking"
},
"directions": {
"east": "east",
"north": "north",
"northeast": "northeast",
"northwest": "northwest",
"south": "south",
"southeast": "southeast",
"southwest": "southwest",
"west": "west"
},
"error_types": {
"ow": {
"title": "Missing One-way",
@@ -822,7 +832,7 @@
},
"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."
"description": "{num_passed} of {num_trips} recorded trips (travelling {travel_direction}) make a turn from {from_way} to {to_way}. There may be a missing \"{turn_restriction}\" restriction."
}
}
},
modules/services/improveOSM.js
+35 -3
View File
@@ -83,7 +83,34 @@ function pointAverage(points) {
x /= points.length;
y /= points.length;
return [x, y]
return [x, y];
}
function relativeBearing(p1, p2) {
var angle = Math.atan2(p2.lon - p1.lon, p2.lat - p1.lat);
if (angle < 0) {
angle += 2 * Math.PI;
}
// Return degrees
return angle * 180 / Math.PI;
}
// Assuming range [0,360)
function cardinalDirection(bearing) {
var dir = 45 * Math.round(bearing / 45);
var compass = {
0: 'north',
45: 'northeast',
90: 'east',
135: 'southeast',
180: 'south',
225: 'southwest',
270: 'west',
315: 'northwest'
};
return t('QA.improveOSM.directions.' + compass[dir]);
}
export default {
@@ -214,6 +241,11 @@ export default {
var via_node = ids[3];
var to_way = ids[2].split(':')[1];
var p1 = feature.segments[0].points[0];
var p2 = feature.segments[0].points[1];
var dir_of_travel = cardinalDirection(relativeBearing(p1, p2));
var d = new impOsmError({
loc: [loc.lon, loc.lat],
comments: null,
@@ -224,13 +256,13 @@ export default {
});
// Variables used in the description
//TODO: Add direction of travel
d.replacements = {
num_passed: feature.numberOfPasses,
num_trips: feature.segments[0].numberOfTrips,
turn_restriction: feature.turnType.toLowerCase(),
from_way: linkEntity('w' + from_way),
to_way: linkEntity('w' + to_way)
to_way: linkEntity('w' + to_way),
travel_direction: dir_of_travel
};
_erCache.data[d.id] = d;