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

code clean

Browse source
This commit is contained in:
madwasp79 2019-03-18 16:22:46 +02:00
parent d7948a7316
commit f1b28d0c2f
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
View file

@ -3,10 +3,8 @@ package net.osmand.plus;
import android.content.Context;
import android.text.format.DateUtils;
import net.osmand.Location;
import net.osmand.data.Amenity;
import net.osmand.data.City.CityType;
import net.osmand.data.LatLon;
import net.osmand.osm.AbstractPoiType;
import net.osmand.osm.MapPoiTypes;
import net.osmand.osm.PoiCategory;

9
OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
View file

@ -14,8 +14,6 @@ import android.widget.TextView;
import net.osmand.GPXUtilities.WptPt;
import net.osmand.Location;
import net.osmand.PlatformUtil;
import net.osmand.data.LatLon;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.R;
@ -25,13 +23,10 @@ import net.osmand.util.MapUtils;
import java.util.Collections;
import java.util.List;
import org.apache.commons.logging.Log;
public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter.MeasureToolItemVH>
implements MeasurementToolItemTouchHelperCallback.ItemTouchHelperAdapter {
private static final Log LOG = PlatformUtil.getLog(MeasurementToolAdapter.class);
private final MapActivity mapActivity;
private final List<WptPt> points;
private MeasurementAdapterListener listener;
@ -95,7 +90,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
if (!TextUtils.isEmpty(pointDesc)) {
holder.descr.setText(pointDesc);
} else {
String azimuth = "";
String azimuth;
String text = "";
if (pos < 1) {
text = mapActivity.getString(R.string.shared_string_control_start);
@ -111,7 +106,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
dist += MapUtils.getDistance(points.get(i - 1).lat, points.get(i - 1).lon,
points.get(i).lat, points.get(i).lon);
azimuth = OsmAndFormatter.getFormattedAzimuth(MapUtils.getBearingToPoint(
points.get(i-1).lat, points.get(i-1).lon,
points.get(i - 1).lat, points.get(i - 1).lon,
points.get(i).lat, points.get(i).lon));
text = OsmAndFormatter.getFormattedDistance(dist, mapActivity.getMyApplication()) + BULLET + azimuth;
}