diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/traccar/geocoder/MapmyIndiaGeocoder.java | 29 | ||||
| -rw-r--r-- | src/org/traccar/protocol/CellocatorProtocolDecoder.java | 7 | ||||
| -rw-r--r-- | src/org/traccar/protocol/FreematicsProtocolDecoder.java | 1 |
3 files changed, 24 insertions, 13 deletions
diff --git a/src/org/traccar/geocoder/MapmyIndiaGeocoder.java b/src/org/traccar/geocoder/MapmyIndiaGeocoder.java index d42ad8eb3..2b70708a1 100644 --- a/src/org/traccar/geocoder/MapmyIndiaGeocoder.java +++ b/src/org/traccar/geocoder/MapmyIndiaGeocoder.java @@ -1,3 +1,18 @@ +/* + * Copyright 2019 Anton Tananaev (anton@traccar.org) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.traccar.geocoder; import javax.json.JsonArray; @@ -22,9 +37,9 @@ public class MapmyIndiaGeocoder extends JsonGeocoder { address.setFormattedAddress(result.getString("formatted_address")); } - if (result.containsKey("house_number") && (result.getString("house_number") != "")) { + if (result.containsKey("house_number") && !result.getString("house_number").isEmpty()) { address.setHouse(result.getString("house_number")); - } else if (result.containsKey("house_name") && (result.getString("house_name") != "")) { + } else if (result.containsKey("house_name") && !result.getString("house_name").isEmpty()) { address.setHouse(result.getString("house_name")); } @@ -32,17 +47,17 @@ public class MapmyIndiaGeocoder extends JsonGeocoder { address.setStreet(result.getString("street")); } - if (result.containsKey("locality") && (result.getString("locality") != "")) { + if (result.containsKey("locality") && !result.getString("locality").isEmpty()) { address.setSuburb(result.getString("locality")); - } else if (result.containsKey("sublocality") && (result.getString("sublocality") != "")) { + } else if (result.containsKey("sublocality") && !result.getString("sublocality").isEmpty()) { address.setSuburb(result.getString("sublocality")); - } else if (result.containsKey("subsublocality") && (result.getString("subsublocality") != "")) { + } else if (result.containsKey("subsublocality") && !result.getString("subsublocality").isEmpty()) { address.setSuburb(result.getString("subsublocality")); } - if (result.containsKey("city") && (result.getString("city") != "")) { + if (result.containsKey("city") && !result.getString("city").isEmpty()) { address.setSettlement(result.getString("city")); - } else if (result.containsKey("village") && (result.getString("village") != "")) { + } else if (result.containsKey("village") && !result.getString("village").isEmpty()) { address.setSettlement(result.getString("village")); } diff --git a/src/org/traccar/protocol/CellocatorProtocolDecoder.java b/src/org/traccar/protocol/CellocatorProtocolDecoder.java index 453d8d7e7..d23f76a93 100644 --- a/src/org/traccar/protocol/CellocatorProtocolDecoder.java +++ b/src/org/traccar/protocol/CellocatorProtocolDecoder.java @@ -117,12 +117,7 @@ public class CellocatorProtocolDecoder extends BaseProtocolDecoder { position.set(Position.KEY_STATUS, buf.readUnsignedByte() & 0x0f); - if (alternative) { - buf.readUnsignedByte(); // configuration flags - } else { - buf.readUnsignedByte(); // operator - } - + buf.readUnsignedByte(); // operator / configuration flags buf.readUnsignedByte(); // reason data position.set(Position.KEY_ALARM, decodeAlarm(buf.readUnsignedByte())); diff --git a/src/org/traccar/protocol/FreematicsProtocolDecoder.java b/src/org/traccar/protocol/FreematicsProtocolDecoder.java index 866e0fd6e..ba47699c3 100644 --- a/src/org/traccar/protocol/FreematicsProtocolDecoder.java +++ b/src/org/traccar/protocol/FreematicsProtocolDecoder.java @@ -56,6 +56,7 @@ public class FreematicsProtocolDecoder extends BaseProtocolDecoder { break; case "EV": event = value; + break; case "TS": time = value; break; |