Merge branch 'master' into travis-improvements

Conflicts: .travis.yml
2026-10-02 16:35:40 +02:00 · 2016-01-29 10:30:19 -08:00
parent 88d02915d7 4aa0ddd54a
commit bbd233c0ec
34 changed files with 33683 additions and 291 deletions
@@ -32,8 +32,7 @@ install:
 - make

 script:
- - echo '{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[0,0]}}' > test.json
- - ./tippecanoe -o test.mbtiles test.json
+ - make test
 - if [ -n "${COVERAGE}" ]; then
       rm vector_tile.pb.o;
       ${COVERAGE} -lp *.o;