[unomi] branch unomi-1.5.x updated: use name for path to location if exists, like in GeoLocationByPointSessionConditionESQueryBuilder (#302)

[jkevan]

This is an automated email from the ASF dual-hosted git repository.

jkevan pushed a commit to branch unomi-1.5.x
in repository https://gitbox.apache.org/repos/asf/unomi.git


The following commit(s) were added to refs/heads/unomi-1.5.x by this push:
     new c3c1f7f  use name for path to location if exists, like in 
GeoLocationByPointSessionConditionESQueryBuilder (#302)
c3c1f7f is described below

commit c3c1f7ff5257286d30a6122644e2e724009e414d
Author: giladw <gweinb...@yotpo.com>
AuthorDate: Fri May 28 12:15:34 2021 +0300

    use name for path to location if exists, like in 
GeoLocationByPointSessionConditionESQueryBuilder (#302)
---
 .../conditions/GeoLocationByPointSessionConditionEvaluator.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/GeoLocationByPointSessionConditionEvaluator.java
 
b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/GeoLocationByPointSessionConditionEvaluator.java
index 12e8da6..e069ed8 100644
--- 
a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/GeoLocationByPointSessionConditionEvaluator.java
+++ 
b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/GeoLocationByPointSessionConditionEvaluator.java
@@ -37,8 +37,11 @@ public class GeoLocationByPointSessionConditionEvaluator 
implements ConditionEva
     public boolean eval(Condition condition, Item item, Map<String, Object> 
context, ConditionEvaluatorDispatcher dispatcher) {
         try {
             String type = (String) condition.getParameter("type");
-            Double latitudeProperty = 
Double.parseDouble(BeanUtils.getProperty(item, "properties.location.lat"));
-            Double longitudeProperty = 
Double.parseDouble(BeanUtils.getProperty(item, "properties.location.lon"));
+            String name = condition.getParameter("name") == null ? 
"properties.location" : (String) condition.getParameter("name");
+
+            Double latitudeProperty = 
Double.parseDouble(BeanUtils.getProperty(item, name + ".lat"));
+            Double longitudeProperty = 
Double.parseDouble(BeanUtils.getProperty(item, name + ".lon"));
+
 
             if("circle".equals(type)) {
                 Double circleLatitude = (Double) 
condition.getParameter("circleLatitude");