Group 11 Assignment 2 Submission

.gitignore

@@ -12,5 +12,6 @@
 /captures
 .externalNativeBuild
 .cxx
+secrets.properties
 local.properties
 /.idea/

app/build.gradle

@@ -2,6 +2,7 @@ plugins {
     id 'com.android.application'
     id 'com.google.gms.google-services'
     id 'androidx.navigation.safeargs'
+
     id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin'
 }
 
@@ -23,18 +24,21 @@ android {
         versionCode 1
         versionName "1.0"
 
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         // Example of referencing secrets (if you use secrets.properties):
-        buildConfigField "String", "MAPS_API_KEY",
-                "\"${localProperties['MAPS_API_KEY'] ?: ''}\""
-        buildConfigField "String", "OPENPOSITIONING_API_KEY",
-                "\"${localProperties['OPENPOSITIONING_API_KEY'] ?: ''}\""
-        buildConfigField "String", "OPENPOSITIONING_MASTER_KEY",
-                "\"${localProperties['OPENPOSITIONING_MASTER_KEY'] ?: ''}\""
+        buildConfigField "String", "MAPS_API_KEY", "\"${localProperties['MAPS_API_KEY'] ?: ''}\""
+        buildConfigField "String", "OPENPOSITIONING_API_KEY", "\"${localProperties['OPENPOSITIONING_API_KEY'] ?: ''}\""
+        buildConfigField "String", "OPENPOSITIONING_MASTER_KEY", "\"${localProperties['OPENPOSITIONING_MASTER_KEY'] ?: ''}\""
+
+        resValue("string", "google_maps_key", localProperties.getProperty("MAPS_API_KEY"))
+
     }
 
     buildFeatures {
+
+
         // For example:
         // compose true    // if you want Jetpack Compose
         // viewBinding true
@@ -92,4 +96,15 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+
+    // Added EJML for matrix operations used in sensor fusion algorithms
+    implementation 'org.ejml:ejml-all:0.43.1'
+
+    // Added these for enhanced math operations
+    implementation 'org.apache.commons:commons-math3:3.6.1'
+
+    implementation 'com.google.maps.android:android-maps-utils:3.4.0'
+
+    implementation 'com.google.maps.android:android-maps-utils:2.3.0'
+
 }

app/src/main/AndroidManifest.xml

@@ -84,7 +84,7 @@
     <!-- Google Maps API key metadata -->
     <meta-data
         android:name="com.google.android.geo.API_KEY"
-        android:value="@string/google_maps_key"/>
+        android:value="@string/google_maps_key" />
 
     <activity
         android:name="com.openpositioning.PositionMe.presentation.activity.MainActivity"

app/src/main/java/com/openpositioning/PositionMe/data/remote/ServerCommunications.java

@@ -93,7 +93,7 @@ public class ServerCommunications implements Observable {
                     + "/?key=" + masterKey;
     private static final String downloadURL =
             "https://openpositioning.org/api/live/trajectory/download/" + userKey
-                    + "?skip=0&limit=30&key=" + masterKey;
+                    + "?skip=0&limit=200&key=" + masterKey;
     private static final String infoRequestURL =
             "https://openpositioning.org/api/live/users/trajectories/" + userKey
                     + "?key=" + masterKey;

app/src/main/java/com/openpositioning/PositionMe/fusion/IPositionFusionAlgorithm.java

@@ -0,0 +1,80 @@
+package com.openpositioning.PositionMe.fusion;
+
+import android.content.Context;
+
+import com.google.android.gms.maps.model.LatLng;
+import com.openpositioning.PositionMe.utils.PdrProcessing;
+
+/**
+ * Interface for position fusion algorithms.
+ * Implementing classes should provide algorithms for fusing PDR and GNSS
+ * positioning sources into a single estimate.
+ *
+ *
+ * @author Michal Wiercigroch
+ */
+public abstract class IPositionFusionAlgorithm {
+
+    /**
+     * Processes an update from the PDR system.
+     *
+     * @param eastMeters The east position in meters relative to the reference point
+     * @param northMeters The north position in meters relative to the reference point
+     * @param altitude The altitude in meters
+     */
+    public abstract void processPdrUpdate(float eastMeters, float northMeters, float altitude);
+
+    /**
+     * Processes an update from the GNSS system.
+     *
+     * @param position The GNSS position (latitude, longitude)
+     * @param altitude The altitude in meters
+     */
+    public abstract void processGnssUpdate(LatLng position, double altitude);
+
+    /**
+     * Processes an update from the GNSS system.
+     *
+     * @param position The WiFi position in LatLng format (latitude, longitude)
+     * @param floor The floor index
+     */
+    public abstract void processWifiUpdate(LatLng position, int floor);
+
+    /**
+     * Gets the current fused position estimate.
+     *
+     * @return The fused position (latitude, longitude)
+     */
+    public abstract LatLng getFusedPosition();
+
+    /**
+     * Resets the fusion algorithm to its initial state.
+     */
+    public abstract void reset();
+
+    /**
+     * Future implementation: Processes an update from the WiFi positioning system.
+     *
+     * @param position The WiFi position (latitude, longitude)
+     */
+    // void processWifiUpdate(LatLng position); - Will be implemented in future updates
+
+    /**
+     * Performs static positioning update every 1000ms
+     *
+     */
+    public abstract void staticUpdate();
+
+    /**
+     *
+     * @param context
+     */
+    public abstract void retrieveContext(Context context);
+
+    /**
+     *
+     * @param elevationDirection
+     */
+
+    public abstract void setElevationStatus(PdrProcessing.ElevationDirection elevationDirection);
+}