Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Small refactoring and cleaning

Browse source
This commit is contained in:
PaulStets 2018-02-01 15:34:49 +02:00 committed by Alexander Sytnyk
parent be45cb0706
commit a4ab825925
3 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd-java/src/net/osmand/binary/BinaryMapRouteReaderAdapter.java
View file

@ -52,7 +52,6 @@ public class BinaryMapRouteReaderAdapter {
public final static int TRAFFIC_SIGNALS = 6; public final static int TRAFFIC_SIGNALS = 6;
public final static int RAILWAY_CROSSING = 7; public final static int RAILWAY_CROSSING = 7;
private final static int LANES = 8; private final static int LANES = 8;
private static final int TUNNEL = 9;
private final String t; private final String t;
private final String v; private final String v;
private int intValue; private int intValue;
@ -202,8 +201,6 @@ public class BinaryMapRouteReaderAdapter {
if (i > 0) { if (i > 0) {
intValue = Integer.parseInt(v.substring(0, i)); intValue = Integer.parseInt(v.substring(0, i));
} }
} else if (t.equalsIgnoreCase("tunnel") && v != null) {
type = TUNNEL;
} }
} }
} }

1
OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
View file

@ -16,7 +16,6 @@ import net.osmand.plus.ApplicationMode;
import net.osmand.plus.IconsCache; import net.osmand.plus.IconsCache;
import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.OsmandSettings.MetricsConstants; import net.osmand.plus.OsmandSettings.MetricsConstants;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.TargetPointsHelper.TargetPoint; import net.osmand.plus.TargetPointsHelper.TargetPoint;

4
OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
View file

@ -17,7 +17,6 @@ import android.hardware.GeomagneticField;
import android.os.BatteryManager; import android.os.BatteryManager;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.text.format.DateFormat; import android.text.format.DateFormat;
import android.util.Log;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ImageView; import android.widget.ImageView;
@ -1294,8 +1293,7 @@ public class RouteInfoWidgetsFactory {
visible = peds; visible = peds;
} else if (alarm.getType() == AlarmInfoType.TUNNEL) { } else if (alarm.getType() == AlarmInfoType.TUNNEL) {
visible = tunnels; visible = tunnels;
} } else {
else {
visible = trafficWarnings; visible = trafficWarnings;
} }
} }