Closing #8

askmon · Apr 19, 2014 · 3a3fcc0 · 3a3fcc0
1 parent 36bb1f1
commit 3a3fcc0
Showing 1 changed file with 27 additions and 37 deletions.
diff --git a/Ouvidoria/src/usp/ime/movel/ouvidoria/Mapa.java b/Ouvidoria/src/usp/ime/movel/ouvidoria/Mapa.java
@@ -3,13 +3,16 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+
 import usp.ime.movel.ouvidoria.web.HttpGetRequest;
 import usp.ime.movel.ouvidoria.web.OnHttpResponseListener;
+
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.MapFragment;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
+
 import android.os.Build;
 import android.os.Bundle;
 import android.annotation.SuppressLint;
@@ -28,6 +31,7 @@ public class Mapa extends OuvidoriaActivity implements OnHttpResponseListener {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.mapa);
+		Toast.makeText(Mapa.this, "Aguarde carregamento das ocorrências", Toast.LENGTH_LONG).show();
 		if (googleMap == null) {
 			googleMap = ((MapFragment) getFragmentManager().
 					findFragmentById(R.id.map)).getMap();
@@ -50,44 +54,30 @@ public void onHttpResponse(JSONObject response) {
 		}
 		try { 
 
-		double[] latitude = new double[10];
-		double[] longitude = new double[10];
-		String[] desc = new String[10];
-		for(int i = 0; i < 10; i++){
-			String lat = jsons.getJSONObject(jsons.length() - 1 - i).getJSONObject("incidentrecord")
-					.getString("latitude");
-			if(lat.equals("null")) lat = "0";
-			latitude[i] = Double.parseDouble(lat);
-			String lon = jsons.getJSONObject(jsons.length() - 1 - i).getJSONObject("incidentrecord")
-					.getString("longitude");
-			if(lon.equals("null")) lon = "0";
-			longitude[i] = Double.parseDouble(lon);
-			desc[i] = jsons.getJSONObject(jsons.length() - 1 - i).getJSONObject("incidentrecord")
-					.getString("description");
+			double[] latitude = new double[jsons.length()];
+			double[] longitude = new double[jsons.length()];
+			String[] desc = new String[jsons.length()];
+			for(int i = 0; i < jsons.length(); i++){
+				String lat = jsons.getJSONObject(jsons.length() - 1 - i).getJSONObject("incidentrecord")
+						.getString("latitude");
+				if(lat.equals("null")) lat = "0";
+				latitude[i] = Double.parseDouble(lat);
+				String lon = jsons.getJSONObject(jsons.length() - 1 - i).getJSONObject("incidentrecord")
+						.getString("longitude");
+				if(lon.equals("null")) lon = "0";
+				longitude[i] = Double.parseDouble(lon);
+				desc[i] = jsons.getJSONObject(jsons.length() - 1 - i).getJSONObject("incidentrecord")
+						.getString("description");
+			}
+			for(int j = 0; j < jsons.length(); j++){
+		         if(latitude[j] != 0){
+		         googleMap.addMarker(new MarkerOptions().
+		                 position(new LatLng(latitude[j], longitude[j])).title(desc[j]));
+		         }
+			}
 		}
-         Marker M1 = googleMap.addMarker(new MarkerOptions().
-         position(new LatLng(latitude[0], longitude[0])).title(desc[0]));
-         Marker M2 = googleMap.addMarker(new MarkerOptions().
-                 position(new LatLng(latitude[1], longitude[1])).title(desc[1]));
-         Marker M3 = googleMap.addMarker(new MarkerOptions().
-                 position(new LatLng(latitude[2], longitude[2])).title(desc[2]));
-         Marker M4 = googleMap.addMarker(new MarkerOptions().
-                 position(new LatLng(latitude[3], longitude[3])).title(desc[3]));
-         Marker M5 = googleMap.addMarker(new MarkerOptions().
-                 position(new LatLng(latitude[4], longitude[4])).title(desc[4]));
-         Marker M6 = googleMap.addMarker(new MarkerOptions().
-                 position(new LatLng(latitude[5], longitude[5])).title(desc[5]));
-         Marker M7 = googleMap.addMarker(new MarkerOptions().
-                 position(new LatLng(latitude[6], longitude[6])).title(desc[6]));
-         Marker M8 = googleMap.addMarker(new MarkerOptions().
-                 position(new LatLng(latitude[7], longitude[7])).title(desc[7]));
-         Marker M9 = googleMap.addMarker(new MarkerOptions().
-                 position(new LatLng(latitude[8], longitude[8])).title(desc[8]));
-         Marker M10 = googleMap.addMarker(new MarkerOptions().
-                 position(new LatLng(latitude[9], longitude[9])).title(desc[9]));
-
-		} catch (Exception e) {
-			e.printStackTrace();
+		catch (Exception e) {
+				e.printStackTrace();
 		}
 	}