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

Cycle through only_ turn restriction states

Browse Source 
(re: #2622)
This commit is contained in:
Bryan Housel
2018-02-07 19:04:28 -05:00
parent 3c340a0362
commit 0cbff57dc9
6 changed files with 42 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ui/fields/restrictions.js
+18 -5
View File
@@ -1,3 +1,5 @@
import _cloneDeep from 'lodash-es/cloneDeep';
import { dispatch as d3_dispatch } from 'd3-dispatch';
import {
@@ -206,7 +208,18 @@ export function uiFieldRestrictions(field, context) {
} else if (datum instanceof osmTurn) {
var actions;
if (datum.restriction) {
datum.restriction = osmInferRestriction(vgraph, datum.from, datum.to, projection);
if (datum.restrictionID && !datum.only) { // cycle thru the `only_` state
var datumOnly = _cloneDeep(datum);
datumOnly.only = true;
datumOnly.restriction = datumOnly.restriction.replace(/^no\_/, 'only_');
actions = _intersection.actions.concat([
actionUnrestrictTurn(datum, projection),
actionRestrictTurn(datumOnly, projection),
t('operations.restriction.annotation.create')
]);
} else if (datum.restrictionID) {
actions = _intersection.actions.concat([
actionUnrestrictTurn(datum, projection),
t('operations.restriction.annotation.delete')
@@ -250,14 +263,14 @@ export function uiFieldRestrictions(field, context) {
.classed('related', true);
var turnType = {
'no_left_turn': 'Left Turns',
'no_right_turn': 'Right Turns',
'no_u_turn': 'U-Turns',
'no_left_turn': 'Left Turn',
'no_right_turn': 'Right Turn',
'no_u_turn': 'U-Turn',
'no_straight_on': 'Continuing'
}[osmInferRestriction(vgraph, datum.from, datum.to, projection)];
var restrictType = 'IS';
if (datum.restriction) {
if (datum.restrictionID) {
if (datum.only) { restrictType = 'IS ONLY'; }
if (datum.direct) { restrictType = 'IS NOT'; }
if (datum.indirect) { restrictType = 'IS NOT '; }