Projects >> Shuttle-Tracker >>c883e7c6404efb8ed3fced321f22ddaccdad7e1f

Chunk
Conflicting content 
    		map.getOverlays().add(routesOverlay);
        }        
        
<<<<<<< HEAD
        shuttlesOverlay = new VehicleItemizedOverlay(getResources().getDrawable(R.drawable.shuttle_color), map);
        shuttlesOverlay.putRoutes(routes.getRoutes());
=======
        shuttlesOverlay = new DirectionalItemizedOverlay(getResources().getDrawable(R.drawable.shuttle), map);
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da
        map.getOverlays().add(shuttlesOverlay);
        
        stopsOverlay.addAllStops(routes.getStops());
Solution content 
    		map.getOverlays().add(routesOverlay);
        }        
        
        shuttlesOverlay = new VehicleItemizedOverlay(getResources().getDrawable(R.drawable.shuttle_color), map);
        shuttlesOverlay.putRoutes(routes.getRoutes());
        map.getOverlays().add(shuttlesOverlay);
        
        stopsOverlay.addAllStops(routes.getStops());
File
Tracker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
					shuttlesOverlay.removeAllOverlays();
		        
		        	for (VehicleJson v : vehicles) {
<<<<<<< HEAD
		        		shuttlesOverlay.addVehicle(v);
=======
		        		shuttlesOverlay.addOverlay(v.toOverlayItem());
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da
		        	}
				}
Solution content 
		        
		        	for (VehicleJson v : vehicles) {
		        		shuttlesOverlay.addVehicle(v);
		        	}
				}
File
Tracker.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
	private int route_id;
	
	
<<<<<<< HEAD
	private int heading;
	private double latitude;
	private double longitude;
	private int speed;
	private String update_time;
	private String cardinal_point;
		
	public int getRoute_id() {
		return route_id + 1;
	}
	public void setRoute_id(int route_id) {
		this.route_id = route_id;
=======
	public static class Vehicle {
		private int id;
		private String name;
		private Latest_Position latest_position;
		private Icon icon;
		
		public static class Latest_Position {
			private int heading;
			private double latitude;
			private double longitude;
			private int speed;
			private String timestamp;
			private String public_status_msg;
			private String cardinal_point;
			
			public int getHeading() {
				return heading;
			}
			public void setHeading(int heading) {
				this.heading = heading;
			}
			public double getLatitude() {
				return latitude;
			}
			public void setLatitude(double latitude) {
				this.latitude = latitude;
			}
			public double getLongitude() {
				return longitude;
			}
			public void setLongitude(double longitude) {
				this.longitude = longitude;
			}
			public int getSpeed() {
				return speed;
			}
			public void setSpeed(int speed) {
				this.speed = speed;
			}
			public String getTimestamp() {
				return timestamp;
			}
			public void setTimestamp(String timestamp) {
				this.timestamp = timestamp;
			}
			public String getPublic_status_msg() {
				return public_status_msg;
			}
			public void setPublic_status_msg(String public_status_msg) {
				this.public_status_msg = public_status_msg;
			}
			public String getCardinal_point() {
				return cardinal_point;
			}
			public void setCardinal_point(String cardinal_point) {
				this.cardinal_point = cardinal_point;
			}
		}
	
		public static class Icon {
			private int id;
		
			public int getId() {
				return id;
			}
			public void setId(int id) {
				this.id = id;
			}
		}
		public String getName() {
			return name;
		}
		public void setName(String name) {
			this.name = name;
		}
		public int getId() {
			return id;
		}
		public void setId(int id) {
			this.id = id;
		}
		public Latest_Position getLatest_position() {
			return latest_position;
		}
		public void setLatest_position(Latest_Position latest_position) {
			this.latest_position = latest_position;
		}
		public Icon getIcon() {
			return icon;
		}
		public void setIcon(Icon icon) {
			this.icon = icon;
		}
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da
	}
	
	public int getHeading() {
Solution content 
	private int route_id;
	
	
	private int heading;
	private double latitude;
	private double longitude;
	private int speed;
	private String update_time;
	private String cardinal_point;
		
	public int getRoute_id() {
		return route_id + 1;
	}
	public void setRoute_id(int route_id) {
		this.route_id = route_id;
	}
	
	public int getHeading() {
File
VehicleJson.java
Developer's decision
Version 1
Kind of conflict
Attribute
Class declaration
Class signature
Method declaration
Method signature
Chunk
Conflicting content 
    		map.getOverlays().add(routesOverlay);
        }        
        
<<<<<<< HEAD
        shuttlesOverlay = new VehicleItemizedOverlay(getResources().getDrawable(R.drawable.shuttle_color), map);
        shuttlesOverlay.putRoutes(routes.getRoutes());
=======
        shuttlesOverlay = new DirectionalItemizedOverlay(getResources().getDrawable(R.drawable.shuttle), map);
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da
        map.getOverlays().add(shuttlesOverlay);
        
        stopsOverlay.addAllStops(routes.getStops());
Solution content 
    		map.getOverlays().add(routesOverlay);
        }        
        
        shuttlesOverlay = new VehicleItemizedOverlay(getResources().getDrawable(R.drawable.shuttle_color), map);
        shuttlesOverlay.putRoutes(routes.getRoutes());
        map.getOverlays().add(shuttlesOverlay);
        
        stopsOverlay.addAllStops(routes.getStops());
File
Tracker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
					shuttlesOverlay.removeAllOverlays();
		        
		        	for (VehicleJson v : vehicles) {
<<<<<<< HEAD
		        		shuttlesOverlay.addVehicle(v);
=======
		        		shuttlesOverlay.addOverlay(v.toOverlayItem());
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da
		        	}
				}
