From c6a3c7fe4886cab673de1f81474836cebaa2c60d Mon Sep 17 00:00:00 2001
From: Jeroen Hoek <mail@jeroenhoek.nl>
Date: Fri, 19 Mar 2021 12:36:57 +0100
Subject: [PATCH] Allow use of aeroway=holding_position on way

`aeroway=holding_position` can be used on ways as well as nodes. Using
it on ways is a later addition that JOSM did not support yet.

In this commit:

* Ways tagged with `aeroway=holding_position` are rendered in a subtle
  yellow line colour.
* The validator no longer warns for use on ways.
* The preset is applicable on ways as well now.
---
 resources/data/defaultpresets.xml           | 2 +-
 resources/data/validator/geometry.mapcss    | 1 -
 resources/styles/standard/elemstyles.mapcss | 4 ++++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/resources/data/defaultpresets.xml b/resources/data/defaultpresets.xml
index 51be7b0ce..b65a49619 100644
--- a/resources/data/defaultpresets.xml
+++ b/resources/data/defaultpresets.xml
@@ -3087,7 +3087,7 @@
                 <reference ref="surface" />
             </optional>
         </item> <!-- Taxiway -->
-        <item name="Holding Position" icon="presets/transport/airport/holding_position.svg" type="node" preset_name_label="true">
+        <item name="Holding Position" icon="presets/transport/airport/holding_position.svg" type="node,way" preset_name_label="true">
             <link wiki="Tag:aeroway=holding_position" />
             <key key="aeroway" value="holding_position" />
             <combo key="holding_position:type" text="Type" values="ILS,intermediate,runway" values_context="aeroway holding_position" />
diff --git a/resources/data/validator/geometry.mapcss b/resources/data/validator/geometry.mapcss
index ad114882f..7dd2daf94 100644
--- a/resources/data/validator/geometry.mapcss
+++ b/resources/data/validator/geometry.mapcss
@@ -103,7 +103,6 @@ way[entrance],
 way[door],
 way[railway=subway_entrance],
 way[man_made=survey_point],
-way[aeroway=holding_position],
 way[power=transformer],
 way[transformer],
 way[power=pole],
diff --git a/resources/styles/standard/elemstyles.mapcss b/resources/styles/standard/elemstyles.mapcss
index abbf58778..f5029b2e4 100644
--- a/resources/styles/standard/elemstyles.mapcss
+++ b/resources/styles/standard/elemstyles.mapcss
@@ -4225,6 +4225,10 @@ node[aeroway=holding_position] {
     icon-image: "presets/transport/airport/holding_position.svg";
     set icon_z17;
 }
+way[aeroway=holding_position] {
+    width: 1;
+    color: aeroway_marking#D6CE08;
+}
 node[aeroway=hangar] {
     icon-image: "presets/transport/airport/hangar.svg";
     set icon_z17;
-- 
2.25.1