From db155a89d5b9e68be05a5f3bd7441c9537a37f7c Mon Sep 17 00:00:00 2001
From: jsetton <jeremy.setton@gmail.com>
Date: Thu, 29 Aug 2019 11:37:34 -0400
Subject: [PATCH] Improve state presentation symbol extract logic

Signed-off-by: jsetton <jeremy.setton@gmail.com>
---
 lambda/smarthome/alexa/propertyMap.js | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/lambda/smarthome/alexa/propertyMap.js b/lambda/smarthome/alexa/propertyMap.js
index 6137cbc3..b44e132d 100644
--- a/lambda/smarthome/alexa/propertyMap.js
+++ b/lambda/smarthome/alexa/propertyMap.js
@@ -189,8 +189,7 @@ const normalizeParameters = {
     if (!property.parameters.unitOfMeasure || !getUnitOfMeasure({id: property.parameters.unitOfMeasure})) {
       property.parameters.unitOfMeasure = getUnitOfMeasure({
         dimension: item.type.split(':')[1],
-        symbol: sprintf(item.stateDescription && item.stateDescription.pattern, '42')
-          .split(/\d+\s*(?=\S)/).pop().trim(),
+        symbol: getStatePresentationSymbol(item.stateDescription && item.stateDescription.pattern),
         system: settings.regional &&
           (settings.regional.measurementSystem || settings.regional.region),
         property: 'id'
@@ -211,8 +210,7 @@ const normalizeParameters = {
     if (!temperatureScale) {
       temperatureScale = getUnitOfMeasure({
         dimension: 'Temperature',
-        symbol: sprintf(item.stateDescription && item.stateDescription.pattern, '42')
-          .split(/\d+\s*(?=\S)/).pop().trim(),
+        symbol: getStatePresentationSymbol(item.stateDescription && item.stateDescription.pattern),
         system: settings.regional &&
           (settings.regional.measurementSystem || settings.regional.region),
         property: 'unit'
@@ -249,6 +247,25 @@ const normalizeParameters = {
   }
 };
 
+/**
+ * Defines item state presentation pattern
+ * @type {RegExp}
+ */
+const STATE_PRESENTATION_PATTERN = /[\d.]+\s*(?=.{1,4}$)([%'"]|°[CF]?|[a-zA-Z/]+\d?)$/;
+
+/**
+ * Returns item state presentation symbol
+ * @param  {String} format
+ * @return {String}
+ */
+function getStatePresentationSymbol(format) {
+  try {
+    return sprintf(format, '42').match(STATE_PRESENTATION_PATTERN)[1];
+  } catch (e) {
+    return '';
+  }
+}
+
 /**
  * Defines property map class to associate items to an endpoint from metadata, per the description below:
  *