From d288e12030fc75ffe0419c17b2f3f96e96fbf397 Mon Sep 17 00:00:00 2001
From: fehnomenal <fehnomenal@fehn.systems>
Date: Sat, 29 May 2021 12:07:19 +0200
Subject: [PATCH] Make latitude and longitude numeric fields for correct
 comparisons (#220)

---
 framework/common/entitydef/entitymodel.xml                    | 4 ++--
 .../main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/framework/common/entitydef/entitymodel.xml b/framework/common/entitydef/entitymodel.xml
index 490a9410efd..37b8133f047 100644
--- a/framework/common/entitydef/entitymodel.xml
+++ b/framework/common/entitydef/entitymodel.xml
@@ -286,8 +286,8 @@ under the License.
         <field name="geoPointTypeEnumId" type="id"/>
         <field name="description" type="description"></field>
         <field name="dataSourceId" type="id"></field>
-        <field name="latitude" type="short-varchar" not-null="true"></field>
-        <field name="longitude" type="short-varchar" not-null="true"></field>
+        <field name="latitude" type="fixed-point" not-null="true"></field>
+        <field name="longitude" type="fixed-point" not-null="true"></field>
         <field name="elevation" type="fixed-point"></field>
         <field name="elevationUomId" type="id"><description>UOM for elevation (feet, meters, etc.)</description></field>
         <field name="information" type="comment"><description>To enter any related information</description></field>
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java
index 5b5604b0575..654c44a8f84 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java
@@ -954,6 +954,8 @@ public static void addValueSingle(StringBuffer buffer, ModelField field, Object
     public static void addValueSingle(StringBuilder buffer, ModelField field, Object value, List<EntityConditionParam> params) {
         if (field != null) {
             buffer.append('?');
+        } else if (value instanceof Number) {
+            buffer.append(value);
         } else {
             buffer.append('\'');
             if (value instanceof String) {