Merge pull request #515 from franiis/512fix

#512 - fixes problem with creating geofences via API
vitalidze · Feb 11, 2016 · f7eb159 · f7eb159
2 parents 0bc1638 + 7098baa
commit f7eb159
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/main/java/org/traccar/web/shared/model/GeoFence.java b/src/main/java/org/traccar/web/shared/model/GeoFence.java
@@ -16,6 +16,7 @@
 package org.traccar.web.shared.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.gwt.user.client.rpc.GwtTransient;
 import com.google.gwt.user.client.rpc.IsSerializable;
 
@@ -61,10 +62,12 @@ public String getName() {
     @JsonIgnore
     private String description;
 
+    @JsonIgnore
     public String getDescription() {
         return description;
     }
 
+    @JsonProperty
     public void setDescription(String description) {
         this.description = description;
     }
@@ -83,10 +86,12 @@ public void setColor(String color) {
     @JsonIgnore
     private GeoFenceType type;
 
+    @JsonIgnore
     public GeoFenceType getType() {
         return type;
     }
 
+    @JsonProperty
     public void setType(GeoFenceType type) {
         this.type = type;
     }
@@ -97,10 +102,12 @@ public void setType(GeoFenceType type) {
     @JsonIgnore
     private String points;
 
+    @JsonIgnore
     public String getPoints() {
         return points;
     }
 
+    @JsonProperty
     public void setPoints(String points) {
         this.points = points;
     }
@@ -109,10 +116,12 @@ public void setPoints(String points) {
     @JsonIgnore
     private float radius;
 
+    @JsonIgnore
     public float getRadius() {
         return radius;
     }
 
+    @JsonProperty
     public void setRadius(float radius) {
         this.radius = radius;
     }