From e86cc3ef2560d20f39b7a152aab6cc13fdaede21 Mon Sep 17 00:00:00 2001
From: Hampus Rosenquist <hamro777@student.liu.se>
Date: Fri, 21 Oct 2022 17:13:30 +0200
Subject: [PATCH] Aircraft marker working
---
.../android/app/AircraftMapView.java | 28 ++++++-------------
1 file changed, 8 insertions(+), 20 deletions(-)
diff --git a/drip-android-observer-master/Android/app/src/main/java/org/dripdronescanner/android/app/AircraftMapView.java b/drip-android-observer-master/Android/app/src/main/java/org/dripdronescanner/android/app/AircraftMapView.java
index b436247..b2cf3e4 100644
--- a/drip-android-observer-master/Android/app/src/main/java/org/dripdronescanner/android/app/AircraftMapView.java
+++ b/drip-android-observer-master/Android/app/src/main/java/org/dripdronescanner/android/app/AircraftMapView.java
@@ -3,6 +3,8 @@ package org.dripdronescanner.android.app;
import android.Manifest;
import android.content.Context;
import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.view.LayoutInflater;
@@ -11,6 +13,7 @@ import android.view.ViewGroup;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
+import androidx.core.content.res.ResourcesCompat;
import androidx.fragment.app.Fragment;
import org.dripdronescanner.android.R;
@@ -281,19 +284,10 @@ public class AircraftMapView extends Fragment {
Marker pilotMarker = new Marker(map);
pilotMarker.setPosition(new GeoPoint(latLng.latitude, latLng.longitude));
- //pilotMarker.setIcon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_AZURE));
- pilotMarker.setIcon(getResources().getDrawable(R.drawable.ic_airplan));
+ pilotMarker.setIcon(ResourcesCompat.getDrawable(getResources(), R.drawable.ic_airplan, null));
pilotMarker.setTitle("pilot " + id);
pilotMarker.setAlpha(0.5f);
markerPilot = pilotMarker;
-
- /*googleMap.addMarker(
- new MarkerOptions()
- .alpha(0.5f)
- .icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_AZURE))
- .position(latLng)
- .title("pilot " + id));*/
- //markerPilot.setTag(new Pair<>(aircraft, this));
markerPilot.setRelatedObject(aircraft);
markerPilot.setOnMarkerClickListener(new Marker.OnMarkerClickListener() {
@Override
@@ -310,6 +304,7 @@ public class AircraftMapView extends Fragment {
});
}
markerPilot.setPosition(new GeoPoint(latLng.latitude, latLng.longitude)); // duplicate?
+ map.getOverlays().add(markerPilot);
}
};
@@ -332,20 +327,12 @@ public class AircraftMapView extends Fragment {
Marker aircraftMarker = new Marker(map);
aircraftMarker.setPosition(new GeoPoint(latLng.latitude, latLng.longitude));
- //aircraftMarker.setIcon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_AZURE));
- aircraftMarker.setIcon(getResources().getDrawable(R.drawable.ic_airplan));
+ aircraftMarker.setIcon(ResourcesCompat.getDrawable(getResources(), R.drawable.ic_airplan, null));
aircraftMarker.setTitle("aircraft " + id);
aircraftMarker.setAlpha(0.5f);
marker = aircraftMarker;
-
- /*googleMap.addMarker(
- new MarkerOptions()
- .alpha(0.5f)
- .position(latLng)
- .title("aircraft " + id));*/
- //marker.setTag(aircraft);
marker.setRelatedObject(aircraft);
- markerPilot.setOnMarkerClickListener(new Marker.OnMarkerClickListener() {
+ marker.setOnMarkerClickListener(new Marker.OnMarkerClickListener() {
@Override
public boolean onMarkerClick(Marker marker, MapView mapView) {
if (marker != null) {
@@ -360,6 +347,7 @@ public class AircraftMapView extends Fragment {
});
zoom = true;
}
+ map.getOverlays().add(marker);
polylineOptions.add(latLng);
if (polyline != null) {
--
GitLab