From 3c3eeac6e5a6ab74012a4cd2f62a009ba9504037 Mon Sep 17 00:00:00 2001
From: PonomarevDA <ponomarevda96@gmail.com>
Date: Wed, 31 Jul 2024 00:03:46 +0300
Subject: [PATCH] remove geographiclib_conversions submodule

---
 .github/workflows/catkin_build.yml     |  2 --
 .gitmodules                            |  3 ---
 Dockerfile                             | 14 ++++++--------
 catkin_build.sh                        |  1 -
 uav_dynamics/geographiclib_conversions |  1 -
 5 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 160000 uav_dynamics/geographiclib_conversions

diff --git a/.github/workflows/catkin_build.yml b/.github/workflows/catkin_build.yml
index a3dcba7..4eac2d4 100644
--- a/.github/workflows/catkin_build.yml
+++ b/.github/workflows/catkin_build.yml
@@ -26,8 +26,6 @@ jobs:
       # 3. Install requirements
       - name: Install innopolis_vtol_dynamics requirements
         run: ./catkin_ws/src/innopolis_vtol_dynamics/uav_dynamics/uav_hitl_dynamics/install_requirements.sh
-      - name: Install geographiclib_conversions requirements
-        run: ./catkin_ws/src/innopolis_vtol_dynamics/uav_dynamics/geographiclib_conversions/scripts/install.sh
       - name: Install uavcan_communicator requirements
         run: |
           cd catkin_ws/src/innopolis_vtol_dynamics/communicators/uavcan_communicator                &&  \
diff --git a/.gitmodules b/.gitmodules
index 08bb3cb..d135f77 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "uav_dynamics/timed_roslaunch"]
 	path = uav_dynamics/timed_roslaunch
 	url = https://github.com/MoriKen254/timed_roslaunch.git
-[submodule "uav_dynamics/geographiclib_conversions"]
-	path = uav_dynamics/geographiclib_conversions
-	url = https://github.com/RaccoonLabDev/geographiclib_conversions.git
 [submodule "uav_dynamics/uav_hitl_dynamics"]
 	path = uav_dynamics/uav_hitl_dynamics
 	url = https://github.com/ZilantRobotics/uav_hitl_dynamics.git
diff --git a/Dockerfile b/Dockerfile
index 6018e37..e7b731e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,30 +17,28 @@ RUN apt-get install -y python3-catkin-tools
 
 RUN if [[ "$ROS_DISTRO" = "melodic" ]] ; then apt-get install -y python-pip python-catkin-tools ; fi
 
-# 2. Install requirements
-# 2.1. geographiclib_conversions
-COPY uav_dynamics/geographiclib_conversions uav_dynamics/geographiclib_conversions/
-RUN ./uav_dynamics/geographiclib_conversions/scripts/install.sh
+# Setup ROS
 RUN source /opt/ros/$ROS_DISTRO/setup.bash                                      &&  \
     cd ../../                                                                   &&  \
     git config --global http.sslverify false                                    && \
     catkin build
 
-# 2.2. inno-sim-interface
+# 2. Install requirements
+# 2.1. inno-sim-interface
 RUN sudo apt-get install -y ros-$ROS_DISTRO-rosauth                             &&  \
     pip install bson pymongo protobuf Pillow twisted
 
-# 2.3. innopolis_vtol_dynamics
+# 2.2. innopolis_vtol_dynamics
 COPY uav_dynamics/uav_hitl_dynamics/install_requirements.sh    uav_dynamics/uav_hitl_dynamics/install_requirements.sh
 COPY uav_dynamics/uav_hitl_dynamics/requirements.txt           uav_dynamics/uav_hitl_dynamics/requirements.txt
 RUN apt-get update && \
     uav_dynamics/uav_hitl_dynamics/install_requirements.sh
 
-# 2.4 tools/can
+# 2.3 tools/can
 COPY scripts/tools scripts/tools
 RUN ./scripts/tools/can/install.sh --yes
 
-# 2.5. communicators
+# 2.4. communicators
 COPY communicators/mavlink_communicator/                        communicators/mavlink_communicator/
 COPY communicators/uavcan_communicator/                         communicators/uavcan_communicator/
 COPY communicators/cyphal_communicator/scripts/config.sh        communicators/cyphal_communicator/scripts/config.sh
diff --git a/catkin_build.sh b/catkin_build.sh
index a1de468..60c6b33 100755
--- a/catkin_build.sh
+++ b/catkin_build.sh
@@ -4,5 +4,4 @@ catkin build innopolis_vtol_dynamics    \
              timed_roslaunch            \
              rosbridge_suite            \
              inno_sim_interface         \
-             geographiclib_conversions  \
              uavcan_communicator
\ No newline at end of file
diff --git a/uav_dynamics/geographiclib_conversions b/uav_dynamics/geographiclib_conversions
deleted file mode 160000
index fa374fa..0000000
--- a/uav_dynamics/geographiclib_conversions
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fa374fa836b0214abd481130a5d8a0c5d9937d4b