[core] Use better types for modified / expires / etag

3 files changed, 7 insertions, 6 deletions

diff --git a/src/mbgl/map/geometry_tile.hpp b/src/mbgl/map/geometry_tile.hpp
index dd9a21bc62..e906fed8f3 100644
--- a/src/mbgl/map/geometry_tile.hpp
+++ b/src/mbgl/map/geometry_tile.hpp
@@ -55,8 +55,8 @@ public:
 
     using Callback = std::function<void (std::exception_ptr,
                                          std::unique_ptr<GeometryTile>,
-                                         Seconds modified,
-                                         Seconds expires)>;
+                                         optional<SystemTimePoint> modified,
+                                         optional<SystemTimePoint> expires)>;
     /*
      * Monitor the tile held by this object for changes. When the tile is loaded for the first time,
      * or updates, the callback is executed. If an error occurs, the first parameter will be set.
diff --git a/src/mbgl/map/tile_data.hpp b/src/mbgl/map/tile_data.hpp
index 1067c86d3d..fec8ba4901 100644
--- a/src/mbgl/map/tile_data.hpp
+++ b/src/mbgl/map/tile_data.hpp
@@ -3,6 +3,7 @@
 
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/chrono.hpp>
+#include <mbgl/util/optional.hpp>
 #include <mbgl/map/tile_id.hpp>
 #include <mbgl/renderer/bucket.hpp>
 #include <mbgl/text/placement_config.hpp>
@@ -91,8 +92,8 @@ public:
     void dumpDebugLogs() const;
 
     const TileID id;
-    Seconds modified = Seconds::zero();
-    Seconds expires = Seconds::zero();
+    optional<SystemTimePoint> modified;
+    optional<SystemTimePoint> expires;
 
     // Contains the tile ID string for painting debug information.
     std::unique_ptr<DebugBucket> debugBucket;
diff --git a/src/mbgl/map/vector_tile_data.cpp b/src/mbgl/map/vector_tile_data.cpp
index 9e1390decd..fa08432b20 100644
--- a/src/mbgl/map/vector_tile_data.cpp
+++ b/src/mbgl/map/vector_tile_data.cpp
@@ -29,8 +29,8 @@ VectorTileData::VectorTileData(const TileID& id_,
     state = State::loading;
     tileRequest = monitor->monitorTile([callback, this](std::exception_ptr err,
                                                         std::unique_ptr<GeometryTile> tile,
-                                                        Seconds modified_,
-                                                        Seconds expires_) {
+                                                        optional<SystemTimePoint> modified_,
+                                                        optional<SystemTimePoint> expires_) {
         if (err) {
             callback(err);
             return;