Use tileVector for std::vector<std::pair<uint32_t, uint32_t>>

Author: CelliesProjects

src/OpenStreetMap-esp32.cpp

@@ -36,7 +36,7 @@ void OpenStreetMap::PNGDraw(PNGDRAW *pDraw)
     currentInstance->png.getLineAsRGB565(pDraw, destRow, PNG_RGB565_BIG_ENDIAN, 0x0000);
 }
 
-void OpenStreetMap::computeRequiredTiles(double longitude, double latitude, uint8_t zoom, std::vector<std::pair<uint32_t, uint32_t>> &requiredTiles)
+void OpenStreetMap::computeRequiredTiles(double longitude, double latitude, uint8_t zoom, tileVector &requiredTiles)
 {
     // Compute exact tile coordinates
     const double exactTileX = lon2tile(longitude, zoom);
@@ -106,7 +106,7 @@ bool OpenStreetMap::isTileCached(uint32_t x, uint32_t y, uint8_t z)
     return false;
 }
 
-CachedTile *OpenStreetMap::findUnusedTile(const std::vector<std::pair<uint32_t, uint32_t>> &requiredTiles, uint8_t zoom)
+CachedTile *OpenStreetMap::findUnusedTile(const tileVector &requiredTiles, uint8_t zoom)
 {
     for (auto &tile : tilesCache)
     {
@@ -161,6 +161,23 @@ bool OpenStreetMap::resizeTilesCache(uint8_t cacheSize)
     return true;
 }
 
+void OpenStreetMap::updateCache(tileVector &requiredTiles, uint8_t zoom)
+{
+    for (const auto &[x, y] : requiredTiles)
+    {
+        if (!isTileCached(x, y, zoom))
+        {
+            CachedTile *tileToReplace = findUnusedTile(requiredTiles, zoom);
+            String result;
+            const bool success = downloadAndDecodeTile(*tileToReplace, x, y, zoom, result);
+            if (!success)
+                log_e("%s", result.c_str());
+
+            log_i("%s", result.c_str());
+        }
+    }    
+}
+
 bool OpenStreetMap::fetchMap(LGFX_Sprite &mapSprite, double longitude, double latitude, uint8_t zoom)
 {
     if (!zoom || zoom > 18)
@@ -185,7 +202,7 @@ bool OpenStreetMap::fetchMap(LGFX_Sprite &mapSprite, double longitude, double la
     longitude = fmod(longitude + 180.0, 360.0) - 180.0;
     latitude = std::clamp(latitude, -90.0, 90.0);
 
-    std::vector<std::pair<uint32_t, uint32_t>> requiredTiles;
+    tileVector requiredTiles;
     computeRequiredTiles(longitude, latitude, zoom, requiredTiles);
 
     if (tilesCache.capacity() < requiredTiles.size())

src/OpenStreetMap-esp32.h

@@ -14,6 +14,8 @@
 
 constexpr int16_t OSM_TILESIZE = 256;
 
+using tileVector = std::vector<std::pair<uint32_t, uint32_t>>;
+
 class OpenStreetMap
 {
     uint16_t mapWidth = 320;
@@ -42,6 +44,7 @@ class OpenStreetMap
 
     void setResolution(uint16_t w, uint16_t h);
     bool resizeTilesCache(uint8_t cacheSize);
+    void updateCache(tileVector &requiredTiles, uint8_t zoom);
     void freeTilesCache();
     bool fetchMap(LGFX_Sprite &sprite, double longitude, double latitude, uint8_t zoom);
     bool saveMap(const char *filename, LGFX_Sprite &display, String &result, uint8_t sdPin = SS);
@@ -51,8 +54,8 @@ class OpenStreetMap
     static void PNGDraw(PNGDRAW *pDraw);
     double lon2tile(double lon, uint8_t zoom);
     double lat2tile(double lat, uint8_t zoom);
-    void computeRequiredTiles(double longitude, double latitude, uint8_t zoom, std::vector<std::pair<uint32_t, uint32_t>> &requiredTiles);
-    CachedTile *findUnusedTile(const std::vector<std::pair<uint32_t, uint32_t>> &requiredTiles, uint8_t zoom);
+    void computeRequiredTiles(double longitude, double latitude, uint8_t zoom, tileVector &requiredTiles);
+    CachedTile *findUnusedTile(const tileVector &requiredTiles, uint8_t zoom);
     bool isTileCached(uint32_t x, uint32_t y, uint8_t z);
     bool downloadAndDecodeTile(CachedTile &tile, uint32_t x, uint32_t y, uint8_t zoom, String &result);
 };