diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2019-02-02 00:31:18 -0800 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2019-02-02 00:31:18 -0800 |
commit | 9d9778d13be1cef31c7891fc9519edfa54efdc2a (patch) | |
tree | d04b3b74b4f727948ae981da3ab53a773d554c0a /src/org/traccar/geocoder | |
parent | a6dab5ead053d641da3221ecacacb3c67bf72fb9 (diff) | |
download | traccar-server-9d9778d13be1cef31c7891fc9519edfa54efdc2a.tar.gz traccar-server-9d9778d13be1cef31c7891fc9519edfa54efdc2a.tar.bz2 traccar-server-9d9778d13be1cef31c7891fc9519edfa54efdc2a.zip |
Fix code issues
Diffstat (limited to 'src/org/traccar/geocoder')
-rw-r--r-- | src/org/traccar/geocoder/MapmyIndiaGeocoder.java | 29 |
1 files changed, 22 insertions, 7 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")); } |