diff options
| author | Jochen Topf <jochen@topf.org> | 2013-01-14 11:43:36 +0100 |
|---|---|---|
| committer | Jochen Topf <jochen@topf.org> | 2013-01-14 11:43:36 +0100 |
| commit | 5f988197e320b47444ce09ec722a7c6e8c4f8b3a (patch) | |
| tree | 167384a67d9a3f715b1c58f08bd5890b808d81b4 /tagstats | |
| parent | 522ae6c8bf890437d9cc40d80d00063b2f2a584c (diff) | |
| download | taginfo-5f988197e320b47444ce09ec722a7c6e8c4f8b3a.tar taginfo-5f988197e320b47444ce09ec722a7c6e8c4f8b3a.tar.gz | |
Auto indent
Diffstat (limited to 'tagstats')
| -rw-r--r-- | tagstats/tagstats.cpp | 6 | ||||
| -rw-r--r-- | tagstats/tagstats_handler.hpp | 47 |
2 files changed, 28 insertions, 25 deletions
diff --git a/tagstats/tagstats.cpp b/tagstats/tagstats.cpp index aeca840..6f63c1b 100644 --- a/tagstats/tagstats.cpp +++ b/tagstats/tagstats.cpp @@ -105,11 +105,11 @@ int main(int argc, char *argv[]) { while (true) { int c = getopt_long(argc, argv, #ifdef TAGSTATS_COUNT_TAG_COMBINATIONS - "dHT:R:t:r:b:l:w:h:", + "dHT:R:t:r:b:l:w:h:", #else - "dHR:t:r:b:l:w:h:", + "dHR:t:r:b:l:w:h:", #endif // TAGSTATS_COUNT_TAG_COMBINATIONS - long_options, 0); + long_options, 0); if (c == -1) { break; } diff --git a/tagstats/tagstats_handler.hpp b/tagstats/tagstats_handler.hpp index 26c4954..2fd592a 100644 --- a/tagstats/tagstats_handler.hpp +++ b/tagstats/tagstats_handler.hpp @@ -214,15 +214,18 @@ public: BOOST_FOREACH(const Osmium::OSM::RelationMember& member, relation.members()) { RelationRoleStats& r = m_role_counts[member.role()]; switch (member.type()) { - case 'n': ++r.node; - ++m_node_members; - break; - case 'w': ++r.way; - ++m_way_members; - break; - case 'r': ++r.relation; - ++m_relation_members; - break; + case 'n': + ++r.node; + ++m_node_members; + break; + case 'w': + ++r.way; + ++m_way_members; + break; + case 'r': + ++r.relation; + ++m_relation_members; + break; } } } @@ -721,23 +724,23 @@ public: BOOST_FOREACH(relation_type_stats_map_iterator_t it, m_relation_type_stats) { const RelationTypeStats& r = it.second; statement_insert_into_relation_types - .bind_text(it.first) - .bind_int64(r.m_count) - .bind_int64(r.m_node_members + r.m_way_members + r.m_relation_members) - .bind_int64(r.m_node_members) - .bind_int64(r.m_way_members) - .bind_int64(r.m_relation_members) - .execute(); + .bind_text(it.first) + .bind_int64(r.m_count) + .bind_int64(r.m_node_members + r.m_way_members + r.m_relation_members) + .bind_int64(r.m_node_members) + .bind_int64(r.m_way_members) + .bind_int64(r.m_relation_members) + .execute(); BOOST_FOREACH(relation_role_stats_map_iterator_t roleit, r.m_role_counts) { const RelationRoleStats& rstats = roleit.second; statement_insert_into_relation_roles - .bind_text(it.first) - .bind_text(roleit.first) - .bind_int64(rstats.node) - .bind_int64(rstats.way) - .bind_int64(rstats.relation) - .execute(); + .bind_text(it.first) + .bind_text(roleit.first) + .bind_int64(rstats.node) + .bind_int64(rstats.way) + .bind_int64(rstats.relation) + .execute(); } } |