Projects >> bostonbusmap >>46db821d4950dd1a0c9de922447bbf0b72637e7e

Chunk
Conflicting content 
	private static final String[] emails = new String[]{"bostonbusmap@gmail.com"};
	private static final String emailSubject = "Los AngelBus error report";

<<<<<<< HEAD
    /**
     * Unimplemented for Los Angelbus
     */
	public static String ALERTS_URL = null;
=======
	private static final String[] emails = new String[]{"bostonbusmap@gmail.com"};
	private static final String emailSubject = "BostonBusMap error report";
    private static final String feedbackUrl = "http://www.mbta.com/customer_support/feedback/";
>>>>>>> cc1496fea30137c0ead383a18783846332d963d8

	private static final boolean showRunNumber = false;
Solution content 
	private static final String[] emails = new String[]{"bostonbusmap@gmail.com"};
	private static final String emailSubject = "Los AngelBus error report";

    /**
     * Unimplemented for Los Angelbus
     */
	public static String ALERTS_URL = null;
	private static final String[] emails = new String[]{"bostonbusmap@gmail.com"};
	private static final String emailSubject = "Los Angelbus error report";
    private static final String feedbackUrl = "http://webapps2.metro.net/customercomments/";

	private static final boolean showRunNumber = false;
File
TransitSystem.java
Developer's decision
Manual
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
	 * This will be null when alerts haven't been read yet
	 */
	private AlertsFuture alertsFuture;
<<<<<<< HEAD
	
	public static double getCenterLat() {
		return laLatitude;
=======
    private static final String agencyName = "MBTA";

    public static double getCenterLat() {
		return bostonLatitude;
>>>>>>> cc1496fea30137c0ead383a18783846332d963d8
	}

	public static double getCenterLon() {
Solution content 
	public static double getCenterLat() {
        return laLatitude;
    }

    private static final String agencyName = "MBTA";


	public static double getCenterLon() {
File
TransitSystem.java
Developer's decision
Manual
Kind of conflict
Attribute
Method signature
Return statement
Chunk
Conflicting content 
			defaultTransitSource = new LABusTransitSource(this, busDrawables, busTransitRoutes, routeTitles);
			
			ImmutableMap.Builder mapBuilder = ImmutableMap.builder();
<<<<<<< HEAD

			transitSourceMap = mapBuilder.build();

			transitSources = ImmutableList.of(defaultTransitSource);

=======
			MbtaRealtimeTransitSource subwayTransitSource = new MbtaRealtimeTransitSource(
					subwayDrawables,
                    routeTitles.getMappingForSources(new Schema.Routes.SourceId[]{Schema.Routes.SourceId.Subway, Schema.Routes.SourceId.CommuterRail}), this);
			for (String route : subwayTransitSource.getRouteTitles().routeTags()) {
				mapBuilder.put(route, subwayTransitSource);
			}

			HubwayTransitSource hubwayTransitSource = new HubwayTransitSource(hubwayDrawables, hubwayTransitRoutes,
					this);

			for (String route : hubwayTransitSource.getRouteTitles().routeTags()) {
				mapBuilder.put(route, hubwayTransitSource);
			}
			transitSourceMap = mapBuilder.build();

			transitSources = ImmutableList.of(subwayTransitSource, hubwayTransitSource,
					defaultTransitSource);
		
>>>>>>> cc1496fea30137c0ead383a18783846332d963d8
		}
		else
		{
Solution content 
			defaultTransitSource = new LABusTransitSource(this, busDrawables, busTransitRoutes, routeTitles);
			
			ImmutableMap.Builder mapBuilder = ImmutableMap.builder();

			transitSourceMap = mapBuilder.build();

			transitSources = ImmutableList.of(defaultTransitSource);

		}
		else
		{
File
TransitSystem.java
Developer's decision
Version 1
Kind of conflict
Attribute
For statement
Method invocation
Variable
Chunk
Conflicting content 
	public final static int FIRST_COPYING_DB = 37;
	public final static int ADDING_BOUNDS = 38;
	public final static int ADDING_BOUNDS_1 = 39;
<<<<<<< HEAD
	public final static int NEW_DB = 40;
	public final static int NEW_DB_2 = 41;
	public final static int NEW_DB_3 = 42;
	public final static int NEW_DB_4 = 43;
	public final static int NEW_DB_5 = 44;
	public final static int NEW_DB_6 = 45;
	public final static int NEW_DB_7 = 46;
	public final static int NEW_DB_8 = 47;
	public final static int NEW_DB_9 = 48;
	public final static int NEW_DB_10 = 49;
	public final static int CURRENT_DB_VERSION = NEW_DB_10;
=======
	public final static int ADDING_BOUNDS_2 = 42;
	public final static int FIX_LOCATIONS = 43;
	public final static int NEW_SUBWAY = 44;
	public final static int NEW_CR = 45;
	public final static int NEW_CR_2 = 46;
	public final static int HUBWAY_1 = 50;
	public final static int HUBWAY_2 = 51;
	public final static int HUBWAY_3 = 52;
	public final static int HUBWAY_4 = 53;
	public final static int HUBWAY_5 = 54;
	public final static int HUBWAY_6 = 55;
    public final static int HUBWAY_7 = 56;
	public final static int HUBWAY_8 = 57;
    public final static int HUBWAY_9 = 58;
    public final static int HUBWAY_10 = 59;
	public final static int HUBWAY_11 = 60;
	public final static int HUBWAY_12 = 61;
	public final static int HUBWAY_13 = 62;
	public final static int HUBWAY_14 = 63;
	public final static int HUBWAY_15 = 64;
	public final static int HUBWAY_16 = 65;
	public final static int HUBWAY_17 = 66;
	public final static int HUBWAY_18 = 67;
	public final static int HUBWAY_19 = 68;
	public final static int HUBWAY_20 = 69;
	public final static int HUBWAY_21 = 70;
	public final static int NEW_1 = 71;
    public final static int NEW_2 = 72;
	public final static int CURRENT_DB_VERSION = NEW_2;
>>>>>>> cc1496fea30137c0ead383a18783846332d963d8

	public static final int ALWAYS_POPULATE = 3;
	public static final int POPULATE_IF_UPGRADE = 2;
Solution content 
	public final static int FIRST_COPYING_DB = 37;
	public final static int ADDING_BOUNDS = 38;
	public final static int ADDING_BOUNDS_1 = 39;
	public final static int NEW_DB = 40;
	public final static int NEW_DB_2 = 41;
	public final static int NEW_DB_3 = 42;
	public final static int NEW_DB_4 = 43;
	public final static int NEW_DB_5 = 44;
	public final static int NEW_DB_6 = 45;
	public final static int NEW_DB_7 = 46;
	public final static int NEW_DB_8 = 47;
	public final static int NEW_DB_9 = 48;
	public final static int NEW_DB_10 = 49;
    public final static int NEW_DB_11 = 50;
	public final static int CURRENT_DB_VERSION = NEW_DB_11;

	public static final int ALWAYS_POPULATE = 3;
	public static final int POPULATE_IF_UPGRADE = 2;
File
DatabaseContentProvider.java
Developer's decision
Manual
Kind of conflict
Attribute