Commit ba66d074 authored by Schoumi's avatar Schoumi

Fix some crash

parent 8359aa27
......@@ -151,6 +151,8 @@ public class Database extends SQLiteOpenHelper {
}
public void addSitesToDb(List<BloodSite> sites) {
if(sites == null)
return;
//remove existing site in the list
List<BloodSite> oldList = getBloodSites(-1);
List<BloodSite> removeList = new ArrayList<>();
......
......@@ -169,7 +169,7 @@ public class MapsFragment extends Fragment implements OnMapReadyCallback {
userCenter.remove();
MarkerOptions markerOptions = new MarkerOptions().position(new LatLng(location.getLatitude(),location.getLongitude()))
.icon(BitmapDescriptorFactory.getInstance().fromResource(R.drawable.userlocation));
.icon(BitmapDescriptorFactory.getInstance().fromResource(R.drawable.userlocation)).anchor(0.5f,0.5f);
userCenter = map.addMarker(markerOptions);
}
Database.getInstance(getActivity()).updateUserLoc(location.getLatitude(), location.getLongitude());
......@@ -177,7 +177,12 @@ public class MapsFragment extends Fragment implements OnMapReadyCallback {
List<Address> addrList = coder.getFromLocation(location.getLatitude(), location.getLongitude(), 5);
for (Address addr : addrList) {
if (addr != null && addr.getPostalCode() != null) {
Integer code = Integer.valueOf(addr.getPostalCode());
Integer code;
try {
code = Integer.valueOf(addr.getPostalCode());
} catch (NumberFormatException e) {
continue;
}
int original = (code - (code % 1000)) / 1000;
if (original == 97) {
postCode = (code - (code % 100)) / 100;
......@@ -512,6 +517,7 @@ public class MapsFragment extends Fragment implements OnMapReadyCallback {
else
res = R.drawable.mixed;
options.icon(BitmapDescriptorFactory.getInstance().fromResource(res));
options.anchor(0.5f,0.5f);
}
markerList.put(site.getDbId(),map.addMarker(options));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment