From beb49f7f31ad8d332fc734b7247213c2a3cf118f Mon Sep 17 00:00:00 2001
From: Eddy Ferre <eddy.ferre@georobotix.com>
Date: Tue, 28 Jul 2026 12:38:23 -0700
Subject: [PATCH 1/2] [Aero] add NavDb get methods

---
 .../sensorhub-utils-aero/build.gradle         |  1 +
 .../sensorhub/utils/aero/INavDatabase.java    | 47 +++++++++++++++----
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/sensors/aviation/sensorhub-utils-aero/build.gradle b/sensors/aviation/sensorhub-utils-aero/build.gradle
index 91436fe76..d3105a4f3 100644
--- a/sensors/aviation/sensorhub-utils-aero/build.gradle
+++ b/sensors/aviation/sensorhub-utils-aero/build.gradle
@@ -3,6 +3,7 @@ ext.details = 'Common classes for use in aviation applications (e.g. aircraft st
 version = '1.0.0'
 
 dependencies {
+  implementation 'org.locationtech.jts:jts-core:1.19.0'
   implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion
   implementation project(':sensorhub-process-geoloc')
 }
diff --git a/sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/INavDatabase.java b/sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/INavDatabase.java
index 14781f82e..ff166bc34 100644
--- a/sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/INavDatabase.java
+++ b/sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/INavDatabase.java
@@ -14,15 +14,17 @@
 
 package org.sensorhub.utils.aero;
 
-import java.time.LocalDate;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.TimeoutException;
+import org.locationtech.jts.geom.Polygon;
 import org.sensorhub.api.ISensorHub;
 import org.sensorhub.api.common.SensorHubException;
 import org.sensorhub.impl.module.ModuleRegistry;
 import org.sensorhub.utils.Async;
 
+import java.time.LocalDate;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.TimeoutException;
+
 
 /**
  * <p>
@@ -46,11 +48,25 @@ public interface INavDbWaypoint extends IWaypoint
     {
         public String getName();
     }
-    
-    
+
+    public interface INavDbShape
+    {
+        public String getName();
+        public Polygon getGeom();
+    }
+
+    public interface INavDbRoute
+    {
+        public String getName();
+        public List<String> getFixes();
+    }
+
+
     public boolean isReady();
     
-    
+
+    public String getDbPath();
+
     /**
      * @return The AIRAC date of the loaded database or null if unknown
      */
@@ -64,8 +80,23 @@ public interface INavDbWaypoint extends IWaypoint
     
     
     public Collection<? extends INavDbWaypoint> getAllWaypoints();
+
+
+    public Collection<? extends INavDbRoute> getAllAirways();
+
+
+    public Collection<? extends INavDbRoute> getAllSids();
+
+
+    public Collection<? extends INavDbRoute> getAllStars();
+
+
+    public Collection<? extends INavDbShape> getAllSuas();
+
+
+    public Collection<? extends INavDbShape> getAllFirs();
     
-    
+
     public IDecodedRoute decodeRoute(String codedRouteString);
 
 

From f26eb116a52896ac0e387eb1beacc590d74cd398 Mon Sep 17 00:00:00 2001
From: Alex Robin <alex.robin@sensiasoft.com>
Date: Tue, 28 Jul 2026 22:33:25 +0200
Subject: [PATCH 2/2] Reformating in INavDatabase.java

---
 .../java/org/sensorhub/utils/aero/INavDatabase.java  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/INavDatabase.java b/sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/INavDatabase.java
index ff166bc34..1c8befaca 100644
--- a/sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/INavDatabase.java
+++ b/sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/INavDatabase.java
@@ -14,17 +14,16 @@
 
 package org.sensorhub.utils.aero;
 
+import java.time.LocalDate;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.TimeoutException;
 import org.locationtech.jts.geom.Polygon;
 import org.sensorhub.api.ISensorHub;
 import org.sensorhub.api.common.SensorHubException;
 import org.sensorhub.impl.module.ModuleRegistry;
 import org.sensorhub.utils.Async;
 
-import java.time.LocalDate;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.TimeoutException;
-
 
 /**
  * <p>
@@ -48,12 +47,14 @@ public interface INavDbWaypoint extends IWaypoint
     {
         public String getName();
     }
+ 
 
     public interface INavDbShape
     {
         public String getName();
         public Polygon getGeom();
     }
+ 
 
     public interface INavDbRoute
     {
@@ -66,6 +67,7 @@ public interface INavDbRoute
     
 
     public String getDbPath();
+ 
 
     /**
      * @return The AIRAC date of the loaded database or null if unknown