From: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Date: Mon, 13 Feb 2017 15:43:22 +0000 (-0500)
Subject: Merge branch 'v1.1'
X-Git-Tag: v2.0.0~49
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=commitdiff_plain;h=b6bb9b5e3f414e408ea622cc4b0753b7f19d6242;hp=6833a3f4e39b0a858a4595576a784b6710b88467

Merge branch 'v1.1'
---

diff --git a/skyquake/plugins/composer/src/src/libraries/utils.js b/skyquake/plugins/composer/src/src/libraries/utils.js
index 1d54a6f5b..ee4163cd2 100644
--- a/skyquake/plugins/composer/src/src/libraries/utils.js
+++ b/skyquake/plugins/composer/src/src/libraries/utils.js
@@ -212,9 +212,27 @@ export default {
 						let key = fragment.split('[')[0];
 						let searchObject = {};
 						searchObject[predicateKey] = predicateValue;
-						objectCopy = _.find(objectCopy[key], searchObject);
-						if (!objectCopy) {
-							return [];
+						let found = _.find(objectCopy[key], searchObject);
+						if (found) {
+							objectCopy = found;
+						} else {
+							// check for numerical value
+							if (predicateValue != "" &&
+								predicateValue != null &&
+								predicateValue != NaN &&
+								predicateValue != Infinity &&
+								predicateValue != -Infinity) {
+								let numericalPredicateValue = _.toNumber(predicateValue);
+								if (_.isNumber(numericalPredicateValue)) {
+									searchObject[predicateKey] = numericalPredicateValue;
+									found = _.find(objectCopy[key], searchObject);
+								}
+							}
+							if (found) {
+								objectCopy = found;
+							} else {
+								return [];
+							}
 						}
 					} else {
 						// contains no predicate