feat(vectormap): Add waypoint mark in vectorized map

jgauchia · Dec 7, 2024 · dcc59e6 · dcc59e6
1 parent c2787c2
commit dcc59e6
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/lib/maps/src/globalMapsDef.h b/lib/maps/src/globalMapsDef.h
@@ -133,5 +133,11 @@ struct tileBounds
  */
 extern tileBounds totalBounds;
 
+/**
+ * @brief Waypoint destination latitude and longitude
+ *
+ */
+extern double destLat;
+extern double destLon;
 
 #endif
diff --git a/lib/maps/src/mapsDrawFunc.h b/lib/maps/src/mapsDrawFunc.h
@@ -183,7 +183,10 @@ static void displayMap(uint16_t tileSize)
     }
 
     if (tileSize == VECTOR_TILE_SIZE)
+    {
+      mapTempSprite.pushImage(wptPosX-8, wptPosY-8, 16 ,16 ,(uint16_t*)waypoint, TFT_BLACK);
       mapTempSprite.setPivot(tileSize , tileSize );
+    }
 
     mapTempSprite.pushRotated(&mapSprite, 360 - mapHeading, TFT_TRANSPARENT);
     //mapTempSprite.pushRotated(&mapSprite, 0, TFT_TRANSPARENT);

diff --git a/lib/maps/src/renderMaps.hpp b/lib/maps/src/renderMaps.hpp
@@ -30,9 +30,6 @@ extern MapTile oldMapTile;     // Old Map tile coordinates and zoom
 extern MapTile currentMapTile; // Current Map tile coordinates and zoom
 extern MapTile roundMapTile;   // Boundaries Map tiles
 
-extern double destLat;
-extern double destLon;
-
 uint32_t lon2tilex(double f_lon, uint8_t zoom);
 uint32_t lat2tiley(double f_lat, uint8_t zoom);
 double tilex2lon(uint32_t tileX, uint8_t zoom);

diff --git a/lib/maps/src/vectorMaps.cpp b/lib/maps/src/vectorMaps.cpp
@@ -579,9 +579,17 @@ void generateVectorMap(ViewPort &viewPort, MemCache &memCache, TFT_eSprite &map)
     totalBounds.lat_max = mercatorY2lat(viewPort.bbox.max.y);
     totalBounds.lon_min = mercatorX2lon(viewPort.bbox.min.x);
     totalBounds.lon_max = mercatorX2lon(viewPort.bbox.max.x);
-    
+
     log_i("Total Bounds: Lat Min: %f, Lat Max: %f, Lon Min: %f, Lon Max: %f",
       totalBounds.lat_min, totalBounds.lat_max, totalBounds.lon_min, totalBounds.lon_max);
+
+    if(isCoordInBounds(destLat,destLon,totalBounds))
+      coords2map(destLat, destLon, totalBounds, &wptPosX, &wptPosY);
+    else
+    {
+      wptPosX = -1;
+      wptPosY = -1;
+    }
   }
   else
   {

diff --git a/lib/maps/src/vectorMaps.hpp b/lib/maps/src/vectorMaps.hpp
@@ -13,6 +13,7 @@
 #include <vector>
 #include <map>
 #include "globalMapsDef.h"
+#include "renderMaps.hpp"
 #include "gpsMath.hpp"
 #include "settings.hpp"
 
@@ -182,7 +183,7 @@ struct MemBlocks
 };
 
 /**
- * @brief Point in geografic (lat,lon) coordinates and other gps data
+ * @brief Point in geographic (lat,lon) coordinates and other gps data
  *
  */
 struct Coord