Skip to content

Commit

Permalink
When reversing a way also reverse direction=forward/backward tags on …
Browse files Browse the repository at this point in the history
…nodes
  • Loading branch information
bryceco committed Jun 29, 2020
1 parent d20721c commit 89fab33
Showing 1 changed file with 19 additions and 4 deletions.
23 changes: 19 additions & 4 deletions src/Shared/OsmMapData+Edit.m
Expand Up @@ -600,6 +600,10 @@ - (EditAction)canReverseWay:(OsmWay *)way error:(NSString **)error
@"east" : @"west",
@"west" : @"east"
};
NSDictionary * nodeReversals = @{
@"forward" : @"backward",
@"backward" : @"forward",
};

return ^{
[self registerUndoCommentString:NSLocalizedString(@"Reverse",nil)];
Expand All @@ -613,14 +617,25 @@ - (EditAction)canReverseWay:(OsmWay *)way error:(NSString **)error
[self deleteNodeInWayUnsafe:way index:way.nodes.count-1 preserveNode:NO];
}

// reverse tags
__block NSMutableDictionary * newTags = [NSMutableDictionary new];
// reverse tags on way
__block NSMutableDictionary * newWayTags = [NSMutableDictionary new];
[way.tags enumerateKeysAndObjectsUsingBlock:^(NSString * k, NSString * v, BOOL *stop) {
k = reverseKey(k);
v = reverseValue(k, v);
[newTags setObject:v forKey:k];
[newWayTags setObject:v forKey:k];
}];
[self setTags:newTags forObject:way];
[self setTags:newWayTags forObject:way];

// reverse direction tags on nodes in way
for ( OsmNode * node in way.nodes ) {
NSString * value = node.tags[@"direction"];
NSString * replacement = nodeReversals[ value ];
if ( replacement ) {
NSMutableDictionary * nodeTags = [node.tags mutableCopy];
nodeTags[ @"direction" ] = replacement;
[self setTags:nodeTags forObject:node];
}
}

// reverse roles in relations the way belongs to
for ( OsmRelation * relation in way.parentRelations ) {
Expand Down

0 comments on commit 89fab33

Please sign in to comment.