This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to tag v1.0.0
in repository osmium-tool.

commit 159a1000267a88befa34cec8b72d7f64438282ae
Author: Jochen Topf <joc...@topf.org>
Date:   Wed Nov 27 14:48:29 2013 +0100

    First commit
---
 .gitignore                    |   5 +
 LICENSE.txt                   | 674 ++++++++++++++++++++++++++++++++++++++++++
 Makefile                      |  93 ++++++
 README.md                     |  63 ++++
 debian/changelog              |   5 +
 debian/compat                 |   1 +
 debian/control                |  15 +
 debian/copyright              |  18 ++
 debian/dirs                   |   1 +
 debian/osmium.manpages        |   4 +
 debian/rules                  |  87 ++++++
 doc/.gitignore                |   1 +
 doc/Makefile                  |  26 ++
 doc/osmium-cat.md             | 113 +++++++
 doc/osmium-fileinfo.md        |  60 ++++
 doc/osmium-time-filter.md     |  90 ++++++
 doc/osmium.md                 |  58 ++++
 src/command_apply_changes.cpp | 191 ++++++++++++
 src/command_apply_changes.hpp |  59 ++++
 src/command_cat.cpp           | 178 +++++++++++
 src/command_cat.hpp           |  54 ++++
 src/command_fileinfo.cpp      | 186 ++++++++++++
 src/command_fileinfo.hpp      |  48 +++
 src/command_help.cpp          |  76 +++++
 src/command_help.hpp          |  41 +++
 src/command_merge_changes.cpp | 168 +++++++++++
 src/command_merge_changes.hpp |  57 ++++
 src/command_time_filter.cpp   | 184 ++++++++++++
 src/command_time_filter.hpp   |  61 ++++
 src/main.cpp                  | 101 +++++++
 src/osmc.hpp                  | 134 +++++++++
 31 files changed, 2852 insertions(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..dfd5ee4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+osmium
+.*.swp
+src/*.o
+doc/*.1
+doc/*.html
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..bebd203
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,93 @@
+#------------------------------------------------------------------------------
+#
+#  Makefile for Osmium Command Line Tool
+#
+#------------------------------------------------------------------------------
+#
+#  You can set several environment variables before running make if you don't
+#  like the defaults:
+#
+#  CXX                - Your C++ compiler.
+#  CPLUS_INCLUDE_PATH - Include file search path.
+#  CXXFLAGS           - Extra compiler flags.
+#  LDFLAGS            - Extra linker flags.
+#  
+#------------------------------------------------------------------------------
+
+CXXFLAGS += -O3
+#CXXFLAGS += -g
+CXXFLAGS += -std=c++11 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+CXXFLAGS += -I../libosmium/include
+
+OS:=$(shell uname -s)
+ifeq ($(OS),Darwin)
+       CXXFLAGS += -stdlib=libc++
+       LDFLAGS += -stdlib=libc++
+endif
+
+CXXFLAGS_WARNINGS := -Wall -Wextra -pedantic -Wredundant-decls 
-Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor 
-Woverloaded-virtual -Wsign-promo -Wold-style-cast
+
+LIB_PBF    := -pthread -lz -lprotobuf-lite -losmpbf
+LIB_EXPAT  := -lexpat
+LIB_GZIP   := -lz
+LIB_BZIP2  := -lbz2
+
+LIB_PRGOPT := -lboost_program_options
+LIB_CRYPTO := -lcrypto++
+
+PROGRAMS := osmium
+COMMANDS_H := $(wildcard src/command_*.hpp)
+COMMANDS_O := $(COMMANDS_H:.hpp=.o)
+
+INCLUDES := src/osmc.hpp
+
+# We use the numeric id 0 here because different systems (Linux vs. BSD)
+# use different names for the "root group".
+INSTALL_GROUP := 0
+
+CPPCHECK_OPTIONS := 
--enable=warning,style,performance,portability,information,missingInclude
+
+# cpp doesn't find system includes for some reason, suppress that report
+CPPCHECK_OPTIONS += --suppress=missingIncludeSystem
+
+# temp fix for http://sourceforge.net/apps/trac/cppcheck/ticket/4966
+CPPCHECK_OPTIONS += --suppress=constStatement
+
+.PHONY: all check clean doc
+
+all: $(PROGRAMS)
+
+src/main.o: src/main.cpp $(COMMANDS_H) $(INCLUDES)
+       $(CXX) -c $(CXXFLAGS) $(CXXFLAGS_WARNINGS) -o $@ $<
+
+src/command_%.o: src/command_%.cpp src/command_%.hpp $(INCLUDES)
+       $(CXX) -c $(CXXFLAGS) $(CXXFLAGS_WARNINGS) -o $@ $<
+
+osmium: src/main.o $(COMMANDS_O)
+       $(CXX) -o $@ $< $(COMMANDS_O) $(LDFLAGS) $(LIB_PBF) $(LIB_EXPAT) 
$(LIB_GZIP) $(LIB_BZIP2) $(LIB_PRGOPT) $(LIB_CRYPTO)
+
+check:
+       cppcheck --std=c++11 $(CPPCHECK_OPTIONS) src/*pp
+
+indent:
+       astyle --style=java --indent-namespaces --indent-switches --pad-header 
--lineend=linux --suffix=none --recursive src/\*pp
+
+clean:
+       rm -f src/*.o core $(PROGRAMS)
+       $(MAKE) -C doc clean
+
+doc:
+       $(MAKE) -C doc
+
+install:
+       install -m 755 -g $(INSTALL_GROUP) -o root -d $(DESTDIR)/usr/bin
+       install -m 755 -g $(INSTALL_GROUP) -o root -d 
$(DESTDIR)/usr/share/doc/osmium
+       install -m 755 -g $(INSTALL_GROUP) -o root osmium 
$(DESTDIR)/usr/bin/osmium
+       install -m 644 -g $(INSTALL_GROUP) -o root README.md 
$(DESTDIR)/usr/share/doc/osmium/README.md
+
+deb:
+       debuild -I -us -uc
+
+deb-clean:
+       debuild clean
+
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..1de233c
--- /dev/null
+++ b/README.md
@@ -0,0 +1,63 @@
+
+# OSMIUM Command Line Tool
+
+Command line tool for working with OpenStreetMap data based on the Osmium 
library.
+
+
+## Prerequisites
+
+You need a C++11 compliant compiler. GCC 4.7.3 and clang 3.2 are known to work.
+
+    Osmium Library
+        http://osmcode.org/osmium
+
+    boost-program-options (for parsing command line options)
+        http://www.boost.org/doc/libs/1_54_0/doc/html/program_options.html
+        Debian/Ubuntu: libboost-program-options-dev
+
+    Google protocol buffers (for PBF support)
+        http://code.google.com/p/protobuf/ (at least version 2.3.0 needed)
+        Debian/Ubuntu: libprotobuf-dev protobuf-compiler
+        openSUSE: protobuf-devel
+        Also see http://wiki.openstreetmap.org/wiki/PBF_Format
+
+    OSMPBF (for PBF support)
+        https://github.com/scrosby/OSM-binary
+        Debian/Ubuntu: libosmpbf-dev
+
+    zlib (for PBF support)
+        http://www.zlib.net/
+        Debian/Ubuntu: zlib1g-dev
+        openSUSE: zlib-devel
+
+    Expat (for parsing XML files)
+        http://expat.sourceforge.net/
+        Debian/Ubuntu: libexpat1-dev
+        openSUSE: libexpat-devel
+
+    libcrypto++ (for checksumming)
+        http://www.cryptopp.com/
+        Debian/Ubuntu: libcrypto++-dev
+
+
+## Building
+
+Type 'make'.
+
+
+## Documentation
+
+There are man pages in the 'doc' directory. To build them you need 'pandoc'.
+Run 'make doc' to build.
+
+
+## License
+
+This program is available under the GNU GENERAL PUBLIC LICENSE Version 3. See
+the file LICENSE.txt for the complete text of the license.
+
+
+## Authors
+
+This program was written and is maintained by Jochen Topf <joc...@topf.org>.
+
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..e0fbeea
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+osmium (0.0.1) jessie; urgency=low
+
+  * Initial standalone debian package
+
+ -- Jochen Topf <joc...@topf.org>  Wed, 27 Nov 2013 13:42:00 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..391e53a
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,15 @@
+Source: osmium
+Section: utils
+Priority: optional
+Maintainer: Jochen Topf <joc...@topf.org>
+Build-Depends: debhelper (>= 7)
+Standards-Version: 3.9.4
+Homepage: http://osmcode.org/osmium/
+
+Package: osmium
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: 
+Description: Command line tool for working with OpenStreetMap data.
+ A versatile command line tool that makes manipulating
+ OpenStreetMap data easy.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..e5743ab
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,18 @@
+Copyright 2013 Jochen Topf <joc...@topf.org>
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+The GNU General Public License version 3 may be found on Debian systems
+in /usr/share/common-licenses/GPL-3.
+
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/osmium.manpages b/debian/osmium.manpages
new file mode 100644
index 0000000..29e5958
--- /dev/null
+++ b/debian/osmium.manpages
@@ -0,0 +1,4 @@
+doc/osmium.1
+doc/osmium-cat.1
+doc/osmium-fileinfo.1
+doc/osmium-time-filter.1
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..d38ac5f
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,87 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+configure: configure-stamp
+configure-stamp: 
+       dh_testdir
+       
+       # Add here commands to configure the package.
+
+       touch configure-stamp
+
+build: build-stamp
+
+build-stamp: configure-stamp  
+       dh_testdir
+
+       # Add here commands to compile the package.
+       $(MAKE) CXX=clang++
+       $(MAKE) doc
+
+       touch $@
+
+clean: 
+       dh_testdir
+       dh_testroot
+       rm -f build-stamp configure-stamp
+
+       # Add here commands to clean up after the build process.
+       $(MAKE) clean || /bin/true
+
+       dh_clean 
+
+install: build
+       dh_testdir
+       dh_testroot
+       dh_prep
+       dh_installdirs
+
+       # Add here commands to install the package into debian/osmium.
+       $(MAKE) DESTDIR=$(CURDIR)/debian/osmium install
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+       dh_testdir
+       dh_testroot
+       dh_installchangelogs
+       dh_installdocs
+       dh_installexamples
+       dh_install
+#      dh_installmenu
+#      dh_installdebconf       
+#      dh_installlogrotate
+#      dh_installemacsen
+#      dh_installpam
+#      dh_installmime
+#      dh_python
+#      dh_installinit
+#      dh_installcron
+#      dh_installinfo
+       dh_installman
+       dh_link
+       dh_strip
+       dh_compress
+       dh_fixperms
+#      dh_perl
+#      dh_makeshlibs
+       dh_installdeb
+       dh_shlibdeps
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 0000000..f7e585b
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1 @@
+*.1
diff --git a/doc/Makefile b/doc/Makefile
new file mode 100644
index 0000000..845a675
--- /dev/null
+++ b/doc/Makefile
@@ -0,0 +1,26 @@
+#
+#  Makefile for Osmium command line tool documentation.
+#
+#  You need 'pandoc' for this to work.
+#
+
+OSMIUM_VERSION := 0.0.1
+
+PANDOC := pandoc
+
+MARKDOWN_FILES := $(wildcard *.md)
+MAN_PAGES := $(MARKDOWN_FILES:.md=.1)
+
+PUBDATE := `date +%Y-%m-%d`
+
+all: $(MAN_PAGES)
+
+%.1: %.md
+       $(PANDOC) -s -t man --variable "description=osmium/$(OSMIUM_VERSION)" 
--variable "date=$(PUBDATE)" -o $@ $<
+
+%.html: %.md
+       $(PANDOC) -s -t html -o $@ $<
+
+clean:
+       rm -f *.1 *.html
+
diff --git a/doc/osmium-cat.md b/doc/osmium-cat.md
new file mode 100644
index 0000000..cd31c00
--- /dev/null
+++ b/doc/osmium-cat.md
@@ -0,0 +1,113 @@
+% OSMIUM-CAT(1)
+% Jochen Topf <joc...@topf.org>
+
+# NAME
+
+osmium-cat - Concatenate OSM files and convert to different formats.
+
+
+# SYNOPSIS
+
+**osmium cat** \[OPTIONS\] \[**-o** *OUTPUT-FILE*\] *INPUT-FILE...*
+
+
+# DESCRIPTION
+
+Concatenates all input files and writes the result to the output file. The data
+is not sorted in any way but strictly copied from input to output.
+
+Because this program supports several different input and output formats, it
+can be used to convert OSM files from one format into another.
+
+
+# OPTIONS
+
+--generator
+:   The name and version of the program generating the output file. It will be
+    added to the header of the output file. Default is *osmium/* and the 
version
+    of osmium.
+
+--input-format, -F
+:   The format of the input files. Can be used to set the input format if it
+    can't be autodetected from the file names. This will set the format for
+    all input files, there is no way to set the format for some input files
+    only. See the FILE FORMATS section for details.
+
+--output-file, -o
+:   Name of the output file. Default is '-' (*stdout*).
+
+--output-format, -f
+:   The format of the output file. Can be used to set the output file format
+    if it can't be autodetected from the output file name. See the FILE FORMATS
+    section for details.
+
+--overwrite, -O
+:   Allow an existing output file to be overwritten. Normally **osmium** will
+    refuse to write over an existing file.
+
+--verbose,-v
+:   Set verbose mode. The program will output information about what it is
+    doing to *stderr*.
+
+
+# FILE FORMATS
+
+**osmium** supports all file formats supported by Osmium. These are:
+
+* The classical XML format in the variants *.osm* (for data files),
+  *.osh* (for data files with history) and *.osc* (for change files)
+* The PBF binary format (with the usual suffix *.osm.pbf*)
+* The OPL format (with the usual suffix *.osm.opl*)
+
+In addition XML and OPL files can be compressed using *gzip* or *bzip2*.
+(Add *.gz* or *.bz2* suffixes, respectively.)
+
+Which format a file has is usually autodetected from the file name.
+Where this doesn't work, either because you are reading from stdin
+or writing to stdout, or because you have an unusual file name, the
+--input-format and --output-format options can be used to set the
+format. They take a comma-separated list of arguments, the first is
+the format, further arguments set additional options.
+
+Here are some examples:
+
+pbf
+:   PBF format
+osm.bz2
+:   XML format, compressed with bzip2
+osc.gz
+:   OSM change file, compressed with gzip
+osm.gz,xml_change_format=true
+:   OSM change file, compressed with gzip
+
+
+# DIAGNOSTICS
+
+**osmium cat** exits with code 0 if everything went alright, it exits
+with code 2 if there was a problem with the command line arguments,
+and with exit code 1 if some other error occurred.
+
+
+# EXAMPLES
+
+Convert a PBF file to a compressed XML file:
+
+    osmium cat -o out.osm.bz2 in.osm.pbf
+
+Concatenate all change files in the 'changes' directory into one:
+
+    osmium cat -o all-changes.osc.gz changes/*.osc.gz
+
+
+# COPYRIGHT
+
+Copyright (C) 2013  Jochen Topf <joc...@topf.org>.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+
+
+# SEE ALSO
+
+<http://osmcode.org/osmium>
+
diff --git a/doc/osmium-fileinfo.md b/doc/osmium-fileinfo.md
new file mode 100644
index 0000000..def1d4b
--- /dev/null
+++ b/doc/osmium-fileinfo.md
@@ -0,0 +1,60 @@
+% OSMIUM-FILEINFO(1)
+% Jochen Topf <joc...@topf.org>
+
+# NAME
+
+osmium-fileinfo - Show information about an OpenStreetMap file.
+
+
+# SYNOPSIS
+
+**osmium fileinfo** \[OPTIONS\] *FILE*
+
+
+# DESCRIPTION
+
+Shows verious information about OSM files such as the file type, bounding box,
+etc.
+
+This command will usually only read the file header. Use the **--extended**
+option to show more information.
+
+The output is split into three sections:
+
+File
+:   This section shows the information available without opening the
+    file itself. It contains the file name, the format, the compression
+    used and the size of the file in bytes.
+
+Header
+:   This section shows the information available from the header of
+    the file (if available, OPL files have no header).
+
+Data
+:   This section shows the information available from reading the whole
+    file. It is only shown if the **--extended** option was used.
+
+
+# OPTIONS
+
+--extended, -e
+:   Read the complete file and show additional information.
+
+--input-format, -f
+:   The format of the input file. Can be used to set the input file format
+    if it can't be autodetected from the file name. See the FILE FORMATS
+    section of the osmium-cat man page for details.
+
+
+# COPYRIGHT
+
+Copyright (C) 2013  Jochen Topf <joc...@topf.org>.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+
+
+# SEE ALSO
+
+<http://osmcode.org/osmium>
+
diff --git a/doc/osmium-time-filter.md b/doc/osmium-time-filter.md
new file mode 100644
index 0000000..37a0159
--- /dev/null
+++ b/doc/osmium-time-filter.md
@@ -0,0 +1,90 @@
+% OSMIUM-TIME-FILTER(1)
+% Jochen Topf <joc...@topf.org>
+
+# NAME
+
+osmium-time-filter - Filter OSM data from a point in time or a time span out 
of a history file.
+
+
+# SYNOPSIS
+
+**osmium time-filter** \[OPTIONS\] \[**-o** *OUTPUT-FILE*\] *INPUT-FILE* 
\[*TIME*\]\
+**osmium time-filter** \[OPTIONS\] \[**-o** *OUTPUT-FILE*\] *INPUT-FILE* 
*FROM-TIME* *TO-TIME*
+
+
+# DESCRIPTION
+
+Copy all objects that were valid at the given *TIME* or in the time period
+between *FROM-TIME* (inclusive) and *TO-TIME* (not inclusive) from the input
+file into the output file.  If no time is given on the command line the current
+time is used.
+
+Usually the *INPUT-FILE* will be an OSM data file with history. If both 
*FROM-TIME*
+and *TO-TIME* are given, the result will also have history data, it will also
+include deleted versions of objects.
+
+If only a single point in time was given the result will be a normal OSM file
+without history containing no deleted objects.
+
+The format for the time stamps is "yyyy-mm-ddThh:mm::ssZ".
+
+
+# OPTIONS
+
+--generator
+:   The name and version of the program generating the output file. It will be
+    added to the header of the output file. Default is *osmium/* and the 
version
+    of osmium.
+
+--input-format, -F
+:   The format of the input file. Can be used to set the input format if it
+    can't be autodetected from the file name. See the FILE FORMATS section
+    of the osmium-cat man page for details.
+
+--output-file, -o
+:   Name of the output file. Default is '-' (*stdout*).
+
+--output-format, -f
+:   The format of the output file. Can be used to set the output file format
+    if it can't be autodetected from the output file name. See the FILE FORMATS
+    section of the osmium-cat man page for details.
+
+--overwrite, -O
+:   Allow an existing output file to be overwritten. Normally **osmium** will
+    refuse to write over an existing file.
+
+--verbose,-v
+:   Set verbose mode. The program will output information about what it is
+    doing to *stderr*.
+
+
+# DIAGNOSTICS
+
+**osmium time-filter** exits with code 0 if everything went alright, it exits
+with code 2 if there was a problem with the command line arguments,
+and with exit code 1 if some other error occurred.
+
+
+# EXAMPLES
+
+Extract current planet file from history planet:
+
+    osmium time-filter -o planet.osm.pbf history-planet.osh.pbf
+
+Extract planet data how it appeared on January 1 2008 from history planet:
+
+    osmium time-filter -o planet-20080101.osm.pbf history-planet.osh.pbf 
2008-01-01T00:00:00Z
+
+
+# COPYRIGHT
+
+Copyright (C) 2013  Jochen Topf <joc...@topf.org>.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+
+
+# SEE ALSO
+
+<http://osmcode.org/osmium>
+
diff --git a/doc/osmium.md b/doc/osmium.md
new file mode 100644
index 0000000..864836b
--- /dev/null
+++ b/doc/osmium.md
@@ -0,0 +1,58 @@
+% OSMIUM(1)
+% Jochen Topf <joc...@topf.org>
+
+# NAME
+osmium - Multipurpose tool for working with OpenStreetMap data.
+
+
+# SYNOPSIS
+
+**osmium** *COMMAND* \[ARGS\]\
+**osmium** --help\
+**osmium** --version
+
+
+# DESCRIPTION
+
+Multipurpose tool for working with OpenStreetMap data.
+
+Run **osmium help** *COMMAND* to get more information about a command.
+
+
+# OPTIONS
+
+--help, -h
+:   Show usage and list of commands.
+
+--version, -v
+:   Show program version.
+
+
+# COMMANDS
+
+apply-changes
+:   Apply OSM change file(s) to OSM data file.
+cat
+:   Concatenate OSM files and convert OSM files between different formats.
+dump
+:   Dump contents of OSM file.
+fileinfo
+:   Show information about an OpenStreetMap file.
+help
+:   Show help about commands.
+merge-changes
+:   Merge several OSM change files into one.
+
+
+# COPYRIGHT
+
+Copyright (C) 2013  Jochen Topf <joc...@topf.org>.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+
+
+# SEE ALSO
+
+<http://osmcode.org/osmium>
+
diff --git a/src/command_apply_changes.cpp b/src/command_apply_changes.cpp
new file mode 100644
index 0000000..68e9275
--- /dev/null
+++ b/src/command_apply_changes.cpp
@@ -0,0 +1,191 @@
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013  Jochen Topf <joc...@topf.org>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <boost/function_output_iterator.hpp>
+#include <boost/program_options.hpp>
+namespace po = boost::program_options;
+
+#include <osmium/io/any_input.hpp>
+#include <osmium/io/any_output.hpp>
+#include <osmium/io/output_iterator.hpp>
+#include <osmium/osm/object_pointer_collection.hpp>
+#include <osmium/osm/object_comparisons.hpp>
+
+#include "command_apply_changes.hpp"
+
+bool CommandApplyChanges::setup(const std::vector<std::string>& arguments) {
+    po::variables_map vm;
+    try {
+        po::options_description cmdline("Allowed options");
+        cmdline.add_options()
+        ("output,o", po::value<std::string>(), "Output file")
+        ("output-format,f", po::value<std::string>(), "Format of output file")
+        ("input-format,F", po::value<std::string>(), "Format of input file")
+        ("simplify,s", "Simplify change")
+        ("remove-deleted,r", "Remove deleted objects from output")
+        ("generator", po::value<std::string>(), "Generator setting for file 
header")
+        ("overwrite,O", "Allow existing output file to be overwritten")
+        ;
+
+        po::options_description hidden("Hidden options");
+        hidden.add_options()
+        ("input-filename", po::value<std::string>(), "OSM input file")
+        ("change-filenames", po::value<std::vector<std::string>>(), "OSM 
change input files")
+        ;
+
+        po::options_description desc("Allowed options");
+        desc.add(cmdline).add(hidden);
+
+        po::positional_options_description positional;
+        positional.add("input-filename", 1);
+        positional.add("change-filenames", -1);
+
+        
po::store(po::command_line_parser(arguments).options(desc).positional(positional).run(),
 vm);
+        po::notify(vm);
+
+        if (vm.count("input-filename")) {
+            m_input_filename = vm["input-filename"].as<std::string>();
+        }
+
+        if (vm.count("change-filenames")) {
+            m_change_filenames = 
vm["change-filenames"].as<std::vector<std::string>>();
+        }
+
+        if (vm.count("output")) {
+            m_output_filename = vm["output"].as<std::string>();
+        }
+
+        if (vm.count("input-format")) {
+            m_input_format = vm["input-format"].as<std::string>();
+        }
+
+        if (vm.count("output-format")) {
+            m_output_format = vm["output-format"].as<std::string>();
+        }
+
+        if (vm.count("overwrite")) {
+            m_output_overwrite = true;
+        }
+
+        if (vm.count("simplify")) {
+            m_simplify_change = true;
+        }
+
+        if (vm.count("remove-deleted")) {
+            m_remove_deleted = true;
+        }
+
+        if (vm.count("generator")) {
+            m_generator = vm["generator"].as<std::string>();
+        }
+
+    } catch (boost::program_options::error& e) {
+        std::cerr << "Error parsing command line: " << e.what() << std::endl;
+        return false;
+    }
+
+    if ((m_output_filename == "-" || m_output_filename == "") && 
m_output_format.empty()) {
+        std::cerr << "When writing to STDOUT you need to use the 
--output-format,f option to declare the file format.\n";
+        return false;
+    }
+
+    if ((m_input_filename == "-" || m_input_filename == "") && 
m_input_format.empty()) {
+        std::cerr << "When reading from STDIN you need to use the 
--input-format,F option to declare the file format.\n";
+        return false;
+    }
+
+    m_output_file = osmium::io::File(m_output_filename, m_output_format);
+
+    return true;
+}
+
+bool CommandApplyChanges::run() {
+    std::vector<osmium::memory::Buffer> changes;
+    osmium::osm::ObjectPointerCollection objects;
+
+    for (const std::string& change_file_name : m_change_filenames) {
+        osmium::io::Reader reader(change_file_name);
+        while (osmium::memory::Buffer buffer = reader.read()) {
+            osmium::apply(buffer, objects);
+            changes.push_back(std::move(buffer));
+        }
+    }
+
+    osmium::io::Reader reader(m_input_filename);
+
+    osmium::io::Header header = reader.header();
+    header.set("generator", m_generator);
+
+    osmium::io::Writer writer(m_output_file, header, m_output_overwrite);
+    osmium::io::OutputIterator<osmium::io::Writer> out(writer);
+
+    if (m_simplify_change) {
+        // If the --simplify option was given we sort with the
+        // largest version of each object first and then only
+        // copy this last version of any object to the output_buffer.
+        objects.sort(osmium::osm::object_order_type_id_reverse_version());
+
+        osmium::object_id_type id = 0;
+        bool keep_deleted = !m_remove_deleted;
+
+        auto output_it = boost::make_function_output_iterator([&out, &id, 
keep_deleted](const osmium::Object& obj) {
+            if (obj.id() != id) {
+                if (keep_deleted || obj.visible()) {
+                    *out = obj;
+                }
+                id = obj.id();
+            }
+        });
+
+        std::set_union(objects.begin(),
+                       objects.end(),
+                       osmium::io::InputIterator<osmium::io::Reader, 
osmium::Object> {reader},
+                       osmium::io::InputIterator<osmium::io::Reader, 
osmium::Object> {},
+                       output_it,
+                       osmium::osm::object_order_type_id_reverse_version());
+    } else {
+        // If the --simplify option was not given, this
+        // is a straightforward sort of the change files
+        // and the a merge with the input file.
+        objects.sort(osmium::osm::object_order_type_id_version());
+
+        std::set_union(objects.begin(),
+                       objects.end(),
+                       osmium::io::InputIterator<osmium::io::Reader, 
osmium::Object> {reader},
+                       osmium::io::InputIterator<osmium::io::Reader, 
osmium::Object> {},
+                       out);
+    }
+
+    out.flush();
+    writer.close();
+
+    return true;
+}
+
+namespace {
+
+    const bool register_apply_changes_command = 
CommandFactory::add("apply-changes", "Apply OSM change files to OSM data file", 
[]() {
+        return new CommandApplyChanges();
+    });
+
+}
+
diff --git a/src/command_apply_changes.hpp b/src/command_apply_changes.hpp
new file mode 100644
index 0000000..982b6a4
--- /dev/null
+++ b/src/command_apply_changes.hpp
@@ -0,0 +1,59 @@
+#ifndef COMMAND_APPLY_CHANGES_HPP
+#define COMMAND_APPLY_CHANGES_HPP
+
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013  Jochen Topf <joc...@topf.org>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <string>
+#include <vector>
+
+#include <osmium/io/file.hpp>
+
+#include "osmc.hpp"
+
+class CommandApplyChanges : public Command {
+
+    std::string m_input_filename = "-"; // default: stdin
+    std::string m_output_filename = "-"; // default: stdout
+    std::vector<std::string> m_change_filenames;
+
+    std::string m_input_format;
+    std::string m_output_format;
+
+    bool m_output_overwrite = false;
+    bool m_simplify_change = false;
+    bool m_remove_deleted = false;
+
+    osmium::io::File m_output_file;
+
+public:
+
+    CommandApplyChanges() = default;
+
+    bool setup(const std::vector<std::string>& arguments) override final;
+
+    bool run() override final;
+
+}; // class CommandApplyChanges
+
+
+#endif // COMMAND_APPLY_CHANGES_HPP
diff --git a/src/command_cat.cpp b/src/command_cat.cpp
new file mode 100644
index 0000000..ef05dba
--- /dev/null
+++ b/src/command_cat.cpp
@@ -0,0 +1,178 @@
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013  Jochen Topf <joc...@topf.org>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <iostream>
+#include <iterator>
+
+#include <boost/program_options.hpp>
+namespace po = boost::program_options;
+
+#include <osmium/io/any_input.hpp>
+#include <osmium/io/any_output.hpp>
+
+#include "command_cat.hpp"
+
+bool CommandCat::setup(const std::vector<std::string>& arguments) {
+    po::variables_map vm;
+    try {
+        po::options_description cmdline("Allowed options");
+        cmdline.add_options()
+        ("verbose,v", "Set verbose mode")
+        ("output,o", po::value<std::string>(), "Output file")
+        ("output-format,f", po::value<std::string>(), "Format of output file")
+        ("input-format,F", po::value<std::string>(), "Format of input files")
+        ("generator", po::value<std::string>(), "Generator setting for file 
header")
+        ("overwrite,O", "Allow existing output file to be overwritten")
+        ;
+
+        po::options_description hidden("Hidden options");
+        hidden.add_options()
+        ("input-filenames", po::value<std::vector<std::string>>(), "Input 
files")
+        ;
+
+        po::options_description desc("Allowed options");
+        desc.add(cmdline).add(hidden);
+
+        po::positional_options_description positional;
+        positional.add("input-filenames", -1);
+
+        
po::store(po::command_line_parser(arguments).options(desc).positional(positional).run(),
 vm);
+        po::notify(vm);
+
+        if (vm.count("verbose")) {
+            m_vout.verbose(true);
+        }
+
+        if (vm.count("generator")) {
+            m_generator = vm["generator"].as<std::string>();
+        }
+
+        if (vm.count("input-filenames")) {
+            m_input_filenames = 
vm["input-filenames"].as<std::vector<std::string>>();
+        } else {
+            m_input_filenames.push_back("-"); // default is stdin
+        }
+
+        if (vm.count("output")) {
+            m_output_filename = vm["output"].as<std::string>();
+        }
+
+        if (vm.count("input-format")) {
+            m_input_format = vm["input-format"].as<std::string>();
+        }
+
+        if (vm.count("output-format")) {
+            m_output_format = vm["output-format"].as<std::string>();
+        }
+
+        if (vm.count("overwrite")) {
+            m_output_overwrite = true;
+        }
+
+    } catch (boost::program_options::error& e) {
+        std::cerr << "Error parsing command line: " << e.what() << std::endl;
+        return false;
+    }
+
+    m_vout << "Started osmium cat\n";
+
+    m_vout << "Command line options and default settings:\n";
+    m_vout << "  generator: " << m_generator << "\n";
+    m_vout << "  input-filenames: \n";
+    for (const auto& fn : m_input_filenames) {
+        m_vout << "    " << fn << "\n";
+    }
+    m_vout << "  output-filename: " << m_output_filename << "\n";
+    m_vout << "  input-format: " << m_input_format << "\n";
+    m_vout << "  output-format: " << m_output_format << "\n";
+
+    if ((m_output_filename == "-" || m_output_filename == "") && 
m_output_format.empty()) {
+        std::cerr << "When writing to STDOUT you need to use the 
--output-format,f option to declare the file format.\n";
+        return false;
+    }
+
+    if (m_input_format.empty()) {
+        bool uses_stdin = false;
+        for (auto& filename : m_input_filenames) {
+            if (filename.empty() || filename == "-") {
+                uses_stdin = true;
+            }
+        }
+        if (uses_stdin) {
+            std::cerr << "When reading from STDIN you need to use the 
--input-format,F option to declare the file format.\n";
+            return false;
+        }
+    }
+
+    m_output_file = osmium::io::File(m_output_filename, m_output_format);
+
+    for (const std::string& input_filename : m_input_filenames) {
+        osmium::io::File input_file(input_filename, m_input_format);
+        m_input_files.push_back(input_file);
+    }
+
+    return true;
+}
+
+bool CommandCat::run() {
+
+    try {
+        if (m_input_files.size() == 1) { // single input file
+            m_vout << "Copying input file '" << m_input_files[0].filename() << 
"'\n";
+            osmium::io::Reader reader(m_input_files[0]);
+            osmium::io::Header header = reader.header();
+            header.set("generator", m_generator);
+            osmium::io::Writer writer(m_output_file, header, 
m_output_overwrite);
+            while (osmium::memory::Buffer buffer = reader.read()) {
+                writer(std::move(buffer));
+            }
+            writer.close();
+        } else { // multiple input files
+            osmium::io::Header header({{"generator", m_generator}});
+            osmium::io::Writer writer(m_output_file, header, 
m_output_overwrite);
+            for (const auto& input_file : m_input_files) {
+                m_vout << "Copying input file '" << input_file.filename() << 
"'\n";
+                osmium::io::Reader reader(input_file);
+                while (osmium::memory::Buffer buffer = reader.read()) {
+                    writer(std::move(buffer));
+                }
+            }
+            writer.close();
+        }
+    } catch (std::exception& e) {
+        std::cerr << e.what() << "\n";
+        return false;
+    }
+
+    m_vout << "Done.\n";
+
+    return true;
+}
+
+namespace {
+
+    const bool register_cat_command = CommandFactory::add("cat", "Concatenate 
OSM files and convert to different formats", []() {
+        return new CommandCat();
+    });
+
+}
+
diff --git a/src/command_cat.hpp b/src/command_cat.hpp
new file mode 100644
index 0000000..4f8aa54
--- /dev/null
+++ b/src/command_cat.hpp
@@ -0,0 +1,54 @@
+#ifndef COMMAND_CAT_HPP
+#define COMMAND_CAT_HPP
+
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013  Jochen Topf <joc...@topf.org>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <string>
+#include <vector>
+
+#include <osmium/io/file.hpp>
+
+#include "osmc.hpp"
+
+class CommandCat : public Command {
+
+    std::vector<std::string> m_input_filenames;
+    std::string m_output_filename = "-"; // default: stdout
+    std::string m_input_format;
+    std::string m_output_format;
+    osmium::io::File m_output_file;
+    std::vector<osmium::io::File> m_input_files;
+    bool m_output_overwrite = false;
+
+public:
+
+    CommandCat() = default;
+
+    bool setup(const std::vector<std::string>& arguments) override final;
+
+    bool run() override final;
+
+}; // class CommandCat
+
+
+#endif // COMMAND_CAT_HPP
diff --git a/src/command_fileinfo.cpp b/src/command_fileinfo.cpp
new file mode 100644
index 0000000..4093a02
--- /dev/null
+++ b/src/command_fileinfo.cpp
@@ -0,0 +1,186 @@
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013  Jochen Topf <joc...@topf.org>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <iostream>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <boost/program_options.hpp>
+namespace po = boost::program_options;
+
+#include <crypto++/sha.h>
+
+#include <osmium/io/any_input.hpp>
+#include <osmium/handler.hpp>
+#include <osmium/osm/entity_flags.hpp>
+#include <osmium/osm/ostream.hpp>
+#include <osmium/visitor.hpp>
+
+#include "command_fileinfo.hpp"
+
+bool CommandFileinfo::setup(const std::vector<std::string>& arguments) {
+    po::variables_map vm;
+    try {
+        po::options_description cmdline("Allowed options");
+        cmdline.add_options()
+        ("extended,e", "Extended output")
+        ("input-format,F", po::value<std::string>(), "Format of input file")
+        ;
+
+        po::options_description hidden("Hidden options");
+        hidden.add_options()
+        ("input-filename", po::value<std::string>(), "Input file")
+        ;
+
+        po::options_description desc("Allowed options");
+        desc.add(cmdline).add(hidden);
+
+        po::positional_options_description positional;
+        positional.add("input-filename", 1);
+
+        
po::store(po::command_line_parser(arguments).options(desc).positional(positional).run(),
 vm);
+        po::notify(vm);
+
+        if (vm.count("extended")) {
+            m_extended = true;
+        }
+
+        if (vm.count("input-format")) {
+            m_input_format = vm["input-format"].as<std::string>();
+        }
+
+        if (vm.count("input-filename")) {
+            m_input_filename = vm["input-filename"].as<std::string>();
+        }
+
+    } catch (boost::program_options::error& e) {
+        std::cerr << "Error parsing command line: " << e.what() << std::endl;
+        return false;
+    }
+
+    if ((m_input_filename == "-" || m_input_filename == "") && 
m_input_format.empty()) {
+        std::cerr << "When reading from STDIN you need to use the 
--input-format,F option to declare the file format.\n";
+        return false;
+    }
+
+    m_input_file = osmium::io::File(m_input_filename, m_input_format);
+
+    return true;
+}
+
+struct InfoHandler : public osmium::handler::Handler {
+
+    osmium::BBox bbox;
+    uint64_t nodes = 0;
+    uint64_t ways = 0;
+    uint64_t relations = 0;
+    CryptoPP::SHA hash {};
+
+    void node(const osmium::Node& node) {
+        hash.Update(node.data(), node.byte_size());
+        bbox.extend(node.location());
+        ++nodes;
+    }
+
+    void way(const osmium::Way& way) {
+        hash.Update(way.data(), way.byte_size());
+        ++ways;
+    }
+
+    void relation(const osmium::Relation& relation) {
+        hash.Update(relation.data(), relation.byte_size());
+        ++relations;
+    }
+
+}; // InfoHandler
+
+off_t filesize(const std::string& filename) {
+    if (filename.empty()) {
+        return 0;
+    }
+    struct stat s;
+    stat(filename.c_str(), &s);
+    return s.st_size;
+}
+
+bool CommandFileinfo::run() {
+    try {
+        std::cout << "File:\n";
+        std::cout << "  Name: " << m_input_filename << "\n";
+        std::cout << "  Format: " << m_input_file.format() << "\n";
+        std::cout << "  Compression: " << m_input_file.compression() << "\n";
+
+        if (!m_input_file.filename().empty()) {
+            std::cout << "  Size: " << filesize(m_input_file.filename()) << 
"\n";
+        }
+
+        osmium::io::Reader reader(m_input_file, m_extended ? 
osmium::osm_entity::flags::all : osmium::osm_entity::flags::nothing);
+
+        osmium::io::Header header = reader.header();
+        std::cout << "Header:\n";
+
+        std::cout << "  Bounding boxes:\n";
+        for (auto& bbox : header.bboxes()) {
+            std::cout << "    " << bbox << "\n";
+        }
+        std::cout << "  With history: " << 
(header.has_multiple_object_versions() ? "yes" : "no") << "\n";
+
+        std::cout << "  Options:\n";
+        for (auto option : header) {
+            std::cout << "    " << option.first << "=" << option.second << 
"\n";
+        }
+
+        if (m_extended) {
+            InfoHandler info_handler;
+            osmium::apply(reader, info_handler);
+            std::cout << "Data: " << "\n";
+            std::cout << "  Bounding box: " << info_handler.bbox << "\n";
+
+            unsigned char digest[CryptoPP::SHA::DIGESTSIZE];
+            info_handler.hash.Final(digest);
+            std::cout << "  SHA: " << std::hex;
+            for (int i=0; i < CryptoPP::SHA::DIGESTSIZE; ++i) {
+                std::cout << static_cast<int>(digest[i]);
+            }
+            std::cout << std::dec << "\n";
+            std::cout << "  Number of nodes: " << info_handler.nodes << "\n";
+            std::cout << "  Number of ways: " << info_handler.ways << "\n";
+            std::cout << "  Number of relations: " << info_handler.relations 
<< "\n";
+        }
+
+        return true;
+    } catch (std::exception& e) {
+        std::cerr << e.what() << std::endl;
+        return false;
+    }
+}
+
+namespace {
+
+    const bool register_fileinfo_command = CommandFactory::add("fileinfo", 
"Show information about OSM file", []() {
+        return new CommandFileinfo();
+    });
+
+}
+
diff --git a/src/command_fileinfo.hpp b/src/command_fileinfo.hpp
new file mode 100644
index 0000000..2062cd4
--- /dev/null
+++ b/src/command_fileinfo.hpp
@@ -0,0 +1,48 @@
+#ifndef COMMAND_FILEINFO_HPP
+#define COMMAND_FILEINFO_HPP
+
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013  Jochen Topf <joc...@topf.org>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <string>
+
+#include "osmc.hpp"
+
+class CommandFileinfo : public Command {
+
+    std::string m_input_filename = "-"; // default: stdin
+    bool m_extended = false;
+    std::string m_input_format;
+    osmium::io::File m_input_file;
+
+public:
+
+    CommandFileinfo() = default;
+
+    bool setup(const std::vector<std::string>& arguments) override final;
+
+    bool run() override final;
+
+}; // class CommandFileinfo
+
+
+#endif // COMMAND_FILEINFO_HPP
diff --git a/src/command_help.cpp b/src/command_help.cpp
new file mode 100644
index 0000000..c6c578f
--- /dev/null
+++ b/src/command_help.cpp
@@ -0,0 +1,76 @@
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013  Jochen Topf <joc...@topf.org>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <algorithm>
+#include <cstring>
+#include <iostream>
+#include <iomanip>
+#include <map>
+#include <numeric>
+#include <string>
+#include <unistd.h>
+
+#include "command_help.hpp"
+
+bool CommandHelp::setup(const std::vector<std::string>& arguments) {
+    m_topic = arguments.empty() ? "help" : arguments.front();
+    return true;
+}
+
+bool CommandHelp::run() {
+    if (m_topic == "help") {
+        std::cout << "Usage: osmium [--version] [--help] <command> 
[<args>]\n\nCommands are:\n";
+
+        auto commands = CommandFactory::help();
+
+        // find the maximum length of all command names
+        size_t max_width = std::accumulate(commands.begin(), commands.end(), 
0, [](size_t max_so_far, std::pair<std::string, std::string> info) {
+            return std::max(max_so_far, info.first.length());
+        });
+
+        // and print them out in a nice table
+        for (const auto& cmd : commands) {
+            std::cout << "  " << std::setw(max_width) << std::left << 
cmd.first << std::setw(0) << "  " << cmd.second << "\n";
+        }
+
+        std::cout << "\nSee 'osmium help <command>' for more information on a 
specific command." << std::endl;
+        return true;
+    }
+
+    // show man page
+    std::string manpage("osmium-");
+    manpage += m_topic;
+    ::execlp("man", "man", manpage.c_str(), nullptr);
+
+    std::cerr << "Executing man command failed: " << std::strerror(errno) << 
std::endl;
+
+    return false;
+}
+
+namespace {
+
+    const bool register_help_command = CommandFactory::add("help", "Show 
osmium help", []() {
+        return new CommandHelp();
+    });
+
+}
+
diff --git a/src/command_help.hpp b/src/command_help.hpp
new file mode 100644
index 0000000..7cccd02
--- /dev/null
+++ b/src/command_help.hpp
@@ -0,0 +1,41 @@
+#ifndef COMMAND_HELP_HPP
+#define COMMAND_HELP_HPP
+
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013  Jochen Topf <joc...@topf.org>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "osmc.hpp"
+
+class CommandHelp : public Command {
+
+    std::string m_topic;
+
+public:
+
+    bool setup(const std::vector<std::string>& arguments) override final;
+
+    bool run() override final;
+
+}; // class CommandHelp
+
+
+#endif // COMMAND_HELP_HPP
diff --git a/src/command_merge_changes.cpp b/src/command_merge_changes.cpp
new file mode 100644
index 0000000..ba6adc1
--- /dev/null
+++ b/src/command_merge_changes.cpp
@@ -0,0 +1,168 @@
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013  Jochen Topf <joc...@topf.org>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <iostream>
+
+#include <boost/program_options.hpp>
+namespace po = boost::program_options;
+
+#include <osmium/io/any_input.hpp>
+#include <osmium/io/any_output.hpp>
+#include <osmium/io/output_iterator.hpp>
+#include <osmium/osm/object_pointer_collection.hpp>
+#include <osmium/osm/object_comparisons.hpp>
+
+#include "command_merge_changes.hpp"
+
+bool CommandMergeChanges::setup(const std::vector<std::string>& arguments) {
+    po::variables_map vm;
+    try {
+        po::options_description cmdline("Allowed options");
+        cmdline.add_options()
+        ("output,o", po::value<std::string>(), "Output file")
+        ("output-format,f", po::value<std::string>(), "Format of output file")
+        ("input-format,F", po::value<std::string>(), "Format of input files")
+        ("simplify,s", "Simplify change")
+        ("generator", po::value<std::string>(), "Generator setting for file 
header")
+        ("overwrite,O", "Allow existing output file to be overwritten")
+        ;
+
+        po::options_description hidden("Hidden options");
+        hidden.add_options()
+        ("input-filenames", po::value<std::vector<std::string>>(), "Input 
files")
+        ;
+
+        po::options_description desc("Allowed options");
+        desc.add(cmdline).add(hidden);
+
+        po::positional_options_description positional;
+        positional.add("input-filenames", -1);
+
+        
po::store(po::command_line_parser(arguments).options(desc).positional(positional).run(),
 vm);
+        po::notify(vm);
+
+        if (vm.count("input-filenames")) {
+            m_input_filenames = 
vm["input-filenames"].as<std::vector<std::string>>();
+        }
+
+        if (vm.count("output")) {
+            m_output_filename = vm["output"].as<std::string>();
+        }
+
+        if (vm.count("input-format")) {
+            m_input_format = vm["input-format"].as<std::string>();
+        }
+
+        if (vm.count("output-format")) {
+            m_output_format = vm["output-format"].as<std::string>();
+        }
+
+        if (vm.count("overwrite")) {
+            m_output_overwrite = true;
+        }
+
+        if (vm.count("simplify")) {
+            m_simplify_change = true;
+        }
+
+        if (vm.count("generator")) {
+            m_generator = vm["generator"].as<std::string>();
+        }
+
+    } catch (boost::program_options::error& e) {
+        std::cerr << "Error parsing command line: " << e.what() << std::endl;
+        return false;
+    }
+
+    if ((m_output_filename == "-" || m_output_filename == "") && 
m_output_format.empty()) {
+        std::cerr << "When writing to STDOUT you need to use the 
--output-format,f option to declare the file format.\n";
+        return false;
+    }
+
+    if (m_input_format.empty()) {
+        bool uses_stdin = false;
+        for (auto& filename : m_input_filenames) {
+            if (filename.empty() || filename == "-") {
+                uses_stdin = true;
+            }
+        }
+        if (uses_stdin) {
+            std::cerr << "When reading from STDIN you need to use the 
--input-format,F option to declare the file format.\n";
+            return false;
+        }
+    }
+
+    m_output_file = osmium::io::File(m_output_filename, m_output_format);
+
+    return true;
+}
+
+bool CommandMergeChanges::run() {
+    // this will contain all the buffers with the input data
+    std::vector<osmium::memory::Buffer> changes;
+
+    osmium::osm::ObjectPointerCollection objects;
+
+    // read all input files, keep the buffers around and add pointer
+    // to each object to objects collection.
+    for (const std::string& change_file_name : m_input_filenames) {
+        osmium::io::Reader reader(change_file_name);
+        while (osmium::memory::Buffer buffer = reader.read()) {
+            osmium::apply(buffer, objects);
+            changes.push_back(std::move(buffer));
+        }
+    }
+
+    osmium::io::Header header;
+    header.set("generator", m_generator);
+    osmium::io::Writer writer(m_output_file, header, m_output_overwrite);
+    osmium::io::OutputIterator<osmium::io::Writer> out(writer);
+
+    // Now we sort all objects and write them in order into the
+    // output_buffer, flushing the output_buffer whenever it is full.
+    if (m_simplify_change) {
+        // If the --simplify option was given we sort with the
+        // largest version of each object first and then only
+        // copy this last version of any object to the output_buffer.
+        objects.sort(osmium::osm::object_order_type_id_reverse_version());
+        std::unique_copy(objects.cbegin(), objects.cend(), out, 
osmium::osm::object_equal_type_id());
+    } else {
+        // If the --simplify option was not given, this
+        // is a straightforward sort and copy.
+        objects.sort(osmium::osm::object_order_type_id_version());
+        std::copy(objects.cbegin(), objects.cend(), out);
+    }
+
+    out.flush();
+    writer.close();
+
+    return true;
+}
+
+namespace {
+
+    const bool register_merge_changes_command = 
CommandFactory::add("merge-changes", "Merge several OSM change files into one", 
[]() {
+        return new CommandMergeChanges();
+    });
+
+}
+
diff --git a/src/command_merge_changes.hpp b/src/command_merge_changes.hpp
new file mode 100644
index 0000000..7ccb692
--- /dev/null
+++ b/src/command_merge_changes.hpp
@@ -0,0 +1,57 @@
+#ifndef COMMAND_MERGE_CHANGES_HPP
+#define COMMAND_MERGE_CHANGES_HPP
+
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013  Jochen Topf <joc...@topf.org>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <string>
+#include <vector>
+
+#include <osmium/io/file.hpp>
+
+#include "osmc.hpp"
+
+class CommandMergeChanges : public Command {
+
+    std::vector<std::string> m_input_filenames;
+    std::string m_output_filename = "-"; // default: stdout
+
+    std::string m_input_format;
+    std::string m_output_format;
+
+    bool m_output_overwrite = false;
+    bool m_simplify_change = false;
+
+    osmium::io::File m_output_file;
+
+public:
+
+    CommandMergeChanges() = default;
+
+    bool setup(const std::vector<std::string>& arguments) override final;
+
+    bool run() override final;
+
+}; // class CommandMergeChanges
+
+
+#endif // COMMAND_MERGE_CHANGES_HPP
diff --git a/src/command_time_filter.cpp b/src/command_time_filter.cpp
new file mode 100644
index 0000000..bddc3dc
--- /dev/null
+++ b/src/command_time_filter.cpp
@@ -0,0 +1,184 @@
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013  Jochen Topf <joc...@topf.org>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <boost/program_options.hpp>
+namespace po = boost::program_options;
+
+#include <osmium/io/any_input.hpp>
+#include <osmium/io/any_output.hpp>
+#include <osmium/io/input_iterator.hpp>
+#include <osmium/io/output_iterator.hpp>
+#include <osmium/diff_iterator.hpp>
+
+#include "command_time_filter.hpp"
+
+bool CommandTimeFilter::setup(const std::vector<std::string>& arguments) {
+    po::variables_map vm;
+    try {
+        po::options_description cmdline("Allowed options");
+        cmdline.add_options()
+        ("verbose,v", "Set verbose mode")
+        ("output,o", po::value<std::string>(), "Output file")
+        ("output-format,f", po::value<std::string>(), "Format of output file")
+        ("input-format,F", po::value<std::string>(), "Format of input file")
+        ("generator", po::value<std::string>(), "Generator setting for file 
header")
+        ("overwrite,O", "Allow existing output file to be overwritten")
+        ;
+
+        po::options_description hidden("Hidden options");
+        hidden.add_options()
+        ("input-filename", po::value<std::string>(), "OSM input file")
+        ("time-from", po::value<std::string>(), "Start of time range")
+        ("time-to", po::value<std::string>(), "End of time range")
+        ;
+
+        po::options_description desc("Allowed options");
+        desc.add(cmdline).add(hidden);
+
+        po::positional_options_description positional;
+        positional.add("input-filename", 1);
+        positional.add("time-from", 1);
+        positional.add("time-to", 1);
+
+        
po::store(po::command_line_parser(arguments).options(desc).positional(positional).run(),
 vm);
+        po::notify(vm);
+
+        if (vm.count("input-filename")) {
+            m_input_filename = vm["input-filename"].as<std::string>();
+        }
+
+        if (vm.count("output")) {
+            m_output_filename = vm["output"].as<std::string>();
+        }
+
+        if (vm.count("input-format")) {
+            m_input_format = vm["input-format"].as<std::string>();
+        }
+
+        if (vm.count("output-format")) {
+            m_output_format = vm["output-format"].as<std::string>();
+        }
+
+        if (vm.count("overwrite")) {
+            m_output_overwrite = true;
+        }
+
+        if (vm.count("verbose")) {
+            m_vout.verbose(true);
+        }
+
+        if (vm.count("generator")) {
+            m_generator = vm["generator"].as<std::string>();
+        }
+
+        m_from = osmium::Timestamp(time(0));
+        m_to = m_from;
+
+        if (vm.count("time-from")) {
+            m_from = 
osmium::Timestamp(vm["time-from"].as<std::string>().c_str());
+            m_to = m_from;
+        }
+
+        if (vm.count("time-to")) {
+            m_to = osmium::Timestamp(vm["time-to"].as<std::string>().c_str());
+            if (m_to < m_from) {
+                std::cerr << "Second timestamp is before first one.\n";
+                return false;
+            }
+        }
+
+    } catch (boost::program_options::error& e) {
+        std::cerr << "Error parsing command line: " << e.what() << std::endl;
+        return false;
+    }
+
+    if ((m_output_filename == "-" || m_output_filename == "") && 
m_output_format.empty()) {
+        std::cerr << "When writing to STDOUT you need to use the 
--output-format,f option to declare the file format.\n";
+        return false;
+    }
+
+    if ((m_input_filename == "-" || m_input_filename == "") && 
m_input_format.empty()) {
+        std::cerr << "When reading from STDIN you need to use the 
--input-format,F option to declare the file format.\n";
+        return false;
+    }
+
+    m_input_file = osmium::io::File(m_input_filename, m_input_format);
+    m_output_file = osmium::io::File(m_output_filename, m_output_format);
+
+    if (m_from == m_to) { // point in time
+        if (m_output_file.has_multiple_object_versions()) {
+            std::cerr << "Warning! You are writing to a file marked as having 
multiple object versions,\n";
+            std::cerr << "but there will be only a single version of each 
object.\n";
+        }
+    } else { // time range
+        if (!m_output_file.has_multiple_object_versions()) {
+            std::cerr << "Warning! You are writing to a file marked as having 
a single object version,\n";
+            std::cerr << "but there might be multiple versions of each 
object.\n";
+        }
+    }
+
+    m_vout << "Start osmium-time-filter\n";
+    m_vout << "Filtering from time " << m_from.to_iso() << " to " << 
m_to.to_iso() << "\n";
+
+    return true;
+}
+
+bool CommandTimeFilter::run() {
+    osmium::io::Reader reader(m_input_file);
+
+    osmium::io::Header header = reader.header();
+    header.set("generator", m_generator);
+
+    osmium::io::Writer writer(m_output_file, header, m_output_overwrite);
+    osmium::io::OutputIterator<osmium::io::Writer> out(writer);
+
+    typedef osmium::io::InputIterator<osmium::io::Reader, osmium::Object> 
object_iterator;
+
+    object_iterator object_it(reader);
+    object_iterator object_end;
+
+    typedef osmium::DiffIterator<object_iterator> diff_iterator;
+
+    std::copy_if(
+        diff_iterator(object_it, object_end),
+        diff_iterator(object_end, object_end),
+        out,
+        [this](const osmium::DiffObject& d){
+            return ((d.end_time() == 0 || d.end_time() > m_from) &&
+                   d.start_time() <= m_to) &&
+                   (m_from != m_to || d.curr().visible());
+    });
+
+    out.flush();
+    writer.close();
+
+    return true;
+}
+
+namespace {
+
+    const bool register_time_filter_command = 
CommandFactory::add("time-filter", "Filter OSM data from a point in time or a 
time span out of a history file", []() {
+        return new CommandTimeFilter();
+    });
+
+}
+
diff --git a/src/command_time_filter.hpp b/src/command_time_filter.hpp
new file mode 100644
index 0000000..ed0332c
--- /dev/null
+++ b/src/command_time_filter.hpp
@@ -0,0 +1,61 @@
+#ifndef COMMAND_TIME_FILTER_HPP
+#define COMMAND_TIME_FILTER_HPP
+
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013  Jochen Topf <joc...@topf.org>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <string>
+#include <vector>
+
+#include <osmium/io/file.hpp>
+#include <osmium/osm/timestamp.hpp>
+
+#include "osmc.hpp"
+
+class CommandTimeFilter : public Command {
+
+    std::string m_input_filename = "-"; // default: stdin
+    std::string m_output_filename = "-"; // default: stdout
+
+    std::string m_input_format;
+    std::string m_output_format;
+
+    bool m_output_overwrite = false;
+
+    osmium::io::File m_input_file;
+    osmium::io::File m_output_file;
+
+    osmium::Timestamp m_from {};
+    osmium::Timestamp m_to {};
+
+public:
+
+    CommandTimeFilter() = default;
+
+    bool setup(const std::vector<std::string>& arguments) override final;
+
+    bool run() override final;
+
+}; // class CommandTimeFilter
+
+
+#endif // COMMAND_TIME_FILTER_HPP
diff --git a/src/main.cpp b/src/main.cpp
new file mode 100644
index 0000000..b50534b
--- /dev/null
+++ b/src/main.cpp
@@ -0,0 +1,101 @@
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013  Jochen Topf <joc...@topf.org>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <iostream>
+#include <string>
+#include <vector>
+
+#include <osmpbf/osmpbf.h>
+
+#include "osmc.hpp"
+
+#include "command_apply_changes.hpp"
+#include "command_cat.hpp"
+#include "command_fileinfo.hpp"
+#include "command_help.hpp"
+#include "command_merge_changes.hpp"
+#include "command_time_filter.hpp"
+
+enum return_code : int {
+    okay  = 0,
+    error = 1,
+    fatal = 2
+};
+
+int main(int argc, char *argv[]) {
+    std::string command = argv[0];
+    if (command.find_last_of("/") != std::string::npos) {
+        command = command.substr(command.find_last_of("/") + 1);
+    }
+
+    std::vector<std::string> arguments;
+
+    for (int i=1; i < argc; ++i) {
+        arguments.push_back(argv[i]);
+    }
+
+    if (command == "osmium") {
+        if (arguments.size() == 0) {
+            command = "help";
+        } else {
+            if (arguments.front() == "--help" || arguments.front() == "-h") {
+                command = "help";
+            } else if (arguments.front() == "--version") {
+                command = "version";
+            } else {
+                command = arguments.front();
+            }
+            arguments.erase(arguments.begin());
+        }
+    } else {
+        if (command.substr(0, 5) == "osmium-") {
+            command = command.substr(5);
+        }
+    }
+
+    if (command == "version") {
+        std::cout << "osmium version " << OSMIUM_VERSION << std::endl;
+        return return_code::okay;
+    }
+
+    std::unique_ptr<Command> cmd = 
CommandFactory::instance().create_command(command);
+
+    if (!cmd) {
+        std::cerr << "Unknown command '" << command << "'. Try 'osmium help'." 
<< std::endl;
+        return return_code::fatal;
+    }
+
+    if (!cmd->setup(arguments)) {
+        return return_code::fatal;
+    }
+
+    bool result = cmd->run();
+
+    google::protobuf::ShutdownProtobufLibrary();
+
+    if (result) {
+        return return_code::okay;
+    } else {
+        return return_code::error;
+    }
+}
+
diff --git a/src/osmc.hpp b/src/osmc.hpp
new file mode 100644
index 0000000..83378ac
--- /dev/null
+++ b/src/osmc.hpp
@@ -0,0 +1,134 @@
+#ifndef OSMC_HPP
+#define OSMC_HPP
+
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013  Jochen Topf <joc...@topf.org>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <functional>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include <osmium/util/verbose_output.hpp>
+
+#define OSMIUM_VERSION "0.0.1"
+
+/**
+ * Virtual base class for commands that can be called from the command line.
+ */
+class Command {
+
+protected:
+
+    std::string m_generator {"osmium/" OSMIUM_VERSION};
+    bool m_debug {false};
+    osmium::util::VerboseOutput m_vout {false};
+
+public:
+
+    virtual ~Command() {
+    }
+
+    // This function parses the command line arguments for a
+    // command.
+    // It returns true if the parsing was successful.
+    // It returns false if the arguments could not be parsed.
+    //
+    // This function should not attempt to open any files or
+    // do any other actual work. That will happen in the run()
+    // function.
+    virtual bool setup(const std::vector<std::string>&) {
+        return true;
+    }
+
+    // Run the actual command.
+    // It returns true if everything ran successfully.
+    // It returns false if there was an error.
+    virtual bool run() = 0;
+
+}; // class Command
+
+
+/**
+ * All commands than can be called from the command line are registered
+ * with this factory. When the program is running it uses this factory
+ * to create the command object from the class depending on the name of
+ * the command.
+ */
+class CommandFactory {
+
+    typedef std::function<Command*()> create_command_type;
+
+    struct command_info {
+        std::string description; // description of command for help
+        create_command_type create; // function that creates C++ object
+    };
+
+    std::map<const std::string, command_info> m_commands;
+
+    // The constructor is private because CommandFactory is a singleton
+    CommandFactory() :
+        m_commands() {
+    }
+
+public:
+
+    // CommandFactory is a singleton, this returns the only instance
+    static CommandFactory& instance() {
+        static CommandFactory factory;
+        return factory;
+    }
+
+    // Return a vector with names and descriptions of all commands
+    static std::vector<std::pair<std::string, std::string>> help() {
+        std::vector<std::pair<std::string, std::string>> commands;
+        for (const auto& cmd : instance().m_commands) {
+            commands.push_back(std::make_pair(cmd.first, 
cmd.second.description));
+        }
+        return std::move(commands);
+    }
+
+    static bool add(const std::string& name, const std::string& description, 
create_command_type create_function) {
+        return instance().register_command(name, description, create_function);
+    }
+
+    bool register_command(const std::string& name, const std::string& 
description, create_command_type create_function) {
+        command_info info {description, create_function};
+        return m_commands.insert(std::make_pair(name, info)).second;
+    }
+
+    // This will create a C++ command object from the given name and
+    // return it wrapped in a unique_ptr.
+    std::unique_ptr<Command> create_command(const std::string& name) {
+        const auto it = m_commands.find(name);
+
+        if (it != m_commands.end()) {
+            return std::unique_ptr<Command>((it->second.create)());
+        }
+
+        return std::unique_ptr<Command>();
+    }
+
+}; // class CommandFactory
+
+#endif // OSMC_HPP

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osmium-tool.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to