[osmium-tool] 01/02: Imported Upstream version 0.0~20150306-4ef5dd5
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Mar 6 17:09:50 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository osmium-tool.
commit e1e2b0e5b933631384d18473ef0ac068b54d8ffd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Mar 6 15:43:41 2015 +0100
Imported Upstream version 0.0~20150306-4ef5dd5
---
.gitignore | 6 +
.travis.yml | 44 +++
.ycm_extra_conf.py | 40 +++
CMakeLists.txt | 263 ++++++++++++++++
LICENSE.txt | 674 ++++++++++++++++++++++++++++++++++++++++++
Makefile | 15 +
README.md | 101 +++++++
appveyor.yml | 66 +++++
cmake/FindOSMPBF.cmake | 50 ++++
cmake/FindOsmium.cmake | 340 +++++++++++++++++++++
debian/.gitignore | 4 +
debian/changelog | 5 +
debian/compat | 1 +
debian/control | 25 ++
debian/copyright | 18 ++
debian/dirs | 1 +
debian/docs | 1 +
debian/osmium.install | 1 +
debian/rules | 8 +
doc/.gitignore | 2 +
doc/Makefile | 32 ++
doc/manpage.template | 30 ++
doc/osmium-apply-changes.md | 81 +++++
doc/osmium-cat.md | 87 ++++++
doc/osmium-file-formats.md | 73 +++++
doc/osmium-fileinfo.md | 75 +++++
doc/osmium-merge-changes.md | 74 +++++
doc/osmium-time-filter.md | 82 +++++
doc/osmium.md | 53 ++++
osmium-wrapper.in | 13 +
src/CMakeLists.txt | 16 +
src/command_apply_changes.cpp | 219 ++++++++++++++
src/command_apply_changes.hpp | 60 ++++
src/command_cat.cpp | 226 ++++++++++++++
src/command_cat.hpp | 58 ++++
src/command_fileinfo.cpp | 234 +++++++++++++++
src/command_fileinfo.hpp | 50 ++++
src/command_help.cpp | 82 +++++
src/command_help.hpp | 41 +++
src/command_merge_changes.cpp | 194 ++++++++++++
src/command_merge_changes.hpp | 58 ++++
src/command_time_filter.cpp | 189 ++++++++++++
src/command_time_filter.hpp | 62 ++++
src/main.cpp | 109 +++++++
src/osmc.hpp | 136 +++++++++
zsh_completion/_osmium | 149 ++++++++++
46 files changed, 4148 insertions(+)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6b3cb91
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+.*.swp
+src/*.o
+doc/*.1
+doc/*.html
+build*
+.ycm_extra_conf.pyc
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..e5968cc
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,44 @@
+language: cpp
+
+compiler:
+ - gcc
+ - clang
+
+env:
+ - CONFIGURATION=Dev
+ - CONFIGURATION=Release
+
+before_install:
+ # we need at least g++-4.8 for c++11 features
+ - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
+ - sudo apt-get update --yes --quiet
+
+install:
+ # upgrade compilers
+ - sudo apt-get install --yes gcc-4.8 g++-4.8
+ # make sure 'cpp' is the just installed current one
+ - sudo rm /usr/bin/cpp
+ - sudo ln -s /usr/bin/cpp-4.8 /usr/bin/cpp
+ # upgrade libosmium dependencies
+ - sudo apt-get install --yes make libboost-dev libboost-program-options-dev libprotobuf-dev protobuf-compiler pandoc
+ - cd ..
+ - git clone https://github.com/osmcode/libosmium.git
+ # OSMPBF is too old, install from git
+ #- sudo apt-get install --yes libosmpbf-dev
+ - git clone https://github.com/scrosby/OSM-binary.git
+ - cd OSM-binary/src
+ - make
+ - sudo make install
+
+#before_script:
+# - true
+
+script:
+ - cd $TRAVIS_BUILD_DIR
+ - if [ "${CXX}" = 'g++' ]; then export CXX=g++-4.8; fi;
+ - mkdir build
+ - cd build
+ - cmake -LA -DCMAKE_BUILD_TYPE=${CONFIGURATION} ..
+ - make VERBOSE=1
+ - ctest
+
diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py
new file mode 100644
index 0000000..cdff62b
--- /dev/null
+++ b/.ycm_extra_conf.py
@@ -0,0 +1,40 @@
+#-----------------------------------------------------------------------------
+#
+# Configuration for YouCompleteMe Vim plugin
+#
+# http://valloric.github.io/YouCompleteMe/
+#
+#-----------------------------------------------------------------------------
+
+# some default flags
+# for more information install clang-3.2-doc package and
+# check UsersManual.html
+flags = [
+'-Werror',
+'-Wall',
+'-Wextra',
+'-pedantic',
+'-Wno-return-type',
+'-Wno-unused-parameter',
+'-Wno-unused-variable',
+
+'-std=c++11',
+
+# '-x' and 'c++' also required
+# use 'c' for C projects
+'-x',
+'c++',
+
+# libosmium include dirs
+'-I../libosmium/include',
+
+]
+
+# youcompleteme is calling this function to get flags
+# You can also set database for flags. Check: JSONCompilationDatabase.html in
+# clang-3.2-doc package
+def FlagsForFile( filename ):
+ return {
+ 'flags': flags,
+ 'do_cache': True
+ }
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..e690c2e
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,263 @@
+#-----------------------------------------------------------------------------
+#
+# CMake Config
+#
+# Osmium Tool
+#
+#-----------------------------------------------------------------------------
+
+cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+
+
+#-----------------------------------------------------------------------------
+#
+# Project version
+#
+#-----------------------------------------------------------------------------
+
+set(CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;MinSizeRel;Dev"
+ CACHE STRING
+ "List of available configuration types"
+ FORCE)
+
+project(osmium)
+
+set(OSMIUM_VERSION_MAJOR 0)
+set(OSMIUM_VERSION_MINOR 0)
+set(OSMIUM_VERSION_PATCH 1)
+
+set(OSMIUM_VERSION ${OSMIUM_VERSION_MAJOR}.${OSMIUM_VERSION_MINOR}.${OSMIUM_VERSION_PATCH})
+
+add_definitions(-DOSMIUM_VERSION="${OSMIUM_VERSION}")
+
+
+#-----------------------------------------------------------------------------
+#
+# Find external dependencies
+#
+#-----------------------------------------------------------------------------
+
+find_package(Boost REQUIRED COMPONENTS program_options)
+include_directories(${Boost_INCLUDE_DIRS})
+
+find_package(Osmium REQUIRED COMPONENTS io)
+include_directories(${OSMIUM_INCLUDE_DIRS})
+
+
+#-----------------------------------------------------------------------------
+#
+# Optional "cppcheck" target that checks C++ code
+#
+#-----------------------------------------------------------------------------
+message(STATUS "Looking for cppcheck")
+find_program(CPPCHECK cppcheck)
+
+if(CPPCHECK)
+ message(STATUS "Looking for cppcheck - found")
+ set(CPPCHECK_OPTIONS --enable=warning,style,performance,portability,information,missingInclude)
+
+ # cpp doesn't find system includes for some reason, suppress that report
+ set(CPPCHECK_OPTIONS ${CPPCHECK_OPTIONS} --suppress=missingIncludeSystem)
+
+ add_custom_target(cppcheck ${CPPCHECK} --std=c++11 ${CPPCHECK_OPTIONS} ${CMAKE_SOURCE_DIR}/src/*pp)
+else()
+ message(STATUS "Looking for cppcheck - not found")
+ message(STATUS " Make target cppcheck not available")
+endif(CPPCHECK)
+
+
+#-----------------------------------------------------------------------------
+#
+# Optional "man" target to generate man pages
+#
+#-----------------------------------------------------------------------------
+message(STATUS "Looking for pandoc")
+find_program(PANDOC pandoc)
+
+function(add_man_page _section _name)
+ file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/man/man${_section})
+ set(_output_file ${CMAKE_BINARY_DIR}/man/man${_section}/${_name}.${_section})
+ set(_source_file ${CMAKE_SOURCE_DIR}/doc/${_name}.md)
+ set(_install_dir "share/man/man{$_section}")
+ add_custom_command(OUTPUT ${_output_file}
+ COMMAND ${PANDOC} ${PANDOC_MAN_OPTIONS} -o ${_output_file} ${_source_file}
+ DEPENDS ${_source_file}
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ COMMENT "Building manpage ${_name}.${_section}"
+ VERBATIM)
+ set(ALL_MAN_PAGES "${ALL_MAN_PAGES};${_output_file}" PARENT_SCOPE)
+endfunction()
+
+
+if(PANDOC)
+ message(STATUS "Looking for pandoc - found")
+ message(STATUS " Manual pages will be built")
+ execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE PUBDATE OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(PANDOC_MAN_OPTIONS -s -t man --template ${CMAKE_CURRENT_SOURCE_DIR}/doc/manpage.template --variable "description=osmium/${OSMIUM_VERSION}" --variable "date=${PUBDATE}")
+ set(PANDOC_HTML_OPTIONS -s -t html)
+
+ add_man_page(1 osmium)
+ add_man_page(1 osmium-apply-changes)
+ add_man_page(1 osmium-cat)
+ add_man_page(1 osmium-fileinfo)
+ add_man_page(1 osmium-merge-changes)
+ add_man_page(1 osmium-time-filter)
+ add_man_page(5 osmium-file-formats)
+
+ install(DIRECTORY ${CMAKE_BINARY_DIR}/man DESTINATION share)
+
+ add_custom_target(man ALL DEPENDS ${ALL_MAN_PAGES})
+else()
+ message(STATUS "Looking for pandoc - not found")
+ message(STATUS " Manual pages will not be built")
+endif(PANDOC)
+
+
+#-----------------------------------------------------------------------------
+#
+# Optional "format" target that formats C++ code
+#
+#-----------------------------------------------------------------------------
+message(STATUS "Looking for astyle")
+find_program(ASTYLE astyle)
+
+if(ASTYLE)
+ add_custom_target(format astyle --style=java --indent-namespaces --indent-switches --pad-header --lineend=linux --suffix=none --recursive src/*pp)
+ message(STATUS "Looking for astyle - found")
+ message(STATUS " Adding 'indent' target")
+else()
+ message(STATUS "Looking for astyle - not found")
+ message(STATUS " No 'indent' target available")
+endif(ASTYLE)
+
+
+#-----------------------------------------------------------------------------
+#
+# Decide which C++ version to use (Minimum/default: C++11).
+#
+#-----------------------------------------------------------------------------
+if(NOT MSVC)
+ if(NOT USE_CPP_VERSION)
+ set(USE_CPP_VERSION c++11)
+ endif()
+ message(STATUS "Use C++ version: ${USE_CPP_VERSION}")
+ # following only available from cmake 2.8.12:
+ # add_compile_options(-std=${USE_CPP_VERSION})
+ # so using this instead:
+ add_definitions(-std=${USE_CPP_VERSION})
+endif()
+
+
+#-----------------------------------------------------------------------------
+#
+# Compiler and Linker flags
+#
+#-----------------------------------------------------------------------------
+if(MSVC)
+ set(USUAL_COMPILE_OPTIONS "/Ox")
+else()
+ set(USUAL_COMPILE_OPTIONS "-O3 -g")
+endif()
+
+if(WIN32)
+ add_definitions(-DWIN32 -D_WIN32 -DMSWIN32 -DBGDWIN32
+ -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0600)
+endif()
+
+set(CMAKE_CXX_FLAGS_DEV "${USUAL_COMPILE_OPTIONS}"
+ CACHE STRING "Flags used by the compiler during developer builds."
+ FORCE)
+
+set(CMAKE_EXE_LINKER_FLAGS_DEV ""
+ CACHE STRING "Flags used by the linker during developer builds."
+ FORCE)
+mark_as_advanced(
+ CMAKE_CXX_FLAGS_DEV
+ CMAKE_EXE_LINKER_FLAGS_DEV
+)
+
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${USUAL_COMPILE_OPTIONS}"
+ CACHE STRING "Flags used by the compiler during RELWITHDEBINFO builds."
+ FORCE)
+
+
+#-----------------------------------------------------------------------------
+#
+# Build Type
+#
+#-----------------------------------------------------------------------------
+
+# In 'Dev' mode: compile with very strict warnings and turn them into errors.
+if(CMAKE_BUILD_TYPE STREQUAL "Dev")
+ if(NOT MSVC)
+ add_definitions(-Werror)
+ endif()
+ add_definitions(${OSMIUM_WARNING_OPTIONS})
+endif()
+
+# Force RelWithDebInfo build type if none was given
+if(CMAKE_BUILD_TYPE)
+ set(build_type ${CMAKE_BUILD_TYPE})
+else()
+ set(build_type "RelWithDebInfo")
+endif()
+
+set(CMAKE_BUILD_TYPE ${build_type}
+ CACHE STRING
+ "Choose the type of build, options are: ${CMAKE_CONFIGURATION_TYPES}."
+ FORCE)
+
+
+#-----------------------------------------------------------------------------
+
+configure_file(
+ ${PROJECT_SOURCE_DIR}/osmium-wrapper.in
+ ${PROJECT_BINARY_DIR}/osmium
+)
+
+
+#-----------------------------------------------------------------------------
+#
+# Tests
+#
+#-----------------------------------------------------------------------------
+
+enable_testing()
+
+function(do_test _name _command _regex)
+ separate_arguments(_command)
+ add_test(NAME ${_name} COMMAND ${_command})
+ set_tests_properties(${_name} PROPERTIES
+ ENVIRONMENT "MANPATH=${PROJECT_BINARY_DIR}/man"
+ PASS_REGULAR_EXPRESSION ${_regex}
+ )
+endfunction()
+
+do_test(version "osmium --version" "^osmium version ${OSMIUM_VERSION}\n")
+do_test(help "osmium help" "^Usage: .*Commands are:")
+do_test(help2 "osmium --help" "^Usage: .*Commands are:")
+
+if(PANDOC)
+ do_test(help_cat "osmium help cat" "^OSMIUM-CAT\\(1\\)")
+endif()
+
+
+#-----------------------------------------------------------------------------
+
+include_directories(${PROJECT_BINARY_DIR}/src)
+
+add_subdirectory(src)
+
+
+#-----------------------------------------------------------------------------
+if(BUILD_WITH_CRYPTOPP AND NOT CRYPTOPP_FOUND)
+ message(WARNING "=========================================================================
+ Libcryptopp/crypto++ not found! - Some functionality will be missing.
+ Install the library/headers to fix this. You might have to set the
+ CRYPTOPP_INCLUDE_DIR and CRYPTOPP_LIBRARY CMake variables.
+=========================================================================")
+endif()
+
+
+#-----------------------------------------------------------------------------
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..056945c
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,15 @@
+
+all:
+ mkdir -p build && cd build && cmake .. && $(MAKE)
+
+clean:
+ if test -d build; then cd build && $(MAKE) clean; fi
+
+distclean:
+ rm -fr build
+
+deb:
+ debuild -I -us -uc
+
+.PHONY: clean distclean deb
+
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..9762fff
--- /dev/null
+++ b/README.md
@@ -0,0 +1,101 @@
+
+# Osmium Command Line Tool
+
+Command line tool for working with OpenStreetMap data based on the Osmium
+library.
+
+[](http://travis-ci.org/osmcode/osmium-tool)
+[](https://ci.appveyor.com/project/Mapbox/osmium-tool)
+
+## Prerequisites
+
+You need a C++11 compliant compiler. GCC 4.8 and later as well as clang 3.4 and
+later are known to work. You also need the following libraries:
+
+ Osmium Library
+ http://osmcode.org/libosmium
+
+ 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
+
+ boost-crc
+ http://www.boost.org/doc/libs/1_57_0/libs/crc/
+ Debian/Ubuntu: libboost-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
+ (You need at least version 1.3.2,
+ install from GIT if the package is too old.)
+
+ 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
+
+ cmake (for building)
+ http://www.cmake.org/
+ Debian/Ubuntu: cmake
+
+ Pandoc (optional, do build documentation)
+ http://johnmacfarlane.net/pandoc/
+ Debian/Ubuntu: pandoc
+
+
+## Building
+
+Osmium uses CMake for its builds. For Unix/Linux systems a simple Makefile
+wrapper is provided to make the build even easier. Just type `make` to compile.
+Results will be in the `build` directory.
+
+Or you can go the long route explicitly calling CMake as follows:
+
+ mkdir build
+ cd build
+ cmake ..
+ make
+
+To set the build type call cmake with `-DCMAKE_BUILD_TYPE=type`. Possible
+values are empty, Debug, Release, RelWithDebInfo, MinSizeRel, and Dev. The
+defaults is RelWithDebInfo.
+
+
+## Documentation
+
+There are man pages in the 'doc' directory. To build them you need 'pandoc'.
+If the `pandoc` command was found during the CMake config step, the manpages
+will be built, if not they will not be built.
+
+
+## Building Debian Package
+
+A `debian` directory is provided for building (unofficial) Debian packages.
+Call `make deb` or `debuild -I -us -uc` to build the package. Note that there
+currently is no libosmium package with the new libosmium version needed for the
+Osmium tool, so the build dependencies are not complete.
+
+
+## License
+
+Copyright (C) 2013-2015 Jochen Topf <jochen at topf.org>
+
+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 <jochen at topf.org>.
+
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..7e78126
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,66 @@
+#-----------------------------------------------------------------------------
+#
+# Configuration for continuous integration service at appveyor.com
+#
+#-----------------------------------------------------------------------------
+
+environment:
+ matrix:
+ - config: Dev
+ - config: RelWithDebInfo
+
+# branches to build
+branches:
+ # whitelist
+ only:
+ - master
+
+# Operating system (build VM template)
+os: Visual Studio 2014 CTP4
+
+# scripts that are called at very beginning, before repo cloning
+init:
+
+# clone directory
+clone_folder: c:\projects\osmium-tool
+
+platform: x64
+
+install:
+ # show all availble env vars
+ - set
+ - echo cmake on AppVeyor
+ - cmake -version
+ - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+ - set PATH=c:\projects\osmium-tool\cmake-3.1.0-win32-x86\bin;%PATH%
+ - set LODEPSDIR=c:\projects\osmium-tool\libosmium-deps
+ #libexpat.dll
+ - set PATH=%LODEPSDIR%\expat\lib;%PATH%
+ #zlibwapi.dll
+ - set PATH=%LODEPSDIR%\zlib\lib;%PATH%
+ #convert backslashes in bzip2 path to forward slashes
+ #cmake cannot find it otherwise
+ - set LIBBZIP2=%LODEPSDIR%\bzip2\lib\libbz2.lib
+ - set LIBBZIP2=%LIBBZIP2:\=/%
+ - ps: Start-FileDownload https://mapnik.s3.amazonaws.com/deps/cmake-3.1.0-win32-x86.7z -FileName cm.7z
+ - ps: Start-FileDownload https://mapnik.s3.amazonaws.com/dist/dev/libosmium-deps-win-14.0-x64.7z -FileName lodeps.7z
+ - 7z x cm.7z > nul
+ - 7z x lodeps.7z > nul
+ - echo %LODEPSDIR%
+ - dir %LODEPSDIR%
+ #- tree %LODEPSDIR%
+ - echo our own cmake
+ - cmake -version
+ - cd c:\projects
+ - git clone https://github.com/osmcode/libosmium.git
+
+build_script:
+ - cd c:\projects\osmium-tool
+ - mkdir build
+ - cd build
+ - echo %config%
+ - cmake .. -LA -G "Visual Studio 14 Win64" -DOsmium_DEBUG=TRUE -DCMAKE_BUILD_TYPE=%config% -DBOOST_ROOT=%LODEPSDIR%\boost -DBoost_PROGRAM_OPTIONS_LIBRARY=%LODEPSDIR%\boost\lib\libboost_program_options-vc140-mt-1_57.lib -DOSMPBF_LIBRARY=%LODEPSDIR%\osmpbf\lib\osmpbf.lib -DOSMPBF_INCLUDE_DIR=%LODEPSDIR%\osmpbf\include -DPROTOBUF_LIBRARY=%LODEPSDIR%\protobuf\lib\libprotobuf.lib -DPROTOBUF_LITE_LIBRARY=%LODEPSDIR%\protobuf\lib\libprotobuf-lite.lib -DPROTOBUF_INCLUDE_DIR=%LODEPSDIR%\protobu [...]
+ - msbuild osmium.sln /p:Configuration=%config% /toolsversion:14.0 /p:Platform=x64 /p:PlatformToolset=v140
+# - cmake .. -LA -G "NMake Makefiles" -DOsmium_DEBUG=TRUE -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DBOOST_ROOT=%LODEPSDIR%\boost -DBoost_PROGRAM_OPTIONS_LIBRARY=%LODEPSDIR%\boost\lib\libboost_program_options-vc140-mt-1_57.lib -DOSMPBF_LIBRARY=%LODEPSDIR%\osmpbf\lib\osmpbf.lib -DOSMPBF_INCLUDE_DIR=%LODEPSDIR%\osmpbf\include -DPROTOBUF_LIBRARY=%LODEPSDIR%\protobuf\lib\libprotobuf.lib -DPROTOBUF_LITE_LIBRARY=%LODEPSDIR%\protobuf\lib\libprotobuf-lite.lib -DPROTOBUF_INCLUDE_DIR=%LODEPSDIR%\protob [...]
+# - nmake VERBOSE=1
+
diff --git a/cmake/FindOSMPBF.cmake b/cmake/FindOSMPBF.cmake
new file mode 100644
index 0000000..deeebd8
--- /dev/null
+++ b/cmake/FindOSMPBF.cmake
@@ -0,0 +1,50 @@
+#
+# Locate OSMPBF library
+#
+# This module defines
+# OSMPBF_FOUND - if false, do not try to link to OSMPBF
+# OSMPBF_LIBRARIES - full library path name
+# OSMPBF_INCLUDE_DIRS - where to find OSMPBF.hpp
+#
+# Note that the expected include convention is
+# #include <osmpbf/osmpbf.h>
+# and not
+# #include <osmpbf.h>
+#
+
+find_path(OSMPBF_INCLUDE_DIR osmpbf/osmpbf.h
+ HINTS $ENV{OSMPBF_DIR}
+ PATH_SUFFIXES include
+ PATHS
+ ~/Library/Frameworks
+ /Library/Frameworks
+ /usr/local
+ /usr
+ /opt/local # DarwinPorts
+ /opt
+)
+
+find_library(OSMPBF_LIBRARY
+ NAMES osmpbf
+ HINTS $ENV{OSMPBF_DIR}
+ PATH_SUFFIXES lib64 lib
+ PATHS
+ ~/Library/Frameworks
+ /Library/Frameworks
+ /usr/local
+ /usr
+ /opt/local
+ /opt
+)
+
+# Handle the QUIETLY and REQUIRED arguments and set OSMPBF_FOUND to TRUE if
+# all listed variables are TRUE.
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(OSMPBF DEFAULT_MSG OSMPBF_LIBRARY OSMPBF_INCLUDE_DIR)
+
+# Copy the results to the output variables.
+if(OSMPBF_FOUND)
+ set(OSMPBF_INCLUDE_DIRS ${OSMPBF_INCLUDE_DIR})
+ set(OSMPBF_LIBRARIES ${OSMPBF_LIBRARY})
+endif()
+
diff --git a/cmake/FindOsmium.cmake b/cmake/FindOsmium.cmake
new file mode 100644
index 0000000..1de41a0
--- /dev/null
+++ b/cmake/FindOsmium.cmake
@@ -0,0 +1,340 @@
+#----------------------------------------------------------------------
+#
+# FindOsmium.cmake
+#
+# Find the Libosmium headers and, optionally, several components needed for
+# different Libosmium functions.
+#
+#----------------------------------------------------------------------
+#
+# Usage:
+#
+# Copy this file somewhere into your project directory, where cmake can
+# find it. Usually this will be a directory called "cmake" which you can
+# add to the CMake module search path with the following line in your
+# CMakeLists.txt:
+#
+# list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+#
+# Then add the following in your CMakeLists.txt:
+#
+# find_package(Osmium REQUIRED COMPONENTS <XXX>)
+# include_directories(${OSMIUM_INCLUDE_DIRS})
+#
+# For the <XXX> substitute a space separated list of one or more of the
+# following components:
+#
+# pbf - include libraries needed for PBF input and output
+# xml - include libraries needed for XML input and output
+# io - include libraries needed for any type of input/output
+# geos - include if you want to use any of the GEOS functions
+# gdal - include if you want to use any of the OGR functions
+# proj - include if you want to use any of the Proj.4 functions
+# sparsehash - include if you use the sparsehash index
+#
+# You can check for success with something like this:
+#
+# if(NOT OSMIUM_FOUND)
+# message(WARNING "Libosmium not found!\n")
+# endif()
+#
+#----------------------------------------------------------------------
+#
+# Variables:
+#
+# OSMIUM_FOUND - True if Osmium found.
+# OSMIUM_INCLUDE_DIRS - Where to find include files.
+# OSMIUM_XML_LIBRARIES - Libraries needed for XML I/O.
+# OSMIUM_PBF_LIBRARIES - Libraries needed for PBF I/O.
+# OSMIUM_IO_LIBRARIES - Libraries needed for XML or PBF I/O.
+# OSMIUM_LIBRARIES - All libraries Osmium uses somewhere.
+#
+#----------------------------------------------------------------------
+
+# Look for the header file.
+find_path(OSMIUM_INCLUDE_DIR osmium/osm.hpp
+ PATH_SUFFIXES include
+ PATHS
+ ../libosmium
+ ../../libosmium
+ libosmium
+ ~/Library/Frameworks
+ /Library/Frameworks
+ /usr/local
+ /usr/
+ /opt/local # DarwinPorts
+ /opt
+)
+
+# Handle the QUIETLY and REQUIRED arguments and set OSMIUM_FOUND to TRUE if
+# all listed variables are TRUE.
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(OSMIUM REQUIRED_VARS OSMIUM_INCLUDE_DIR)
+
+# Copy the results to the output variables.
+if(OSMIUM_FOUND)
+ set(OSMIUM_INCLUDE_DIRS ${OSMIUM_INCLUDE_DIR})
+else()
+ set(OSMIUM_INCLUDE_DIRS "")
+endif()
+
+if(Osmium_FIND_REQUIRED AND NOT OSMIUM_FOUND)
+ message(FATAL_ERROR "Can not find libosmium headers, please install them or configure the paths")
+endif()
+
+#----------------------------------------------------------------------
+#
+# Check for optional components
+#
+#----------------------------------------------------------------------
+if(Osmium_FIND_COMPONENTS)
+ foreach(_component ${Osmium_FIND_COMPONENTS})
+ string(TOUPPER ${_component} _component_uppercase)
+ set(Osmium_USE_${_component_uppercase} TRUE)
+ endforeach()
+endif()
+
+#----------------------------------------------------------------------
+# Component 'io' is an alias for 'pbf' and 'xml'
+if(Osmium_USE_IO)
+ set(Osmium_USE_PBF TRUE)
+ set(Osmium_USE_XML TRUE)
+endif()
+
+#----------------------------------------------------------------------
+# Component 'ogr' is an alias for 'gdal'
+if(Osmium_USE_OGR)
+ set(Osmium_USE_GDAL TRUE)
+endif()
+
+#----------------------------------------------------------------------
+# Component 'pbf'
+if(Osmium_USE_PBF)
+ find_package(OSMPBF)
+ find_package(Protobuf)
+ find_package(ZLIB)
+ find_package(Threads)
+
+ if(OSMPBF_FOUND AND PROTOBUF_FOUND AND ZLIB_FOUND AND Threads_FOUND)
+ list(APPEND OSMIUM_PBF_LIBRARIES
+ ${OSMPBF_LIBRARIES}
+ ${PROTOBUF_LITE_LIBRARY}
+ ${ZLIB_LIBRARIES}
+ ${CMAKE_THREAD_LIBS_INIT}
+ )
+ if(WIN32)
+ list(APPEND OSMIUM_PBF_LIBRARIES ws2_32)
+ endif()
+ list(APPEND OSMIUM_INCLUDE_DIRS
+ ${OSMPBF_INCLUDE_DIRS}
+ ${PROTOBUF_INCLUDE_DIR}
+ ${ZLIB_INCLUDE_DIR}
+ )
+ else()
+ set(_missing_libraries 1)
+ message(WARNING "Osmium: Can not find some libraries for PBF input/output, please install them or configure the paths.")
+ endif()
+endif()
+
+#----------------------------------------------------------------------
+# Component 'xml'
+if(Osmium_USE_XML)
+ find_package(EXPAT)
+ find_package(BZip2)
+ find_package(ZLIB)
+ find_package(Threads)
+
+ if(EXPAT_FOUND AND BZIP2_FOUND AND ZLIB_FOUND AND Threads_FOUND)
+ list(APPEND OSMIUM_XML_LIBRARIES
+ ${EXPAT_LIBRARIES}
+ ${BZIP2_LIBRARIES}
+ ${ZLIB_LIBRARIES}
+ ${CMAKE_THREAD_LIBS_INIT}
+ )
+ list(APPEND OSMIUM_INCLUDE_DIRS
+ ${EXPAT_INCLUDE_DIR}
+ ${BZIP2_INCLUDE_DIR}
+ ${ZLIB_INCLUDE_DIR}
+ )
+ else()
+ set(_missing_libraries 1)
+ message(WARNING "Osmium: Can not find some libraries for XML input/output, please install them or configure the paths.")
+ endif()
+endif()
+
+#----------------------------------------------------------------------
+list(APPEND OSMIUM_IO_LIBRARIES
+ ${OSMIUM_PBF_LIBRARIES}
+ ${OSMIUM_XML_LIBRARIES}
+)
+
+list(APPEND OSMIUM_LIBRARIES
+ ${OSMIUM_IO_LIBRARIES}
+)
+
+#----------------------------------------------------------------------
+# Component 'geos'
+if(Osmium_USE_GEOS)
+ find_path(GEOS_INCLUDE_DIR geos/geom.h)
+ find_library(GEOS_LIBRARY NAMES geos)
+
+ if(GEOS_INCLUDE_DIR AND GEOS_LIBRARY)
+ SET(GEOS_FOUND 1)
+ list(APPEND OSMIUM_LIBRARIES ${GEOS_LIBRARY})
+ list(APPEND OSMIUM_INCLUDE_DIRS ${GEOS_INCLUDE_DIR})
+ else()
+ set(_missing_libraries 1)
+ message(WARNING "Osmium: GEOS library is required but not found, please install it or configure the paths.")
+ endif()
+endif()
+
+#----------------------------------------------------------------------
+# Component 'gdal' (alias 'ogr')
+if(Osmium_USE_GDAL)
+ find_package(GDAL)
+
+ if(GDAL_FOUND)
+ list(APPEND OSMIUM_LIBRARIES ${GDAL_LIBRARIES})
+ list(APPEND OSMIUM_INCLUDE_DIRS ${GDAL_INCLUDE_DIRS})
+ else()
+ set(_missing_libraries 1)
+ message(WARNING "Osmium: GDAL library is required but not found, please install it or configure the paths.")
+ endif()
+endif()
+
+#----------------------------------------------------------------------
+# Component 'proj'
+if(Osmium_USE_PROJ)
+ find_path(PROJ_INCLUDE_DIR proj_api.h)
+ find_library(PROJ_LIBRARY NAMES proj)
+
+ if(PROJ_INCLUDE_DIR AND PROJ_LIBRARY)
+ set(PROJ_FOUND 1)
+ list(APPEND OSMIUM_LIBRARIES ${PROJ_LIBRARY})
+ list(APPEND OSMIUM_INCLUDE_DIRS ${PROJ_INCLUDE_DIR})
+ else()
+ set(_missing_libraries 1)
+ message(WARNING "Osmium: PROJ.4 library is required but not found, please install it or configure the paths.")
+ endif()
+endif()
+
+#----------------------------------------------------------------------
+# Component 'sparsehash'
+if(Osmium_USE_SPARSEHASH)
+ find_path(SPARSEHASH_INCLUDE_DIR google/sparsetable)
+
+ if(SPARSEHASH_INCLUDE_DIR)
+ # Find size of sparsetable::size_type. This does not work on older
+ # CMake versions because they can do this check only in C, not in C++.
+ include(CheckTypeSize)
+ set(CMAKE_REQUIRED_INCLUDES ${SPARSEHASH_INCLUDE_DIR})
+ set(CMAKE_EXTRA_INCLUDE_FILES "google/sparsetable")
+ check_type_size("google::sparsetable<int>::size_type" SPARSETABLE_SIZE_TYPE LANGUAGE CXX)
+ set(CMAKE_EXTRA_INCLUDE_FILES)
+ set(CMAKE_REQUIRED_INCLUDES)
+
+ # Falling back to checking size_t if google::sparsetable<int>::size_type
+ # could not be checked.
+ if(SPARSETABLE_SIZE_TYPE STREQUAL "")
+ check_type_size("void*" VOID_PTR_SIZE)
+ set(SPARSETABLE_SIZE_TYPE ${VOID_PTR_SIZE})
+ endif()
+
+ # Sparsetable::size_type must be at least 8 bytes (64bit), otherwise
+ # OSM object IDs will not fit.
+ if(SPARSETABLE_SIZE_TYPE GREATER 7)
+ set(SPARSEHASH_FOUND 1)
+ add_definitions(-DOSMIUM_WITH_SPARSEHASH=${SPARSEHASH_FOUND})
+ list(APPEND OSMIUM_INCLUDE_DIRS ${SPARSEHASH_INCLUDE_DIR})
+ else()
+ message(WARNING "Osmium: Disabled Google SparseHash library on 32bit system (size_type=${SPARSETABLE_SIZE_TYPE}).")
+ endif()
+ else()
+ set(_missing_libraries 1)
+ message(WARNING "Osmium: Google SparseHash library is required but not found, please install it or configure the paths.")
+ endif()
+endif()
+
+#----------------------------------------------------------------------
+
+list(REMOVE_DUPLICATES OSMIUM_INCLUDE_DIRS)
+
+if(OSMIUM_XML_LIBRARIES)
+ list(REMOVE_DUPLICATES OSMIUM_XML_LIBRARIES)
+endif()
+
+if(OSMIUM_PBF_LIBRARIES)
+ list(REMOVE_DUPLICATES OSMIUM_PBF_LIBRARIES)
+endif()
+
+if(OSMIUM_IO_LIBRARIES)
+ list(REMOVE_DUPLICATES OSMIUM_IO_LIBRARIES)
+endif()
+
+if(OSMIUM_LIBRARIES)
+ list(REMOVE_DUPLICATES OSMIUM_LIBRARIES)
+endif()
+
+#----------------------------------------------------------------------
+#
+# Check that all required libraries are available
+#
+#----------------------------------------------------------------------
+if(Osmium_FIND_REQUIRED AND _missing_libraries)
+ message(FATAL_ERROR "Required library or libraries missing. Aborting.")
+endif()
+
+#----------------------------------------------------------------------
+#
+# Add compiler flags
+#
+#----------------------------------------------------------------------
+add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64)
+
+if(MSVC)
+ add_definitions(-wd4996)
+
+ # Disable warning C4068: "unknown pragma" because we want it to ignore
+ # pragmas for other compilers.
+ add_definitions(-wd4068)
+
+ # Disable warning C4715: "not all control paths return a value" because
+ # it generates too many false positives.
+ add_definitions(-wd4715)
+
+ # Disable warning C4351: new behavior: elements of array '...' will be
+ # default initialized. The new behaviour is correct and we don't support
+ # old compilers anyway.
+ add_definitions(-wd4351)
+
+ add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+if(APPLE)
+# following only available from cmake 2.8.12:
+# add_compile_options(-stdlib=libc++)
+# so using this instead:
+ add_definitions(-stdlib=libc++)
+ set(LDFLAGS ${LDFLAGS} -stdlib=libc++)
+endif()
+
+#----------------------------------------------------------------------
+
+# This is a set of recommended warning options that can be added when compiling
+# libosmium code.
+if(MSVC)
+ set(OSMIUM_WARNING_OPTIONS "/W3 /wd4514" CACHE STRING "Recommended warning options for libosmium")
+else()
+ set(OSMIUM_WARNING_OPTIONS "-Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wold-style-cast -Wno-return-type" CACHE STRING "Recommended warning options for libosmium")
+endif()
+
+set(OSMIUM_DRACONIC_CLANG_OPTIONS "-Wdocumentation -Wunused-exception-parameter -Wmissing-declarations -Weverything -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-unused-macros -Wno-exit-time-destructors -Wno-global-constructors -Wno-padded -Wno-switch-enum -Wno-missing-prototypes -Wno-weak-vtables -Wno-cast-align -Wno-float-equal")
+
+if(Osmium_DEBUG)
+ message(STATUS "OSMIUM_XML_LIBRARIES=" ${OSMIUM_XML_LIBRARIES})
+ message(STATUS "OSMIUM_PBF_LIBRARIES=" ${OSMIUM_PBF_LIBRARIES})
+ message(STATUS "OSMIUM_IO_LIBRARIES=" ${OSMIUM_IO_LIBRARIES})
+ message(STATUS "OSMIUM_LIBRARIES=" ${OSMIUM_LIBRARIES})
+ message(STATUS "OSMIUM_INCLUDE_DIRS=" ${OSMIUM_INCLUDE_DIRS})
+endif()
+
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..a520ed4
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,4 @@
+files
+osmium
+osmium.debhelper.log
+osmium.substvars
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 <jochen at topf.org> Wed, 27 Nov 2013 13:42:00 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..a52d9a1
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,25 @@
+Source: osmium
+Section: utils
+Priority: optional
+Maintainer: Jochen Topf <jochen at topf.org>
+Build-Depends: debhelper (>= 9),
+ cmake (>= 2.8),
+ libboost-program-options-dev,
+ libbz2-dev,
+ libcrypto++-dev,
+ libexpat1-dev,
+ libosmpbf-dev,
+ libprotobuf-c-dev | libprotobuf-c0-dev (>= 0.14),
+ pandoc,
+ zlib1g-dev
+Standards-Version: 3.9.5
+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 <jochen at 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/docs b/debian/docs
new file mode 100644
index 0000000..b43bf86
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/debian/osmium.install b/debian/osmium.install
new file mode 100644
index 0000000..a1b43ae
--- /dev/null
+++ b/debian/osmium.install
@@ -0,0 +1 @@
+zsh_completion/_osmium usr/share/zsh/vendor-completions
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..9861256
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+ dh $@
+
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 0000000..8c7bbbe
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,2 @@
+*.1
+*.5
diff --git a/doc/Makefile b/doc/Makefile
new file mode 100644
index 0000000..9a55a06
--- /dev/null
+++ b/doc/Makefile
@@ -0,0 +1,32 @@
+#
+# 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_1 := osmium.1 osmium-apply-changes.1 osmium-cat.1 osmium-fileinfo.1 osmium-merge-changes.1 osmium-time-filter.1
+MAN_PAGES_5 := osmium-file-formats.5
+
+PUBDATE := `date +%Y-%m-%d`
+PANDOC_MAN_OPTIONS := -s -t man --template manpage.template --variable "description=osmium/$(OSMIUM_VERSION)" --variable "date=$(PUBDATE)"
+PANDOC_HTML_OPTIONS := -s -t html
+
+all: $(MAN_PAGES_1) $(MAN_PAGES_5)
+
+%.1: %.md
+ $(PANDOC) $(PANDOC_MAN_OPTIONS) -o $@ $<
+
+%.5: %.md
+ $(PANDOC) $(PANDOC_MAN_OPTIONS) -o $@ $<
+
+%.html: %.md
+ $(PANDOC) $(PANDOC_HTML_OPTIONS) -o $@ $<
+
+clean:
+ rm -f *.1 *.5 *.html
+
diff --git a/doc/manpage.template b/doc/manpage.template
new file mode 100644
index 0000000..be7bbaa
--- /dev/null
+++ b/doc/manpage.template
@@ -0,0 +1,30 @@
+$if(has-tables)$
+.\"t
+$endif$
+.TH "$title$" "$section$" "$date$" "$footer$" "$header$"
+$for(header-includes)$
+$header-includes$
+$endfor$
+$for(include-before)$
+$include-before$
+$endfor$
+$body$
+$for(include-after)$
+$include-after$
+$endfor$
+$if(author)$
+.SH COPYRIGHT
+.PP
+Copyright (C) 2013\-2015 Jochen Topf <jochen at 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.
+.SH CONTACT
+.PP
+Developers can be contacted through the OSM dev mailinglist
+(https://lists.openstreetmap.org/listinfo/dev).
+Bugs should be reported to https://github.com/osmcode/osmium-tool.
+.SH AUTHORS
+$for(author)$$author$$sep$; $endfor$.
+$endif$
diff --git a/doc/osmium-apply-changes.md b/doc/osmium-apply-changes.md
new file mode 100644
index 0000000..8cc21a2
--- /dev/null
+++ b/doc/osmium-apply-changes.md
@@ -0,0 +1,81 @@
+% OSMIUM-APPLY-CHANGES(1)
+% Jochen Topf <jochen at topf.org>
+
+# NAME
+
+osmium-apply-changes - Apply OSM change file(s) to OSM data file.
+
+
+# SYNOPSIS
+
+**osmium apply-changes** \[OPTIONS\] *INPUT-FILE* *CHANGE-FILE...*
+
+
+# DESCRIPTION
+
+Merges the content of all change files given on the command line and applies
+those changes to the INPUT-FILE.
+
+Objects in change files are sorted by type, ID, and version, so it doesn't matter
+in what order the change files are given or in what order they contain the data.
+
+**Osmium apply** keeps the contents of the change files in main memory, so the
+data has to fit in there!
+
+
+# OPTIONS
+
+--generator NAME
+: 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 FORMAT
+: 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 **osmium-file-formats**(5) or the libosmium manual for details.
+
+--output, -o FILE
+: Name of the output file. Default is '-' (*stdout*).
+
+--output-format, -f FORMAT
+: 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 **osmium-file-formats**(5) or the libosmium manual for details.
+
+--overwrite, -O
+: Allow an existing output file to be overwritten. Normally **osmium** will
+ refuse to write over an existing file.
+
+--remove-deleted, -r
+: Remove deleted objects from the output. If this is not set, deleted objects
+ will be in the output with the visible flag set to false.
+
+--simplify, -s
+: Only write the last version of any object to the output.
+
+--verbose, -v
+: Set verbose mode. The program will output information about what it is
+ doing to *stderr*.
+
+
+# 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
+
+Apply change file 362.osc.gz to planet file:
+
+ osmium apply-changes -o new.osm.pbf planet.osm.pbf 362.osc.gz
+
+
+# SEE ALSO
+
+* [Osmium website](http://osmcode.org/osmium)
+* [Libosmium manual](http://osmcode.org/libosmium/manual/libosmium-manual.html)
+
diff --git a/doc/osmium-cat.md b/doc/osmium-cat.md
new file mode 100644
index 0000000..0ad81ca
--- /dev/null
+++ b/doc/osmium-cat.md
@@ -0,0 +1,87 @@
+% OSMIUM-CAT(1)
+% Jochen Topf <jochen at 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 NAME
+: 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 FORMAT
+: 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 **osmium-file-formats**(5) or the libosmium manual for details.
+
+--output, -o FILE
+: Name of the output file. Default is '-' (*stdout*).
+
+--output-format, -f FORMAT
+: 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 osmium-file-formats**(5) or the libosmium manual for details.
+
+--output-header OPTION
+: Add output header option. This option can be given several times. See the
+ *libosmium manual* for a list of allowed header options.
+
+--overwrite, -O
+: Allow an existing output file to be overwritten. Normally **osmium** will
+ refuse to write over an existing file.
+
+--object-type, -t TYPE
+: Read only objects of given type (*node*, *way*, *relation*, *changeset*).
+ By default all types are read. This option can be given multiple times.
+
+--verbose, -v
+: Set verbose mode. The program will output information about what it is
+ doing to *stderr*.
+
+
+# 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
+
+Copy nodes and ways from source to destination file:
+
+ osmium cat -o dest.osm.pbf source.osm.pbf -t node -t way
+
+
+# SEE ALSO
+
+* [Osmium website](http://osmcode.org/osmium)
+* [Libosmium manual](http://osmcode.org/libosmium/manual/libosmium-manual.html)
+
diff --git a/doc/osmium-file-formats.md b/doc/osmium-file-formats.md
new file mode 100644
index 0000000..b799be1
--- /dev/null
+++ b/doc/osmium-file-formats.md
@@ -0,0 +1,73 @@
+% OSMIUM-FILE-FORMATS(5)
+% Jochen Topf <jochen at topf.org>
+
+# NAME
+
+osmium-file-formats - OSM file formats known to Osmium.
+
+# FORMATS
+
+The **osmium** command line tool supports all file formats supported by the
+Osmium library. 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 (usually with suffix *.osm.pbf*).
+* The OPL format (usually with suffix *.osm.opl*).
+
+In addition, XML and OPL files can be compressed using *gzip* or *bzip2*.
+(Add *.gz* or *.bz2* suffixes, respectively.)
+
+# AUTODETECTION
+
+Which format a file has is usually autodetected from the file name suffix.
+
+If this doesn't work, either because you are reading from stdin or writing to
+stdout, or because you have an unusual file name, you have to set the format
+manually. You can also set the format manually if you want to set special
+format options.
+
+Most **osmium** commands support the **--input-format** and **--output-format**
+options to set the format. They take a comma-separated list of arguments, the
+first is the format, further arguments set additional options.
+
+# SPECIAL FORMAT OPTIONS
+
+The following options can be added when writing OSM files:
+
+xml_change_format=true/false
+: Enable/disable XML change format. Same as *.osc*.
+
+force_visible_flag=true/false (*default: false*)
+: Force writing of visible flag, even for normal OSM XML files.
+
+pbf_dense_nodes=true/false (*default: true*)
+: Enable/disable DenseNodes format for PBF files.
+
+pbf_compression=true/false (*default: true*)
+: Enable/disable compression in PBF files. Disabling this will make writing
+ files a bit faster, but the resulting files are 2 to 3 times bigger.
+
+pbf_add_metadata=true/false (*default: true*)
+: Enable/disable writing of object metadata such as changeset id, username,
+ etc. Disabling this will make files a bit smaller.
+
+# EXAMPLES
+
+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.
+
+
+# SEE ALSO
+
+* [Osmium website](http://osmcode.org/osmium)
+* [Libosmium manual](http://osmcode.org/libosmium/manual/libosmium-manual.html)
+
diff --git a/doc/osmium-fileinfo.md b/doc/osmium-fileinfo.md
new file mode 100644
index 0000000..5ab3ab8
--- /dev/null
+++ b/doc/osmium-fileinfo.md
@@ -0,0 +1,75 @@
+% OSMIUM-FILEINFO(1)
+% Jochen Topf <jochen at topf.org>
+
+# NAME
+
+osmium-fileinfo - Show information about an OpenStreetMap file.
+
+
+# SYNOPSIS
+
+**osmium fileinfo** \[OPTIONS\] *FILE*
+
+
+# DESCRIPTION
+
+Shows various information about OSM files such as the file type, bounding boxes
+in the header, 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 deduced from the
+ file name, 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). Any available
+ bounding boxes are shown as well as header options such as the
+ generator and file format version.
+
+Data
+: This section shows the information available from reading the whole
+ file. It is only shown if the **--extended** option was used. It
+ shows the actual bounding box calculated from the nodes in the file,
+ the first and last timestamp of all objects in the file, a SHA1
+ checksum of the data in the file, the number of changesets, nodes,
+ ways, and relations found in the file, whether the objects in the
+ file were ordered by type (nodes, then ways, then relations) and
+ id, and whether there were multiple versions of the same object in
+ the file (history files and change files can have that).
+
+
+# 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 **osmium-file-formats**(5) or the libosmium manual for details.
+
+
+# DIAGNOSTICS
+
+**osmium fileinfo** 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.
+
+
+# NOTES
+
+Calculation of the SHA1 is only available if Osmium was compiled with support
+for it. Check **osmium --version** to see whether thats the case.
+
+
+# SEE ALSO
+
+* [Osmium website](http://osmcode.org/osmium)
+* [Libosmium manual](http://osmcode.org/libosmium/manual/libosmium-manual.html)
+
diff --git a/doc/osmium-merge-changes.md b/doc/osmium-merge-changes.md
new file mode 100644
index 0000000..4212f49
--- /dev/null
+++ b/doc/osmium-merge-changes.md
@@ -0,0 +1,74 @@
+% OSMIUM-MERGE-CHANGES(1)
+% Jochen Topf <jochen at topf.org>
+
+# NAME
+
+osmium-merge-changes - Merge several OSM change files into one.
+
+
+# SYNOPSIS
+
+**osmium merge-changes** \[OPTIONS\] *CHANGE-FILE...*
+
+
+# DESCRIPTION
+
+Merges the content of all change files given on the command line into one large
+change file. Objects are sorted by type, ID, and version, so it doesn't matter
+in what order the change files are given or in what order they contain the data.
+
+**Osmium merge** does its work in main memory, so all data has to fit in there!
+
+
+# OPTIONS
+
+--generator NAME
+: 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 FORMAT
+: 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 **osmium-file-formats**(5) or the libosmium manual for details.
+
+--output, -o FILE
+: Name of the output file. Default is '-' (*stdout*).
+
+--output-format, -f FORMAT
+: 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 **osmium-file-formats**(5) or the libosmium manual for details.
+
+--overwrite, -O
+: Allow an existing output file to be overwritten. Normally **osmium** will
+ refuse to write over an existing file.
+
+--simplify, -s
+: Only write the last version of any object to the output.
+
+--verbose, -v
+: Set verbose mode. The program will output information about what it is
+ doing to *stderr*.
+
+
+# DIAGNOSTICS
+
+**osmium merge** 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
+
+Merge all changes in *changes* directory into *all.osc.gz*:
+
+ osmium merge-changes -o all.osc.gz changes/*.gz
+
+
+# SEE ALSO
+
+* [Osmium website](http://osmcode.org/osmium)
+* [Libosmium manual](http://osmcode.org/libosmium/manual/libosmium-manual.html)
+
diff --git a/doc/osmium-time-filter.md b/doc/osmium-time-filter.md
new file mode 100644
index 0000000..a6e201c
--- /dev/null
+++ b/doc/osmium-time-filter.md
@@ -0,0 +1,82 @@
+% OSMIUM-TIME-FILTER(1)
+% Jochen Topf <jochen at topf.org>
+
+# NAME
+
+osmium-time-filter - Filter OSM data by time from a history file.
+
+
+# SYNOPSIS
+
+**osmium time-filter** \[OPTIONS\] *INPUT-FILE* \[*TIME*\]\
+**osmium time-filter** \[OPTIONS\] *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, 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 timestamps 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 file format
+ if it can't be autodetected from the file name.
+ **See osmium-file-formats**(5) or the libosmium manual 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 osmium-file-formats**(5) or the libosmium manual 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
+
+
+# SEE ALSO
+
+* [Osmium website](http://osmcode.org/osmium)
+* [Libosmium manual](http://osmcode.org/libosmium/manual/libosmium-manual.html)
+
diff --git a/doc/osmium.md b/doc/osmium.md
new file mode 100644
index 0000000..a38fd79
--- /dev/null
+++ b/doc/osmium.md
@@ -0,0 +1,53 @@
+% OSMIUM(1)
+% Jochen Topf <jochen at 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
+: Show program version.
+
+
+# COMMANDS
+
+apply-changes
+: Apply OSM change file(s) to OSM data file.
+cat
+: Concatenate OSM files and convert to different formats.
+fileinfo
+: Show information about an OpenStreetMap file.
+help
+: Show help about commands.
+merge-changes
+: Merge several OSM change files into one.
+time-filter
+: Filter OSM data by time from a history file.
+
+
+# SEE ALSO
+
+* **osmium-apply-changes**(1), **osmium-cat**(1), **osmium-fileinfo**(1),
+ **osmium-merge-changes**(1), **osmium-time-filter**(1), **osmium-file-formats**(5)
+* [Osmium website](http://osmcode.org/osmium)
+* [Libosmium manual](http://osmcode.org/libosmium/manual/libosmium-manual.html)
+
diff --git a/osmium-wrapper.in b/osmium-wrapper.in
new file mode 100755
index 0000000..6574724
--- /dev/null
+++ b/osmium-wrapper.in
@@ -0,0 +1,13 @@
+#!/bin/sh
+#-----------------------------------------------------------------------------
+#
+# This is a small wrapper for the osmium binary that is only used to call it
+# from the build directory, ie when it is not installed. It sets the MANPATH
+# so the help facility will work and then calls the osmium proper.
+#
+#-----------------------------------------------------------------------------
+
+export MANPATH=$MANPATH:@PROJECT_BINARY_DIR@/man:
+
+exec @PROJECT_BINARY_DIR@/src/osmium $*
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..f910154
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,16 @@
+#-----------------------------------------------------------------------------
+#
+# CMake Config
+#
+# Osmium Tool
+#
+#-----------------------------------------------------------------------------
+
+file(GLOB OSMIUM_SOURCE_FILES *.cpp)
+
+add_executable(osmium ${OSMIUM_SOURCE_FILES})
+
+target_link_libraries(osmium ${Boost_LIBRARIES} ${CRYPTOPP_LIBRARIES} ${OSMIUM_LIBRARIES})
+
+install(TARGETS osmium DESTINATION bin)
+
diff --git a/src/command_apply_changes.cpp b/src/command_apply_changes.cpp
new file mode 100644
index 0000000..bea4710
--- /dev/null
+++ b/src/command_apply_changes.cpp
@@ -0,0 +1,219 @@
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013-2015 Jochen Topf <jochen at 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>
+
+#include <osmium/io/any_input.hpp>
+#include <osmium/io/any_output.hpp>
+#include <osmium/io/output_iterator.hpp>
+#include <osmium/object_pointer_collection.hpp>
+#include <osmium/osm/object_comparisons.hpp>
+
+#include "command_apply_changes.hpp"
+
+bool CommandApplyChanges::setup(const std::vector<std::string>& arguments) {
+ namespace po = boost::program_options;
+ 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")
+ ("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 = osmium::io::overwrite::allow;
+ }
+
+ 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>();
+ }
+
+ if (vm.count("verbose")) {
+ m_vout.verbose(true);
+ }
+
+ } 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);
+
+ m_vout << "Started osmium apply-changes\n";
+
+ m_vout << "Command line options and default settings:\n";
+ m_vout << " generator: " << m_generator << "\n";
+ m_vout << " input data file name: " << m_input_filename << "\n";
+ m_vout << " input change file names: \n";
+ for (const auto& fn : m_change_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";
+
+ return true;
+}
+
+bool CommandApplyChanges::run() {
+ std::vector<osmium::memory::Buffer> changes;
+ osmium::ObjectPointerCollection objects;
+
+ m_vout << "Reading change file contents...\n";
+
+ for (const std::string& change_file_name : m_change_filenames) {
+ osmium::io::Reader reader(change_file_name, osmium::osm_entity_bits::object);
+ while (osmium::memory::Buffer buffer = reader.read()) {
+ osmium::apply(buffer, objects);
+ changes.push_back(std::move(buffer));
+ }
+ }
+
+ m_vout << "Opening input file...\n";
+ osmium::io::Reader reader(m_input_filename, osmium::osm_entity_bits::object);
+
+ osmium::io::Header header = reader.header();
+ header.set("generator", m_generator);
+
+ m_vout << "Opening output file...\n";
+ 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.
+ m_vout << "Sorting change data...\n";
+ objects.sort(osmium::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::OSMObject& obj) mutable {
+ if (obj.id() != id) {
+ if (keep_deleted || obj.visible()) {
+ *out = obj;
+ }
+ id = obj.id();
+ }
+ });
+
+ m_vout << "Applying changes and writing them to output...\n";
+ std::set_union(objects.begin(),
+ objects.end(),
+ osmium::io::InputIterator<osmium::io::Reader, osmium::OSMObject> {reader},
+ osmium::io::InputIterator<osmium::io::Reader, osmium::OSMObject> {},
+ output_it,
+ osmium::object_order_type_id_reverse_version());
+ } else {
+ // If the --simplify option was not given, this
+ // is a straightforward sort of the change files
+ // and then a merge with the input file.
+ m_vout << "Sorting change data...\n";
+ objects.sort(osmium::object_order_type_id_version());
+
+ m_vout << "Applying changes and writing them to output...\n";
+ std::set_union(objects.begin(),
+ objects.end(),
+ osmium::io::InputIterator<osmium::io::Reader, osmium::OSMObject> {reader},
+ osmium::io::InputIterator<osmium::io::Reader, osmium::OSMObject> {},
+ out);
+ }
+
+ out.flush();
+ writer.close();
+
+ m_vout << "Done.\n";
+
+ 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..770bb71
--- /dev/null
+++ b/src/command_apply_changes.hpp
@@ -0,0 +1,60 @@
+#ifndef COMMAND_APPLY_CHANGES_HPP
+#define COMMAND_APPLY_CHANGES_HPP
+
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013-2015 Jochen Topf <jochen at 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/io/overwrite.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;
+
+ osmium::io::overwrite m_output_overwrite = osmium::io::overwrite::no;
+ 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..6b44cb7
--- /dev/null
+++ b/src/command_cat.cpp
@@ -0,0 +1,226 @@
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013-2015 Jochen Topf <jochen at 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>
+
+#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) {
+ namespace po = boost::program_options;
+ 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")
+ ("output-header", po::value<std::vector<std::string>>(), "Add output header")
+ ("overwrite,O", "Allow existing output file to be overwritten")
+ ("object-type,t", po::value<std::vector<std::string>>(), "Read only objects of given type (node, way, relation, changeset)")
+ ;
+
+ 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("output-header")) {
+ m_output_headers = vm["output-header"].as<std::vector<std::string>>();
+ }
+
+ if (vm.count("overwrite")) {
+ m_output_overwrite = osmium::io::overwrite::allow;
+ }
+
+ if (vm.count("object-type")) {
+ m_osm_entity_bits = osmium::osm_entity_bits::nothing;
+ for (const auto& t : vm["object-type"].as<std::vector<std::string>>()) {
+ if (t == "node") {
+ m_osm_entity_bits |= osmium::osm_entity_bits::node;
+ } else if (t == "way") {
+ m_osm_entity_bits |= osmium::osm_entity_bits::way;
+ } else if (t == "relation") {
+ m_osm_entity_bits |= osmium::osm_entity_bits::relation;
+ } else if (t == "changeset") {
+ m_osm_entity_bits |= osmium::osm_entity_bits::changeset;
+ } else {
+ std::cerr << "Unknown object type '" << t << "' (Allowed are 'node', 'way', 'relation', and 'changeset').\n";
+ return false;
+ }
+ }
+ }
+
+ } 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";
+ m_vout << " output header: \n";
+ for (const auto& h : m_output_headers) {
+ m_vout << " " << h << "\n";
+ }
+ m_vout << " object types:";
+ if (m_osm_entity_bits & osmium::osm_entity_bits::node) {
+ m_vout << " node";
+ }
+ if (m_osm_entity_bits & osmium::osm_entity_bits::way) {
+ m_vout << " way";
+ }
+ if (m_osm_entity_bits & osmium::osm_entity_bits::relation) {
+ m_vout << " relation";
+ }
+ if (m_osm_entity_bits & osmium::osm_entity_bits::changeset) {
+ m_vout << " changeset";
+ }
+ m_vout << "\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], m_osm_entity_bits);
+ osmium::io::Header header = reader.header();
+ header.set("generator", m_generator);
+ for (const auto& h : m_output_headers) {
+ header.set(h);
+ }
+ 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}});
+ for (const auto& h : m_output_headers) {
+ header.set(h);
+ }
+ 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, m_osm_entity_bits);
+ 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..b09f0b2
--- /dev/null
+++ b/src/command_cat.hpp
@@ -0,0 +1,58 @@
+#ifndef COMMAND_CAT_HPP
+#define COMMAND_CAT_HPP
+
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013-2015 Jochen Topf <jochen at 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/io/overwrite.hpp>
+#include <osmium/osm/entity_bits.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;
+ std::vector<std::string> m_output_headers;
+ osmium::io::File m_output_file;
+ std::vector<osmium::io::File> m_input_files;
+ osmium::io::overwrite m_output_overwrite = osmium::io::overwrite::no;
+ osmium::osm_entity_bits::type m_osm_entity_bits = osmium::osm_entity_bits::all;
+
+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..b41a917
--- /dev/null
+++ b/src/command_fileinfo.cpp
@@ -0,0 +1,234 @@
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013-2015 Jochen Topf <jochen at 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>
+
+#ifndef _MSC_VER
+# include <unistd.h>
+#endif
+
+#include <boost/crc.hpp>
+#include <boost/program_options.hpp>
+
+#include <osmium/io/any_input.hpp>
+#include <osmium/handler.hpp>
+#include <osmium/osm/entity_bits.hpp>
+#include <osmium/visitor.hpp>
+
+#include "command_fileinfo.hpp"
+
+bool CommandFileinfo::setup(const std::vector<std::string>& arguments) {
+ namespace po = boost::program_options;
+ 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::Box bounds;
+ uint64_t changesets = 0;
+ uint64_t nodes = 0;
+ uint64_t ways = 0;
+ uint64_t relations = 0;
+ osmium::Timestamp first_timestamp = osmium::end_of_time();
+ osmium::Timestamp last_timestamp = osmium::start_of_time();
+ boost::crc_32_type crc32;
+
+ bool ordered = true;
+ bool multiple_versions = false;
+ osmium::item_type last_type = osmium::item_type::undefined;
+ osmium::object_id_type last_id = 0;
+
+ void changeset(const osmium::Changeset& changeset) {
+ crc32.process_bytes(changeset.data(), changeset.byte_size());
+ ++changesets;
+ }
+
+ void osm_object(const osmium::OSMObject& object) {
+ crc32.process_bytes(object.data(), object.byte_size());
+ if (object.timestamp() < first_timestamp) {
+ first_timestamp = object.timestamp();
+ }
+ if (object.timestamp() > last_timestamp) {
+ last_timestamp = object.timestamp();
+ }
+
+ if (last_type == object.type()) {
+ if (last_id == object.id()) {
+ multiple_versions = true;
+ }
+ if (last_id > object.id()) {
+ ordered = false;
+ }
+ } else if (last_type > object.type()) {
+ ordered = false;
+ }
+
+ last_type = object.type();
+ last_id = object.id();
+ }
+
+ void node(const osmium::Node& node) {
+ bounds.extend(node.location());
+ ++nodes;
+ }
+
+ void way(const osmium::Way& /* way */) {
+ ++ways;
+ }
+
+ void relation(const osmium::Relation& /* relation */) {
+ ++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_bits::all : osmium::osm_entity_bits::nothing);
+
+ osmium::io::Header header = reader.header();
+ std::cout << "Header:\n";
+
+ std::cout << " Bounding boxes:\n";
+ for (auto& box : header.boxes()) {
+ std::cout << " " << box << "\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.bounds << "\n";
+
+ if (info_handler.first_timestamp != osmium::end_of_time()) {
+ std::cout << " First timestamp: " << info_handler.first_timestamp << "\n";
+ std::cout << " Last timestamp: " << info_handler.last_timestamp << "\n";
+ }
+
+ std::cout << " Objects ordered (by type and id): " << (info_handler.ordered ? "yes\n" : "no\n");
+
+ std::cout << " Multiple versions of same object: ";
+ if (info_handler.ordered) {
+ std::cout << (info_handler.multiple_versions ? "yes\n" : "no\n");
+ if (info_handler.multiple_versions != header.has_multiple_object_versions()) {
+ std::cout << " WARNING! This is different from the setting in the header.\n";
+ }
+ } else {
+ std::cout << "unknown (because objects in file are unordered)";
+ }
+
+ std::cout << " CRC32: " << std::hex << info_handler.crc32.checksum() << std::dec << "\n";
+ std::cout << " Number of changesets: " << info_handler.changesets << "\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..d4773fb
--- /dev/null
+++ b/src/command_fileinfo.hpp
@@ -0,0 +1,50 @@
+#ifndef COMMAND_FILEINFO_HPP
+#define COMMAND_FILEINFO_HPP
+
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013-2015 Jochen Topf <jochen at 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 <osmium/io/file.hpp>
+
+#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..28d8301
--- /dev/null
+++ b/src/command_help.cpp
@@ -0,0 +1,82 @@
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013-2015 Jochen Topf <jochen at 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>
+
+#ifndef _MSC_VER
+# include <unistd.h>
+#else
+# include <process.h>
+# define execlp _execlp
+#endif
+
+#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..a2dbee7
--- /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-2015 Jochen Topf <jochen at 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..5e83696
--- /dev/null
+++ b/src/command_merge_changes.cpp
@@ -0,0 +1,194 @@
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013-2015 Jochen Topf <jochen at 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>
+
+#include <osmium/io/any_input.hpp>
+#include <osmium/io/any_output.hpp>
+#include <osmium/io/output_iterator.hpp>
+#include <osmium/object_pointer_collection.hpp>
+#include <osmium/osm/object_comparisons.hpp>
+
+#include "command_merge_changes.hpp"
+
+bool CommandMergeChanges::setup(const std::vector<std::string>& arguments) {
+ namespace po = boost::program_options;
+ 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")
+ ("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 = osmium::io::overwrite::allow;
+ }
+
+ if (vm.count("simplify")) {
+ m_simplify_change = true;
+ }
+
+ if (vm.count("generator")) {
+ m_generator = vm["generator"].as<std::string>();
+ }
+
+ if (vm.count("verbose")) {
+ m_vout.verbose(true);
+ }
+
+ } 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);
+
+ m_vout << "Started osmium merge-changes\n";
+
+ m_vout << "Command line options and default settings:\n";
+ m_vout << " generator: " << m_generator << "\n";
+ m_vout << " input change file names: \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";
+
+ return true;
+}
+
+bool CommandMergeChanges::run() {
+ // this will contain all the buffers with the input data
+ std::vector<osmium::memory::Buffer> changes;
+
+ osmium::ObjectPointerCollection objects;
+
+ // read all input files, keep the buffers around and add pointer
+ // to each object to objects collection.
+ m_vout << "Reading change file contents...\n";
+ for (const std::string& change_file_name : m_input_filenames) {
+ osmium::io::Reader reader(change_file_name, osmium::osm_entity_bits::object);
+ 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);
+
+ m_vout << "Opening output file...\n";
+ 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.
+ m_vout << "Sorting change data...\n";
+ objects.sort(osmium::object_order_type_id_reverse_version());
+ m_vout << "Writing last version of each object to output...\n";
+ std::unique_copy(objects.cbegin(), objects.cend(), out, osmium::object_equal_type_id());
+ } else {
+ // If the --simplify option was not given, this
+ // is a straightforward sort and copy.
+ m_vout << "Sorting change data...\n";
+ objects.sort(osmium::object_order_type_id_version());
+ m_vout << "Writing all objects to output...\n";
+ std::copy(objects.cbegin(), objects.cend(), out);
+ }
+
+ out.flush();
+ writer.close();
+
+ m_vout << "Done.\n";
+
+ 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..1708b66
--- /dev/null
+++ b/src/command_merge_changes.hpp
@@ -0,0 +1,58 @@
+#ifndef COMMAND_MERGE_CHANGES_HPP
+#define COMMAND_MERGE_CHANGES_HPP
+
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013-2015 Jochen Topf <jochen at 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/io/overwrite.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;
+
+ osmium::io::overwrite m_output_overwrite = osmium::io::overwrite::no;
+ 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..5e5bff7
--- /dev/null
+++ b/src/command_time_filter.cpp
@@ -0,0 +1,189 @@
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013-2015 Jochen Topf <jochen at 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>
+
+#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) {
+ namespace po = boost::program_options;
+ 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 = osmium::io::overwrite::allow;
+ }
+
+ 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 << "Started osmium time-filter\n";
+ m_vout << "Filtering from time " << m_from.to_iso() << " to " << m_to.to_iso() << "\n";
+
+ return true;
+}
+
+bool CommandTimeFilter::run() {
+ m_vout << "Opening input file...\n";
+ osmium::io::Reader reader(m_input_file, osmium::osm_entity_bits::object);
+
+ osmium::io::Header header = reader.header();
+ header.set("generator", m_generator);
+
+ m_vout << "Opening output file...\n";
+ 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::OSMObject> object_iterator;
+
+ object_iterator object_it(reader);
+ object_iterator object_end;
+
+ typedef osmium::DiffIterator<object_iterator> diff_iterator;
+
+ m_vout << "Filtering data...\n";
+ 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();
+
+ m_vout << "Done.\n";
+
+ 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..e4e0b71
--- /dev/null
+++ b/src/command_time_filter.hpp
@@ -0,0 +1,62 @@
+#ifndef COMMAND_TIME_FILTER_HPP
+#define COMMAND_TIME_FILTER_HPP
+
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013-2015 Jochen Topf <jochen at 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/io/overwrite.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;
+
+ osmium::io::overwrite m_output_overwrite = osmium::io::overwrite::no;
+
+ 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..c65119e
--- /dev/null
+++ b/src/main.cpp
@@ -0,0 +1,109 @@
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013-2015 Jochen Topf <jochen at 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];
+
+ // remove path from command
+ // (backslash for windows, slash for everybody else)
+ 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" || command == "osmium.exe") {
+ 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, 7) == "osmium-") {
+ command = command.substr(7);
+ }
+ }
+
+ if (command == "version") {
+ std::cout << "osmium version " << OSMIUM_VERSION << "\n"
+ << "Copyright (C) 2013-2015 Jochen Topf <jochen at topf.org>\n"
+ << "License: GNU GENERAL PUBLIC LICENSE Version 3 <http://gnu.org/licenses/gpl.html>.\n"
+ << "This is free software: you are free to change and redistribute it.\n"
+ << "There is NO WARRANTY, to the extent permitted by law.\n";
+
+ 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..1a55f63
--- /dev/null
+++ b/src/osmc.hpp
@@ -0,0 +1,136 @@
+#ifndef OSMC_HPP
+#define OSMC_HPP
+
+/*
+
+Osmium -- OpenStreetMap data manipulation command line tool
+http://osmcode.org/osmium
+
+Copyright (C) 2013-2015 Jochen Topf <jochen at 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>
+
+/**
+ * Virtual base class for commands that can be called from the command line.
+ */
+class Command {
+
+protected:
+
+ std::string m_generator;
+ bool m_debug {false};
+ osmium::util::VerboseOutput m_vout {false};
+
+public:
+
+ Command() :
+ m_generator("osmium/" OSMIUM_VERSION) {
+ }
+
+ 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 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
diff --git a/zsh_completion/_osmium b/zsh_completion/_osmium
new file mode 100644
index 0000000..1aa92c6
--- /dev/null
+++ b/zsh_completion/_osmium
@@ -0,0 +1,149 @@
+#compdef osmium
+#
+# ZSH completion for Osmium tool.
+#
+# To test this file:
+# 1) Comment out last line
+# 2) Call: . ./zsh_osmium
+# 3) Call: compdef _osmium osmium
+#
+# To read more about what is happening here:
+# zshcompsys(1)
+# http://bewatermyfriend.org/p/2012/003/
+# http://zsh.sourceforge.net/Guide/zshguide06.html
+#
+
+osmium_file_glob="'*.(osm|osh|osc|pbf|osm.pbf) *.(osm|osh|osc).(bz2|gz)'"
+
+_osmium() {
+ local -a osmium_commands
+ osmium_commands=(apply-changes cat fileinfo help merge-changes time-filter)
+ if (( CURRENT > 2 )); then
+ # Remember the subcommand name
+ local cmd=${words[2]}
+ # Set the context for the subcommand.
+ curcontext="${curcontext%:*:*}:osmium-$cmd"
+ # Narrow the range of words we are looking at to exclude `osmium'
+ (( CURRENT-- ))
+ shift words
+ # Run the completion for the subcommand
+ _osmium-$cmd
+ else
+ _describe -t osmium-commands 'osmium subcommand' osmium_commands
+ fi
+}
+
+_osmium-apply-changes() {
+ _arguments : \
+ '--generator[generator setting for output file header]:generator:' \
+ '(--input-format)-F[format of input OSM file(s)]:OSM file format:_osmium_file_formats' \
+ '(-F)--input-format[format of input OSM file(s)]:OSM file format:_osmium_file_formats' \
+ "(--output)-o[output file name]:output OSM file:_files -g ${osmium_file_glob}" \
+ "(-o)--output[output file name]:output OSM file:_files -g ${osmium_file_glob}" \
+ '(--output-format)-f[format of output OSM file]:OSM file format:_osmium_file_formats' \
+ '(-f)--output-format[format of output OSM file]:OSM file format:_osmium_file_formats' \
+ '(--overwrite)-O[allow overwriting of existing output file]' \
+ '(-O)--overwrite[allow overwriting of existing output file]' \
+ '(--remove-deleted)-r[remove deleted objects]' \
+ '(-r)--remove-deleted[remove deleted objects]' \
+ '(--simplify)-s[only write last version of any object]' \
+ '(-s)--simplify[only write last version of any object]' \
+ '(--verbose)-v[set verbose mode]' \
+ '(-v)--verbose[set verbose mode]' \
+ "*::input OSM files:_files -g ${osmium_file_glob}"
+}
+
+_osmium-cat() {
+ _arguments : \
+ '--generator[generator setting for output file header]:generator:' \
+ '(--input-format)-F[format of input OSM file(s)]:OSM file format:_osmium_file_formats' \
+ '(-F)--input-format[format of input OSM file(s)]:OSM file format:_osmium_file_formats' \
+ "(--output)-o[output file name]:output OSM file:_files -g ${osmium_file_glob}" \
+ "(-o)--output[output file name]:output OSM file:_files -g ${osmium_file_glob}" \
+ '(--output-format)-f[format of output OSM file]:OSM file format:_osmium_file_formats' \
+ '(-f)--output-format[format of output OSM file]:OSM file format:_osmium_file_formats' \
+ '--output-header[add option for output header]:output header:' \
+ '(--overwrite)-O[allow overwriting of existing output file]' \
+ '(-O)--overwrite[allow overwriting of existing output file]' \
+ '*-t[read only object of given output types]:OSM object type:_osmium_object_type' \
+ '*--object-type[read only object of given output types]:OSM object type:_osmium_object_type' \
+ '(--verbose)-v[set verbose mode]' \
+ '(-v)--verbose[set verbose mode]' \
+ "*::input OSM file:_files -g ${osmium_file_glob}"
+}
+
+_osmium-fileinfo() {
+ _arguments : \
+ '(--extended)-e[show extended info (reads entire file)]' \
+ '(-e)--extended[show extended info (reads entire file)]' \
+ '(-F)--input-format=[format of input OSM file]:OSM file format:_osmium_file_formats' \
+ '(--input-format)-F=[format of input OSM file]:OSM file format:_osmium_file_formats' \
+ "*::input OSM file:_files -g ${osmium_file_glob}"
+}
+
+_osmium-merge-changes() {
+ _arguments : \
+ '--generator[generator setting for output file header]:generator:' \
+ '(--input-format)-F[format of input OSM file(s)]:OSM file format:_osmium_file_formats' \
+ '(-F)--input-format[format of input OSM file(s)]:OSM file format:_osmium_file_formats' \
+ "(--output)-o[output file name]:output OSM file:_files -g ${osmium_file_glob}" \
+ "(-o)--output[output file name]:output OSM file:_files -g ${osmium_file_glob}" \
+ '(--output-format)-f[format of output OSM file]:OSM file format:_osmium_file_formats' \
+ '(-f)--output-format[format of output OSM file]:OSM file format:_osmium_file_formats' \
+ '(--overwrite)-O[allow overwriting of existing output file]' \
+ '(-O)--overwrite[allow overwriting of existing output file]' \
+ '(--simplify)-s[only write last version of any object]' \
+ '(-s)--simplify[only write last version of any object]' \
+ '(--verbose)-v[set verbose mode]' \
+ '(-v)--verbose[set verbose mode]' \
+ "*::input OSM files:_files -g ${osmium_file_glob}"
+}
+
+_osmium-time-filter() {
+ _arguments : \
+ '--generator[generator setting for output file header]:generator:' \
+ '(--input-format)-F[format of input OSM file]:OSM file format:_osmium_file_formats' \
+ '(-F)--input-format[format of input OSM file]:OSM file format:_osmium_file_formats' \
+ "(--output)-o[output file name]:output OSM file:_files -g ${osmium_file_glob}" \
+ "(-o)--output[output file name]:output OSM file:_files -g ${osmium_file_glob}" \
+ '(--output-format)-f[format of output OSM file]:OSM file format:_osmium_file_formats' \
+ '(-f)--output-format[format of output OSM file]:OSM file format:_osmium_file_formats' \
+ '(--overwrite)-O[allow overwriting of existing output file]' \
+ '(-O)--overwrite[allow overwriting of existing output file]' \
+ '(--verbose)-v[set verbose mode]' \
+ '(-v)--verbose[set verbose mode]' \
+ "1::input OSM file:_files -g ${osmium_file_glob}" \
+ "2::start time (format\: yyyy-mm-ddThh\:mm\:ssZ):" \
+ "3::end time (format\: yyyy-mm-ddThh\:mm\:ssZ):"
+}
+
+_osmium_file_formats() {
+ _values 'OSM file formats' \
+ 'osm[XML data format]' \
+ 'osm.gz[XML data format (compressed with gzip)]' \
+ 'osm.bz2[XML data format (compressed with bzip2)]' \
+ 'osh[XML history format]' \
+ 'osh.gz[XML history format (compressed with gzip)]' \
+ 'osh.bz2[XML history format (compressed with bzip2)]' \
+ 'osc[XML change format]' \
+ 'osc.gz[XML change format (compressed with gzip)]' \
+ 'osc.bz2[XML change format (compressed with bzip2)]' \
+ 'pbf[PBF format]'
+}
+
+_osmium_object_type() {
+ _values 'OSM object type' \
+ 'node' \
+ 'way' \
+ 'relation' \
+ 'changeset'
+}
+
+_osmium-help() {
+ local -a osmium_help_topics
+ osmium_help_topics=(apply-changes cat fileinfo help merge-changes time-filter file-formats)
+ _describe -t osmium-help-topics 'osmium help topics' osmium_help_topics
+}
+
+_osmium "$@"
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git
More information about the Pkg-grass-devel
mailing list