package com.example.suhasamireddy.turtlemap;

import android.Manifest;
import android.content.pm.PackageManager;
import android.support.v4.app.ActivityCompat;
import android.support.v4.app.FragmentActivity;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;

import com.google.android.gms.common.api.GoogleApiClient;
import com.google.android.gms.drive.Drive;
import com.google.android.gms.location.LocationServices;
import com.google.android.gms.maps.CameraUpdateFactory;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.OnMapReadyCallback;
import com.google.android.gms.maps.SupportMapFragment;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.MarkerOptions;

public class MapsActivity extends FragmentActivity implements OnMapReadyCallback {

    private GoogleMap mMap;
    private Marker mMarker;

    @Override
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_maps);
        // Obtain the SupportMapFragment and get notified when the map is ready to be used.
        SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager()
                .findFragmentById(R.id.map);
        mapFragment.getMapAsync(this);

    }


    /**
     * Manipulates the map once available.
     * This callback is triggered when the map is ready to be used.
     * This is where we can add markers or lines, add listeners or move the camera. In this case,
     * we just add a marker near Sydney, Australia.
     * If Google Play services is not installed on the device, the user will be prompted to install
     * it inside the SupportMapFragment. This method will only be triggered once the user has
     * installed Google Play services and returned to the app.
     */
    @Override
    public void onMapReady(GoogleMap googleMap) {
        mMap = googleMap;
        int confirmPermission=0;
          if ( ContextCompat.checkSelfPermission( this, android.Manifest.permission.ACCESS_FINE_LOCATION ) == PackageManager.PERMISSION_GRANTED ) {
            mMap.setMyLocationEnabled(true);
        }else{ // Permissions case will always run, displays a message asking for location permissions
              ActivityCompat.requestPermissions(this,
                      new String[]{Manifest.permission.ACCESS_FINE_LOCATION},
                      confirmPermission);
          }
        mMap.setMyLocationEnabled(true);  //assume they always say yes
        // Marker starts in mckeldin
        LatLng mckeldin = new LatLng(38.985882, -76.944845);
        mMap.addMarker(new MarkerOptions().position(mckeldin).title("Mckeldin"));
        mMap.moveCamera(CameraUpdateFactory.newLatLng(mckeldin));
        mMap.animateCamera( CameraUpdateFactory.zoomTo( 15.5f ) );
<<<<<<< HEAD
        mMap.setOnMyLocationChangeListener(myLocationChangeListener);
=======
        /*Testing marker 1*/
        LatLng Climb = new LatLng(MainActivity.events.get(0).latitude,
                MainActivity.events.get(0).longitude);
        mMap.addMarker(new MarkerOptions().position(Climb).title(
                MainActivity.events.get(0).eventName + " " + MainActivity.events.get(0).latitude
                + " " + MainActivity.events.get(0).longitude +
                        " Time: " + MainActivity.events.get(0).time));
>>>>>>> origin/master
    }
    
    private GoogleMap.OnMyLocationChangeListener myLocationChangeListener = new GoogleMap.OnMyLocationChangeListener() {
    	
        @Override
        public void onMyLocationChange(Location location) {
            LatLng loc = new LatLng(location.getLatitude(), location.getLongitude());
            mMarker = mMap.addMarker(new MarkerOptions().position(loc));
            if(mMap != null){
                mMap.animateCamera(CameraUpdateFactory.newLatLngZoom(loc, 16.0f));
            }
        }
    };
}

@@ -2859,21 +2859,8 @@
  );%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A
     
@@ -2929,16 +2929,8 @@
 r);%0A
-=======%0A
     
@@ -3381,30 +3381,8 @@
 ));%0A
-%3E%3E%3E%3E%3E%3E%3E origin/master%0A
     

Remove conflicts