Merge pull request #334 from mmd-osm/patch/pr331

Adding left over commit from #331

include/cgimap/api06/changeset_close_handler.hpp

@@ -20,9 +20,11 @@ namespace api06 {
 
 class changeset_close_responder : public text_responder {
 public:
-  changeset_close_responder(mime::type, data_update &, osm_changeset_id_t,
-                             const std::string &,
-                             std::optional<osm_user_id_t>);
+  changeset_close_responder(mime::type, 
+                            data_update &, 
+                            osm_changeset_id_t,
+                            const std::string &,
+                            std::optional<osm_user_id_t>);
 };
 
 class changeset_close_handler : public payload_enabled_handler {
@@ -33,7 +35,7 @@ class changeset_close_handler : public payload_enabled_handler {
   responder_ptr_t responder(data_selection &x) const override;
 
   responder_ptr_t responder(data_update &,
-			    const std::string &payload,
+                            const std::string &payload,
                             std::optional<osm_user_id_t> user_id) const override;
   bool requires_selection_after_update() const override;
 

include/cgimap/api06/changeset_create_handler.hpp

@@ -20,7 +20,8 @@ namespace api06 {
 
 class changeset_create_responder : public text_responder {
 public:
-  changeset_create_responder(mime::type, data_update &,
+  changeset_create_responder(mime::type, 
+                             data_update &,
                              const std::string &,
                              std::optional<osm_user_id_t>);
 };
@@ -33,7 +34,7 @@ class changeset_create_handler : public payload_enabled_handler {
   responder_ptr_t responder(data_selection &x) const override;
 
   responder_ptr_t responder(data_update &,
-			    const std::string &payload,
+                            const std::string &payload,
                             std::optional<osm_user_id_t> user_id) const override;
   bool requires_selection_after_update() const override;
 };

include/cgimap/api06/changeset_update_handler.hpp

@@ -22,17 +22,17 @@ namespace api06 {
 class changeset_update_responder : public text_responder {
 public:
   changeset_update_responder(mime::type,
-			     data_update &,
-			     osm_changeset_id_t id_,
+                             data_update &,
+                             osm_changeset_id_t id_,
                              const std::string & payload,
-			     std::optional<osm_user_id_t> user_id);
+                             std::optional<osm_user_id_t> user_id);
 };
 
 class changeset_update_sel_responder : public osm_current_responder {
 public:
   changeset_update_sel_responder(mime::type,
-			     data_selection & sel,
-			     osm_changeset_id_t id_);
+                                 data_selection & sel,
+                                 osm_changeset_id_t id_);
 private:
   data_selection& sel;
 };
@@ -45,7 +45,7 @@ class changeset_update_handler : public payload_enabled_handler {
   responder_ptr_t responder(data_selection &x) const override;
 
   responder_ptr_t responder(data_update &,
-			    const std::string &payload,
+                            const std::string &payload,
                             std::optional<osm_user_id_t> user_id) const override;
   bool requires_selection_after_update() const override;
 

include/cgimap/api06/changeset_upload/node.hpp

@@ -10,7 +10,7 @@
 #ifndef NODE_HPP
 #define NODE_HPP
 
-#include "osmobject.hpp"
+#include "cgimap/api06/changeset_upload/osmobject.hpp"
 
 #include <iostream>
 #include <optional>

include/cgimap/api06/changeset_upload/node_updater.hpp

@@ -16,7 +16,6 @@
 #include "cgimap/api06/changeset_upload/osmchange_tracking.hpp"
 
 #include <map>
-#include <set>
 #include <string>
 
 

include/cgimap/api06/changeset_upload/osmchange_tracking.hpp

@@ -11,7 +11,6 @@
 #define OSMCHANGE_TRACKING_HPP
 
 #include <map>
-#include <set>
 #include <string>
 #include <vector>
 

include/cgimap/api06/changeset_upload/parser_callback.hpp

@@ -22,6 +22,7 @@ namespace api06 {
 class Parser_Callback {
 
 public:
+  virtual ~Parser_Callback() = default;
 
   virtual void start_document() = 0;
 
@@ -32,8 +33,6 @@ class Parser_Callback {
   virtual void process_way(const Way &, operation op, bool if_unused) = 0;
 
   virtual void process_relation(const Relation &, operation op, bool if_unused) = 0;
-
-  virtual ~Parser_Callback() = default;
 };
 
 } // namespace api06

include/cgimap/api06/changeset_upload/relation.hpp

@@ -10,7 +10,7 @@
 #ifndef RELATION_HPP
 #define RELATION_HPP
 
-#include "osmobject.hpp"
+#include "cgimap/api06/changeset_upload/osmobject.hpp"
 #include "cgimap/types.hpp"
 #include "cgimap/util.hpp"
 
@@ -26,7 +26,9 @@ class RelationMember {
   RelationMember() = default;
 
   RelationMember(const std::string &m_type, osm_nwr_signed_id_t m_ref, const std::string &m_role) :
-    m_role(m_role), m_ref(m_ref), m_type(m_type) {};
+    m_role(m_role), 
+    m_ref(m_ref), 
+    m_type(m_type) {}
 
   void set_type(const std::string &type) {
 

include/cgimap/api06/changeset_upload/relation_updater.hpp

@@ -17,7 +17,6 @@
 #include "cgimap/api06/changeset_upload/relation.hpp"
 
 #include <map>
-#include <set>
 #include <string>
 #include <vector>
 

include/cgimap/api06/changeset_upload/way_updater.hpp

@@ -16,12 +16,10 @@
 #include "cgimap/api06/changeset_upload/osmchange_tracking.hpp"
 
 #include <map>
-#include <set>
 #include <string>
 #include <vector>
 
 
-
 namespace api06 {
 
 using TagList = std::map<std::string, std::string>;
@@ -36,15 +34,20 @@ class Way_Updater {
   virtual ~Way_Updater() = default;
 
   virtual void add_way(osm_changeset_id_t changeset_id,
-                       osm_nwr_signed_id_t old_id, const WayNodeList &nodes,
+                       osm_nwr_signed_id_t old_id, 
+                       const WayNodeList &nodes,
                        const TagList &tags) = 0;
 
-  virtual void modify_way(osm_changeset_id_t changeset_id, osm_nwr_id_t id,
-                          osm_version_t version, const WayNodeList &nodes,
+  virtual void modify_way(osm_changeset_id_t changeset_id, 
+                          osm_nwr_id_t id,
+                          osm_version_t version, 
+                          const WayNodeList &nodes,
                           const TagList &tags) = 0;
 
-  virtual void delete_way(osm_changeset_id_t changeset_id, osm_nwr_id_t id,
-                          osm_version_t version, bool if_unused) = 0;
+  virtual void delete_way(osm_changeset_id_t changeset_id, 
+                          osm_nwr_id_t id,
+                          osm_version_t version, 
+                          bool if_unused) = 0;
 
   virtual void process_new_ways() = 0;
 

include/cgimap/api06/changeset_upload_handler.hpp

@@ -33,7 +33,7 @@ class changeset_upload_handler : public payload_enabled_handler {
   responder_ptr_t responder(data_selection &x) const override;
 
   responder_ptr_t responder(data_update &,
-			    const std::string &payload,
+                            const std::string &payload,
                             std::optional<osm_user_id_t> user_id) const override;
   bool requires_selection_after_update() const override;
 

include/cgimap/api06/handler_utils.hpp

@@ -13,13 +13,13 @@
 #include "cgimap/types.hpp"
 #include "cgimap/request.hpp"
 #include "cgimap/api06/id_version.hpp"
+
 #include <vector>
 #include <string_view>
 
 namespace api06 {
 
-std::vector<id_version> parse_id_list_params(const request &req,
-                                             std::string_view param_name);
+std::vector<id_version> parse_id_list_params(const request &req, std::string_view param_name);
 }
 
 #endif /* API06_HANDLER_UTILS_HPP */

include/cgimap/api06/relations_handler.hpp

@@ -16,8 +16,9 @@
 #include "cgimap/data_selection.hpp"
 #include "cgimap/request.hpp"
 #include "cgimap/api06/id_version.hpp"
+
 #include <string>
-#include <list>
+#include <vector>
 
 namespace api06 {
 

include/cgimap/api06/way_history_handler.hpp

@@ -14,6 +14,8 @@
 #include "cgimap/osm_current_responder.hpp"
 #include "cgimap/request.hpp"
 
+#include <string>
+
 namespace api06 {
 
 class way_history_responder : public osm_current_responder {

include/cgimap/api06/way_relations_handler.hpp

@@ -13,6 +13,7 @@
 #include "cgimap/handler.hpp"
 #include "cgimap/osm_current_responder.hpp"
 #include "cgimap/request.hpp"
+
 #include <string>
 
 namespace api06 {

include/cgimap/api06/way_version_handler.hpp

@@ -13,6 +13,7 @@
 #include "cgimap/handler.hpp"
 #include "cgimap/osm_current_responder.hpp"
 #include "cgimap/request.hpp"
+
 #include <string>
 
 namespace api06 {

include/cgimap/api06/ways_handler.hpp

@@ -15,8 +15,9 @@
 #include "cgimap/request_helpers.hpp"
 #include "cgimap/request.hpp"
 #include "cgimap/api06/id_version.hpp"
+
 #include <string>
-#include <list>
+#include <vector>
 
 namespace api06 {
 

include/cgimap/data_selection.hpp

@@ -15,8 +15,8 @@
 
 #include <chrono>
 #include <memory>
-#include <sstream>
 #include <vector>
+#include <string>
 
 class Transaction_Owner_Base;
 
@@ -171,8 +171,10 @@ class data_selection {
   // is user currently blocked?
   virtual bool is_user_blocked(const osm_user_id_t) = 0;
 
-  virtual bool get_user_id_pass(const std::string& display_name, osm_user_id_t &,
-				std::string & pass_crypt, std::string & pass_salt) = 0;
+  virtual bool get_user_id_pass(const std::string& display_name, 
+                                osm_user_id_t &,
+                                std::string & pass_crypt, 
+                                std::string & pass_salt) = 0;
 
   // is user status confirmed or active?
   virtual bool is_user_active(const osm_user_id_t) = 0;

include/cgimap/data_update.hpp

@@ -26,10 +26,10 @@
 
 class data_update {
 public:
-  virtual ~data_update() = default;
-
   data_update() = default;
 
+  virtual ~data_update() = default;
+
   data_update(const data_update&) = delete;
   data_update& operator=(const data_update&) = delete;
 

include/cgimap/handler.hpp

@@ -22,6 +22,7 @@
 #include <set>
 #include <string>
 #include <memory>
+#include <optional>
 
 
 /**
@@ -63,6 +64,7 @@ class handler {
   handler(mime::type default_type = mime::unspecified_type,
           http::method methods = default_methods);
   virtual ~handler() = default;
+
   virtual std::string log_name() const = 0;
   virtual responder_ptr_t responder(data_selection &) const = 0;
 
@@ -89,10 +91,12 @@ using handler_ptr_t = std::unique_ptr<handler>;
 class payload_enabled_handler : public handler {
 public:
   payload_enabled_handler(mime::type default_type = mime::unspecified_type,
-    http::method methods = http::method::POST | http::method::OPTIONS);
+                          http::method methods = http::method::POST | http::method::OPTIONS);
 
   // Responder used to update the database
-  virtual responder_ptr_t responder(data_update &, const std::string & payload, std::optional<osm_user_id_t> user_id) const = 0;
+  virtual responder_ptr_t responder(data_update &, 
+                                    const std::string & payload, 
+                                    std::optional<osm_user_id_t> user_id) const = 0;
 
   // Optional responder to return XML response back to caller of the API method
   responder_ptr_t responder(data_selection &) const override = 0;

include/cgimap/logger.hpp

@@ -10,7 +10,7 @@
 #ifndef LOGGER_HPP
 #define LOGGER_HPP
 
-#include <fmt/core.h>
+#include <string>
 
 /**
  * Contains support for logging.

include/cgimap/osm_current_responder.hpp

@@ -22,8 +22,9 @@ class osm_current_responder : public osm_responder {
 public:
   // construct, passing the mime type down to the responder.
   // optional bounds are stored at this level, but available to derived classes.
-  osm_current_responder(mime::type, data_selection &s,
-                        std::optional<bbox> bounds = std::optional<bbox>());
+  osm_current_responder(mime::type, 
+                        data_selection &s,
+                        std::optional<bbox> bounds = {});
 
   // writes whatever is in the tmp_nodes/ways/relations tables to the given
   // formatter.

include/cgimap/osm_responder.hpp

@@ -30,8 +30,7 @@ class osm_responder : public responder {
 public:
   // construct, passing the mime type down to the responder.
   // optional bounds are stored at this level, but available to derived classes.
-  explicit osm_responder(mime::type,
-                std::optional<bbox> bounds = {});
+  explicit osm_responder(mime::type, std::optional<bbox> bounds = {});
 
   ~osm_responder() override = default;
 

include/cgimap/request_helpers.hpp

@@ -13,12 +13,14 @@
 #include <string>
 #include "cgimap/request.hpp"
 #include "cgimap/http.hpp"
+#include <memory>
 
 /**
  * Lookup a string from the request environment. Throws 500 error if the
  * string isn't there and no default value is given.
  */
-std::string fcgi_get_env(const request &req, const char *name,
+std::string fcgi_get_env(const request &req, 
+                         const char *name,
                          const char *default_value = nullptr);
 
 /**