Projects >> eonum-client >>60ae87d346997c6abab4e2372a939100ed357ede

Chunk
Conflicting content 
	private double longitude;
	private LocationManager locMgr;
	private String locProvider;
<<<<<<< HEAD
	private Location location = null;
=======

	TextView locationTxt;

	MapView mapView;
	List mapOverlays;
	Drawable drawableLocation, drawableSearchresult;
	MapItemizedOverlay itemizedLocationOverlay, itemizedSearchresultOverlay;

	// detect zoom and trigger event
	private Handler handler = new Handler();
	private int zoomLevel = 0, newZoomLevel;
	public static final int zoomCheckingDelay = 500; // in ms
	private Runnable zoomChecker = new Runnable()
	{
		public void run()
		{
			// ZoomControls mZoom = (ZoomControls) mapView.getZoomControls();;
			mapView.getZoomLevel();

			if (zoomLevel == 0)
				zoomLevel = mapView.getZoomLevel();

			newZoomLevel = mapView.getZoomLevel();

			if (newZoomLevel != zoomLevel)
			{
				Toast.makeText(getApplicationContext(), "You just zoomed!", Toast.LENGTH_SHORT).show();
				zoomLevel = newZoomLevel;
			}

			/* TODO
			 * call function for firing a search event */

			handler.removeCallbacks(zoomChecker); // remove the old callback
			handler.postDelayed(zoomChecker, zoomCheckingDelay); // register a new one
		}
	};

>>>>>>> 9b72a82be380de3025989cac693a8d876a223c11
	/* Implement Location Listener */
	private LocationListener locLst = new LocationListener()
	{
Solution content 
	private double longitude;
	private LocationManager locMgr;
	private String locProvider;
	private Location location = null;
	TextView locationTxt;

	MapView mapView;
	List mapOverlays;
	Drawable drawableLocation, drawableSearchresult;
	MapItemizedOverlay itemizedLocationOverlay, itemizedSearchresultOverlay;

	// detect zoom and trigger event
	private Handler handler = new Handler();
	private int zoomLevel = 0, newZoomLevel;
	public static final int zoomCheckingDelay = 500; // in ms
	private Runnable zoomChecker = new Runnable()
	{
		public void run()
		{
			// ZoomControls mZoom = (ZoomControls) mapView.getZoomControls();;
			mapView.getZoomLevel();

			if (zoomLevel == 0)
				zoomLevel = mapView.getZoomLevel();

			newZoomLevel = mapView.getZoomLevel();

			if (newZoomLevel != zoomLevel)
			{
				Toast.makeText(getApplicationContext(), "You just zoomed!", Toast.LENGTH_SHORT).show();
				zoomLevel = newZoomLevel;
			}

			/* TODO
			 * call function for firing a search event */

			handler.removeCallbacks(zoomChecker); // remove the old callback
			handler.postDelayed(zoomChecker, zoomCheckingDelay); // register a new one
		}
	};

	/* Implement Location Listener */
	private LocationListener locLst = new LocationListener()
	{
File
HealthActivity.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
			mc.animateTo(initGeoPoint);

			// Search for results around that point and display them
<<<<<<< HEAD
			AsyncTask queryAnswer =
				new QueryData(HealthActivity.this).execute(location.getLatitude(), location.getLongitude());
=======
			AsyncTask queryAnswer = new QueryData(HealthActivity.this)
				.execute(
					location.getLatitude(), location.getLongitude());
>>>>>>> 9b72a82be380de3025989cac693a8d876a223c11
			ch.eonum.MedicalLocation[] results = {};
			try
			{
Solution content 
			mc.animateTo(initGeoPoint);

			// Search for results around that point and display them
			AsyncTask queryAnswer =
				new QueryData(HealthActivity.this).execute(location.getLatitude(), location.getLongitude());
			ch.eonum.MedicalLocation[] results = {};
			try
			{
File
HealthActivity.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
	};
	/* End of implemented LocationListener */

<<<<<<< HEAD
	MapView mapView;
	List mapOverlays;
	Drawable drawableLocation, drawableSearchresult;
	MapItemizedOverlay itemizedLocationOverlay, itemizedSearchresultOverlay;
	
	private static final int TWO_MINUTES = 1000 * 60 * 2;
=======
>>>>>>> 9b72a82be380de3025989cac693a8d876a223c11
	private static final String[] CITIES = new CityResolver().getAllCities();

	/**
Solution content 
	};
	/* End of implemented LocationListener */

	private static final int TWO_MINUTES = 1000 * 60 * 2;
	private static final String[] CITIES = new CityResolver().getAllCities();

	/**
File
HealthActivity.java
Developer's decision
Combination
Kind of conflict
Attribute