From 805e910681b6f170847ec40c29e232e0bbd9e008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sat, 4 Aug 2018 15:06:26 +0200
Subject: [PATCH] cycle_routes, hiking_routes: fix priority

---
 cycle_routes.json  | 9 +++++++--
 hiking_routes.json | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/cycle_routes.json b/cycle_routes.json
index e2a8757..5df6c4c 100644
--- a/cycle_routes.json
+++ b/cycle_routes.json
@@ -15,7 +15,7 @@
     },
     "members": true,
     "feature": {
-        "priority": "{{ {icn:0,ncn:1,rcn:2,lcn:3}[tags.network] }}",
+        "priority": "{{ const[tags.network].priority|default(4) }}",
         "description": "{{ tagTrans('network', tags.network) }}",
         "listMarkerSymbol": "{{ markerLine({ 'width': 4, 'color': const[tags.network].color|default(const[''].color) })|raw }}",
         "title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}",
@@ -29,7 +29,7 @@
             "{% set refs = [] %}",
             "",
             "{% for master in masters %}",
-            "  {% set _p = {icn:0,ncn:1,rcn:2,lcn:3}[master.tags.network]|default(4) %}",
+            "  {% set _p = const[master.tags.network].priority|default(4) %}",
             "  {% if _p < priority %}",
             "    {% set priority = _p %}",
             "    {% set network = master.tags.network %}",
@@ -66,22 +66,27 @@
     "const": {
         "icn": {
             "color": "#ff0000",
+            "priority": 0,
             "zoom": 6
         },
         "ncn": {
             "color": "#ff00ba",
+            "priority": 1,
             "zoom": 9
         },
         "rcn": {
             "color": "#ba00ff",
+            "priority": 2,
             "zoom": 12
         },
         "lcn": {
             "color": "#0000ff",
+            "priority": 3,
             "zoom": 15
         },
         "": {
             "color": "#007fff",
+            "priority": 4,
             "zoom": 15
         }
     },
diff --git a/hiking_routes.json b/hiking_routes.json
index 929ffa9..0ae1629 100644
--- a/hiking_routes.json
+++ b/hiking_routes.json
@@ -15,7 +15,7 @@
     },
     "members": true,
     "feature": {
-        "priority": "{{ {iwn:0,nwn:1,rwn:2,lwn:3}[tags.network]|default(4) }}",
+        "priority": "{{ const[tags.network].priority|default(4) }}",
         "description": "{% if tags.network %}{{ tagTrans('network', tags.network) }}{% endif %}",
         "listMarkerSymbol": "{{ markerLine({ 'width': 4, 'color': const[tags.network|default('')].color|default(const[''].color) })|raw }}",
         "title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}",
@@ -29,7 +29,7 @@
             "{% set refs = [] %}",
             "",
             "{% for master in masters %}",
-            "  {% set _p = {iwn:0,nwn:1,rwn:2,lwn:3}[master.tags.network]|default(4) %}",
+            "  {% set _p = const[master.tags.network].priority|default(4) %}",
             "  {% if _p < priority %}",
             "    {% set priority = _p %}",
             "    {% set network = master.tags.network %}",
@@ -65,22 +65,27 @@
     "const": {
         "iwn": {
             "color": "#ff0000",
+            "priority": 0,
             "zoom": 10
         },
         "nwn": {
             "color": "#ff00ba",
+            "priority": 1,
             "zoom": 11
         },
         "rwn": {
             "color": "#ba00ff",
+            "priority": 2,
             "zoom": 12
         },
         "lwn": {
             "color": "#0000ff",
+            "priority": 3,
             "zoom": 14
         },
         "": {
             "color": "#007fff",
+            "priority": 4,
             "zoom": 14
         }
     },