osm2pgsql-0.92.0/000077500000000000000000000000001302473346700135425ustar00rootroot00000000000000osm2pgsql-0.92.0/.gitignore000066400000000000000000000000341302473346700155270ustar00rootroot00000000000000build docs/html docs/latex osm2pgsql-0.92.0/.travis.yml000066400000000000000000000024201302473346700156510ustar00rootroot00000000000000language: cpp sudo: false addons: apt: sources: - boost-latest - ubuntu-toolchain-r-test packages: - g++-4.8 - libexpat1-dev - libgeos-dev - libgeos++-dev - libpq-dev - libbz2-dev - libproj-dev - lua5.2 - liblua5.2-dev - libboost1.55-dev - libboost-system1.55-dev - libboost-filesystem1.55-dev matrix: include: - os: linux compiler: clang env: CXXFLAGS="-pedantic -Werror" - os: linux compiler: gcc env: RUNTEST="-L NoDB" CXXFLAGS="-pedantic -Werror" - os: osx compiler: clang env: RUNTEST="-L NoDB" CXXFLAGS="-pedantic -Werror" before_install: - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then brew install lua; fi # update versions install: - if [[ $CC == 'gcc' ]]; then export CC=gcc-4.8; fi - if [[ $CXX == 'g++' ]]; then export CXX=g++-4.8; fi before_script: - $CXX --version - xml2-config --version - geos-config --version - proj | head -n1 - lua -v script: - mkdir build && cd build - cmake .. -DBUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Debug - make -j2 - echo "Running tests that does not require PostgreSQL server" - if [[ $RUNTEST ]]; then ctest -VV $RUNTEST; fi after_failure: - # rerun make, but verbosely make VERBOSE=1 osm2pgsql-0.92.0/AUTHORS000066400000000000000000000003301302473346700146060ustar00rootroot00000000000000osm2pgsql was written by Jon Burgess, Artem Pavlenko, Martijn van Oosterhout Sarah Hoffmann, Kai Krueger, Frederik Ramm, Brian Quinion, Matt Amos, Kevin Kreiser, Paul Norman and other OpenStreetMap project members. osm2pgsql-0.92.0/CMakeLists.txt000066400000000000000000000153671302473346700163160ustar00rootroot00000000000000set(PACKAGE osm2pgsql) set(PACKAGE_NAME osm2pgsql) set(PACKAGE_VERSION 0.92.0) cmake_minimum_required(VERSION 2.8.7) project(osm2pgsql) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") set(DATA_DIR \"${CMAKE_INSTALL_PREFIX}/share/osm2pgsql\") option(BUILD_TESTS "Build test suite" OFF) option(WITH_LUA "Build with lua support" ON) if (NOT TESTING_TIMEOUT) set(TESTING_TIMEOUT 1200) endif() if (NOT WIN32 AND NOT APPLE) # No need for this path, just a workaround to make cmake check pass on all systems set(PostgreSQL_TYPE_INCLUDE_DIR /usr/include) endif() # Just in case user installed RPMs from http://yum.postgresql.org/ list(APPEND PostgreSQL_ADDITIONAL_SEARCH_PATHS /usr/pgsql-9.3 /usr/pgsql-9.4 /usr/pgsql-9.5) if (PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR) message(FATAL_ERROR "In-source builds are not allowed, please use a separate build directory like `mkdir build && cd build && cmake ..`") endif() message(STATUS "Building osm2pgsql ${PACKAGE_VERSION}") if (NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE RelWithDebInfo) endif() set (CMAKE_CXX_STANDARD 11) set (CMAKE_CXX_EXTENSIONS Off) set (CMAKE_CXX_STANDARD_REQUIRED TRUE) if ( MSVC ) add_definitions(-D_CRT_SECURE_NO_WARNINGS -DNOMINMAX -wd4996) set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4099 /STACK:30000000") else() add_definitions(-Wall) add_definitions(-DBOOST_TEST_DYN_LINK) if (CMAKE_VERSION VERSION_LESS 3.1) add_definitions(-std=c++11) endif () endif() option(EXTERNAL_LIBOSMIUM "Do not use the bundled libosmium" OFF) ############################################################# # Detect available headers and set global compiler options ############################################################# include (CheckIncludeFiles) include (CheckFunctionExists) include (CheckTypeSize) add_definitions( -DOSM2PGSQL_DATADIR=${DATA_DIR} ) add_definitions( -DFIXED_POINT ) CHECK_INCLUDE_FILES (termios.h HAVE_TERMIOS_H) CHECK_INCLUDE_FILES (libgen.h HAVE_LIBGEN_H) CHECK_INCLUDE_FILES (unistd.h HAVE_UNISTD_H) if (WIN32) set(HAVE_LIBGEN_H FALSE) endif() CHECK_FUNCTION_EXISTS(lseek64 HAVE_LSEEK64) CHECK_FUNCTION_EXISTS(posix_fallocate HAVE_POSIX_FALLOCATE) CHECK_FUNCTION_EXISTS(posix_fadvise HAVE_POSIX_FADVISE) CHECK_FUNCTION_EXISTS(sync_file_range HAVE_SYNC_FILE_RANGE) CHECK_TYPE_SIZE("off_t" SIZEOF_OFF_T) if (NOT WIN32 AND NOT APPLE AND NOT HAVE_LSEEK64 AND NOT SIZEOF_OFF_T EQUAL 8) message(FATAL_ERROR "Flat nodes cache requires a 64 bit capable seek") endif() ############################################################# # Find necessary libraries ############################################################# if (NOT EXTERNAL_LIBOSMIUM) set(OSMIUM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/contrib/libosmium") endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) find_package(Osmium REQUIRED COMPONENTS io geos proj) include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS}) if (WITH_LUA) find_package(Lua REQUIRED) include_directories(${LUA_INCLUDE_DIR}) set(HAVE_LUA 1) endif() if (MSVC) # Boost thread needs extra libraries set(BOOST_EXTRA date_time chrono) endif() if (NOT Boost_ADDITIONAL_VERSIONS) set(Boost_ADDITIONAL_VERSIONS "1.55;1.56;1.57;1.58;1.59;1.60;1.61") endif() # first try to find the version find_package(Boost 1.50 REQUIRED COMPONENTS system filesystem ${BOOST_EXTRA}) include_directories(${Boost_INCLUDE_DIR}) find_package(PostgreSQL REQUIRED) include_directories(${PostgreSQL_INCLUDE_DIRS}) find_package(Threads) ############### Libraries are found now ######################## set (LIBS ${Boost_LIBRARIES} ${PostgreSQL_LIBRARY} ${OSMIUM_LIBRARIES}) if (LUA_FOUND) list(APPEND LIBS ${LUA_LIBRARIES}) endif() if (WIN32) list(APPEND LIBS ws2_32) if (MSVC) find_path(GETOPT_INCLUDE_DIR getopt.h) find_library(GETOPT_LIBRARY NAMES wingetopt getopt ) if (GETOPT_INCLUDE_DIR AND GETOPT_LIBRARY) include_directories(${GETOPT_INCLUDE_DIR}) list(APPEND LIBS ${GETOPT_LIBRARY}) else() message(ERROR "Can not find getopt library for Windows. Please get it from https://github.com/alex85k/wingetopt or alternative source.") endif() endif() endif() message("Libraries used to build: " ${LIBS}) list(APPEND LIBS ${CMAKE_DL_LIBS}) if (CMAKE_SYSTEM_NAME STREQUAL Linux) check_library_exists(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME_IN_RT) if (HAVE_CLOCK_GETTIME_IN_RT) list(APPEND LIBS rt) endif() endif () message("Active compiler flags:" ${CMAKE_CXX_FLAGS}) ############################################################# # Build the library and executable file ############################################################# configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) if (NOT HAVE_UNISTD_H AND NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/unistd.h) file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unistd.h "// empty header\n") endif() set(osm2pgsql_lib_SOURCES expire-tiles.cpp geometry-builder.cpp geometry-processor.cpp id-tracker.cpp middle-pgsql.cpp middle-ram.cpp middle.cpp node-persistent-cache.cpp node-ram-cache.cpp options.cpp osmdata.cpp output-gazetteer.cpp output-multi.cpp output-null.cpp output-pgsql.cpp output.cpp parse-osmium.cpp pgsql.cpp processor-line.cpp processor-point.cpp processor-polygon.cpp reprojection.cpp sprompt.cpp table.cpp taginfo.cpp tagtransform.cpp util.cpp wildcmp.cpp expire-tiles.hpp geometry-builder.hpp geometry-processor.hpp id-tracker.hpp middle-pgsql.hpp middle-ram.hpp middle.hpp node-persistent-cache.hpp node-ram-cache.hpp options.hpp osmdata.hpp osmtypes.hpp output-gazetteer.hpp output-multi.hpp output-null.hpp output-pgsql.hpp output.hpp parse-osmium.hpp pgsql.hpp processor-line.hpp processor-point.hpp processor-polygon.hpp reprojection.hpp sprompt.hpp table.hpp taginfo.hpp taginfo_impl.hpp tagtransform.hpp util.hpp wildcmp.hpp ) add_library(osm2pgsql_lib STATIC ${osm2pgsql_lib_SOURCES}) set_target_properties(osm2pgsql_lib PROPERTIES OUTPUT_NAME osm2pgsql) add_executable(osm2pgsql osm2pgsql.cpp) target_link_libraries(osm2pgsql_lib ${LIBS}) target_link_libraries(osm2pgsql osm2pgsql_lib ${LIBS}) ############################################################# # Build tests ############################################################# enable_testing() include(CTest) if (BUILD_TESTS) add_subdirectory(tests) else() add_subdirectory(tests EXCLUDE_FROM_ALL) endif() ############################################################# # Install ############################################################# install(TARGETS osm2pgsql DESTINATION bin) install(FILES docs/osm2pgsql.1 DESTINATION share/man/man1) install(FILES default.style empty.style DESTINATION share/osm2pgsql) osm2pgsql-0.92.0/CONTRIBUTING.md000066400000000000000000000074151302473346700160020ustar00rootroot00000000000000# Osm2pgsql contribution guidelines ## Workflow We operate the "Fork & Pull" model explained at https://help.github.com/articles/using-pull-requests You should fork the project into your own repo, create a topic branch there and then make one or more pull requests back to the openstreetmap repository. Your pull requests will then be reviewed and discussed. ## History To understand the osm2pgsql code, it helps to know some history on it. Osm2pgsql was written in C in 2007 as a port of an older Python utility. In 2014 it was ported to C++ by MapQuest and the last C version was released as 0.86.0. In it's time, it has had varying contribution activity, including times with no maintainer or active developers. Parts of the codebase still clearly show their C origin and could use rewriting in modern C++, making use of data structures in the standard library. ## Versioning Osm2pgsql uses a X.Y.Z version number, where Y tells you if you are on a stable or development series. Like the Linux Kernel, even numbers are stable and development versions are odd. Bugs and known issues are fixed on the main branch only. Exceptions may be made for easy bug fixes, or if a patch backporting a fix is provided. ## Code style The current codebase is a mix of styles, but new code should be written in the [K&R 1TBS style](https://en.wikipedia.org/wiki/Indent_style#Variant:_1TBS) with 4 spaces indentation. Tabs should never be used in the C++ code. e.g. ``` int main(int argc, char *argv[]) { ... while (x == y) { something(); somethingelse(); if (some_error) { do_correct(); } else { continue_as_usual(); } } finalthing(); ... } ``` Names should use underscores, not camel case, with class/struct names ending in `_t`. Headers should be included in the order `config.h`, C++ standard library headers, C library headers, Boost headers, and last osm2pgsql files. ## Documentation User documentation is stored in `docs/`. Pages on the OpenStreetMap wiki are known to be unreliable and outdated. There is some documentation in Doxygen-formatted comments. The documentation can be generated with ``doxygen docs/Doxyfile``. It is not yet hooked into the build scripts as most functions are not yet documented. ## Platforms targeted Ideally osm2pgsql should compile on Linux, OS X, FreeBSD and Windows. It is actively tested on Debian, Ubuntu and FreeBSD by the maintainers. ## Testing The code also comes with a suite of tests which can be run by executing ``make check``. Most of these tests depend on being able to set up a database and run osm2pgsql against it. You need to ensure that PostgreSQL is running and that your user is a superuser of that system. To do that, run: ```sh sudo -u postgres createuser -s $USER sudo mkdir -p /tmp/psql-tablespace sudo chown postgres.postgres /tmp/psql-tablespace psql -c "CREATE TABLESPACE tablespacetest LOCATION '/tmp/psql-tablespace'" postgres ``` Once this is all set up, all the tests should run (no SKIPs), and pass (no FAILs). If you encounter a failure, you can find more information by looking in the `test-suite.log`. If you find something which seems to be a bug, please check to see if it is a known issue at https://github.com/openstreetmap/osm2pgsql/issues and, if it's not already known, report it there. If running the tests in a virtual machine, allocate sufficient disk space for a 20GB flat nodes file. ### Performance Testing If performance testing with a full planet import is required, indicate what needs testing in a pull request. ## Maintainers The current maintainers of osm2pgsql are [Sarah Hoffmann](https://github.com/lonvia/) and [Paul Norman](https://github.com/pnorman/). Sarah has more experience with the gazetteer backend and Paul with the pgsql and multi backends. osm2pgsql-0.92.0/COPYING000066400000000000000000000431031302473346700145760ustar00rootroot00000000000000 GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) 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 this service 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 make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. 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. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), 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 distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 9. The Free Software Foundation may publish revised and/or new versions of the 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 a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE 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. 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 convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. Copyright (C) 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 2 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, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: Gnomovision version 69, Copyright (C) year name of author Gnomovision 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, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. , 1 April 1989 Ty Coon, President of Vice This 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. osm2pgsql-0.92.0/ChangeLog000066400000000000000000001474411302473346700153270ustar00rootroot000000000000002010-11-06 21:04 +0000 [r24100] giggls: * Auto-detect filetype pbf/osm based on file extension if no Input frontend has been explicitely selected 2010-11-06 20:37 +0000 [r24099] hholzgra: * * improved configure setup (including automake and libtool) * support for different input readers besides libxml2 OSM XML parsing * "primitive" XML parser integrated into the main binary * OSM PBF parser 2010-11-03 10:51 +0000 [r24039] twain: * add extra operator column to word 2010-10-24 00:37 +0000 [r23798] twain: * hstore version of gazetteer output 2010-10-20 23:47 +0000 [r23731] twain: * set CPPFLAGS correctly for non-standard paths 2010-10-19 10:06 +0000 [r23687] twain: * max admin rank, better postcode defaults 2010-10-18 13:40 +0000 [r23678] ldp: * Remove 3 unused (and undocumented) keys 2010-10-02 13:26 +0000 [r23440] jonb: * fix warning about incorrect pointer assignment at osm2pgsql.c:818 2010-09-20 20:59 +0000 [r23286] ldp: * Delete osm.xml. This shouldn't be in here. 2010-09-19 11:35 +0000 [r23264] stevechilton: * add service=drive-through 2010-09-18 12:07 +0000 [r23247] rodo: * Add packages names for Debian 2010-09-17 21:09 +0000 [r23243] stevechilton: * add service=drive-through 2010-09-15 16:19 +0000 [r23186] twain: * Minor javascript fixes. Introduce new search plans for searching by 'special' words 2010-09-10 18:19 +0000 [r23099] twain: * check the indexing process didn't generate any errors (second attempt) 2010-09-10 18:13 +0000 [r23098] frederik: * real programmers don't do syntax checks ;) 2010-09-10 18:08 +0000 [r23097] twain: * check the indexing process didn't generate any errors 2010-09-09 14:14 +0000 [r23085] frederik: * fixed twain47's version and commited to svn 2010-09-09 12:21 +0000 [r23080] twain: * check resulting geometry is a polygon of some type 2010-09-04 16:48 +0000 [r22986] twain: * remove reference to natural earth 2010-09-04 14:41 +0000 [r22984] twain: * performance improvements for initial load of data 2010-08-22 12:57 +0000 [r22731] twain: * remove debug messages 2010-08-21 12:24 +0000 [r22718] twain: * switch to c code for toekn generation revert change to administrative typo improvements to incremental update code 2010-08-21 11:39 +0000 [r22717] frederik: * fix typo 2010-08-21 11:22 +0000 [r22716] frederik: * comment out replace operations which are already covered by the transliteration module 2010-08-20 15:05 +0000 [r22710] twain: * switch to multi-threaded indexing 2010-08-19 22:19 +0000 [r22701] rodo: * Fix #3169 by applying patch 2010-08-17 22:42 +0000 [r22679] frederik: * readme moved to wiki 2010-08-17 10:59 +0000 [r22669] twain: * manage Osmosis import from within util.update.php note the new log table 'import_osmosis_log' created in gazetteer-tables.sql 2010-08-17 10:11 +0000 [r22668] frederik: * add capability to load .osc files directly 2010-08-17 09:55 +0000 [r22667] frederik: * typo 2010-08-16 12:57 +0000 [r22658] frederik: * make explicit that slim mode has to be used. 2010-08-16 12:21 +0000 [r22655] frederik: * remove references to postgres user "twain" 2010-08-03 12:12 +0000 [r22556] twain: * update mime type headers (as per #3088) 2010-07-19 08:02 +0000 [r22371] mazdermind: * add hstore-column option, which allows to create specific hstore columns for sub tags. '--hstore-column name:' will for example create a column "name:" with all the values of name:xx tags ind the form of xx=>Value for any name:xx tagged to an element. This changeset also includes changes to the regular hstore code by moving it to a separate function and also extending keyvals.c/h with an inline wrapper-function. 2010-07-16 13:24 +0000 [r22349] gravitystorm: * Updated table definitions from twain47 to reflect changes made in [22221] 2010-07-16 13:18 +0000 [r22348] gravitystorm: * If you change the build system remember to update the README 2010-07-16 12:32 +0000 [r22347] gravitystorm: * fix typo in district 2010-07-14 11:40 +0000 [r22308] twain: * Finally add warning about postgresql 8.4 2010-07-12 14:16 +0000 [r22285] twain: * move to processing git rather than svg multi-lingual generate 'near' and 'in' tokens 2010-07-10 08:30 +0000 [r22268] frederik: * osm2pgsql version without libxml 2010-07-07 14:59 +0000 [r22222] twain: * handle broken language list in IE 2010-07-07 14:51 +0000 [r22221] twain: * handle house name / number collisions by showing both 2010-07-07 13:35 +0000 [r22220] twain: * improved multi-processor indexing 2010-07-07 13:20 +0000 [r22219] twain: * improved multi-processor indexing 2010-07-07 08:25 +0000 [r22213] giggls: * Put binary into correct places according to debian policy 2010-06-24 14:47 +0000 [r21987] twain: * improve presentation of update status - time remaining extra options to specify max load / blocking processes on command line 2010-06-11 22:47 +0000 [r21661] giggls: * * remove malloc.h for proper compi8lation on Macosx * allow for postgresql password to be specified in PGPASS Environment Variable instead of interactive input 2010-06-09 20:30 +0000 [r21630] rodo: * Add an option to Create indexes on a different tablespace, close #2988 2010-05-27 17:27 +0000 [r21470] twain: * fix pointer error 2010-05-27 15:43 +0000 [r21464] twain: * move string replacements to c module 2010-05-20 08:58 +0000 [r21381] rodo: * Do not warn about slim option on 32nits system if option is enabled 2010-05-15 22:28 +0000 [r21290] jonb: * osm2pgsql: Add C++ compiler into autoconf. Rename DATADIR to prevent clash with mingw32 objidl.h header. Fix some mingw32 compile issues. 2010-05-15 21:38 +0000 [r21289] jonb: * osm2pgsql: Raise maximum tag size in style file to 63 characters 2010-05-05 15:34 +0000 [r21135] frederik: * fix osm2pgsql debian packaging, and make it buildable for ubuntu lucid 2010-04-09 13:48 +0000 [r20873] giggls: * * add brief explanation of hstore functionality * make phstore flag actually do what it is supposed to do * remove obsolete function add_parking_node 2010-04-07 17:51 +0000 [r20823] feixm: * When running on 32bit systems, userprocess can allocate as much as 3GB of virtual address space. This is due to 3GB/1GB split on 32bit linux machines. No matter how much physical RAM you have, you end up on 3GB limit. This is quite low limit when importing anything big as country OSM file or the whole planet OSM. If we know this, we should warn user in syntax help, during runtime and even when we start throwing std::bad_alloc during conversion. 2010-04-06 18:48 +0000 [r20802] strk: * Autoconf for osm2pgsql 2010-04-02 12:13 +0000 [r20775] giggls: * change "char sql[2048]" to "static char *sql" and do dynamic allocation the reason is, that hstore rows can get really long, thus dynamic allocation prevents them to get cut and (hopefully) also prevents likely buffer overflows as well. 2010-03-20 20:06 +0000 [r20565] giggls: * We need to be able to mark polygons as such also in hstore only mode where no additional tag columns should be added. For this reason we introduce a new flag called phstore which will do the same as the polygon flag but without adding a column for the tag specified in the stylefile. 2010-03-16 08:26 +0000 [r20505] giggls: * \r und \n in hstore value needs to be escaped for pgsql copy import as well 2010-03-15 14:47 +0000 [r20493] giggls: * TAB in hstore value needs to be escaped for pgsql copy import 2010-03-14 14:31 +0000 [r20475] giggls: * Add an experimental feature to generate hstore enabled PgSQL tables. At least in theory this will allow for 3-column output tables now. Tested with the following environment: * non slim mode * hstore-new (http://pgfoundry.org/projects/hstore-new/ * PgSQL 8.4/PostGIS 1.4 2010-03-11 22:00 +0000 [r20429] frederik: * patch not needed any longer 2010-03-11 13:53 +0000 [r20418] twain: * only do address intrapolation in append mode 2010-03-08 13:40 +0000 [r20370] twain: * add reverse and reverse.php to the block list 2010-03-08 13:32 +0000 [r20369] gslater: * Add robots.txt, add form action 2010-03-03 14:32 +0000 [r20255] twain: * applied #2769 search field should have focus patch (firefishy) 2010-02-26 14:23 +0000 [r20163] twain: * change json output to be complaint (no comments allowed) 2010-02-26 14:09 +0000 [r20161] frederik: * fix json compliance 2010-02-25 18:41 +0000 [r20149] twain: * new name options, fix error when importing new data 2010-02-24 12:17 +0000 [r20134] twain: * Improve install documentation 2010-02-16 14:25 +0000 [r20035] twain: * More detailed loging. Tweaks to how house numbers are pressented. Fix json output (incorrect address details) 2010-02-16 14:19 +0000 [r20034] twain: * improve handling of house numbers, more install documentation (thanks to Frans Hals) 2010-02-11 23:50 +0000 [r19974] jonb: * osm2pgsql: Complain if we got an error while reading the style file or were unable to parse any valid columns 2010-01-27 00:01 +0000 [r19640] twain: * broken output for [lat,lon] searches, attempting to search on blank queries 2010-01-26 14:45 +0000 [r19633] twain: * suggest alternatives for missing words 2010-01-23 17:58 +0000 [r19603-19604] twain: * minor runtime warning * extra error checking, smaller indexing partitions 2010-01-11 15:34 +0000 [r19407] twain: * More logging, improved UK postcodes, fix more_url 2010-01-11 02:20 +0000 [r19398] ldp: * Make shop into type polygon, to have closed ways with no polygon-enforcing tags (eg. missing building=yes) still show up in the polygon table. 2010-01-05 13:45 +0000 [r19281] twain: * rounding error in generation of bounding box 2009-12-19 23:23 +0000 [r19148] jonb: * osm2pgsql: Apply multipolygon patch from Twain with a few changes. 2009-12-19 17:16 +0000 [r19147] jonb: * Overhaul the osm2pgsql readme text 2009-12-19 16:31 +0000 [r19145] jonb: * Disable the new osm_{user,uid,timestamp,version} columns since the --extra-attributes option is off by default 2009-12-19 16:21 +0000 [r19144] jonb: * Allow user,uid,version & timestamp attributes to be imported from osm objects. Fixes #2405. 2009-12-18 14:56 +0000 [r19133] twain: * expose 'more_url' in xml format 2009-12-18 14:26 +0000 [r19132] twain: * fix bug in finding 'bus stop wilhelmshaven' introduced in recent commit 2009-12-17 18:47 +0000 [r19128] twain: * support for various lat,lon formats as part of the query i.e. village near 48,7.7 2009-12-17 17:46 +0000 [r19127] twain: * correct error handling for missing osm points 2009-12-17 15:54 +0000 [r19126] twain: * ignore empty search phrases 2009-12-14 22:12 +0000 [r19092] twain: * OSM Copright notice in XML reverse geocode by OSM ID (not just lat/lon) improved debuging information added IP block lists 2009-12-14 22:04 +0000 [r19091] twain: * multi-language amenities, one off import of specific nodes/ways/relations 2009-12-04 00:11 +0000 [r18937] twain: * Order results by distance to specified location (#2519) 2009-12-01 17:16 +0000 [r18884] twain: * revert accidentally committed multi-polygon patch 2009-11-30 12:11 +0000 [r18873] twain: * add test in the associatedStreet code to ensure associatedStreet is actually a road 2009-11-29 16:24 +0000 [r18851] twain: * missing library commands 2009-11-28 21:03 +0000 [r18846] twain: * Fix quote type problems in JSON formating (#2508) 2009-11-28 20:29 +0000 [r18845] twain: * fix problems reported with running script first time 2009-11-28 20:24 +0000 [r18844] twain: * some missed files 2009-11-28 18:17 +0000 [r18843] twain: * missing name space for vector 2009-11-28 16:24 +0000 [r18840] twain: * lots of minor changes since going live 2009-11-15 18:13 +0000 [r18632] jonb: * Clear out tag list after parsing a changeset otherwise the accumulated tags will appear on the first node. Fixes ticket #2426 2009-11-12 12:23 +0000 [r18558] ldp: * Add shop=*, as a first step to be able to render them. 2009-11-08 15:09 +0000 [r18509-18510] twain: * changes to indexing * reverse geocoding and output format changes 2009-11-04 08:52 +0000 [r18451] frederik: * bump version to 0.69 2009-11-03 23:55 +0000 [r18440] frederik: * new! now with even fewer annoying debug print statements! 2009-11-03 23:32 +0000 [r18439] frederik: * Allow creation of expiry lists for 900913 tiles even if your target projection is not 900913 (e.g. you have your PostGIS table in lat/lon). Also fixes another bug in the old projection code where expire_from_bbox would not expire the whole box properly (expire-tiles.c around line 333, should have used min/max lon/lat but used min lon/lat twice). 2009-11-03 09:55 +0000 [r18437] frederik: * fix a bug that would sometimes expire tiles at the other end of the world instead of those where a change has occurred. 2009-10-28 22:27 +0000 [r18353] jonb: * osm2pgsql: Update code to use DROP TABLE IF EXISTS. This avoids errors in the postgresql logs and requires postgresql-8.2+. Fixes ticket #2379. Update version to 0.68 2009-10-27 19:28 +0000 [r18316] jonb: * Add double quotes around the column name when performing lookup otherwsie postgres may convert it to lower case 2009-10-27 14:58 +0000 [r18309] twain: * gazetteer diff updates 2009-10-27 14:10 +0000 [r18308] twain: * code cleanup and support for diff updates 2009-10-15 08:22 +0000 [r18167] frederik: * fix error message 2009-10-07 19:23 +0000 [r18009] jonb: * osm2pgsql: Split very long ways into multiple segments. Mapnik has some rendering artifacts for very long ways, this is the cause of #2234. Currently ways are split after about 100km or 1 degree. This should help the rendering performance too since these large and often complex ways have enormous bounding boxes and are therefore fetched when rendering many tiles. The bounding box of each segment is typically a lot smaller than the complete way. 2009-10-06 20:46 +0000 [r18001] jonb: * Apply fix from Milo to display projection information when executed with: -h -v. Fixes #2357 2009-10-04 12:47 +0000 [r17981] jonb: * Update projection strings to match proj-4.7.1 definitions. 2009-10-02 20:09 +0000 [r17947] jonb: * Cascade node changes all the way through to relations. Previously a node change might only trigger updates to ways without these then triggering a relation update. 2009-09-17 16:55 +0000 [r17671] twain: * Missed out the readme file 2009-09-17 15:06 +0000 [r17669] twain: * missed table name change 2009-09-17 15:01 +0000 [r17668] twain: * Refactored website (php), minor indexing changes, documentation 2009-09-04 19:47 +0000 [r17459] ldp: * Add operator for nodes,ways 2009-09-04 18:52 +0000 [r17456] jonb: * Disable add_parking_node() in osm2pgsql since the current osm.xml renders the symbol on parking areas now. 2009-09-01 15:14 +0000 [r17424] tomhughes: * Fix buffer overflow. 2009-08-28 17:53 +0000 [r17326] jonb: * Update osm2pgsql version to 0.67, the previous change to planet_osm_nodes in the previous commit may break things so a version bump is a good idea 2009-08-28 17:06 +0000 [r17325] jonb: * Use fixed point storage for node positions in planet_osm_nodes. This reduces the DB size which should make things a little bit faster too. 2009-08-07 11:42 +0000 [r16911] twain: * add script to show how an address was constructed 2009-07-19 08:15 +0000 [r16573] avar: * If this parser parses a style file with more than MAX_STYLES it'll start writing into unallocated memory and segfault. This fix should change it to malloc/realloc but I don't have the time now, so I'll just extend the memory it's taking up. 2009-07-14 16:47 +0000 [r16498] twain: * extra chars in postgresql transliteration function introduces ranked sql generation graphical updates to search page support for house numbers and ways/nodes connected using relations 2009-07-08 11:01 +0000 [r16380] twain: * Addition of support for Karlsruhe schema / house numbers Various minor bug fixes 2009-07-01 22:47 +0000 [r16258] twain: * New version of gazetteer, performance and scaleing updates 2009-06-02 12:58 +0000 [r15538] twain: * Misc missing characters 2009-06-02 12:36 +0000 [r15536] twain: * Added Hangul Syllables to transliteration table 2009-06-01 14:19 +0000 [r15460] twain: * correct escape sequence 2009-05-30 11:09 +0000 [r15323-15325] twain: * correct spelling of gazatteer folder * adding multi-language support and relations 2009-05-22 19:00 +0000 [r15176] jonb: * osm2pgsql: consider area key as indicating a polygon. This fixes some multipolygon cases with: highway=pedestrian, area=yes 2009-05-22 18:40 +0000 [r15173] joerg: * ubuntu-hardy has older debhelper 2009-05-22 18:36 +0000 [r15172] jonb: * osm2pgsql: Still allow multipolygons to inherit tags from the outer way even if the relation has a name tag. I've seen several examples where people have added a name tag to a relation even though the wiki says they should be untagged. 2009-05-20 18:54 +0000 [r15131] jonb: * Update osm2pgsql to ignore elements 2009-05-19 22:59 +0000 [r15119] jonb: * osm2pgsql: prevent route relation name from getting into the name column, we just want it in route_name, fixes ticket #1703 2009-05-19 21:52 +0000 [r15118] jonb: * osm2pgsql 0.66: Allow final mod & output steps to run in parallel. Display more information about final index creation steps. Fix bug which caused diff updates of multipolygon relations to leave some incorrect ways behind. Form polygons from boundary relations if the ways form a closed ring. 2009-05-10 13:42 +0000 [r14997] jonb: * Fix polygon ring directions using geos normalize() 2009-05-08 13:51 +0000 [r14965] frederik: * Make sure that osm2pgsql does not attempt to append data to a table when it already has data in a different SRS. Without this patch it is perfectly possible for the mindless user (Y.T.) to create a table with -l and later append to it without -l, which will land you with a "select distinct srid(way) from planet_osm_point" returning two SRSs. Mapnik's queries will then fail with an "Operation on two geometries with different SRIDs" error. Note, this patch only checks the default SRID given in the geometry_columns table. 2009-05-01 16:54 +0000 [r14863] jonb: * fix projection help output. osm2pgsql option for old-style mrecator is -M 2009-04-30 16:20 +0000 [r14846-14847] zere: * Fixed bug in bzip handling near end-of-file, plus better error reporting. * Fixed compiler warnings about unused parameters. 2009-04-30 13:36 +0000 [r14843] tomhughes: * Initial work on generating a gazetteer database. 2009-04-30 13:34 +0000 [r14842] zere: * Changed terminology for choosable backend. 2009-04-30 13:26 +0000 [r14841] zere: * Use bzip2 interface directly, rather than through the zlib compatibility interface to deal with multiple streams in pbzip2-generated files. Also added a 'null' output for testing purposes. 2009-04-22 19:58 +0000 [r14703] stevechilton: * service added for parking_aisle 2009-03-22 13:19 +0000 [r14211] guenther: * - changed path for geoinfo.db in mapnik-osm-updater.sh 2009-03-21 22:27 +0000 [r14207] joerg: * use new name osm2poidb for gpsdrive-update-osm-poi-db; more tests if executables exist; --no-mirror also for geofabrik imports 2009-03-13 21:36 +0000 [r14072] frederik: * simple stand-alone debian packaging for osm2pgsql 2009-03-09 06:47 +0000 [r14039] guenther: * - updated mapnik-osm-updater script for new gpsdrive poi database 2009-03-01 21:41 +0000 [r13945] stevechilton: * add construction to default.style 2009-02-25 18:46 +0000 [r13898] jonb: * osm2pgsql: When processing boundary relations, create linestrings, not polygons geometries, even if they form a closed ring. 2009-02-16 12:16 +0000 [r13756] jochen: * database istn't hardcoded any more 2009-02-15 19:44 +0000 [r13745] jonb: * osm2pgsql: Add ability to generate new columns from default.style when operating in append mode 2009-02-15 18:46 +0000 [r13744] jonb: * osm2pgsql: Attempt to make code work with columns in unexpected order, e.g. if default.style updated. Not fully automatted, you still need to manually create any new columns 2009-02-14 11:33 +0000 [r13721] jonb: * osm2pgsql: Fix likely cause of crash reported by cmarqu. This would trigger if you defined too many coluns defined in your default.style. 2009-02-11 20:28 +0000 [r13671] jonb: * osm2pgsql: remove from some targets since they dont work well with mmm:nnn svnversion strings 2009-02-11 20:24 +0000 [r13670] jonb: * osm2plsql: Use svnversion for version string. Update to version 0.65. Fix compile warning about basename. Switch default error message to direct people at using --help instead of flooding them with all options 2009-02-11 17:28 +0000 [r13668] stevehill: * Replace the in-memory dirty tile store with something a bit more efficient. Also adds support for specifying a range of zoom levels - i.e. "-o 0-17". The output dirty tile list will use the lowest zoom level which accurately describes the tiles which have been expired. 2009-02-10 20:40 +0000 [r13653] jonb: * Perform polygon processing on relations with type=boundary 2009-02-08 20:47 +0000 [r13616] stevechilton: * add capital and lock to default.style 2009-02-08 20:44 +0000 [r13615] jonb: * osm2pgsql: Tweak geos includes to work with geos-3. Hopefully this should continue to work with geos-2.2 as well 2009-02-08 20:19 +0000 [r13613] stevehill: * Link to the OPM expire_tiles.py script 2009-02-08 20:12 +0000 [r13612] stevehill: * Adds tile expiry support - see http://lists.openstreetmap.org/pipermail/dev/2009-February/013934.html This introduces 2 new commandline options: "-e " and "-o ". So, specifying "-e 17 -o /tmp/dirty_tiles" when importing a delta will cause osm2pgsql to generate a list of all zoom level 17 tiles which the delta has made dirty and store it in /tmp/dirty_tiles. Proviso: for polygons, it currently takes a simplistic approach of drawing a bounding box around the whole polygon and marking every tile in the box as dirty. If the bounding box is large (over 30x30Km) the polygon is treated as a line instead, so only the perimeter will be marked as dirty (this is so that huge polygons don't expire vast numbers of tiles and is based on the assumption that we probably aren't going to shade the area of massive polygons). The dirty tile list is maintained in memory as a binary tree and dumped to disk at the end of the run. 2009-02-07 23:36 +0000 [r13578] jonb: * Declate out_pgsql as extern in header file. Rename __unused since it may clash with other definitions. 2009-02-02 22:22 +0000 [r13511] jonb: * osm2pgsql: fixes #1550. Don't inherit tags from ways if the multipolygon has its own tags. Don't match inner way tags if there are no poly_tags to match against 2009-02-01 11:39 +0000 [r13474] stevechilton: * add three addr: lines 2009-01-31 21:34 +0000 [r13470] jonb: * osm2pgsql: Fix relation processing in non-slim mode. It now needs more memory during the processing since it needs to remember ways even if they dont have any tags 2009-01-27 22:59 +0000 [r13407] jonb: * Add barrier for latest osm.xml 2009-01-13 13:55 +0000 [r13189] guenther: * - fixed bug in mapnik-osm-updater.sh preventing generation of poi database 2009-01-04 17:27 +0000 [r12912] jonb: * Fix compile problem by removing output-gazetteer.h reference 2009-01-02 23:58 +0000 [r12828] tomhughes: * Allow osm2pgsql to process planetdiff files. 2008-12-29 12:06 +0000 [r12661] guenther: * - updated creation of poi database in mapnik-osm-updater.sh 2008-12-29 11:21 +0000 [r12659] guenther: * - updated part for generation of gpsdrive POI database in mapnik-osm-updater.sh 2008-12-21 10:10 +0000 [r12447] joerg: * show more directory levels of GeoFabrik with option --all-planet-geofabrik=\? 2008-12-21 09:08 +0000 [r12446] joerg: * add creation of spatial_ref_sys in more cases 2008-12-21 08:47 +0000 [r12445] joerg: * also include spatial_ref_sys.sql, check for more possible postgis versions 2008-12-16 22:12 +0000 [r12383] jonb: * Add ele column as used by latest osm.xml 2008-12-02 23:10 +0000 [r12197] jonb: * Add historic= as polygon 2008-12-02 07:15 +0000 [r12182] joerg: * Add the 900913 File to postgress; change order for granting rights; check for file existence of lwpostgis 2008-11-23 12:46 +0000 [r12049] ksharp: * Fixed case of README.txt in Makefile and SPEC file, fixed make clean to remove generated SPEC file. 2008-11-23 01:25 +0000 [r12044] joerg: * Add support for Ubuntu new Postgis 2008-11-23 01:16 +0000 [r12043] joerg: * Type; missing ` 2008-11-16 12:51 +0000 [r11942] jonb: * Update default.style. We now want to render aerialway on points too 2008-10-28 15:08 +0000 [r11520] martinvoosterhout: * Fix reference to fixed table name planet_osm. Not sure how this one slipped through. 2008-10-22 23:24 +0000 [r11410] jonb: * osm2pgsql: Treat lines and polygons the same way when trying to work out if the way should go into the roads table. This allows ways with both waterway and boundary set to be rendered correctly. Also allow tagged islands to appear. Swap order of entries in the layer table to put the most common ones near the front which will speed up the matching. 2008-10-19 15:37 +0000 [r11320] martinvoosterhout: * Add escaping for \r. 2008-10-19 14:18 +0000 [r11315-11316] joerg: * mapnik-osm-updater.sh: improve searching for tools * mapnik-osm-updater.sh: adapt searching for tools 2008-10-07 22:42 +0000 [r11078] jonb: * Add 'disused' column into osm2pgsql style 2008-09-30 21:25 +0000 [r11007] jonb: * Convert waterway into a polygon to match latest osm.xml 2008-09-08 17:33 +0000 [r10564] guenther: * - replaced script for gpsdrive extensions by binary in mapnik-osm-updater.sh 2008-09-03 20:43 +0000 [r10464] martinvoosterhout: * Turns all creates into modifies for osmChange files. Technically wrong but it matches what osmosis does and should probably be the default until the whole snapshot thing gets sorted out. 2008-09-02 21:25 +0000 [r10429] jonb: * Add power_source column for latest osm.xml 2008-09-02 11:03 +0000 [r10387] martinvoosterhout: * Remove the special cases where extra things need to get prepared when you have intarray. An extra field in the table is much nicer then nasty if statements. 2008-08-30 15:32 +0000 [r10338] martinvoosterhout: * Allow the location of the style file to be specified on the command line. Patch by Roeland Douma. 2008-08-26 19:27 +0000 [r10184] martinvoosterhout: * Typo in index creation. 2008-08-25 21:24 +0000 [r10149] martinvoosterhout: * The optimisation steps should not be applied in append mode since they will take forever on a complete database and patching is supposed to be quick. 2008-08-25 21:06 +0000 [r10148] martinvoosterhout: * Use GIN indexes instead of GIST. This means we require a newer version of PostgreSQL but GiST is way too slow here. Also don't try ANALYSE after each endCopy, takes far too long when just applying a patch. 2008-08-12 21:44 +0000 [r9756] jonb: * Add postgis definition for the 900913 spherical mercator projection we use. Import like: psql gis <900913.sql or \i 900913.sql 2008-08-03 20:09 +0000 [r9441] andreas: * add missing include to compile with gcc-4.3 2008-07-27 20:06 +0000 [r9315-9316] jonb: * osm2pgsql: Drop any left over tmp tables at start of import * Add aerialway as linear way type to osm2pgsql default.style 2008-07-24 00:15 +0000 [r9267] jonb: * osm2pgsql: Comment out debug lines 2008-07-24 00:11 +0000 [r9266] jonb: * osm2pgsql: Fix up crash in relation handling. The list of members does not match the x' arrays if one or more members is a node or relation, do all processing on the arrays instead (maybe the member structure can be expanded in future to make this more generic but this requires changes where xnodes is used in build_geometry etc). 2008-07-24 00:07 +0000 [r9265] jonb: * osm2pgsql: Move type definitions to a more appropriate location 2008-07-23 00:54 +0000 [r9252] jonb: * osm2pgsql: Update multi-polygon algorithm to detect multipolygons with different tags on the inner rings and emit these as ways to be rendered seperately. 2008-07-23 00:31 +0000 [r9251] jonb: * osm2pgsql: reduce frequency of out-of-order node warning. Turns out this just effects the cache efficiency not the operation of the overall processing. This is fine for small files like the ones from Josm. Closes #1058 2008-07-21 09:49 +0000 [r9211] tomhughes: * Only prompt for a password if -W/--password is given. This is what psql does and it allows for implicit authentication as a different user using -U without -W. 2008-07-14 20:41 +0000 [r9013] jonb: * osm2pgsql: Re-order arithmetic expression to avoid overflow at --cache 2048. Fix compile warning 2008-07-11 13:50 +0000 [r8944] martinvoosterhout: * Commit all the necessary changes to make saving and restoring of relations work. This means that when a way that is part of a relation changes the relation will be properly reconstructed. 2008-07-10 09:51 +0000 [r8907] martinvoosterhout: * We can't prepare the statement until the table is created, which makes the program break on a clean database. Hopefully it really does work now... 2008-07-09 18:01 +0000 [r8887] martinvoosterhout: * Clearly you can't even prepare statements relying on intarray if you don't have it. Change code so it all works without properly, as long as you don't try to apply patches. 2008-07-09 15:28 +0000 [r8885-8886] martinvoosterhout: * When a prepared statement fails, log the parameters for debugging purposes. * Finally, add the code to process modifies and deletes from patches. Almost everything should work, except if a member of a relation is changed, the relation isn't updated. If the relation is updated though, it will pick up the new members so it could in principle be worked around by reloading all the relations afterwards. In addition there were the following changes: * Fixing escaping bugs since forever when output-pgsql uses prepared statement mode. * The ways table gets a partial index on pending, for performance. * Only bother with the intarray stuff if we're creating tables. Hope nothing else got borked. 2008-07-09 12:01 +0000 [r8871] martinvoosterhout: * Add the necessary infrastructure to build the GIST indexes for finding ways that need updating when a node moved and things like that. It tests for the intarray module and warns if it doesn't find it. It's not an error to run without since the user may be using slim mode to save memory. Perhaps in time we should look into a seperating the slim and the patching mode more clearly. 2008-07-09 11:02 +0000 [r8867] martinvoosterhout: * Add support for process delete commands for ways and nodes. This is the easy part since we don't need to search for objects depending on them (the diff should contains modifications for them anyway). Relations not done because the whole save/restore for them does not exist at all at the moment. In the process output-pgsql needed to be taught how to handle jumping in and out of COPY mode. 2008-07-09 09:34 +0000 [r8863] martinvoosterhout: * Commit parser changes to support the loading of diffs. Supports both osmChange and JOSM though it doesn't support placeholders (it's not clear that's useful in this context). Anything other than creating still results in an error so far, so it doesn't change anything from a practical point of view yet. In passing, fix a bug where the append option didn't work in slim mode. 2008-06-18 21:01 +0000 [r8319-8320] jonb: * osm2pgsql: Up-rev to 0.55 for the new default projection change * osm2pgsql: Make spherical mercator the default, old format is now -M|--oldmerc 2008-06-17 21:38 +0000 [r8288] joerg: * Revert wrong header change. We need the C(not C++) Header to determine the Version Number of geos 2008-06-17 21:34 +0000 [r8287] jonb: * Add tracktype which is required by latest osm.xml 2008-06-12 10:30 +0000 [r8186] guenther: * - adding poi key 2008-06-10 23:18 +0000 [r8159] joerg: * use 0 instead of 0{@{}}, since it is deprecated in newer perl 2008-06-09 12:36 +0000 [r8143] stevehill: * Added "road" to layers. 2008-06-05 21:09 +0000 [r8109] jonb: * osm2pgsql: Allow printf style arguments to pgsql_exec(). Use table specific temporary name during final data indexing 2008-05-28 07:13 +0000 [r7976] martinvoosterhout: * Add some changes from Edgemaster for MinGW support, see #926 2008-05-27 22:32 +0000 [r7975] jonb: * osm2pgsql: Make -C option work (instead of just --cache). Remove commented out ifdef lines for old slim mode 2008-05-26 21:08 +0000 [r7948] jonb: * Add explicit support for area= into osm2pgsql 2008-05-26 19:33 +0000 [r7947] jonb: * Update osm2pgsql to remove minor memory leak of style data. Free up mid-layer memory before doing final step which only touches the final DB. Move boundary data into roads table. Document use of roads table for low-zoom features. Make final DB step multi-threaded. Update default.style to work with existing mapnik code + osm.xml (otherwise Mapnik fails to handle string/integer comparisons in admin_level). 2008-05-18 08:31 +0000 [r7850] martinvoosterhout: * Give relations a negative ID in the database so they don't clash with other objects. 2008-05-18 08:10 +0000 [r7849] martinvoosterhout: * Add support for route relations. It has some special processing for bicycle routes which I just copied from the gravitystorm code. For normal relations like bus routes it should work also. To actually use bicycle relations the user will need to uncomment the relevent columns in the style file. 2008-05-03 14:13 +0000 [r7641] martinvoosterhout: * Fix bug that was reversing all the ways due to subtle interaction of ordering of nodes. Old code assumed the nodes would be provided in reverse order. 2008-04-29 21:54 +0000 [r7596] joerg: * applications/utils/mapnik-osm-updater.sh: use the directory /usr/share/openstreetmap/ for the default.styles 2008-04-29 21:41 +0000 [r7595] joerg: * comment out creation of users, because it might break the system 2008-04-29 21:11 +0000 [r7593] joerg: * export/osm2pgsql/mapnik-osm-updater.sh: go to right directory for asm2pqsql call 2008-04-29 20:57 +0000 [r7591-7592] joerg: * mapnik default.style:remove gpsdrive line * mapnik default.style: move to /usr/share/openstreetmap-utils for debian package 2008-04-28 22:14 +0000 [r7570] joerg: * mapnik-osm-updater.sh: adapt to new osm2pqsql; add more error checks, fix wrong usage of command users 2008-04-19 21:54 +0000 [r7444] martinvoosterhout: * Add code to coalesce output COPY data into larger blocks to avoid excessive overhead. Also start using some of the pgsql.c helper functions to reduce the amount of code for the standard error checking. 2008-04-19 14:53 +0000 [r7440] martinvoosterhout: * Store empty tag lists as NULLs, to try and squeeze out some more space savings. 2008-04-19 14:18 +0000 [r7436] martinvoosterhout: * Use the same filter_tags code for nodes as we do for ways. Apart from simplifying the code it stops us storing useless tags data in the nodes table (including all the hugely long tiger tags). 2008-04-17 10:33 +0000 [r7397] martinvoosterhout: * Try harder to get large file pointers working 2008-04-15 20:35 +0000 [r7371] martinvoosterhout: * Make the style file's use of tags more strict, we now define a strict set of flags which are used and the remainder are warned about. In particular we have the 'delete' flag which indicates the tag should be ignored entirely. Additionally we now look through all the tags in filter_tags and remove any we don't know about. This is primarily for slim mode, stuff which it doesn't understand should be deleted to save space. 2008-04-13 10:33 +0000 [r7350] martinvoosterhout: * Patch from David Stubbs so that columns defined as integers Just Work(tm). We parse the string directly to an integer if the column is defined as int4. 2008-04-12 17:05 +0000 [r7345] martinvoosterhout: * Add a caching level to the slim-mode with configurable size, so it actually has decent performance. It is implemented as a lossy sparse array with a priority queue tracking how much of each block is used to ensure we maximize the number of nodes we fit in the given amount of memory. Also rearrange some header definitions. 2008-04-11 19:14 +0000 [r7334] martinvoosterhout: * Update version number so people know what they're running 2008-04-11 12:10 +0000 [r7331] martinvoosterhout: * Commit many new changes to osm2pgsql, including: - list of tags read from file - slim mode works again - relations properly supported - more efficient DB usage It includes some restructuring of the code, in particular, the output module manages the mid-level now and the main program doesn't call it at all. This moves many of the previous hacks to the output module which can manage the mid-level as appropriate for its output (i.e. slim mode requires different semantics from ram mode) 2008-03-22 17:58 +0000 [r7141] martinvoosterhout: * Add support for a -E|--proj option which allows users to use any epsg projection that be used by proj4's +init=epsg: format. Should help all those people wanting to do maps in different projections. 2008-03-19 20:00 +0000 [r7120] jonb: * osm2pgsql: Add 'width' key 2008-03-14 11:55 +0000 [r7083] guenther: * - added creation of poi column to --all* options in mapnik-osm-updater.sh 2008-03-09 18:50 +0000 [r7064] guenther: * - added script to add gpsdrive poi-types to mapnik database. use the option --add-gpsdrive-types to activate this feature. this is recommended, if you create the database for use with gpsdrive. 2008-03-07 21:17 +0000 [r7048] jonb: * osm2pgsql: Treat man_made & power as possible areas. Longer term we'll probably need to drop this linear/area designation from osm2pgsql since more keys are being used for both. 2008-03-04 22:46 +0000 [r7032] jonb: * osm2pgsql: request from cmarqu to add wood= into DB 2008-02-18 23:41 +0000 [r6920] jonb: * osm2pgsql: Add authentication options (user, host, port, password). 2008-02-16 19:31 +0000 [r6893] jonb: * osm2pgsql: Convert boundary keys into a linear feature to match the current osm.xml. The bulk of boundaries are defined by multiple ways. If we want polygons then we'll need some way to join these to form closed areas. 2008-02-09 19:21 +0000 [r6816] jonb: * osm2pgsql: Add option to filter import with bounding box 2008-01-31 23:51 +0000 [r6734] jonb: * osm2pgsql: Add power= to exported list 2008-01-03 19:40 +0000 [r6239] joerg: * mapnik-osm-updater.sh: add support for automatically downloading and installing smaller planet excerpts from Frederiks Geofabrik Page 2007-12-30 10:48 +0000 [r6191] joerg: * mapnik-osm-updater.sh: Add option to only download and import euope extract 2007-12-21 23:16 +0000 [r6138-6139] jonb: * osm2pgsql: Comment out the broken --slim mode. Export access= tag. Only create automatic parking symbols if there is no defined access= tag or access=public * osm2pgsql: Update Makefile with Solaris compatability fixes from Martin Spott 2007-12-20 15:59 +0000 [r6116] jochen: * added svn:ignore stuff 2007-12-18 23:11 +0000 [r6089] jonb: * osm2pgsql: Add keys for military, embankment, cutting & admin_level 2007-12-16 17:41 +0000 [r6078] jochen: * changed name of readme.txt to README.txt so that it sticks out more 2007-12-15 15:41 +0000 [r6068] jochen: * typo fixed 2007-12-10 22:02 +0000 [r6012] jonb: * osm2pgsql: Apply gcc-4.3 compile fix from Martin Michlmayr & Andreas Putzo 2007-12-04 22:15 +0000 [r5901] jonb: * osm2pgsql: Add religion into exported tags 2007-11-30 17:02 +0000 [r5834] jonb: * osm2pgsql: make tunnel=yes be equivalent to layer=-1 for rendering order 2007-11-23 17:00 +0000 [r5716] martinvoosterhout: * Update the readme to inform users about the new features and how to use them. Also rename the default projection to "WGS84 Mercator" which better describes what it actually is. 2007-11-23 16:54 +0000 [r5715] martinvoosterhout: * Add support for a --prefix option so that you can easily run multiple mapnik instances out of the one DB. The default is ofcourse still "planet_osm" so if you don't use it you won't see a difference. I did however need to change the names of the indexes so they don't clash also, but this is unlikely to break anything. 2007-11-20 08:51 +0000 [r5633] martinvoosterhout: * Restructure the projection code so it can support more projections, primarily the true spherical mercator used by Google, TileCache and others. Add the -m option to select this. The default is still the incorrect projection used before. Also display the used projection during processing. Finally some minor cleanups to fix some warnings about undefined functions. 2007-11-19 07:11 +0000 [r5594] joerg: * mapnik-osm-updater.sh: correct Error checking 2007-11-14 11:12 +0000 [r5506] joerg: * osm2pgsql/mapnik-osm-updater.sh: add option for bz2 dump files 2007-11-14 11:09 +0000 [r5505] joerg: * osm2pgsql/mapnik-osm-updater.sh: have two options for with/without updatechek on import 2007-11-11 15:29 +0000 [r5456] martinvoosterhout: * Fix the pgsql output so it sets the right projection in the database. Usually not terribly important (which is why it's been broken this long) but if you start trying to do more sophisticated operations on the data it's better if the projection is what it says it is. 2007-10-28 21:24 +0000 [r5223] joerg: * mapnik-osm-updater.sh: rename options - instead of _; allow empty username, write logfile while importing, add updateifchanged option 2007-10-24 22:06 +0000 [r5160] jonb: * osm2pgsql: Drop unused index on z_order. Change clustering to use temporary table which is faster (but uses more temporary disk space). Remove Vacuums since we do not remove or update data. 2007-10-14 20:10 +0000 [r5002] joerg: * mapnik-osm-updater: search for planet-mirror.pl 2007-10-14 10:56 +0000 [r4986] joerg: * mapnik-osm-updater: Add check against own userid and root 2007-10-14 10:33 +0000 [r4983] joerg: * move mapnik-osm-updater.sh to utils where it better fits 2007-10-12 21:18 +0000 [r4955] jonb: * mod_tile: Apache module and rendering daemon for serving OSM tiles 2007-10-10 21:48 +0000 [r4935] jonb: * osm2pgsql: check for null pointer 2007-10-10 21:18 +0000 [r4934] jonb: * osm2pgsql: Need to look for type=multipolygon not a multipolygon key (was breaking all polygons with holes) 2007-10-10 21:04 +0000 [r4933] jonb: * osm2pgsql: Reverse direction of one-way streets (bug #559) 2007-10-09 22:10 +0000 [r4917] jonb: * osm2pgsql: Ensure we only process multipolygon relations. Add pre-filter to reduce memory usage by writing out ways which should never be part of a multipolygon instead of storing them 2007-10-09 19:44 +0000 [r4914] jonb: * osm2pgsql: Trap duplicate points and ways which end up with only a single node. These remove some exceptions 2007-10-09 01:05 +0000 [r4903] jonb: * osm2pgsql: Catch exceptions thrown by geos 2007-10-08 23:23 +0000 [r4901] jonb: * osm2pgsql: Swap lat/lon on parking nodes 2007-10-08 22:11 +0000 [r4897] jonb: * osm2pgsql: Fix some memory leaks. Remove debug output 2007-10-08 22:05 +0000 [r4895] jonb: * osm2pgsql: update to handle polygons with holes in 0.5 API (described using relations). The code is nasty but appears to work on small datasets. 2007-10-07 11:24 +0000 [r4842] gabriel: * Make changes for 0.5. 2007-10-03 19:30 +0000 [r4816] jonb: * osm2pgsql: Reduce memory usage by processing ways during the XML reading 2007-09-07 22:22 +0000 [r4485] jonb: * osm2pgsql 0.07: Make UTF8sanitize optional since it is generally no longer required. Add option to output in latlong format 2007-09-03 22:26 +0000 [r4441] jonb: * osm2pgsql version 0.06. Add command line options to select database name, slim memory usage and appending of data. Ignore bound tag. Improve stdin reading. 2007-09-02 23:00 +0000 [r4426] jonb: * osm2pgsql: Version 0.05. Cleaup progress output 2007-09-02 22:25 +0000 [r4424] jonb: * osm2pgsql: Allow multiple .osm files to be imported simultaneoulsy, e.g. for lots of Tiger county.osm.gz files 2007-08-27 14:49 +0000 [r4319] martinvoosterhout: * Whoops, got the test wrong last commit :) 2007-08-27 14:45 +0000 [r4318] martinvoosterhout: * Patch supplied by David Siegel on the mailing list, with editorialisation by moi. 2007-08-23 18:46 +0000 [r4286] jonb: * osm2pgsql: polygon area now used to determine the rendering order 2007-08-19 18:45 +0000 [r4231] jonb: * osm2pgsql 0.04: Further improve handling of polygons with holes. Reduce memory usage by about 10% 2007-08-19 00:16 +0000 [r4221] jonb: * osm2pgsql version 0.03: Handle polygons with holes correctly. Fix minor memory leak. 2007-08-12 21:05 +0000 [r4092] jonb: * osm2pgsql: Add boundary & tunnel. Enable polygon flag on a few columns. Sort key table 2007-08-12 19:03 +0000 [r4090] jonb: * osm2pgsql: Remove hard coded maximum IDs. Support negative IDs. Add RPM build target 2007-08-09 21:26 +0000 [r4059] jonb: * osm2pgsql: Remove warning flags which cause problems with older GCC 2007-08-03 14:56 +0000 [r3899] joerg: * add some linefeeds to error messages to make them easier readable 2007-08-01 21:17 +0000 [r3887] jonb: * osm2pgsql: increase max IDs to work with latest planet dump 2007-07-28 21:32 +0000 [r3826] jonb: * osm2pgsql: tidy up pgsql code, fix a few warnings and add some disabled code to render multiple name tags. No functional changes 2007-06-20 21:05 +0000 [r3280] jonb: * osm2pgsql: Increase max IDs in middle-ram 2007-05-28 21:25 +0000 [r3052] jonb: * osm2pgsql: improve help text, allow - to be used again 2007-05-28 21:16 +0000 [r3051] jonb: * osm2pgsql: enable O_LARGEFILE 2007-05-23 21:02 +0000 [r3008] artem: * added rendering direction arrows for oneway={yes,true,-1} 2007-05-20 20:48 +0000 [r2966] jonb: * osm2pgsql: Add fix for motorway shields. Move landuse to -1. Make tables public 2007-05-14 19:21 +0000 [r2904] jonb: * mapnik layer= implementation for areas/polygons 2007-05-07 21:35 +0000 [r2827] jonb: * osm2pgsql - make experimental version current, move previous implementation to legacy 2007-05-07 20:59 +0000 [r2826] jonb: * osm2pgsql: Mac OS-X and GEOS-3 compatability tweaks 2007-05-07 13:47 +0000 [r2813] jonb: * osm2pgsql/mapnik database changed to store data in mercator. Saving reprojection during rendering 2007-05-07 13:34 +0000 [r2812] jonb: * osm2pgsql update build_geometry.cpp for get_centroid() 2007-05-06 18:19 +0000 [r2797] jonb: * osm2pgsql exprimental update. Increase max IDs. Implement "add parking node for polygons with amenity=parking" as per latest setup_z_order script. First step towards an incremental update process. 2007-05-05 23:06 +0000 [r2770] jonb: * osm2pgsql - add bz2 and UTF8sanitizer support directly into this code 2007-04-21 06:29 +0000 [r2605] joerg: * move utils to applications. This way it should be easier to build Packages 2007-04-14 11:39 +0000 [r2498] jochen: * Movev lots of stuff into export directory 2007-03-25 00:42 +0000 [r2334] jonb: * osm2pgsql exp: Make sure all polygon table contains only polygons 2007-03-24 15:55 +0000 [r2331-2332] jonb: * Automatic GEOS2/3 detection * Add info on requirements and building 2007-03-24 15:42 +0000 [r2330] jonb: * Automatic GEOS version detection 2007-03-23 20:56 +0000 [r2323] jonb: * Switch to printf(%.15g) to give more precision on generated points 2007-03-22 20:20 +0000 [r2320] jonb: * Replace asprintf. Increase max IDs by 10% to give room for future growth 2007-03-22 10:27 +0000 [r2316] ksharp: * Fixing accidental change to Makefile 2007-03-22 10:17 +0000 [r2314] ksharp: * Added the polygons directory containing the extract-polygon.pl script, a README, and an example polygon. 2007-03-21 00:25 +0000 [r2310] jonb: * Add GEOS_TWO from non-experimental version 2007-03-21 00:11 +0000 [r2309] jonb: * Split implementation into middle and output layers. Choice of RAM or PGSQL middle layers offers speed vs memory tradeoff. Implements new point/line/poly tables with z_order for latest osm.xml 2007-03-17 12:46 +0000 [r2269] nick: * Added foot, horse, motorcar, bicycle and residence tags 2007-03-16 12:37 +0000 [r2267] artem: * Use GEOS_TWO flag to control version being used e.g. CXXFLAGS="-DGEOS_TWO" make 2007-03-13 14:06 +0000 [r2253] artem: * wropping geos stuff in try/catch 2007-03-13 12:39 +0000 [r2252] artem: * latest osm2pgsql generates one table per geometry type 2007-03-10 13:28 +0000 [r2249] jonb: * Direct database version of osm2pgsql 2007-03-10 13:17 +0000 [r2248] jonb: * Clone osm2pgsql files to experimental directory 2007-03-09 10:31 +0000 [r2243] artem: * use geos-config to setup compile flags 2007-03-09 00:26 +0000 [r2242] jonb: * Remove duplicate suppression code since this provides little benefit now that the Tiger data has been removed (the source of almost all the duplicate data). This allows the removal of the AVL & BST code and the ID field from the node/segment/way sctrucutres. This saves some memory and simplifies the code. Fixed a memory leak in WKT which forgot to free the segment item. Added counters for maximum node/segment/way IDs. Split the assert(id) checks to make it obvious which is failing. Cleaned up some white space. 2007-02-27 12:13 +0000 [r2180] artem: * we cannot use anythig appart from 'text' data type 2007-02-27 10:52 +0000 [r2178-2179] artem: * added 'bridge','building' and 'layer' tags * applied geos-2.2.3.patch (slightly modified) from jonb 2007-02-24 19:26 +0000 [r2160] artem: * cluster planet on spatial index for extra speed 2007-02-24 14:50 +0000 [r2159] jonb: * Fix empty segment logic 2007-02-24 08:40 +0000 [r2158] artem: * use geos to create geometries 2007-02-21 23:14 +0000 [r2153] jonb: * Make mapnik & osm2pgsql use NULL instead of empty strings in db 2007-02-21 22:43 +0000 [r2152] artem: * Added myself in place of unknown author 2007-02-12 19:42 +0000 [r2104] jonb: * osm2pgsql polygons for closed ways only 2007-02-11 15:58 +0000 [r2099] jonb: * osm2pgql filter duplicate segments in ways 2007-01-17 14:08 +0000 [r1918] steve: * up the max seg ids 2006-12-04 20:34 +0000 [r1734] nick: * man_made added 2006-12-03 01:01 +0000 [r1718] jonb: * Improved version of osm2pgsql. Adds 'natural' attribute. Some alogorithm improvments to reduce run time. Optional duplicate way detection (at expense of RAM usage). 2006-11-28 21:35 +0000 [r1669] nick: * added natural type 2006-11-27 20:38 +0000 [r1655] jonb: * Initial high level description of code and algorithm. 2006-11-22 15:10 +0000 [r1623] steve: * add railways 2006-11-22 12:36 +0000 [r1622] steve: * add ops to geom col 2006-11-22 11:41 +0000 [r1621] steve: * change varchars to text 2006-11-19 18:34 +0000 [r1604] jonb: * Handle missing nodes and segments instead of putting 0,0 into linestrings which was causing lots of rogue lines to appear on the map. Improved linestring generation for non-contiguous ways. Added a GIST index into the SQL output. Corrected usage info and added a gzip example. Removed some redundant lines. 2006-11-17 10:12 +0000 [r1577] jonb: * Initial version of C implmentation of OSM to Postgresql converter osm2pgsql-0.92.0/README000077700000000000000000000000001302473346700156742README.mdustar00rootroot00000000000000osm2pgsql-0.92.0/README.md000066400000000000000000000137251302473346700150310ustar00rootroot00000000000000# osm2pgsql # osm2pgsql is a tool for loading OpenStreetMap data into a PostgreSQL / PostGIS database suitable for applications like rendering into a map, geocoding with Nominatim, or general analysis. ## Features ## * Converts OSM files to a PostgreSQL DB * Conversion of tags to columns is configurable in the style file * Able to read .gz, .bz2, .pbf and .o5m files directly * Can apply diffs to keep the database up to date * Support the choice of output projection * Configurable table names * Gazetteer back-end for [Nominatim](http://wiki.openstreetmap.org/wiki/Nominatim) * Support for hstore field type to store the complete set of tags in one database field if desired ## Installing ## Most Linux distributions include osm2pgsql. It is also available on macOS with [Homebrew](http://brew.sh/). Unoffical builds for Windows are built by [AppVeyor](https://ci.appveyor.com/project/openstreetmap/osm2pgsql/history) but you need to find the right build artifacts. The latest source code is available in the OSM git repository on github and can be downloaded as follows: ```sh $ git clone git://github.com/openstreetmap/osm2pgsql.git ``` ## Building ## Osm2pgsql uses the cross-platform [CMake build system](https://cmake.org/) to configure and build itself and requires Required libraries are * [expat](http://www.libexpat.org/) * [geos](http://trac.osgeo.org/geos) * [proj](http://proj.osgeo.org/) * [bzip2](http://www.bzip.org/) * [zlib](http://www.zlib.net/) * [Boost libraries](http://www.boost.org/), including system and filesystem * [PostgreSQL](http://www.postgresql.org/) client libraries * [Lua](http://www.lua.org/) (Optional, used for [Lua tag transforms](docs/lua.md)) It also requires access to a database server running [PostgreSQL](http://www.postgresql.org/) 9.1+ and [PostGIS](http://www.postgis.net/) 2.0+. Make sure you have installed the development packages for the libraries mentioned in the requirements section and a C++ compiler which supports C++11. Both GCC 4.8 and Clang 3.4 meet this requirement. First install the dependencies. On a Debian or Ubuntu system, this can be done with: ```sh sudo apt-get install make cmake g++ libboost-dev libboost-system-dev \ libboost-filesystem-dev libexpat1-dev zlib1g-dev \ libbz2-dev libpq-dev libgeos-dev libgeos++-dev libproj-dev lua5.2 \ liblua5.2-dev ``` On a Fedora system, use ```sh sudo yum install cmake gcc-c++ boost-devel expat-devel zlib-devel bzip2-devel \ postgresql-devel geos-devel proj-devel proj-epsg lua-devel ``` On RedHat / CentOS first run `sudo yum install epel-release` then install dependencies like on Fedora. On a FreeBSD system, use ```sh pkg install devel/cmake devel/boost-libs textproc/expat2 \ databases/postgresql94-client graphics/geos graphics/proj lang/lua52 ``` Once dependencies are installed, use CMake to build the Makefiles in a separate folder ```sh mkdir build && cd build cmake .. ``` If some installed dependencies are not found by CMake, more options may need to be set. Typically, setting `CMAKE_PREFIX_PATH` to a list of appropriate paths is sufficient. When the Makefiles have been successfully built, compile with ```sh make ``` The compiled files can be installed with ```sh sudo make install ``` By default, the Release build with debug info is created and no tests are compiled. You can change that behavior by using additional options like following: ```sh cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON ``` ## Usage ## Osm2pgsql has one program, the executable itself, which has **44** command line options. Before loading into a database, the database must be created and the PostGIS and optional hstore extensions must be loaded. A full guide to PostgreSQL setup is beyond the scope of this readme, but with reasonably recent versions of PostgreSQL and PostGIS this can be done with ```sh createdb gis psql -d gis -c 'CREATE EXTENSION postgis; CREATE EXTENSION hstore;' ``` A basic invocation to load the data into the database ``gis`` for rendering would be ```sh osm2pgsql --create --database gis data.osm.pbf ``` This will load the data from ``data.osm.pbf`` into the ``planet_osm_point``, ``planet_osm_line``, ``planet_osm_roads``, and ``planet_osm_polygon`` tables. When importing a large amount of data such as the complete planet, a typical command line would be ```sh osm2pgsql -c -d gis --slim -C \ --flat-nodes planet-latest.osm.pbf ``` where * ```` is about 75% of memory in MiB, to a maximum of about 30000. Additional RAM will not be used. * ```` is a location where a 24GiB file can be saved. Many different data files (e.g., .pbf) can be found at [planet.osm.org](http://planet.osm.org/). The databases from either of these commands can be used immediately by [Mapnik](http://mapnik.org/) for rendering maps with standard tools like [renderd/mod_tile](https://github.com/openstreetmap/mod_tile), [TileMill](https://tilemill-project.github.io/tilemill/), [Nik4](https://github.com/Zverik/Nik4), among others. It can also be used for [spatial analysis](docs/analysis.md) or [shapefile exports](docs/export.md). [Additional documentation is available on writing command lines](docs/usage.md). ## Alternate backends ## In addition to the standard [pgsql](docs/pgsql.md) backend designed for rendering there is also the [gazetteer](docs/gazetteer.md) database for geocoding, principally with [Nominatim](http://www.nominatim.org/), and the null backend for testing. For flexibility a new [multi](docs/multi.md) backend is also available which allows the configuration of custom PostgreSQL tables instead of those provided in the pgsql backend. ## Contributing ## We welcome contributions to osm2pgsql. If you would like to report an issue, please use the [issue tracker on GitHub](https://github.com/openstreetmap/osm2pgsql/issues). More information can be found in [CONTRIBUTING.md](CONTRIBUTING.md). General queries can be sent to the tile-serving@ or dev@ [mailing lists](http://wiki.openstreetmap.org/wiki/Mailing_lists). osm2pgsql-0.92.0/appveyor.yml000066400000000000000000000042311302473346700161320ustar00rootroot00000000000000environment: global: PGUSER: postgres PGPASSWORD: Password12! BOOST_ROOT: c:\libs\boost PREFIX: c:\libs PSQL_ROOT: C:\Program Files\PostgreSQL\9.4 CMAKE_PREFIX_PATH: c:\libs;C:\Program Files\PostgreSQL\9.4 PYTHONPATH: c:\libs matrix: - configuration: Release # Operating system (build VM template) os: Visual Studio 2015 services: # - postgresql # enable when Postgis will be available # scripts that are called at very beginning, before repo cloning init: - git config --global core.autocrlf input # clone directory clone_folder: c:\osm2pgsql clone_depth: 1 platform: x64 install: # by default, all script lines are interpreted as batch - cd c:\ - mkdir libs - curl -O https://dl.dropboxusercontent.com/u/63393258/libs_osm2pgsql_%Configuration%.7z - 7z x libs_osm2pgsql_%Configuration%.7z | find ":" build_script: - mkdir c:\osm2pgsql\build - cd c:\osm2pgsql\build - echo Running cmake... - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - cmake .. -LA -G "NMake Makefiles" -DBOOST_ROOT=%BOOST_ROOT% -DCMAKE_BUILD_TYPE=%Configuration% -DCMAKE_INSTALL_PREFIX=%PREFIX% -DBoost_USE_STATIC_LIBS=ON -DBUILD_TESTS=ON -DBoost_ADDITIONAL_VERSIONS=1.57;1.58;1.59 - nmake - mkdir osm2pgsql-bin - copy /y *.exe osm2pgsql-bin - copy /y ..\*.style osm2pgsql-bin - copy /y ..\*.lua osm2pgsql-bin - copy /y %PREFIX%\bin\lua.dll osm2pgsql-bin - copy /y %PREFIX%\bin\geos.dll osm2pgsql-bin - copy /y "%PSQL_ROOT%\bin\libpq.dll" osm2pgsql-bin - copy /y "%PSQL_ROOT%\bin\libintl-8.dll" osm2pgsql-bin - copy /y "%PSQL_ROOT%\bin\libeay32.dll" osm2pgsql-bin - copy /y "%PSQL_ROOT%\bin\ssleay32.dll" osm2pgsql-bin - 7z a c:\osm2pgsql\osm2pgsql_%Configuration%.zip osm2pgsql-bin -tzip test_script: - set PATH=c:\osm2pgsql\build\osm2pgsql-bin;%PATH% - cd c:\osm2pgsql\build - ctest -VV -L NoDB # - ctest -VV -LE FlatNodes # enable when Postgis will be available #deploy_script: # - cd c:\build # - curl -T osm2pgsql_%Configuration%.zip --user %ACCOUNT% https://webdav.yandex.ru/libs/osm2pgsql_%Configuration%.zip artifacts: - path: osm2pgsql_Release.zip name: osm2pgsql_Release.zip osm2pgsql-0.92.0/cmake/000077500000000000000000000000001302473346700146225ustar00rootroot00000000000000osm2pgsql-0.92.0/cmake/FindLua.cmake000066400000000000000000000140621302473346700171510ustar00rootroot00000000000000#.rst: # FindLua # ------- # # # # Locate Lua library This module defines # # :: # # LUA_FOUND - if false, do not try to link to Lua # LUA_LIBRARIES - both lua and lualib # LUA_INCLUDE_DIR - where to find lua.h # LUA_VERSION_STRING - the version of Lua found # LUA_VERSION_MAJOR - the major version of Lua # LUA_VERSION_MINOR - the minor version of Lua # LUA_VERSION_PATCH - the patch version of Lua # # # # Note that the expected include convention is # # :: # # #include "lua.h" # # and not # # :: # # #include # # This is because, the lua location is not standardized and may exist in # locations other than lua/ #============================================================================= # Copyright 2007-2009 Kitware, Inc. # Copyright 2013 Rolf Eike Beer # # Distributed under the OSI-approved BSD License (the "License"); # see accompanying file Copyright.txt for details. # # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. #============================================================================= # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) unset(_lua_include_subdirs) unset(_lua_library_names) # this is a function only to have all the variables inside go away automatically function(set_lua_version_vars) set(LUA_VERSIONS5 5.3 5.2 5.1 5.0) if (Lua_FIND_VERSION_EXACT) if (Lua_FIND_VERSION_COUNT GREATER 1) set(lua_append_versions ${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR}) endif () elseif (Lua_FIND_VERSION) # once there is a different major version supported this should become a loop if (NOT Lua_FIND_VERSION_MAJOR GREATER 5) if (Lua_FIND_VERSION_COUNT EQUAL 1) set(lua_append_versions ${LUA_VERSIONS5}) else () foreach (subver IN LISTS LUA_VERSIONS5) if (NOT subver VERSION_LESS ${Lua_FIND_VERSION}) list(APPEND lua_append_versions ${subver}) endif () endforeach () endif () endif () else () # once there is a different major version supported this should become a loop set(lua_append_versions ${LUA_VERSIONS5}) endif () foreach (ver IN LISTS lua_append_versions) string(REGEX MATCH "^([0-9]+)\\.([0-9]+)$" _ver "${ver}") list(APPEND _lua_include_subdirs include/lua${CMAKE_MATCH_1}${CMAKE_MATCH_2} include/lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2} include/lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2} ) list(APPEND _lua_library_names lua${CMAKE_MATCH_1}${CMAKE_MATCH_2} lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2} lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2} ) endforeach () set(_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE) set(_lua_library_names "${_lua_library_names}" PARENT_SCOPE) endfunction(set_lua_version_vars) set_lua_version_vars() find_path(LUA_INCLUDE_DIR lua.h HINTS ENV LUA_DIR PATH_SUFFIXES ${_lua_include_subdirs} include/lua include PATHS ~/Library/Frameworks /Library/Frameworks /sw # Fink /opt/local # DarwinPorts /opt/csw # Blastwave /opt ) unset(_lua_include_subdirs) find_library(LUA_LIBRARY NAMES ${_lua_library_names} lua HINTS ENV LUA_DIR PATH_SUFFIXES lib PATHS ~/Library/Frameworks /Library/Frameworks /sw /opt/local /opt/csw /opt ) unset(_lua_library_names) if (LUA_LIBRARY) # include the math library for Unix if (UNIX AND NOT APPLE AND NOT BEOS) find_library(LUA_MATH_LIBRARY m) set(LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}") # For Windows and Mac, don't need to explicitly include the math library else () set(LUA_LIBRARIES "${LUA_LIBRARY}") endif () endif () if (LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h") # At least 5.[012] have different ways to express the version # so all of them need to be tested. Lua 5.2 defines LUA_VERSION # and LUA_RELEASE as joined by the C preprocessor, so avoid those. file(STRINGS "${LUA_INCLUDE_DIR}/lua.h" lua_version_strings REGEX "^#define[ \t]+LUA_(RELEASE[ \t]+\"Lua [0-9]|VERSION([ \t]+\"Lua [0-9]|_[MR])).*") string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MAJOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MAJOR ";${lua_version_strings};") if (LUA_VERSION_MAJOR MATCHES "^[0-9]+$") string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MINOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MINOR ";${lua_version_strings};") string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_RELEASE[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_PATCH ";${lua_version_strings};") set(LUA_VERSION_STRING "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.${LUA_VERSION_PATCH}") else () string(REGEX REPLACE ".*;#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};") if (NOT LUA_VERSION_STRING MATCHES "^[0-9.]+$") string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};") endif () string(REGEX REPLACE "^([0-9]+)\\.[0-9.]*$" "\\1" LUA_VERSION_MAJOR "${LUA_VERSION_STRING}") string(REGEX REPLACE "^[0-9]+\\.([0-9]+)[0-9.]*$" "\\1" LUA_VERSION_MINOR "${LUA_VERSION_STRING}") string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]).*" "\\1" LUA_VERSION_PATCH "${LUA_VERSION_STRING}") endif () unset(lua_version_strings) endif() include(FindPackageHandleStandardArgs) # handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if # all listed variables are TRUE FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR VERSION_VAR LUA_VERSION_STRING) mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARY LUA_MATH_LIBRARY) osm2pgsql-0.92.0/cmake/FindOsmium.cmake000066400000000000000000000263241302473346700177050ustar00rootroot00000000000000#---------------------------------------------------------------------- # # 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 ) # include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS}) # # For the 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 ~/Library/Frameworks /Library/Frameworks /opt/local # DarwinPorts /opt ) set(OSMIUM_INCLUDE_DIRS "${OSMIUM_INCLUDE_DIR}") #---------------------------------------------------------------------- # # 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(ZLIB) find_package(Threads) list(APPEND OSMIUM_EXTRA_FIND_VARS ZLIB_FOUND Threads_FOUND) if(ZLIB_FOUND AND Threads_FOUND) list(APPEND OSMIUM_PBF_LIBRARIES ${ZLIB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) if(WIN32) list(APPEND OSMIUM_PBF_LIBRARIES ws2_32) endif() list(APPEND OSMIUM_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR} ) else() 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) list(APPEND OSMIUM_EXTRA_FIND_VARS EXPAT_FOUND BZIP2_FOUND ZLIB_FOUND Threads_FOUND) 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() 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) list(APPEND OSMIUM_EXTRA_FIND_VARS GEOS_INCLUDE_DIR GEOS_LIBRARY) 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() 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) list(APPEND OSMIUM_EXTRA_FIND_VARS GDAL_FOUND) if(GDAL_FOUND) list(APPEND OSMIUM_LIBRARIES ${GDAL_LIBRARIES}) list(APPEND OSMIUM_INCLUDE_DIRS ${GDAL_INCLUDE_DIRS}) else() 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) list(APPEND OSMIUM_EXTRA_FIND_VARS PROJ_INCLUDE_DIR PROJ_LIBRARY) 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() 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) list(APPEND OSMIUM_EXTRA_FIND_VARS SPARSEHASH_INCLUDE_DIR) 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++. if (NOT CMAKE_VERSION VERSION_LESS 3.0) include(CheckTypeSize) set(CMAKE_REQUIRED_INCLUDES ${SPARSEHASH_INCLUDE_DIR}) set(CMAKE_EXTRA_INCLUDE_FILES "google/sparsetable") check_type_size("google::sparsetable::size_type" SPARSETABLE_SIZE_TYPE LANGUAGE CXX) set(CMAKE_EXTRA_INCLUDE_FILES) set(CMAKE_REQUIRED_INCLUDES) else() set(SPARSETABLE_SIZE_TYPE ${CMAKE_SIZEOF_VOID_P}) 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() 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_EXTRA_FIND_VARS) list(REMOVE_DUPLICATES OSMIUM_EXTRA_FIND_VARS) endif() # 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 ${OSMIUM_EXTRA_FIND_VARS}) unset(OSMIUM_EXTRA_FIND_VARS) #---------------------------------------------------------------------- # # 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" 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() osm2pgsql-0.92.0/cmake/config.h.in000066400000000000000000000013741302473346700166520ustar00rootroot00000000000000#cmakedefine HAVE_LSEEK64 1 #cmakedefine HAVE_LUA 1 #cmakedefine HAVE_POSIX_FADVISE 1 #cmakedefine HAVE_POSIX_FALLOCATE 1 #cmakedefine HAVE_SYNC_FILE_RANGE 1 #cmakedefine HAVE_TERMIOS_H 1 #cmakedefine HAVE_LIBGEN_H 1 #cmakedefine SIZEOF_OFF_T ${SIZEOF_OFF_T} #ifdef _MSC_VER #include typedef SSIZE_T ssize_t; #endif /* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # define _ALL_SOURCE 1 #endif /* Enable GNU extensions on systems that have them. */ #ifndef _GNU_SOURCE # define _GNU_SOURCE 1 #endif /* Enable extensions on HP NonStop. */ #ifndef _TANDEM_SOURCE # define _TANDEM_SOURCE 1 #endif /* Enable general extensions on Solaris. */ #ifndef __EXTENSIONS__ # define __EXTENSIONS__ 1 #endif #define VERSION "@PACKAGE_VERSION@" osm2pgsql-0.92.0/contrib/000077500000000000000000000000001302473346700152025ustar00rootroot00000000000000osm2pgsql-0.92.0/default.style000066400000000000000000000215601302473346700162540ustar00rootroot00000000000000# This is the default osm2pgsql .style file that comes with osm2pgsql. # # A .style file has 4 columns that define how OSM objects end up in tables in # the database and what columns are created. It interacts with the command-line # hstore options. # # Columns # ======= # # OsmType: This is either "node", "way" or "node,way" and indicates if this tag # applies to nodes, ways, or both. # # Tag: The tag # # DataType: The type of the column to be created. Normally "text" # # Flags: Flags that indicate what table the OSM object is moved into. # # There are 6 possible flags. These flags are used both to indicate if a column # should be created, and if ways with the tag are assumed to be areas. The area # assumptions can be overridden with an area=yes/no tag # # polygon - Create a column for this tag, and objects with the tag are areas # # linear - Create a column for this tag # # nocolumn - Override the above and don't create a column for the tag, but do # include objects with this tag # # phstore - Same as polygon,nocolumn for backward compatibility # # delete - Drop this tag completely and don't create a column for it. This also # prevents the tag from being added to hstore columns # # nocache - Deprecated and does nothing # # If an object has a tag that indicates it is an area or has area=yes/1, # osm2pgsql will try to turn it into an area. If it succeeds, it places it in # the polygon table. If it fails (e.g. not a closed way) it places it in the # line table. # # Nodes are never placed into the polygon or line table and are always placed in # the point table. # # Hstore # ====== # # The options --hstore, --hstore-match-only, and --hstore-all interact with # the .style file. # # With --hstore any tags without a column will be added to the hstore column. # This will also cause all objects to be kept. # # With --hstore-match-only the behavior for tags is the same, but objects are # only kept if they have a non-NULL value in one of the columns. # # With --hstore-all all tags are added to the hstore column unless they appear # in the style file with a delete flag, causing duplication between the normal # columns and the hstore column. # # Special database columns # ======================== # # There are some special database columns that if present in the .style file # will be populated by osm2pgsql. # # These are # # z_order - datatype int4 # # way_area - datatype real. The area of the way, in the units of the projection # (e.g. square mercator meters). Only applies to areas # # osm_user - datatype text # osm_uid - datatype integer # osm_version - datatype integer # osm_changeset - datatype integer # osm_timestamp - datatype timestamptz(0). # Used with the --extra-attributes option to include metadata in the database. # If importing with both --hstore and --extra-attributes the meta-data will # end up in the tags hstore column regardless of the style file. # OsmType Tag DataType Flags node,way access text linear node,way addr:housename text linear node,way addr:housenumber text linear node,way addr:interpolation text linear node,way admin_level text linear node,way aerialway text linear node,way aeroway text polygon node,way amenity text polygon node,way area text polygon # hard coded support for area=1/yes => polygon is in osm2pgsql node,way barrier text linear node,way bicycle text linear node,way brand text linear node,way bridge text linear node,way boundary text linear node,way building text polygon node capital text linear node,way construction text linear node,way covered text linear node,way culvert text linear node,way cutting text linear node,way denomination text linear node,way disused text linear node ele text linear node,way embankment text linear node,way foot text linear node,way generator:source text linear node,way harbour text polygon node,way highway text linear node,way historic text polygon node,way horse text linear node,way intermittent text linear node,way junction text linear node,way landuse text polygon node,way layer text linear node,way leisure text polygon node,way lock text linear node,way man_made text polygon node,way military text polygon node,way motorcar text linear node,way name text linear node,way natural text polygon # natural=coastline tags are discarded by a hard coded rule in osm2pgsql node,way office text polygon node,way oneway text linear node,way operator text linear node,way place text polygon node,way population text linear node,way power text polygon node,way power_source text linear node,way public_transport text polygon node,way railway text linear node,way ref text linear node,way religion text linear node,way route text linear node,way service text linear node,way shop text polygon node,way sport text polygon node,way surface text linear node,way toll text linear node,way tourism text polygon node,way tower:type text linear way tracktype text linear node,way tunnel text linear node,way water text polygon node,way waterway text polygon node,way wetland text polygon node,way width text linear node,way wood text linear node,way z_order int4 linear # This is calculated during import way way_area real linear # This is calculated during import # Area tags # We don't make columns for these tags, but objects with them are areas. # Mainly for use with hstore way abandoned:aeroway text polygon,nocolumn way abandoned:amenity text polygon,nocolumn way abandoned:building text polygon,nocolumn way abandoned:landuse text polygon,nocolumn way abandoned:power text polygon,nocolumn way area:highway text polygon,nocolumn # Deleted tags # These are tags that are generally regarded as useless for most rendering. # Most of them are from imports or intended as internal information for mappers # Some of them are automatically deleted by editors. # If you want some of them, perhaps for a debugging layer, just delete the lines. # These tags are used by mappers to keep track of data. # They aren't very useful for rendering. node,way note text delete node,way note:* text delete node,way source text delete node,way source_ref text delete node,way source:* text delete node,way attribution text delete node,way comment text delete node,way fixme text delete # Tags generally dropped by editors, not otherwise covered node,way created_by text delete node,way odbl text delete node,way odbl:note text delete node,way SK53_bulk:load text delete # Lots of import tags # TIGER (US) node,way tiger:* text delete # NHD (US) # NHD has been converted every way imaginable node,way NHD:* text delete node,way nhd:* text delete # GNIS (US) node,way gnis:* text delete # Geobase (CA) node,way geobase:* text delete # NHN (CA) node,way accuracy:meters text delete node,way sub_sea:type text delete node,way waterway:type text delete # KSJ2 (JA) # See also note:ja and source_ref above node,way KSJ2:* text delete # Yahoo/ALPS (JA) node,way yh:* text delete # osak (DK) node,way osak:* text delete # kms (DK) node,way kms:* text delete # ngbe (ES) # See also note:es and source:file above node,way ngbe:* text delete # naptan (UK) node,way naptan:* text delete # Corine (CLC) (Europe) node,way CLC:* text delete # misc node,way 3dshapes:ggmodelk text delete node,way AND_nosr_r text delete node,way import text delete node,way it:fvg:* text delete osm2pgsql-0.92.0/docs/000077500000000000000000000000001302473346700144725ustar00rootroot00000000000000osm2pgsql-0.92.0/docs/Doxyfile000066400000000000000000003111731302473346700162060ustar00rootroot00000000000000# Doxyfile 1.8.9.1 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. # # All text after a double hash (##) is considered a comment and is placed in # front of the TAG it is preceding. # # All text after a single hash (#) is considered a comment and will be ignored. # The format is: # TAG = value [value, ...] # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv # built into libc) for the transcoding. See http://www.gnu.org/software/libiconv # for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded by # double-quotes, unless you are using Doxywizard) that should identify the # project for which the documentation is generated. This name is used in the # title of most generated pages and in a few other places. # The default value is: My Project. PROJECT_NAME = "osm2pgsql" # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version # control system is used. PROJECT_NUMBER = # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a # quick idea about the purpose of the project. Keep the description short. PROJECT_BRIEF = "OpenStreetMap data to PostgreSQL converter" # With the PROJECT_LOGO tag one can specify a logo or an icon that is included # in the documentation. The maximum height of the logo should not exceed 55 # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy # the logo to the output directory. PROJECT_LOGO = # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # into which the generated documentation will be written. If a relative path is # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. OUTPUT_DIRECTORY = "docs" # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and # will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes # performance problems for the file system. # The default value is: NO. CREATE_SUBDIRS = NO # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode # U+3044. # The default value is: NO. ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. # Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, # Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), # Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, # Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), # Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, # Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, # Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, # Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member # descriptions after the members that are listed in the file and class # documentation (similar to Javadoc). Set to NO to disable this. # The default value is: YES. BRIEF_MEMBER_DESC = YES # If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief # description of a member or function before the detailed description # # Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the # brief descriptions will be completely suppressed. # The default value is: YES. REPEAT_BRIEF = YES # This tag implements a quasi-intelligent brief description abbreviator that is # used to form the text in various listings. Each string in this list, if found # as the leading text of the brief description, will be stripped from the text # and the result, after processing the whole list, is used as the annotated # text. Otherwise, the brief description is used as-is. If left blank, the # following values are used ($name is automatically replaced with the name of # the entity):The $name class, The $name widget, The $name file, is, provides, # specifies, contains, represents, a, an and the. ABBREVIATE_BRIEF = # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then # doxygen will generate a detailed section even if there is only a brief # description. # The default value is: NO. ALWAYS_DETAILED_SEC = NO # If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all # inherited members of a class in the documentation of that class as if those # members were ordinary class members. Constructors, destructors and assignment # operators of the base classes will not be shown. # The default value is: NO. INLINE_INHERITED_MEMB = NO # If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path # before files name in the file list and in the header files. If set to NO the # shortest path that makes the file name unique will be used # The default value is: YES. FULL_PATH_NAMES = YES # The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. # Stripping is only done if one of the specified strings matches the left-hand # part of the path. The tag can be used to show relative paths in the file list. # If left blank the directory from which doxygen is run is used as the path to # strip. # # Note that you can specify absolute paths here, but also relative paths, which # will be relative from the directory where doxygen is started. # This tag requires that the tag FULL_PATH_NAMES is set to YES. STRIP_FROM_PATH = # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the # path mentioned in the documentation of a class, which tells the reader which # header file to include in order to use a class. If left blank only the name of # the header file containing the class definition is used. Otherwise one should # specify the list of include paths that are normally passed to the compiler # using the -I flag. STRIP_FROM_INC_PATH = # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but # less readable) file names. This can be useful is your file systems doesn't # support long names like on DOS, Mac, or CD-ROM. # The default value is: NO. SHORT_NAMES = NO # If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the # first line (until the first dot) of a Javadoc-style comment as the brief # description. If set to NO, the Javadoc-style will behave just like regular Qt- # style comments (thus requiring an explicit @brief command for a brief # description.) # The default value is: NO. JAVADOC_AUTOBRIEF = YES # If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first # line (until the first dot) of a Qt-style comment as the brief description. If # set to NO, the Qt-style will behave just like regular Qt-style comments (thus # requiring an explicit \brief command for a brief description.) # The default value is: NO. QT_AUTOBRIEF = NO # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a # multi-line C++ special comment block (i.e. a block of //! or /// comments) as # a brief description. This used to be the default behavior. The new default is # to treat a multi-line C++ comment block as a detailed description. Set this # tag to YES if you prefer the old behavior instead. # # Note that setting this tag to YES also means that rational rose comments are # not recognized any more. # The default value is: NO. MULTILINE_CPP_IS_BRIEF = NO # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the # documentation from any documented member that it re-implements. # The default value is: YES. INHERIT_DOCS = YES # If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new # page for each member. If set to NO, the documentation of a member will be part # of the file/class/namespace that contains it. # The default value is: NO. SEPARATE_MEMBER_PAGES = NO # The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen # uses this value to replace tabs by spaces in code fragments. # Minimum value: 1, maximum value: 16, default value: 4. TAB_SIZE = 4 # This tag can be used to specify a number of aliases that act as commands in # the documentation. An alias has the form: # name=value # For example adding # "sideeffect=@par Side Effects:\n" # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert # newlines. ALIASES = # This tag can be used to specify a number of word-keyword mappings (TCL only). # A mapping has the form "name=value". For example adding "class=itcl::class" # will allow you to use the command class in the itcl::class meaning. TCL_SUBST = # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources # only. Doxygen will then generate output that is more tailored for C. For # instance, some of the names that are used will be different. The list of all # members will be omitted, etc. # The default value is: NO. OPTIMIZE_OUTPUT_FOR_C = NO # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or # Python sources only. Doxygen will then generate output that is more tailored # for that language. For instance, namespaces will be presented as packages, # qualified scopes will look different, etc. # The default value is: NO. OPTIMIZE_OUTPUT_JAVA = NO # Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran # sources. Doxygen will then generate output that is tailored for Fortran. # The default value is: NO. OPTIMIZE_FOR_FORTRAN = NO # Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL # sources. Doxygen will then generate output that is tailored for VHDL. # The default value is: NO. OPTIMIZE_OUTPUT_VHDL = NO # Doxygen selects the parser to use depending on the extension of the files it # parses. With this tag you can assign which parser to use for a given # extension. Doxygen has a built-in mapping, but you can override or extend it # using this tag. The format is ext=language, where ext is a file extension, and # language is one of the parsers supported by doxygen: IDL, Java, Javascript, # C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: # FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: # Fortran. In the later case the parser tries to guess whether the code is fixed # or free formatted code, this is the default for Fortran type files), VHDL. For # instance to make doxygen treat .inc files as Fortran files (default is PHP), # and .f files as C (default is Fortran), use: inc=Fortran f=C. # # Note: For files without extension you can use no_extension as a placeholder. # # Note that for custom extensions you also need to set FILE_PATTERNS otherwise # the files are not read by doxygen. EXTENSION_MAPPING = # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments # according to the Markdown format, which allows for more readable # documentation. See http://daringfireball.net/projects/markdown/ for details. # The output of markdown processing is further processed by doxygen, so you can # mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in # case of backward compatibilities issues. # The default value is: YES. MARKDOWN_SUPPORT = YES # When enabled doxygen tries to link words that correspond to documented # classes, or namespaces to their corresponding documentation. Such a link can # be prevented in individual cases by putting a % sign in front of the word or # globally by setting AUTOLINK_SUPPORT to NO. # The default value is: YES. AUTOLINK_SUPPORT = YES # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want # to include (a tag file for) the STL sources as input, then you should set this # tag to YES in order to let doxygen match functions declarations and # definitions whose arguments contain STL classes (e.g. func(std::string); # versus func(std::string) {}). This also make the inheritance and collaboration # diagrams that involve STL classes more complete and accurate. # The default value is: NO. BUILTIN_STL_SUPPORT = NO # If you use Microsoft's C++/CLI language, you should set this option to YES to # enable parsing support. # The default value is: NO. CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: # http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. SIP_SUPPORT = NO # For Microsoft's IDL there are propget and propput attributes to indicate # getter and setter methods for a property. Setting this option to YES will make # doxygen to replace the get and set methods by a property in the documentation. # This will only work if the methods are indeed getting or setting a simple # type. If this is not the case, or you want to show the methods anyway, you # should set this option to NO. # The default value is: YES. IDL_PROPERTY_SUPPORT = YES # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC # tag is set to YES then doxygen will reuse the documentation of the first # member in the group (if any) for the other members of the group. By default # all members of a group must be documented explicitly. # The default value is: NO. DISTRIBUTE_GROUP_DOC = NO # Set the SUBGROUPING tag to YES to allow class member groups of the same type # (for instance a group of public functions) to be put as a subgroup of that # type (e.g. under the Public Functions section). Set it to NO to prevent # subgrouping. Alternatively, this can be done per class using the # \nosubgrouping command. # The default value is: YES. SUBGROUPING = YES # When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions # are shown inside the group in which they are included (e.g. using \ingroup) # instead of on a separate page (for HTML and Man pages) or section (for LaTeX # and RTF). # # Note that this feature does not work in combination with # SEPARATE_MEMBER_PAGES. # The default value is: NO. INLINE_GROUPED_CLASSES = NO # When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions # with only public data fields or simple typedef fields will be shown inline in # the documentation of the scope in which they are defined (i.e. file, # namespace, or group documentation), provided this scope is documented. If set # to NO, structs, classes, and unions are shown on a separate page (for HTML and # Man pages) or section (for LaTeX and RTF). # The default value is: NO. INLINE_SIMPLE_STRUCTS = NO # When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or # enum is documented as struct, union, or enum with the name of the typedef. So # typedef struct TypeS {} TypeT, will appear in the documentation as a struct # with name TypeT. When disabled the typedef will appear as a member of a file, # namespace, or class. And the struct will be named TypeS. This can typically be # useful for C code in case the coding convention dictates that all compound # types are typedef'ed and only the typedef is referenced, never the tag name. # The default value is: NO. TYPEDEF_HIDES_STRUCT = NO # The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This # cache is used to resolve symbols given their name and scope. Since this can be # an expensive process and often the same symbol appears multiple times in the # code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small # doxygen will become slower. If the cache is too large, memory is wasted. The # cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range # is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 # symbols. At the end of a run doxygen will report the cache usage and suggest # the optimal cache size from a speed point of view. # Minimum value: 0, maximum value: 9, default value: 0. LOOKUP_CACHE_SIZE = 0 #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- # If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in # documentation are documented, even if no documentation was available. Private # class members and static file members will be hidden unless the # EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. # Note: This will also disable the warnings about undocumented members that are # normally produced when WARNINGS is set to YES. # The default value is: NO. EXTRACT_ALL = YES # If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will # be included in the documentation. # The default value is: NO. EXTRACT_PRIVATE = NO # If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal # scope will be included in the documentation. # The default value is: NO. EXTRACT_PACKAGE = NO # If the EXTRACT_STATIC tag is set to YES, all static members of a file will be # included in the documentation. # The default value is: NO. EXTRACT_STATIC = NO # If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined # locally in source files will be included in the documentation. If set to NO, # only classes defined in header files are included. Does not have any effect # for Java sources. # The default value is: YES. EXTRACT_LOCAL_CLASSES = YES # This flag is only useful for Objective-C code. If set to YES, local methods, # which are defined in the implementation section but not in the interface are # included in the documentation. If set to NO, only methods in the interface are # included. # The default value is: NO. EXTRACT_LOCAL_METHODS = NO # If this flag is set to YES, the members of anonymous namespaces will be # extracted and appear in the documentation as a namespace called # 'anonymous_namespace{file}', where file will be replaced with the base name of # the file that contains the anonymous namespace. By default anonymous namespace # are hidden. # The default value is: NO. EXTRACT_ANON_NSPACES = NO # If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all # undocumented members inside documented classes or files. If set to NO these # members will be included in the various overviews, but no documentation # section is generated. This option has no effect if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option # has no effect if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend # (class|struct|union) declarations. If set to NO, these declarations will be # included in the documentation. # The default value is: NO. HIDE_FRIEND_COMPOUNDS = NO # If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any # documentation blocks found inside the body of a function. If set to NO, these # blocks will be appended to the function's detailed documentation block. # The default value is: NO. HIDE_IN_BODY_DOCS = NO # The INTERNAL_DOCS tag determines if documentation that is typed after a # \internal command is included. If the tag is set to NO then the documentation # will be excluded. Set it to YES to include the internal documentation. # The default value is: NO. INTERNAL_DOCS = NO # If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file # names in lower-case letters. If set to YES, upper-case letters are also # allowed. This is useful if you have classes or files whose names only differ # in case and if your file system supports case sensitive file names. Windows # and Mac users are advised to set this option to NO. # The default value is: system dependent. CASE_SENSE_NAMES = YES # If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with # their full class and namespace scopes in the documentation. If set to YES, the # scope will be hidden. # The default value is: NO. HIDE_SCOPE_NAMES = NO # If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will # append additional text to a page's title, such as Class Reference. If set to # YES the compound reference will be hidden. # The default value is: NO. HIDE_COMPOUND_REFERENCE= NO # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of # the files that are included by a file in the documentation of that file. # The default value is: YES. SHOW_INCLUDE_FILES = YES # If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each # grouped member an include statement to the documentation, telling the reader # which file to include in order to use the member. # The default value is: NO. SHOW_GROUPED_MEMB_INC = NO # If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include # files with double quotes in the documentation rather than with sharp brackets. # The default value is: NO. FORCE_LOCAL_INCLUDES = NO # If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the # documentation for inline members. # The default value is: YES. INLINE_INFO = YES # If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the # (detailed) documentation of file and class members alphabetically by member # name. If set to NO, the members will appear in declaration order. # The default value is: YES. SORT_MEMBER_DOCS = YES # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief # descriptions of file, namespace and class members alphabetically by member # name. If set to NO, the members will appear in declaration order. Note that # this will also influence the order of the classes in the class list. # The default value is: NO. SORT_BRIEF_DOCS = NO # If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the # (brief and detailed) documentation of class members so that constructors and # destructors are listed first. If set to NO the constructors will appear in the # respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. # Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief # member documentation. # Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting # detailed member documentation. # The default value is: NO. SORT_MEMBERS_CTORS_1ST = NO # If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy # of group names into alphabetical order. If set to NO the group names will # appear in their defined order. # The default value is: NO. SORT_GROUP_NAMES = NO # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by # fully-qualified names, including namespaces. If set to NO, the class list will # be sorted only by class name, not including the namespace part. # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. # Note: This option applies only to the class list, not to the alphabetical # list. # The default value is: NO. SORT_BY_SCOPE_NAME = NO # If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper # type resolution of all parameters of a function it will reject a match between # the prototype and the implementation of a member function even if there is # only one candidate or it is obvious which candidate to choose by doing a # simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still # accept a match between prototype and implementation in such cases. # The default value is: NO. STRICT_PROTO_MATCHING = NO # The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo # list. This list is created by putting \todo commands in the documentation. # The default value is: YES. GENERATE_TODOLIST = YES # The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test # list. This list is created by putting \test commands in the documentation. # The default value is: YES. GENERATE_TESTLIST = YES # The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug # list. This list is created by putting \bug commands in the documentation. # The default value is: YES. GENERATE_BUGLIST = YES # The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO) # the deprecated list. This list is created by putting \deprecated commands in # the documentation. # The default value is: YES. GENERATE_DEPRECATEDLIST= YES # The ENABLED_SECTIONS tag can be used to enable conditional documentation # sections, marked by \if ... \endif and \cond # ... \endcond blocks. ENABLED_SECTIONS = # The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the # initial value of a variable or macro / define can have for it to appear in the # documentation. If the initializer consists of more lines than specified here # it will be hidden. Use a value of 0 to hide initializers completely. The # appearance of the value of individual variables and macros / defines can be # controlled using \showinitializer or \hideinitializer command in the # documentation regardless of this setting. # Minimum value: 0, maximum value: 10000, default value: 30. MAX_INITIALIZER_LINES = 30 # Set the SHOW_USED_FILES tag to NO to disable the list of files generated at # the bottom of the documentation of classes and structs. If set to YES, the # list will mention the files that were used to generate the documentation. # The default value is: YES. SHOW_USED_FILES = YES # Set the SHOW_FILES tag to NO to disable the generation of the Files page. This # will remove the Files entry from the Quick Index and from the Folder Tree View # (if specified). # The default value is: YES. SHOW_FILES = YES # Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces # page. This will remove the Namespaces entry from the Quick Index and from the # Folder Tree View (if specified). # The default value is: YES. SHOW_NAMESPACES = YES # The FILE_VERSION_FILTER tag can be used to specify a program or script that # doxygen should invoke to get the current version for each file (typically from # the version control system). Doxygen will invoke the program by executing (via # popen()) the command command input-file, where command is the value of the # FILE_VERSION_FILTER tag, and input-file is the name of an input file provided # by doxygen. Whatever the program writes to standard output is used as the file # version. For an example see the documentation. FILE_VERSION_FILTER = # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed # by doxygen. The layout file controls the global structure of the generated # output files in an output format independent way. To create the layout file # that represents doxygen's defaults, run doxygen with the -l option. You can # optionally specify a file name after the option, if omitted DoxygenLayout.xml # will be used as the name of the layout file. # # Note that if you run doxygen from a directory containing a file called # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE # tag is left empty. LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool # to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. CITE_BIB_FILES = #--------------------------------------------------------------------------- # Configuration options related to warning and progress messages #--------------------------------------------------------------------------- # The QUIET tag can be used to turn on/off the messages that are generated to # standard output by doxygen. If QUIET is set to YES this implies that the # messages are off. # The default value is: NO. QUIET = NO # The WARNINGS tag can be used to turn on/off the warning messages that are # generated to standard error (stderr) by doxygen. If WARNINGS is set to YES # this implies that the warnings are on. # # Tip: Turn warnings on while writing the documentation. # The default value is: YES. WARNINGS = YES # If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate # warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag # will automatically be disabled. # The default value is: YES. WARN_IF_UNDOCUMENTED = YES # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for # potential errors in the documentation, such as not documenting some parameters # in a documented function, or documenting parameters that don't exist or using # markup commands wrongly. # The default value is: YES. WARN_IF_DOC_ERROR = YES # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that # are documented, but have no documentation for their parameters or return # value. If set to NO, doxygen will only warn about wrong or incomplete # parameter documentation, but not about the absence of documentation. # The default value is: NO. WARN_NO_PARAMDOC = NO # The WARN_FORMAT tag determines the format of the warning messages that doxygen # can produce. The string should contain the $file, $line, and $text tags, which # will be replaced by the file and line number from which the warning originated # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard # error (stderr). WARN_LOGFILE = #--------------------------------------------------------------------------- # Configuration options related to the input files #--------------------------------------------------------------------------- # The INPUT tag is used to specify the files and/or directories that contain # documented source files. You may enter file names like myfile.cpp or # directories like /usr/src/myproject. Separate the files or directories with # spaces. # Note: If this tag is empty the current directory is searched. INPUT = # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: http://www.gnu.org/software/libiconv) for the list of # possible encodings. # The default value is: UTF-8. INPUT_ENCODING = UTF-8 # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. If left blank the # following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii, # *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, # *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, # *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, # *.qsf, *.as and *.js. FILE_PATTERNS = *.c *.cpp *.h *.hpp *.md # The RECURSIVE tag can be used to specify whether or not subdirectories should # be searched for input files as well. # The default value is: NO. RECURSIVE = NO # The EXCLUDE tag can be used to specify files and/or directories that should be # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. # # Note that relative paths are relative to the directory from which doxygen is # run. EXCLUDE = # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # directories that are symbolic links (a Unix file system feature) are excluded # from the input. # The default value is: NO. EXCLUDE_SYMLINKS = NO # If the value of the INPUT tag contains directories, you can use the # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude # certain files from those directories. # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories for example use the pattern */test/* EXCLUDE_PATTERNS = # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, # AClass::ANamespace, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* EXCLUDE_SYMBOLS = # The EXAMPLE_PATH tag can be used to specify one or more files or directories # that contain example code fragments that are included (see the \include # command). EXAMPLE_PATH = # If the value of the EXAMPLE_PATH tag contains directories, you can use the # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and # *.h) to filter out the source-files in the directories. If left blank all # files are included. EXAMPLE_PATTERNS = # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be # searched for input files to be used with the \include or \dontinclude commands # irrespective of the value of the RECURSIVE tag. # The default value is: NO. EXAMPLE_RECURSIVE = NO # The IMAGE_PATH tag can be used to specify one or more files or directories # that contain images that are to be included in the documentation (see the # \image command). IMAGE_PATH = # The INPUT_FILTER tag can be used to specify a program that doxygen should # invoke to filter for each input file. Doxygen will invoke the filter program # by executing (via popen()) the command: # # # # where is the value of the INPUT_FILTER tag, and is the # name of an input file. Doxygen will then use the output that the filter # program writes to standard output. If FILTER_PATTERNS is specified, this tag # will be ignored. # # Note that the filter must not add or remove lines; it is applied before the # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. INPUT_FILTER = # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern # basis. Doxygen will compare the file name with each pattern and apply the # filter if there is a match. The filters are a list of the form: pattern=filter # (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how # filters are used. If the FILTER_PATTERNS tag is empty or if none of the # patterns match the file name, INPUT_FILTER is applied. FILTER_PATTERNS = # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using # INPUT_FILTER) will also be used to filter the input files that are used for # producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). # The default value is: NO. FILTER_SOURCE_FILES = NO # The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file # pattern. A pattern will override the setting for FILTER_PATTERN (if any) and # it is also possible to disable source filtering for a specific pattern using # *.ext= (so without naming a filter). # This tag requires that the tag FILTER_SOURCE_FILES is set to YES. FILTER_SOURCE_PATTERNS = # If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that # is part of the input, its contents will be placed on the main page # (index.html). This can be useful if you have a project on for instance GitHub # and want to reuse the introduction page also for the doxygen output. USE_MDFILE_AS_MAINPAGE = #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- # If the SOURCE_BROWSER tag is set to YES then a list of source files will be # generated. Documented entities will be cross-referenced with these sources. # # Note: To get rid of all source code in the generated output, make sure that # also VERBATIM_HEADERS is set to NO. # The default value is: NO. SOURCE_BROWSER = NO # Setting the INLINE_SOURCES tag to YES will include the body of functions, # classes and enums directly into the documentation. # The default value is: NO. INLINE_SOURCES = NO # Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any # special comment blocks from generated source code fragments. Normal C, C++ and # Fortran comments will always remain visible. # The default value is: YES. STRIP_CODE_COMMENTS = YES # If the REFERENCED_BY_RELATION tag is set to YES then for each documented # function all documented functions referencing it will be listed. # The default value is: NO. REFERENCED_BY_RELATION = NO # If the REFERENCES_RELATION tag is set to YES then for each documented function # all documented entities called/used by that function will be listed. # The default value is: NO. REFERENCES_RELATION = NO # If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set # to YES then the hyperlinks from functions in REFERENCES_RELATION and # REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will # link to the documentation. # The default value is: YES. REFERENCES_LINK_SOURCE = YES # If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the # source code will show a tooltip with additional information such as prototype, # brief description and links to the definition and documentation. Since this # will make the HTML file larger and loading of large files a bit slower, you # can opt to disable this feature. # The default value is: YES. # This tag requires that the tag SOURCE_BROWSER is set to YES. SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system # (see http://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: # - Install the latest version of global # - Enable SOURCE_BROWSER and USE_HTAGS in the config file # - Make sure the INPUT points to the root of the source tree # - Run doxygen as normal # # Doxygen will invoke htags (and that will in turn invoke gtags), so these # tools must be available from the command line (i.e. in the search path). # # The result: instead of the source browser generated by doxygen, the links to # source code will now point to the output of htags. # The default value is: NO. # This tag requires that the tag SOURCE_BROWSER is set to YES. USE_HTAGS = NO # If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a # verbatim copy of the header file for each class for which an include is # specified. Set to NO to disable this. # See also: Section \class. # The default value is: YES. VERBATIM_HEADERS = YES #--------------------------------------------------------------------------- # Configuration options related to the alphabetical class index #--------------------------------------------------------------------------- # If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all # compounds will be generated. Enable this if the project contains a lot of # classes, structs, unions or interfaces. # The default value is: YES. ALPHABETICAL_INDEX = YES # The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in # which the alphabetical index list will be split. # Minimum value: 1, maximum value: 20, default value: 5. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. COLS_IN_ALPHA_INDEX = 5 # In case all classes in a project start with a common prefix, all classes will # be put under the same header in the alphabetical index. The IGNORE_PREFIX tag # can be used to specify a prefix (or a list of prefixes) that should be ignored # while generating the index headers. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = #--------------------------------------------------------------------------- # Configuration options related to the HTML output #--------------------------------------------------------------------------- # If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output # The default value is: YES. GENERATE_HTML = YES # The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of # it. # The default directory is: html. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_OUTPUT = html # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each # generated HTML page (for example: .htm, .php, .asp). # The default value is: .html. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_FILE_EXTENSION = .html # The HTML_HEADER tag can be used to specify a user-defined HTML header file for # each generated HTML page. If the tag is left blank doxygen will generate a # standard header. # # To get valid HTML the header file that includes any scripts and style sheets # that doxygen needs, which is dependent on the configuration options used (e.g. # the setting GENERATE_TREEVIEW). It is highly recommended to start with a # default header using # doxygen -w html new_header.html new_footer.html new_stylesheet.css # YourConfigFile # and then modify the file new_header.html. See also section "Doxygen usage" # for information on how to generate the default header that doxygen normally # uses. # Note: The header is subject to change so you typically have to regenerate the # default header when upgrading to a newer version of doxygen. For a description # of the possible markers and block names see the documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_HEADER = # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each # generated HTML page. If the tag is left blank doxygen will generate a standard # footer. See HTML_HEADER for more information on how to generate a default # footer and what special commands can be used inside the footer. See also # section "Doxygen usage" for information on how to generate the default footer # that doxygen normally uses. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_FOOTER = # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style # sheet that is used by each HTML page. It can be used to fine-tune the look of # the HTML output. If left blank doxygen will generate a default style sheet. # See also section "Doxygen usage" for information on how to generate the style # sheet that doxygen normally uses. # Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as # it is more robust and this tag (HTML_STYLESHEET) will in the future become # obsolete. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_STYLESHEET = # The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined # cascading style sheets that are included after the standard style sheets # created by doxygen. Using this option one can overrule certain style aspects. # This is preferred over using HTML_STYLESHEET since it does not replace the # standard style sheet and is therefore more robust against future updates. # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the # list). For an example see the documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or # other source files which should be copied to the HTML output directory. Note # that these files will be copied to the base HTML output directory. Use the # $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these # files. In the HTML_STYLESHEET file, use the file name only. Also note that the # files will be copied as-is; there are no commands or markers available. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see # http://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_COLORSTYLE_HUE = 220 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors # in the HTML output. For a value of 0 the output will use grayscales only. A # value of 255 will produce the most vivid colors. # Minimum value: 0, maximum value: 255, default value: 100. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_COLORSTYLE_SAT = 100 # The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the # luminance component of the colors in the HTML output. Values below 100 # gradually make the output lighter, whereas values above 100 make the output # darker. The value divided by 100 is the actual gamma applied, so 80 represents # a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not # change the gamma. # Minimum value: 40, maximum value: 240, default value: 80. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_COLORSTYLE_GAMMA = 80 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML # page will contain the date and time when the page was generated. Setting this # to NO can help when comparing the output of multiple runs. # The default value is: YES. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_TIMESTAMP = YES # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_DYNAMIC_SECTIONS = NO # With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries # shown in the various tree structured indices initially; the user can expand # and collapse entries dynamically later on. Doxygen will expand the tree to # such a level that at most the specified number of entries are visible (unless # a fully collapsed tree already exceeds this amount). So setting the number of # entries 1 will produce a full collapsed tree by default. 0 is a special value # representing an infinite number of entries and will result in a full expanded # tree by default. # Minimum value: 0, maximum value: 9999, default value: 100. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development # environment (see: http://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at # startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_DOCSET = NO # This tag determines the name of the docset feed. A documentation feed provides # an umbrella under which multiple documentation sets from a single provider # (such as a company or product suite) can be grouped. # The default value is: Doxygen generated docs. # This tag requires that the tag GENERATE_DOCSET is set to YES. DOCSET_FEEDNAME = "Doxygen generated docs" # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_DOCSET is set to YES. DOCSET_BUNDLE_ID = org.doxygen.Project # The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify # the documentation publisher. This should be a reverse domain-name style # string, e.g. com.mycompany.MyDocSet.documentation. # The default value is: org.doxygen.Publisher. # This tag requires that the tag GENERATE_DOCSET is set to YES. DOCSET_PUBLISHER_ID = org.doxygen.Publisher # The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. # The default value is: Publisher. # This tag requires that the tag GENERATE_DOCSET is set to YES. DOCSET_PUBLISHER_NAME = Publisher # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three # additional HTML index files: index.hhp, index.hhc, and index.hhk. The # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop # (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on # Windows. # # The HTML Help Workshop contains a compiler that can convert all HTML output # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML # files are now used as the Windows 98 help format, and will replace the old # Windows help format (.hlp) on all Windows platforms in the future. Compressed # HTML files also contain an index, a table of contents, and you can search for # words in the documentation. The HTML workshop also contains a viewer for # compressed HTML files. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_HTMLHELP = NO # The CHM_FILE tag can be used to specify the file name of the resulting .chm # file. You can add a path in front of the file if the result should not be # written to the html output directory. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. CHM_FILE = # The HHC_LOCATION tag can be used to specify the location (absolute path # including file name) of the HTML help compiler (hhc.exe). If non-empty, # doxygen will try to run the HTML help compiler on the generated index.hhp. # The file has to be specified with full path. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. HHC_LOCATION = # The GENERATE_CHI flag controls if a separate .chi index file is generated # (YES) or that it should be included in the master .chm file (NO). # The default value is: NO. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. GENERATE_CHI = NO # The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc) # and project file content. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. CHM_INDEX_ENCODING = # The BINARY_TOC flag controls whether a binary table of contents is generated # (YES) or a normal table of contents (NO) in the .chm file. Furthermore it # enables the Previous and Next buttons. # The default value is: NO. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. BINARY_TOC = NO # The TOC_EXPAND flag can be set to YES to add extra items for group members to # the table of contents of the HTML help documentation and to the tree view. # The default value is: NO. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. TOC_EXPAND = NO # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and # QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that # can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help # (.qch) of the generated HTML documentation. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_QHP = NO # If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify # the file name of the resulting .qch file. The path specified is relative to # the HTML output folder. # This tag requires that the tag GENERATE_QHP is set to YES. QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace # (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual # Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- # folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom # Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- # filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom # Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- # filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: # http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = # The QHG_LOCATION tag can be used to specify the location of Qt's # qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the # generated .qhp file. # This tag requires that the tag GENERATE_QHP is set to YES. QHG_LOCATION = # If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be # generated, together with the HTML files, they form an Eclipse help plugin. To # install this plugin and make it available under the help contents menu in # Eclipse, the contents of the directory containing the HTML and XML files needs # to be copied into the plugins directory of eclipse. The name of the directory # within the plugins directory should be the same as the ECLIPSE_DOC_ID value. # After copying Eclipse needs to be restarted before the help appears. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_ECLIPSEHELP = NO # A unique identifier for the Eclipse help plugin. When installing the plugin # the directory name containing the HTML and XML files should also have this # name. Each documentation set should have its own identifier. # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. ECLIPSE_DOC_ID = org.doxygen.Project # If you want full control over the layout of the generated HTML pages it might # be necessary to disable the index and replace it with your own. The # DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top # of each HTML page. A value of NO enables the index and the value YES disables # it. Since the tabs in the index contain the same information as the navigation # tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. DISABLE_INDEX = NO # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index # structure should be generated to display hierarchical information. If the tag # value is set to YES, a side panel will be generated containing a tree-like # index structure (just like the one that is generated for HTML Help). For this # to work a browser that supports JavaScript, DHTML, CSS and frames is required # (i.e. any modern browser). Windows users are probably better off using the # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can # further fine-tune the look of the index. As an example, the default style # sheet generated by doxygen has an example that shows how to put an image at # the root of the tree instead of the PROJECT_NAME. Since the tree basically has # the same information as the tab index, you could consider setting # DISABLE_INDEX to YES when enabling this option. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_TREEVIEW = NO # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that # doxygen will group on one line in the generated HTML documentation. # # Note that a value of 0 will completely suppress the enum values from appearing # in the overview section. # Minimum value: 0, maximum value: 20, default value: 4. # This tag requires that the tag GENERATE_HTML is set to YES. ENUM_VALUES_PER_LINE = 4 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used # to set the initial width (in pixels) of the frame in which the tree is shown. # Minimum value: 0, maximum value: 1500, default value: 250. # This tag requires that the tag GENERATE_HTML is set to YES. TREEVIEW_WIDTH = 250 # If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to # external symbols imported via tag files in a separate window. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. EXT_LINKS_IN_WINDOW = NO # Use this tag to change the font size of LaTeX formulas included as images in # the HTML documentation. When you change the font size after a successful # doxygen run you need to manually remove any form_*.png images from the HTML # output directory to force them to be regenerated. # Minimum value: 8, maximum value: 50, default value: 10. # This tag requires that the tag GENERATE_HTML is set to YES. FORMULA_FONTSIZE = 10 # Use the FORMULA_TRANPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # # Note that when changing this option you need to delete any form_*.png files in # the HTML output directory before the changes have effect. # The default value is: YES. # This tag requires that the tag GENERATE_HTML is set to YES. FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see # http://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path # to it using the MATHJAX_RELPATH option. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. USE_MATHJAX = NO # When MathJax is enabled you can set the default output format to be used for # the MathJax output. See the MathJax site (see: # http://docs.mathjax.org/en/latest/output.html) for more details. # Possible values are: HTML-CSS (which is slower, but has the best # compatibility), NativeMML (i.e. MathML) and SVG. # The default value is: HTML-CSS. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_FORMAT = HTML-CSS # When MathJax is enabled you need to specify the location relative to the HTML # output directory using the MATHJAX_RELPATH option. The destination directory # should contain the MathJax.js script. For instance, if the mathjax directory # is located at the same level as the HTML output directory, then # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of # MathJax from http://www.mathjax.org before deployment. # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_EXTENSIONS = # The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces # of code that will be used on startup of the MathJax code. See the MathJax site # (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an # example see the documentation. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_CODEFILE = # When the SEARCHENGINE tag is enabled doxygen will generate a search box for # the HTML output. The underlying search engine uses javascript and DHTML and # should work on any modern browser. Note that when using HTML help # (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) # there is already a search function so this one should typically be disabled. # For large projects the javascript based search engine can be slow, then # enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to # search using the keyboard; to jump to the search box use + S # (what the is depends on the OS and browser, but it is typically # , /