Skip to content

Commit

Permalink
Fix code issues
Browse files Browse the repository at this point in the history
  • Loading branch information
tananaev committed Feb 2, 2019
1 parent a6dab5e commit 9d9778d
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 13 deletions.
4 changes: 4 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,10 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.7.1</version>
</plugin>
</plugins>
</build>

Expand Down
29 changes: 22 additions & 7 deletions src/org/traccar/geocoder/MapmyIndiaGeocoder.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* Copyright 2019 Anton Tananaev ([email protected])
*
* 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;
Expand All @@ -22,27 +37,27 @@ public Address parseAddress(JsonObject json) {
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"));
}

if (result.containsKey("street")) {
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"));
}

Expand Down
7 changes: 1 addition & 6 deletions src/org/traccar/protocol/CellocatorProtocolDecoder.java
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,7 @@ protected Object decode(

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()));

Expand Down
1 change: 1 addition & 0 deletions src/org/traccar/protocol/FreematicsProtocolDecoder.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ private Object decodeEvent(
break;
case "EV":
event = value;
break;
case "TS":
time = value;
break;
Expand Down

0 comments on commit 9d9778d

Please sign in to comment.