Merge branch 'master' into plugins

Browse Source

...

This commit is contained in:

Eric Fischer

2017-03-15 16:19:33 -07:00

parent 9cbbc4c68d 8c6f6250b1

commit eaff7b93c5

18 changed files with 213 additions and 306 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

tests/ne_110m_admin_0_countries/out/-z4_-yname.json

+2 -6

File diff suppressed because one or more lines are too long

tests/ne_110m_admin_0_countries/out/-z4_-yname_--drop-polygons.json

+2 -6

File diff suppressed because one or more lines are too long

tests/ne_110m_admin_0_countries/out/-z4_-yname_--grid-low-zooms_-D8.json

+33 -135

File diff suppressed because one or more lines are too long

tests/ne_110m_admin_0_countries/out/-z4_-yname_--no-tiny-polygon-reduction.json

+2 -6

File diff suppressed because one or more lines are too long

tests/ne_110m_admin_0_countries/out/-z4_-yname_-S4.json

+1 -3

File diff suppressed because one or more lines are too long

tests/ne_110m_admin_0_countries/out/-z4_-yname_-pD.json

+5 -15

File diff suppressed because one or more lines are too long

tests/ne_110m_admin_0_countries/out/-z4_-yname_-pc.json

+36 -108

File diff suppressed because one or more lines are too long

tests/ne_110m_admin_0_countries/out/-z5_-M5000_--drop-smallest-as-needed.json

+2 -6

File diff suppressed because one or more lines are too long

tests/tl_2015_us_county/out/-z8.json

+3 -9

File diff suppressed because one or more lines are too long

tests/wraparound/in.json

+7

File diff suppressed because one or more lines are too long

tests/wraparound/out/-z5_--detect-longitude-wraparound.json

+78

File diff suppressed because one or more lines are too long