Ticket #22790: 0001-Minimal-support-for-aeroway-taxilane.patch

File 0001-Minimal-support-for-aeroway-taxilane.patch, 4.2 KB (added by JeroenHoek, 3 years ago)

  • resources/data/validator/combinations.mapcss 

    From 5ae8992d9b789175fa7263ce50e4d432f635b502 Mon Sep 17 00:00:00 2001
From: Jeroen Hoek <mail@jeroenhoek.nl>
Date: Sun, 5 Mar 2023 11:49:19 +0100
Subject: [PATCH] Minimal support for aeroway=taxilane

`aeroway=taxilane` is used on larger more complex airports for ground
movement paths of aircraft outside of (or leading out of) the movement
area.
---
 resources/data/validator/combinations.mapcss | 6 +++---
 resources/styles/standard/elemstyles.mapcss  | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/resources/data/validator/combinations.mapcss b/resources/data/validator/combinations.mapcss
index d1dafcc7a..59b7fbacb 100644
    a b way[highway=footway][cycleway=lane] {  
    495495}
    496496
    497497/* {0} on suspicious object, #17255, #19650, #19572, #17253, #19821, #15667, #19930, #20435, #20471, #18815 */
    498 way[oneway ][!highway][!area:highway][!railway][!aerialway][attraction!=summer_toboggan][aeroway!~/^(runway|taxiway)$/][leisure!=track][waterway !~ /^(canal|fairway|lock|river|tidal_channel)$/],
     498way[oneway ][!highway][!area:highway][!railway][!aerialway][attraction!=summer_toboggan][aeroway!~/^(runway|taxiway|taxilane)$/][leisure!=track][waterway !~ /^(canal|fairway|lock|river|tidal_channel)$/],
    499499node[lanes ][!barrier][!ford][highway!=mini_roundabout][!junction][leisure!~/^(bowling_alley|slipway|swimming_pool|track)$/][!traffic_calming]!.only_one_tag,
    500500way[lanes  ][!barrier][!ford][!highway ][!area:highway][!junction][leisure!~/^(bowling_alley|slipway|swimming_pool|track)$/][!traffic_calming]!.only_one_tag,
    501501*[tunnel   ][!highway][!area:highway][!railway][!waterway][!piste:type][type!=tunnel][public_transport!=platform][route!=ferry][man_made!=pipeline][man_made!=goods_conveyor][man_made!=wildlife_crossing][man_made!=tunnel][power!=cable]!.TunnelCulvertWithoutWaterway,
    … … way[lanes ][!barrier][!ford][!highway ][!area:highway][!junction][leisure!~/^(b  
    503503*[psv      ][!highway][!area:highway][!railway][!waterway][barrier !~ /^(bollard|bump_gate|bus_trap|cattle_grid|chain|coupure|entrance|gate|height_restrictor|jersey_barrier|kerb|lift_gate|rope|sally_port|sliding_beam|sliding_gate|spikes|swing_gate|toll_booth|yes)$/][amenity !~ /^parking.*/],
    504504*[width    ][!highway][!area:highway][!railway][!waterway][!aeroway][!cycleway][!footway][!barrier][!man_made][!entrance][natural!=stone][leisure!=track],
    505505*[maxspeed ][!highway][!area:highway][!railway][traffic_sign !~ /^((.*;)?maxspeed(;.*)?|[A-Z][A-Z]:.+)$/][traffic_sign:forward !~ /^((.*;)?maxspeed(;.*)?|[A-Z][A-Z]:.+)$/][traffic_sign:backward !~ /^((.*;)?maxspeed(;.*)?|[A-Z][A-Z]:.+)$/][type != enforcement][waterway !~ /^(canal|fairway|lock|river|tidal_channel)$/][!traffic_calming][aerialway!=zip_line],
    506 way[incline][!highway][!area:highway][!railway][aeroway!~/^(runway|taxiway)$/][attraction!=summer_toboggan][leisure!=slipway] {
     506way[incline][!highway][!area:highway][!railway][aeroway!~/^(runway|taxiway|taxilane)$/][attraction!=summer_toboggan][leisure!=slipway] {
    507507  throwWarning: tr("{0} on suspicious object", "{0.key}");
    508508  group: tr("suspicious tag combination");
    509509}
    … … relation[piste:type=nordic][!piste:grooming]{  
    10751075*[voltage:primary][voltage:secondary][transformer=generator][tag("voltage:secondary")<tag("voltage:primary")] {
    10761076  throwWarning: tr("{0} is lower than {1} on {2}.", "{1.key}", "{0.key}", "{2.tag}");
    10771077  group: tr("suspicious tag combination");
    1078 }
    1079  No newline at end of file
     1078}

  • resources/styles/standard/elemstyles.mapcss 

    diff --git a/resources/styles/standard/elemstyles.mapcss b/resources/styles/standard/elemstyles.mapcss
index db8f12249..37b4cd17a 100644
    a b way[aeroway=taxiway] {  
    43984398    width: 2;
    43994399    color: aeroway#660000;
    44004400}
    4401 way[aeroway=parking_position] {
     4401way[aeroway=parking_position],
     4402way[aeroway=taxilane] {
    44024403    width: 1;
    44034404    color: aeroway#660000;
    44044405}
    … … area[aeroway=hangar] {  
    44124413}
    44134414node[aeroway=apron],
    44144415node[aeroway=runway],
    4415 node[aeroway=taxiway] {
     4416node[aeroway=taxiway],
     4417node[aeroway=taxilane] {
    44164418    icon-image: "presets/misc/deprecated.svg";
    44174419    set icon_z17;
    44184420}