Solution content 
		        
		        	for (VehicleJson v : vehicles) {
		        		shuttlesOverlay.addVehicle(v);
		        	}
				}
File
Tracker.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
	private int route_id;
	
	
<<<<<<< HEAD
	private int heading;
	private double latitude;
	private double longitude;
	private int speed;
	private String update_time;
	private String cardinal_point;
		
	public int getRoute_id() {
		return route_id + 1;
	}
	public void setRoute_id(int route_id) {
		this.route_id = route_id;
=======
	public static class Vehicle {
		private int id;
		private String name;
		private Latest_Position latest_position;
		private Icon icon;
		
		public static class Latest_Position {
			private int heading;
			private double latitude;
			private double longitude;
			private int speed;
			private String timestamp;
			private String public_status_msg;
			private String cardinal_point;
			
			public int getHeading() {
				return heading;
			}
			public void setHeading(int heading) {
				this.heading = heading;
			}
			public double getLatitude() {
				return latitude;
			}
			public void setLatitude(double latitude) {
				this.latitude = latitude;
			}
			public double getLongitude() {
				return longitude;
			}
			public void setLongitude(double longitude) {
				this.longitude = longitude;
			}
			public int getSpeed() {
				return speed;
			}
			public void setSpeed(int speed) {
				this.speed = speed;
			}
			public String getTimestamp() {
				return timestamp;
			}
			public void setTimestamp(String timestamp) {
				this.timestamp = timestamp;
			}
			public String getPublic_status_msg() {
				return public_status_msg;
			}
			public void setPublic_status_msg(String public_status_msg) {
				this.public_status_msg = public_status_msg;
			}
			public String getCardinal_point() {
				return cardinal_point;
			}
			public void setCardinal_point(String cardinal_point) {
				this.cardinal_point = cardinal_point;
			}
		}
	
		public static class Icon {
			private int id;
		
			public int getId() {
				return id;
			}
			public void setId(int id) {
				this.id = id;
			}
		}
		public String getName() {
			return name;
		}
		public void setName(String name) {
			this.name = name;
		}
		public int getId() {
			return id;
		}
		public void setId(int id) {
			this.id = id;
		}
		public Latest_Position getLatest_position() {
			return latest_position;
		}
		public void setLatest_position(Latest_Position latest_position) {
			this.latest_position = latest_position;
		}
		public Icon getIcon() {
			return icon;
		}
		public void setIcon(Icon icon) {
			this.icon = icon;
		}
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da
	}
	
	public int getHeading() {
Solution content 
	private int route_id;
	
	
	private int heading;
	private double latitude;
	private double longitude;
	private int speed;
	private String update_time;
	private String cardinal_point;
		
	public int getRoute_id() {
		return route_id + 1;
	}
	public void setRoute_id(int route_id) {
		this.route_id = route_id;
	}
	
	public int getHeading() {
File
VehicleJson.java
Developer's decision
Version 1
Kind of conflict
Attribute
Class declaration
Class signature
Method declaration
Method signature
Chunk
Conflicting content 
				if(shuttleList.size() > 0){
					// do ETA calculations and print to the database
					calculateETA();
<<<<<<< HEAD
					JSONSender.saveToDatabase(shuttleList);
					//JSONSender.printToConsole(shuttleList);
=======
					//JSONSender.saveToDatabase(shuttleList);
					JSONSender.printToConsole(shuttleList);
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da
				} else {
					jsExtractor.clearShuttleList();
				}
Solution content 
				if(shuttleList.size() > 0){
					// do ETA calculations and print to the database
					calculateETA();
<<<<<<< HEAD
					JSONSender.saveToDatabase(shuttleList);
					//JSONSender.printToConsole(shuttleList);
=======
					//JSONSender.saveToDatabase(shuttleList);
					JSONSender.printToConsole(shuttleList);
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da
				} else {
					jsExtractor.clearShuttleList();
				}
File
ShuttleTrackerServer.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
	}

	public void setStops(HashMap stops) {
<<<<<<< HEAD
		this.stops = stops;
		this.stopETA.clear();
=======
		if(!finder.changeRoute()) {
			this.stops = stops;
			this.stopETA.clear();
		}
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da
	}

	public int getSpeed() {
Solution content 
	}

	public void setStops(HashMap stops) {
<<<<<<< HEAD
		this.stops = stops;
		this.stopETA.clear();
=======
		if(!finder.changeRoute()) {
			this.stops = stops;
			this.stopETA.clear();
		}
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da
	}

	public int getSpeed() {
File
Shuttle.java
Developer's decision
Manual
Kind of conflict
Attribute
If statement
Method invocation
Chunk
Conflicting content 
	public void setSpeed(int newSpd) {
		if(speedList.size() > 10)
			speedList.remove(0);
<<<<<<< HEAD
		speedList.add((newSpd < 20) ? 20 : newSpd);
=======
		speedList.add((newSpd < 10) ? 10 : newSpd);
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da
		int count = 0;
		
		for(int s : speedList) {
Solution content 
	public void setSpeed(int newSpd) {
		if(speedList.size() > 10)
			speedList.remove(0);
<<<<<<< HEAD
		speedList.add((newSpd < 20) ? 20 : newSpd);
=======
		speedList.add((newSpd < 10) ? 10 : newSpd);
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da
		int count = 0;
		
		for(int s : speedList) {
File
Shuttle.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content 
		for (String name : stops.keySet()) {
			p = stops.get(name).getLocation();
			double distance = finder.getDistanceToStop(p);
<<<<<<< HEAD
			int time = (int) ((distance / (double)this.speed) * 3600000);
=======
			int time = (int) ((distance / (double)this.speed) * 3600000) - 1000 +
						(count * 30 * 00);
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da
			//System.out.println((double) ((double)time * (1.667 * Math.pow(10, -5))));
			this.stopETA.put(name, time);
			count++;
Solution content 
=======
		for (String name : stops.keySet()) {
			p = stops.get(name).getLocation();
			double distance = finder.getDistanceToStop(p);
<<<<<<< HEAD
			int time = (int) ((distance / (double)this.speed) * 3600000);
			int time = (int) ((distance / (double)this.speed) * 3600000) - 1000 +
						(count * 30 * 00);
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da
			//System.out.println((double) ((double)time * (1.667 * Math.pow(10, -5))));
			this.stopETA.put(name, time);
			count++;
File
Shuttle.java
Developer's decision
Manual
Kind of conflict
Cast expression
Variable
Chunk
Conflicting content 
		public String getRouteName() {
			return routeList.get(0).getRouteName();
		}
<<<<<<< HEAD
=======
		
		public boolean changeRoute() {
			return this.foundRoute;
		}
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da

		private void determineRouteOfShuttle() {
			// using the given routes, determine which route the
Solution content 
		public String getRouteName() {
			return routeList.get(0).getRouteName();
		}
<<<<<<< HEAD
=======
		
		public boolean changeRoute() {
			return this.foundRoute;
		}
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da

		private void determineRouteOfShuttle() {
			// using the given routes, determine which route the
File
Shuttle.java
Developer's decision
Manual
Kind of conflict
Method declaration
Chunk
Conflicting content 
				this.closestRouteCoor = (distanceArray[0] < distanceArray[1]) ? locationArray[0]
						: locationArray[1];
				this.routeList.remove((distanceArray[0] < distanceArray[1]) ? 1 : 0);
<<<<<<< HEAD
				this.indexOfClosestCoordinate = indexArray[this.getRouteID() - 1] - 2;
=======
				this.indexOfClosestCoordinate = indexArray[this.getRouteID() - 1];
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da
			}
		}
Solution content 
				this.closestRouteCoor = (distanceArray[0] < distanceArray[1]) ? locationArray[0]
						: locationArray[1];
				this.routeList.remove((distanceArray[0] < distanceArray[1]) ? 1 : 0);
<<<<<<< HEAD
				this.indexOfClosestCoordinate = indexArray[this.getRouteID() - 1] - 2;
=======
				this.indexOfClosestCoordinate = indexArray[this.getRouteID() - 1];
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da
			}
		}
File
Shuttle.java
Developer's decision
Manual
Kind of conflict
Array access
Attribute
Chunk
Conflicting content 
				//if (rt.getIdNum() == routeID) {
					list = rt.getCoordinateList();
<<<<<<< HEAD
					int index = indexOfClosestCoordinate;
					int count = 0;
					distanceToTravel = calculateDistance(list.get(index));
=======
					int index = indexOfClosestCoordinate + 1;
					int count = 0;
					distanceToTravel = calculateDistance(list.get(index - 1));
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da
					for (count = 0; count <= list.size(); count++) {
						if (index > list.size() - 1)
							index = 1;
Solution content 
				//if (rt.getIdNum() == routeID) {
					list = rt.getCoordinateList();
<<<<<<< HEAD
					int index = indexOfClosestCoordinate;
					int count = 0;
					distanceToTravel = calculateDistance(list.get(index));
=======
					int index = indexOfClosestCoordinate + 1;
					int count = 0;
					distanceToTravel = calculateDistance(list.get(index - 1));
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da
					for (count = 0; count <= list.size(); count++) {
						if (index > list.size() - 1)
							index = 1;
File
Shuttle.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
						// distance between this coordinate and the stop is
						// greater than 15 ft
						if (distance <= .006)
<<<<<<< HEAD
							break;
=======
							return distanceToTravel;
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da
						distanceToTravel += calculateDistance(list.get(index),
								list.get(index - 1)) + .003;
						index++;
Solution content 
						// distance between this coordinate and the stop is
						// greater than 15 ft
						if (distance <= .006)
<<<<<<< HEAD
							break;
=======
							return distanceToTravel;
>>>>>>> 37c497d0ef77471039ebff4b92a61104b02762da
						distanceToTravel += calculateDistance(list.get(index),
								list.get(index - 1)) + .003;
						index++;
File
Shuttle.java
Developer's decision
Manual
Kind of conflict
Break statement
Return statement
Variable