diff --git a/app/src/main/java/com/mapps/seproject/CameraFragment.java b/app/src/main/java/com/mapps/seproject/CameraFragment.java
index 6c6f101648cb760aa6ed9fb9891f7c3c79797d3b..4522583528e2a1a35e9177864e4547ecfe03f884 100644
--- a/app/src/main/java/com/mapps/seproject/CameraFragment.java
+++ b/app/src/main/java/com/mapps/seproject/CameraFragment.java
@@ -65,6 +65,12 @@ public class CameraFragment extends Fragment {
     FirebaseUser user;
     FirebaseAuth firebaseAuth;
 
+    private com.mapps.seproject.TrackGPS gps;
+    double longitude;
+    double latitude;
+    String city;
+    String postalCode;
+
 
 
     @Override
@@ -136,6 +142,23 @@ public class CameraFragment extends Fragment {
         if (requestCode == CAMERA_CAPTURE_IMAGE_REQUEST_CODE) {
             if (resultCode == RESULT_OK) {
                 uploadFile();
+                gps = new TrackGPS(getActivity());
+
+
+                if(gps.canGetLocation()){
+
+
+                    longitude = gps.getLongitude();
+                    latitude = gps .getLatitude();
+                    city = gps.getCity();
+                    postalCode = gps.getPostalCode();
+                    Toast.makeText(getActivity(),"Longitude:"+Double.toString(longitude)+"\nLatitude:"+Double.toString(latitude)+"\nCity:"+city+"\nPostal:"+postalCode,Toast.LENGTH_SHORT).show();
+                }
+                else
+                {
+
+                    gps.showSettingsAlert();
+                }
             } else if (resultCode == RESULT_CANCELED) {
                 // user cancelled Image capture
                 Toast.makeText(getActivity(),
diff --git a/app/src/main/java/com/mapps/seproject/TrackGPS.java b/app/src/main/java/com/mapps/seproject/TrackGPS.java
index 299eb7543d49eaa95622d1cfedb3eae9ab431340..3a2a4276863f863b3dc926123234f83272066483 100644
--- a/app/src/main/java/com/mapps/seproject/TrackGPS.java
+++ b/app/src/main/java/com/mapps/seproject/TrackGPS.java
@@ -49,15 +49,17 @@ public class TrackGPS extends Service implements LocationListener {
     boolean canGetLocation = false;
 
     Location loc;
-    double latitude;
-    double longitude;
 
-    String city;
-    String postalCode;
 
     String UserEmail = null;
     final DatabaseReference mDatabase = FirebaseDatabase.getInstance().getReference("users");
 
+    private com.mapps.seproject.TrackGPS gps;
+    double longitude;
+    double latitude;
+    String city;
+    String postalCode;
+