Skip to content

Commit

Permalink
Merge pull request #258 from mmd-osm/simpl_2
Browse files Browse the repository at this point in the history
Some more cleanup
  • Loading branch information
mmd-osm authored Jul 3, 2022
2 parents a89c657 + eef8613 commit ee001a1
Show file tree
Hide file tree
Showing 55 changed files with 7 additions and 164 deletions.
2 changes: 0 additions & 2 deletions include/cgimap/api06/changeset_close_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,11 @@ class changeset_close_responder : public text_responder {
changeset_close_responder(mime::type, data_update &, osm_changeset_id_t,
const std::string &,
std::optional<osm_user_id_t>);
~changeset_close_responder();
};

class changeset_close_handler : public payload_enabled_handler {
public:
changeset_close_handler(request &req, osm_changeset_id_t id);
~changeset_close_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/changeset_create_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,11 @@ class changeset_create_responder : public text_responder {
changeset_create_responder(mime::type, data_update &,
const std::string &,
std::optional<osm_user_id_t>);
~changeset_create_responder();
};

class changeset_create_handler : public payload_enabled_handler {
public:
changeset_create_handler(request &req);
~changeset_create_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/changeset_download_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ namespace api06 {
class changeset_download_responder : public osmchange_responder {
public:
changeset_download_responder(mime::type, osm_changeset_id_t, data_selection &);
~changeset_download_responder();

private:
osm_changeset_id_t id;
Expand All @@ -20,7 +19,6 @@ class changeset_download_responder : public osmchange_responder {
class changeset_download_handler : public handler {
public:
changeset_download_handler(request &req, osm_changeset_id_t id);
~changeset_download_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/changeset_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ namespace api06 {
class changeset_responder : public osm_current_responder {
public:
changeset_responder(mime::type, osm_changeset_id_t, bool, data_selection &);
~changeset_responder();

private:
osm_changeset_id_t id;
Expand All @@ -21,7 +20,6 @@ class changeset_responder : public osm_current_responder {
class changeset_handler : public handler {
public:
changeset_handler(request &req, osm_changeset_id_t id);
~changeset_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;
Expand Down
3 changes: 0 additions & 3 deletions include/cgimap/api06/changeset_update_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ class changeset_update_responder : public text_responder {
osm_changeset_id_t id_,
const std::string & payload,
std::optional<osm_user_id_t> user_id);
~changeset_update_responder();

private:
osm_changeset_id_t id;
Expand All @@ -28,7 +27,6 @@ class changeset_update_sel_responder : public osm_current_responder {
changeset_update_sel_responder(mime::type,
data_selection & sel,
osm_changeset_id_t id_);
~changeset_update_sel_responder();

private:
data_selection& sel;
Expand All @@ -39,7 +37,6 @@ class changeset_update_sel_responder : public osm_current_responder {
class changeset_update_handler : public payload_enabled_handler {
public:
changeset_update_handler(request &req, osm_changeset_id_t id);
~changeset_update_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/changeset_upload_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,11 @@ class changeset_upload_responder : public osm_diffresult_responder {
changeset_upload_responder(mime::type, data_update &, osm_changeset_id_t,
const std::string &,
std::optional<osm_user_id_t>);
~changeset_upload_responder();
};

class changeset_upload_handler : public payload_enabled_handler {
public:
changeset_upload_handler(request &req, osm_changeset_id_t id);
~changeset_upload_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/map_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@ namespace api06 {
class map_responder : public osm_current_responder {
public:
map_responder(mime::type, bbox, data_selection &);
~map_responder();
};

class map_handler : public handler {
public:
map_handler(request &req);
~map_handler();
std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;

Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/node_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ namespace api06 {
class node_responder : public osm_current_responder {
public:
node_responder(mime::type, osm_nwr_id_t, data_selection &);
~node_responder();

private:
osm_nwr_id_t id;
Expand All @@ -22,7 +21,6 @@ class node_responder : public osm_current_responder {
class node_handler : public handler {
public:
node_handler(request &req, osm_nwr_id_t id);
~node_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/node_history_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace api06 {
class node_history_responder : public osm_current_responder {
public:
node_history_responder(mime::type, osm_nwr_id_t, data_selection &);
~node_history_responder();

private:
osm_nwr_id_t id;
Expand All @@ -19,7 +18,6 @@ class node_history_responder : public osm_current_responder {
class node_history_handler : public handler {
public:
node_history_handler(request &, osm_nwr_id_t);
~node_history_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/node_relations_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ namespace api06 {
class node_relations_responder : public osm_current_responder {
public:
node_relations_responder(mime::type, osm_nwr_id_t, data_selection &);
~node_relations_responder();

private:
osm_nwr_id_t id;
Expand All @@ -22,7 +21,6 @@ class node_relations_responder : public osm_current_responder {
class node_relations_handler : public handler {
public:
node_relations_handler(request &req, osm_nwr_id_t id);
~node_relations_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/node_version_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ namespace api06 {
class node_version_responder : public osm_current_responder {
public:
node_version_responder(mime::type, osm_nwr_id_t, osm_version_t, data_selection &);
~node_version_responder();

private:
osm_nwr_id_t id;
Expand All @@ -21,7 +20,6 @@ class node_version_responder : public osm_current_responder {
class node_version_handler : public handler {
public:
node_version_handler(request &req, osm_nwr_id_t id, osm_version_t v);
~node_version_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/node_ways_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ namespace api06 {
class node_ways_responder : public osm_current_responder {
public:
node_ways_responder(mime::type, osm_nwr_id_t, data_selection &);
~node_ways_responder();

private:
osm_nwr_id_t id;
Expand All @@ -22,7 +21,6 @@ class node_ways_responder : public osm_current_responder {
class node_ways_handler : public handler {
public:
node_ways_handler(request &req, osm_nwr_id_t id);
~node_ways_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/nodes_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ namespace api06 {
class nodes_responder : public osm_current_responder {
public:
nodes_responder(mime::type, std::vector<id_version>, data_selection &);
~nodes_responder();

private:
std::vector<id_version> ids;
Expand All @@ -23,7 +22,6 @@ class nodes_responder : public osm_current_responder {
class nodes_handler : public handler {
public:
nodes_handler(request &req);
~nodes_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/relation_full_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ namespace api06 {
class relation_full_responder : public osm_current_responder {
public:
relation_full_responder(mime::type, osm_nwr_id_t, data_selection &);
~relation_full_responder();

private:
osm_nwr_id_t id;
Expand All @@ -22,7 +21,6 @@ class relation_full_responder : public osm_current_responder {
class relation_full_handler : public handler {
public:
relation_full_handler(request &req, osm_nwr_id_t id);
~relation_full_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/relation_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ namespace api06 {
class relation_responder : public osm_current_responder {
public:
relation_responder(mime::type, osm_nwr_id_t, data_selection &);
~relation_responder();

private:
osm_nwr_id_t id;
Expand All @@ -22,7 +21,6 @@ class relation_responder : public osm_current_responder {
class relation_handler : public handler {
public:
relation_handler(request &req, osm_nwr_id_t id);
~relation_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/relation_history_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace api06 {
class relation_history_responder : public osm_current_responder {
public:
relation_history_responder(mime::type, osm_nwr_id_t, data_selection &);
~relation_history_responder();

private:
osm_nwr_id_t id;
Expand All @@ -19,7 +18,6 @@ class relation_history_responder : public osm_current_responder {
class relation_history_handler : public handler {
public:
relation_history_handler(request &, osm_nwr_id_t);
~relation_history_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/relation_relations_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ namespace api06 {
class relation_relations_responder : public osm_current_responder {
public:
relation_relations_responder(mime::type, osm_nwr_id_t, data_selection &);
~relation_relations_responder();

private:
osm_nwr_id_t id;
Expand All @@ -22,7 +21,6 @@ class relation_relations_responder : public osm_current_responder {
class relation_relations_handler : public handler {
public:
relation_relations_handler(request &req, osm_nwr_id_t id);
~relation_relations_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/relation_version_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ namespace api06 {
class relation_version_responder : public osm_current_responder {
public:
relation_version_responder(mime::type, osm_nwr_id_t, osm_version_t v, data_selection &);
~relation_version_responder();

private:
osm_nwr_id_t id;
Expand All @@ -23,7 +22,6 @@ class relation_version_responder : public osm_current_responder {
class relation_version_handler : public handler {
public:
relation_version_handler(request &req, osm_nwr_id_t id, osm_version_t v);
~relation_version_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/relations_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ namespace api06 {
class relations_responder : public osm_current_responder {
public:
relations_responder(mime::type, std::vector<id_version>, data_selection &);
~relations_responder();

private:
std::vector<id_version> ids;
Expand All @@ -24,7 +23,6 @@ class relations_responder : public osm_current_responder {
class relations_handler : public handler {
public:
relations_handler(request &req);
~relations_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/way_full_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ namespace api06 {
class way_full_responder : public osm_current_responder {
public:
way_full_responder(mime::type, osm_nwr_id_t, data_selection &);
~way_full_responder();

private:
osm_nwr_id_t id;
Expand All @@ -22,7 +21,6 @@ class way_full_responder : public osm_current_responder {
class way_full_handler : public handler {
public:
way_full_handler(request &req, osm_nwr_id_t id);
~way_full_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/way_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ namespace api06 {
class way_responder : public osm_current_responder {
public:
way_responder(mime::type, osm_nwr_id_t, data_selection &);
~way_responder();

private:
osm_nwr_id_t id;
Expand All @@ -22,7 +21,6 @@ class way_responder : public osm_current_responder {
class way_handler : public handler {
public:
way_handler(request &req, osm_nwr_id_t id);
~way_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/way_history_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace api06 {
class way_history_responder : public osm_current_responder {
public:
way_history_responder(mime::type, osm_nwr_id_t, data_selection &);
~way_history_responder();

private:
osm_nwr_id_t id;
Expand All @@ -19,7 +18,6 @@ class way_history_responder : public osm_current_responder {
class way_history_handler : public handler {
public:
way_history_handler(request &, osm_nwr_id_t);
~way_history_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/way_relations_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ namespace api06 {
class way_relations_responder : public osm_current_responder {
public:
way_relations_responder(mime::type, osm_nwr_id_t, data_selection &);
~way_relations_responder();

private:
osm_nwr_id_t id;
Expand All @@ -22,7 +21,6 @@ class way_relations_responder : public osm_current_responder {
class way_relations_handler : public handler {
public:
way_relations_handler(request &req, osm_nwr_id_t id);
~way_relations_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/way_version_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ namespace api06 {
class way_version_responder : public osm_current_responder {
public:
way_version_responder(mime::type, osm_nwr_id_t, osm_version_t, data_selection &);
~way_version_responder();

private:
osm_nwr_id_t id;
Expand All @@ -23,7 +22,6 @@ class way_version_responder : public osm_current_responder {
class way_version_handler : public handler {
public:
way_version_handler(request &req, osm_nwr_id_t id, osm_version_t v);
~way_version_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;
Expand Down
2 changes: 0 additions & 2 deletions include/cgimap/api06/ways_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ namespace api06 {
class ways_responder : public osm_current_responder {
public:
ways_responder(mime::type, std::vector<id_version>, data_selection &);
~ways_responder();

private:
std::vector<id_version> ids;
Expand All @@ -23,7 +22,6 @@ class ways_responder : public osm_current_responder {
class ways_handler : public handler {
public:
ways_handler(request &req);
~ways_handler();

std::string log_name() const override;
responder_ptr_t responder(data_selection &x) const override;
Expand Down
Loading

0 comments on commit ee001a1

Please sign in to comment.