Add _t suffix to class reprojection

Author: joto

src/command-line-parser.cpp

@@ -392,7 +392,8 @@ options_t parse_command_line(int argc, char *argv[])
     app.add_flag_function("-l,--latlong",
                           [&](int64_t) {
                               options.projection =
-                                  reprojection::create_projection(PROJ_LATLONG);
+                                  reprojection_t::create_projection(
+                                      PROJ_LATLONG);
                           })
         ->description("Store data in degrees of latitude & longitude (WGS84).")
         ->group("Pgsql output options");
@@ -401,7 +402,7 @@ options_t parse_command_line(int argc, char *argv[])
     app.add_flag_function("-m,--merc",
                           [&](int64_t) {
                               options.projection =
-                                  reprojection::create_projection(
+                                  reprojection_t::create_projection(
                                       PROJ_SPHERE_MERC);
                           })
         ->description("Store data in Web Mercator [EPSG 3857]. This is the "
@@ -425,7 +426,7 @@ options_t parse_command_line(int argc, char *argv[])
 #ifdef HAVE_GENERIC_PROJ
                                  [&](int arg) {
                                      options.projection =
-                                         reprojection::create_projection(arg);
+                                         reprojection_t::create_projection(arg);
 #else
            [&](int) {
                throw std::runtime_error{
@@ -665,7 +666,8 @@ options_t parse_command_line(int argc, char *argv[])
     }
 
     if (!options.projection) {
-        options.projection = reprojection::create_projection(PROJ_SPHERE_MERC);
+        options.projection =
+            reprojection_t::create_projection(PROJ_SPHERE_MERC);
     }
 
     check_options_expire(&options);

src/expire-tiles.cpp

@@ -27,7 +27,7 @@
 #include "wkb.hpp"
 
 expire_tiles::expire_tiles(uint32_t max_zoom,
-                           std::shared_ptr<reprojection> projection)
+                           std::shared_ptr<reprojection_t> projection)
 : m_projection(std::move(projection)), m_maxzoom(max_zoom),
   m_map_width(static_cast<int>(1U << m_maxzoom))
 {}

src/expire-tiles.hpp

@@ -25,12 +25,12 @@
 #include "pgsql.hpp"
 #include "tile.hpp"
 
-class reprojection;
+class reprojection_t;
 
 class expire_tiles
 {
 public:
-    expire_tiles(uint32_t max_zoom, std::shared_ptr<reprojection> projection);
+    expire_tiles(uint32_t max_zoom, std::shared_ptr<reprojection_t> projection);
 
     bool empty() const noexcept { return m_dirty_tiles.empty(); }
 
@@ -115,7 +115,7 @@ class expire_tiles
     /// The tile which has been added last to the unordered set.
     tile_t m_prev_tile;
 
-    std::shared_ptr<reprojection> m_projection;
+    std::shared_ptr<reprojection_t> m_projection;
 
     uint32_t m_maxzoom;
     int m_map_width;

src/flex-table.hpp

@@ -278,7 +278,7 @@ class table_connection_t
 public:
     table_connection_t(flex_table_t *table,
                        std::shared_ptr<db_copy_thread_t> const &copy_thread)
-    : m_proj(reprojection::create_projection(table->srid())), m_table(table),
+    : m_proj(reprojection_t::create_projection(table->srid())), m_table(table),
       m_target(std::make_shared<db_target_descr_t>(
           table->schema(), table->name(), table->id_column_names(),
           table->build_sql_column_list())),
@@ -314,7 +314,7 @@ class table_connection_t
 
     void delete_rows_with(osmium::item_type type, osmid_t id);
 
-    reprojection const &proj() const noexcept
+    reprojection_t const &proj() const noexcept
     {
         assert(m_proj);
         return *m_proj;
@@ -335,7 +335,7 @@ class table_connection_t
     }
 
 private:
-    std::shared_ptr<reprojection> m_proj;
+    std::shared_ptr<reprojection_t> m_proj;
 
     flex_table_t *m_table;
 

src/geom-functions.cpp

@@ -134,7 +134,7 @@ class transform_visitor_t
 {
 public:
     explicit transform_visitor_t(geometry_t *output,
-                                 reprojection const *reprojection)
+                                 reprojection_t const *reprojection)
     : m_output(output), m_reprojection(reprojection)
     {}
 
@@ -220,14 +220,14 @@ class transform_visitor_t
     }
 
     geometry_t *m_output;
-    reprojection const *m_reprojection;
+    reprojection_t const *m_reprojection;
 
 }; // class transform_visitor_t
 
 } // anonymous namespace
 
 void transform(geometry_t *output, geometry_t const &input,
-               reprojection const &reprojection)
+               reprojection_t const &reprojection)
 {
     assert(input.srid() == PROJ_LATLONG);
 
@@ -236,7 +236,8 @@ void transform(geometry_t *output, geometry_t const &input,
     input.visit(transform_visitor_t{output, &reprojection});
 }
 
-geometry_t transform(geometry_t const &input, reprojection const &reprojection)
+geometry_t transform(geometry_t const &input,
+                     reprojection_t const &reprojection)
 {
     geometry_t output;
     transform(&output, input, reprojection);

src/geom-functions.hpp

@@ -100,7 +100,7 @@ geometry_t geometry_n(geometry_t const &input, std::size_t n);
  * \pre \code geom.srid() == 4326 \endcode
  */
 void transform(geometry_t *output, geometry_t const &input,
-               reprojection const &reprojection);
+               reprojection_t const &reprojection);
 
 /**
  * Transform a geometry in 4326 into some other projection.
@@ -111,7 +111,8 @@ void transform(geometry_t *output, geometry_t const &input,
  *
  * \pre \code geom.srid() == 4326 \endcode
  */
-geometry_t transform(geometry_t const &input, reprojection const &reprojection);
+geometry_t transform(geometry_t const &input,
+                     reprojection_t const &reprojection);
 
 /**
  * Returns a modified geometry having no segment longer than the given

src/options.hpp

@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-class reprojection;
+class reprojection_t;
 
 enum class command_t : uint8_t
 {
@@ -93,7 +93,7 @@ struct options_t
 
     std::vector<std::string> input_files;
 
-    std::shared_ptr<reprojection> projection; ///< SRS of projection
+    std::shared_ptr<reprojection_t> projection; ///< SRS of projection
 
     /// Max bbox size in either dimension to expire full bbox for a polygon
     double expire_tiles_max_bbox = 20000.0;

src/output-flex.cpp

@@ -1207,7 +1207,7 @@ output_flex_t::output_flex_t(output_flex_t const *other,
     for (auto &expire_output : *m_expire_outputs) {
         m_expire_tiles.emplace_back(
             expire_output.maxzoom(),
-            reprojection::create_projection(PROJ_SPHERE_MERC));
+            reprojection_t::create_projection(PROJ_SPHERE_MERC));
     }
 }
 
@@ -1273,7 +1273,7 @@ output_flex_t::output_flex_t(std::shared_ptr<middle_query_t> const &mid,
     for (auto const &expire_output : *m_expire_outputs) {
         m_expire_tiles.emplace_back(
             expire_output.maxzoom(),
-            reprojection::create_projection(PROJ_SPHERE_MERC));
+            reprojection_t::create_projection(PROJ_SPHERE_MERC));
     }
 
     create_expire_tables(*m_expire_outputs, get_options()->connection_params);

src/output-pgsql.cpp

@@ -52,7 +52,7 @@ double calculate_area(bool reproject_area, geom::geometry_t const &geom4326,
                       geom::geometry_t const &projected_geom)
 {
     static thread_local auto const proj3857 =
-        reprojection::create_projection(PROJ_SPHERE_MERC);
+        reprojection_t::create_projection(PROJ_SPHERE_MERC);
 
     if (reproject_area) {
         auto const ogeom = geom::transform(geom4326, *proj3857);

src/output-pgsql.hpp

@@ -106,7 +106,7 @@ class output_pgsql_t : public output_t
 
     std::array<std::unique_ptr<table_t>, t_MAX> m_tables;
 
-    std::shared_ptr<reprojection> m_proj;
+    std::shared_ptr<reprojection_t> m_proj;
     expire_config_t m_expire_config;
     expire_tiles m_expire;