From 59c25f8b0e603d92b4c8f29cb31e349dd6ad8444 Mon Sep 17 00:00:00 2001
From: riQQ <riQQ@users.noreply.github.com>
Date: Tue, 11 Jan 2022 00:37:18 +0100
Subject: [PATCH] Use approved tag cycle_barrier in the barrier layer

This replaces all references to the niche tag cycle_barrier:type with the approved tag cycle_barrier in the barrier layer.

Fix #610
---
 assets/layers/barrier/barrier.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/assets/layers/barrier/barrier.json b/assets/layers/barrier/barrier.json
index eb2ba836b..0e7eae8e3 100644
--- a/assets/layers/barrier/barrier.json
+++ b/assets/layers/barrier/barrier.json
@@ -209,7 +209,7 @@
       "condition": "barrier=cycle_barrier",
       "mappings": [
         {
-          "if": "cycle_barrier:type=single",
+          "if": "cycle_barrier=single",
           "then": {
             "en": "Single, just two barriers with a space inbetween <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>",
             "nl": "Enkelvoudig, slechts twee hekjes met ruimte ertussen <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>",
@@ -217,7 +217,7 @@
           }
         },
         {
-          "if": "cycle_barrier:type=double",
+          "if": "cycle_barrier=double",
           "then": {
             "en": "Double, two barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_double.svg' style='width:8em'>",
             "nl": "Dubbel, twee hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_double.svg' style='width:8em'>",
@@ -225,7 +225,7 @@
           }
         },
         {
-          "if": "cycle_barrier:type=triple",
+          "if": "cycle_barrier=triple",
           "then": {
             "en": "Triple, three barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>",
             "nl": "Drievoudig, drie hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>",
@@ -233,7 +233,7 @@
           }
         },
         {
-          "if": "cycle_barrier:type=squeeze",
+          "if": "cycle_barrier=squeeze",
           "then": {
             "en": "Squeeze gate, gap is smaller at top, than at the bottom <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>",
             "nl": "Knijppoort, ruimte is smaller aan de top, dan aan de bodem <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>",
@@ -257,8 +257,8 @@
       },
       "condition": {
         "and": [
-          "cycle_barrier:type!=double",
-          "cycle_barrier:type!=triple"
+          "cycle_barrier!=double",
+          "cycle_barrier!=triple"
         ]
       },
       "freeform": {
@@ -284,8 +284,8 @@
       },
       "condition": {
         "or": [
-          "cycle_barrier:type=double",
-          "cycle_barrier:type=triple"
+          "cycle_barrier=double",
+          "cycle_barrier=triple"
         ]
       },
       "freeform": {
@@ -312,8 +312,8 @@
       },
       "condition": {
         "or": [
-          "cycle_barrier:type=double",
-          "cycle_barrier:type=triple"
+          "cycle_barrier=double",
+          "cycle_barrier=triple"
         ]
       },
       "freeform": {
@@ -338,8 +338,8 @@
       },
       "condition": {
         "or": [
-          "cycle_barrier:type=double",
-          "cycle_barrier:type=triple"
+          "cycle_barrier=double",
+          "cycle_barrier=triple"
         ]
       },
       "freeform": {
@@ -364,4 +364,4 @@
       "width": "5"
     }
   ]
-}
\ No newline at end of file
+}