From aea215a647f290e1c48af7752e88f69b66f0bddb Mon Sep 17 00:00:00 2001
From: Evelyn
Date: Tue, 18 Dec 2018 20:30:10 +0000
Subject: NR: DEM is technically a permitted powertype

---
 modules/nr.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/nr.py b/modules/nr.py
index 0bfcc557..b6780add 100644
--- a/modules/nr.py
+++ b/modules/nr.py
@@ -142,7 +142,7 @@ class Module(ModuleManager.BaseModule):
             "time": ("", lambda x: len(x)==4 and x.isdigit()),
             "date": ("", lambda x: len(x)==10),
             "tops": (None, lambda x: len(x)<4 and x.isdigit()),
-            "power": (None, lambda x: x.upper() in ["EMU", "DMU", "HST", "D", "E"], lambda x: x.upper()),
+            "power": (None, lambda x: x.upper() in ["EMU", "DMU", "HST", "D", "E", "DEM"], lambda x: x.upper()),
             "crs": (False, lambda x: type(x)==type(True)),
             "st": (False, lambda x: type(x)==type(True))
             })
@@ -351,7 +351,7 @@ class Module(ModuleManager.BaseModule):
             if schedule:
                 sources.append("Eagle/SCHEDULE")
                 if not query: query = {"trainid": schedule["signalling_id"] or "0000", "operator": schedule["operator_name"] or schedule["atoc_code"]}
-                stype = "%s %s" % (schedule_query["tops_inferred"], schedule["power_type"]) if schedule_query["tops_inferred"] else schedule["power_type"]
+                stype = "%s %s" % (schedule_query.data["tops_inferred"], schedule["power_type"]) if schedule_query.data["tops_inferred"] else schedule["power_type"]
                 for k,v in {
                     "operatorCode": schedule["atoc_code"],
                     "serviceType": stype if stype else SCHEDULE_STATUS[schedule["status"]],
-- 
cgit v1.3.1-10-gc9f91