Merge pull request #24 from sematext/rename_geo_location_field

Rename field from location to geoip.location
sematext · Jun 8, 2020 · 9c8e6da · 9c8e6da
2 parents e6fbe2c + cb44dde
commit 9c8e6da
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,7 +7,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 28
         versionCode 1
-        versionName "2.2.2"
+        versionName "2.3.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/logseneandroid/build.gradle b/logseneandroid/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 28
         versionCode 4
-        versionName "2.2.2"
+        versionName "2.3.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

diff --git a/logseneandroid/src/main/java/com/sematext/logseneandroid/Logsene.java b/logseneandroid/src/main/java/com/sematext/logseneandroid/Logsene.java
@@ -514,10 +514,12 @@ private void enrich(JSONObject obj) {
 
       // create a location out of lat and lon fields
       if (obj.has("lat") && obj.has("lon")) {
-        obj.put("location", String.format("%.2f,%.2f",
+        JSONObject geoip = new JSONObject();
+        geoip.put("location", String.format("%.2f,%.2f",
                 obj.getDouble("lat"), obj.getDouble("lon")));
         obj.remove("lat");
         obj.remove("lon");
+        obj.put("geoip", geoip);
       }
     } catch (JSONException e) {
       // thrown when key is null in put(), so should never happen