Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Add osmium support for handling different kind of files #15

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

WIP: Add osmium support for handling different kind of files #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ccc89d5
chore: integrate libosmium for reading files
Aug 18, 2020
c96bd24
chore: updated cpplint rules
Aug 19, 2020
f1aa563
chore: fixes and code cleanup
Aug 19, 2020
4e58faf
chore: more clang warnings fixes
Aug 19, 2020
96e9fc0
chore: update travis.ci configuration
Aug 19, 2020
df304d1
chore included missing files
Aug 19, 2020
fbdec40
chore: disable osmium version check
Aug 19, 2020
fe13982
fix: add missing changes
Aug 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CMakeCache.txt
*.a
cmake_install.cmake
*~
cmake-build-*
CMakeFiles
*.cfg
*.cmake
Expand Down
11 changes: 10 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
language: cpp

sudo: true
os:
- linux
- osx

dist: bionic
osx_image: xcode12

compiler:
- gcc
- clang
Expand All @@ -14,9 +17,15 @@ addons:
- ubuntu-toolchain-r-test
packages:
- cmake
- libosmium2-dev
homebrew:
packages:
- libosmium
- boost

before_install:
- export LD_LIBRARY_PATH=$(if [[ $CXX == "clang++" ]]; then echo -n '/usr/local/clang/lib'; fi)
- git clone https://github.com/mapbox/protozero.git && cd protozero && cmake . -DINSTALL_GDALCPP=ON -DINSTALL_UTFCPP=ON && sudo make -j4 install && cd ..

before_script:
- mkdir build
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ enable_testing()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/build")

find_package(Osmium REQUIRED COMPONENTS pbf xml io)

find_package(OpenMP)
if (OPENMP_FOUND)
Expand Down
Loading