diff --git a/features/guidance/destination-signs.feature b/features/guidance/destination-signs.feature index addb1886c..dc29a5bad 100644 --- a/features/guidance/destination-signs.feature +++ b/features/guidance/destination-signs.feature @@ -16,28 +16,34 @@ Feature: Destination Signs m n o p q r + s t + u v """ And the ways - | nodes | name | ref | destination | destination:ref | oneway | # | - | ab | AB | E1 | | | yes | | - | cd | CD | | Berlin | | yes | | - | ef | EF | | Berlin | A1 | yes | | - | gh | | | Berlin | A1 | yes | | - | ij | | | Berlin | | yes | | - | kl | KL | E1 | Berlin | A1 | yes | | - | mn | MN | | Berlin;Hamburg | A1;A2 | yes | | - | op | OP | | Berlin;Hamburg | A1;A2 | no | mis-tagged destination: not a oneway | - | qr | QR | | | A1;A2 | yes | | + | nodes | name | ref | destination | destination:ref | destination:street | oneway | # | + | ab | AB | E1 | | | | yes | | + | cd | CD | | Berlin | | | yes | | + | ef | EF | | Berlin | A1 | | yes | | + | gh | | | Berlin | A1 | | yes | | + | ij | | | Berlin | | | yes | | + | kl | KL | E1 | Berlin | A1 | | yes | | + | mn | MN | | Berlin;Hamburg | A1;A2 | | yes | | + | op | OP | | Berlin;Hamburg | A1;A2 | | no | mis-tagged destination: not a oneway | + | qr | QR | | | A1;A2 | | yes | | + | st | ST | | | | St Street | yes | | + | uv | UV | | Berlin | | St Street | yes | | When I route I should get - | from | to | route | destinations | ref | # | - | a | b | AB,AB | , | E1,E1 | | - | c | d | CD,CD | Berlin,Berlin | , | | - | e | f | EF,EF | A1: Berlin,A1: Berlin | , | | - | g | h | , | A1: Berlin,A1: Berlin | , | | - | i | j | , | Berlin,Berlin | , | | - | k | l | KL,KL | A1: Berlin,A1: Berlin | E1,E1 | | - | m | n | MN,MN | A1, A2: Berlin, Hamburg,A1, A2: Berlin, Hamburg | , | | - | o | p | OP,OP | , | , | guard against mis-tagging | - | q | r | QR,QR | A1, A2,A1, A2 | , | | + | from | to | route | destinations | ref | # | + | a | b | AB,AB | , | E1,E1 | | + | c | d | CD,CD | Berlin,Berlin | , | | + | e | f | EF,EF | A1: Berlin,A1: Berlin | , | | + | g | h | , | A1: Berlin,A1: Berlin | , | | + | i | j | , | Berlin,Berlin | , | | + | k | l | KL,KL | A1: Berlin,A1: Berlin | E1,E1 | | + | m | n | MN,MN | A1, A2: Berlin, Hamburg,A1, A2: Berlin, Hamburg | , | | + | o | p | OP,OP | , | , | guard against mis-tagging | + | q | r | QR,QR | A1, A2,A1, A2 | , | | + | s | t | ST,ST | St Street,St Street | , | | + | u | v | UV,UV | Berlin,Berlin | , | city preferred over street | diff --git a/features/guidance/directional-ref-destination-signs.feature b/features/guidance/directional-ref-destination-signs.feature index 1cdee7a65..abda1efc6 100644 --- a/features/guidance/directional-ref-destination-signs.feature +++ b/features/guidance/directional-ref-destination-signs.feature @@ -36,4 +36,4 @@ Feature: Destination Signs | h | g | GH,GH | A2: Hamburg,A2: Hamburg | , | | | i | j | IJ,IJ | A1: Berlin,A1: Berlin | , | | | l | k | KL,KL | A2: Hamburg,A2: Hamburg | , | | - | m | n | MN,MN | , | , | guard against mis-tagging | \ No newline at end of file + | m | n | MN,MN | , | , | guard against mis-tagging | diff --git a/profiles/lib/destination.lua b/profiles/lib/destination.lua index 1b0d84eb7..a09330a70 100644 --- a/profiles/lib/destination.lua +++ b/profiles/lib/destination.lua @@ -18,11 +18,12 @@ end function Destination.get_destination(way, is_forward) ref = Destination.get_directional_tag(way, is_forward, 'destination:ref') dest = Destination.get_directional_tag(way, is_forward, 'destination') + street = Destination.get_directional_tag(way, is_forward, 'destination:street') if ref and dest then return ref .. ': ' .. dest else - return ref or dest or '' + return ref or dest or street or '' end end -return Destination \ No newline at end of file +return Destination diff --git a/taginfo.json b/taginfo.json index 035dcdb2b..aefe902f5 100644 --- a/taginfo.json +++ b/taginfo.json @@ -330,6 +330,11 @@ "object_types": [ "way" ], "description": "Destination and direction of road for oneways for navigation instructions, supplements name." }, + { + "key": "destination:street", + "object_types": [ "way" ], + "description": "Destination of road for navigation instructions, supplements name." + }, { "key": "destination:ref", "object_types": [ "way" ],