Projects >> Taxometr >>f62ea3a5c5433e9b7dd46ce61380168f3068ff61

Chunk
Conflicting content 
     * log tag fro logging
     */
    public static final String LOGTAG = "taxometr";
<<<<<<< HEAD

    /**
     * the minimum time interval for notifications, in milliseconds.
     */
    public static final int MIN_UPDATE_TIME = 3000;

    /**
     * the minimum distance interval for notifications, in meters
     */
    public static final int MIN_DISTANCE = 10;
=======
>>>>>>> 27ccb4921c5e2fb29b38363a1512a861904d76bf

    /**
     * Default constructor
Solution content 
     * log tag fro logging
     */
    public static final String LOGTAG = "taxometr";

    /**
     * the minimum time interval for notifications, in milliseconds.
     */
    public static final int MIN_UPDATE_TIME = 3000;

    /**
     * the minimum distance interval for notifications, in meters
     */
    public static final int MIN_DISTANCE = 10;

    /**
     * Default constructor
File
LocationHelper.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
        return lastKnownPoint;
    }

<<<<<<< HEAD
    /**
     * Return address by given coordinates
     * @param latitude latitude
     * @param longitude longitude
     * @param context context
     * @return address by given coordinates
     * @throws IOException if {@link android.location.Geocoder} is not available
     */
    public static Address getAddressByCoordinates(double latitude, double longitude, Context context) throws IOException {
        final Geocoder geocoder = new Geocoder(context);
        try{
            final List
 addresses = geocoder.getFromLocation(latitude, longitude, 1);
=======
    public static Address getAddressByCoordinates(double latitude, double longitude, Context context) {
        Geocoder geocoder = new Geocoder(context);
        try{
            List
 addresses = geocoder.getFromLocation(latitude, longitude, 1);
>>>>>>> 27ccb4921c5e2fb29b38363a1512a861904d76bf
            return addresses.get(0);
        } catch (IOException e) {
            Log.e(LOGTAG, "Error", e);
Solution content 
        return lastKnownPoint;
    }

    /**
     * Return address by given coordinates
     * @param latitude latitude
     * @param longitude longitude
     * @param context context
     * @return address by given coordinates
     * @throws IOException if {@link android.location.Geocoder} is not available
     */
    public static Address getAddressByCoordinates(double latitude, double longitude, Context context) throws IOException {
        final Geocoder geocoder = new Geocoder(context);
        try{
            final List
 addresses = geocoder.getFromLocation(latitude, longitude, 1);
            return addresses.get(0);
        } catch (IOException e) {
            Log.e(LOGTAG, "Error", e);
File
LocationHelper.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Method signature
Try statement
Variable
Chunk
Conflicting content 
            Log.e(LOGTAG, "Error", e);
            throw e;
        }
<<<<<<< HEAD
=======
        return null;
>>>>>>> 27ccb4921c5e2fb29b38363a1512a861904d76bf
    }
}
Solution content 
            Log.e(LOGTAG, "Error", e);
            throw e;
        }
    }
}
File
LocationHelper.java
Developer's decision
Version 1
Kind of conflict
Return statement