Commit Graph
100 Commits
Author SHA1 Message Date
Eric Fischer 4b66aa828d Geobuf testing exposes a bug in type coercion of 0.0 to boolean 2017-08-29 11:43:39 -07:00
Eric Fischer 7c031a9796 Memory-map geobuf input instead of reading it into a temporary string 2017-08-28 11:30:30 -07:00
Eric Fischer 5943c82457 Move file-format-neutral code out of JSON-specific source file 2017-08-28 11:10:57 -07:00
Eric Fischer 8d09f0769e Fix multipolygon and feature ID parsing 2017-08-25 17:40:08 -07:00
Eric Fischer ad89fb88fb Most of the way through geometry decoding 2017-08-25 16:36:53 -07:00
Eric Fischer b98bf6e8c7 Get attribute value decoding working 2017-08-25 15:46:32 -07:00
Eric Fischer 75be013059 Start on geobuf parsing 2017-08-25 14:56:03 -07:00
Eric Fischer e7ee83f27b Move attribute type coercion out of parsing and into serialization 2017-08-24 17:27:30 -07:00
Eric Fischer f4818ffb07 Move attribute include/exclude logic into serialization 2017-08-24 17:10:15 -07:00
Eric Fischer 34b1b215f4 Move tilestats management out of parsing and into serialization 2017-08-24 16:30:01 -07:00
Eric Fischer ed8fbd0236 Split more serialization details out from being parsing parameters 2017-08-24 15:57:33 -07:00
Eric Fischer b114e22d39 Factor out geometry fixups 2017-08-23 12:48:45 -07:00
Eric Fischer 6caf20b9c8 Put the pieces back together 2017-08-23 11:43:48 -07:00
Eric Fischer 6cea2d5db6 Progress on factoring out serialization state into a single object 2017-08-22 18:10:52 -07:00
Eric Fischer 235dbf57af More progress on splitting apart parsing and serialization 2017-08-22 16:51:11 -07:00
Eric Fischer f0b32cf710 Merge branch 'master' into geobuf 2017-08-22 16:21:03 -07:00
Eric Fischer e7f264fa51 Merge pull request #458 from mapbox/nan-infinity
Add better diagnostics for NaN or Infinity in input JSON
2017-08-22 15:49:45 -07:00
Eric Fischer 0b3e731f0b Add better diagnostics for NaN or Infinity in input JSON 2017-08-21 10:44:04 -07:00
Eric Fischer 071b4efdab Merge pull request #451 from mapbox/no-tile-stats
Add an option not to produce tilestats
2017-08-16 15:23:29 -07:00
Eric Fischer 4d1ddc5a03 Add tile-join options to select zoom levels to copy 2017-08-16 13:49:16 -07:00
Eric Fischer e6fc22187a Tilestats metadata no longer needs to be limited to 60K 2017-08-16 12:53:10 -07:00
Eric Fischer 8f02aa40c4 Improve tile-join documentation 2017-08-15 15:55:53 -07:00
Eric Fischer 205c28bb64 Fix tilestats with truncated strings. Trim tilestats if TileJSON is huge 2017-08-15 11:23:03 -07:00
Eric Fischer 5fc261020c Add tests for not producing tilestats 2017-08-15 10:41:00 -07:00
Eric Fischer 372194cee9 Add an option not to produce tilestats 2017-08-15 10:35:41 -07:00
Eric Fischer b1620f6c59 Work on factoring out serial_feature 2017-08-15 10:25:11 -07:00
Eric Fischer 23a4ed8754 Merge branch 'master' into geobuf 2017-08-10 10:28:17 -07:00
Eric Fischer f5111857d2 Merge pull request #332 from mapbox/plugins
Add plugin support
2017-08-09 14:13:27 -07:00
Eric Fischer e453e32321 Fix test flakiness for filtered tile-join, and some other warnings. 2017-08-09 11:30:16 -07:00
Eric Fischer 915b1481ad Forgot to check in this file 2017-08-09 10:27:21 -07:00
Eric Fischer 200f6777ba Fix layer list in tilestats when filtering and tile-joining.
(The feature count when filtering will be the sum of features
across tiles instead of filters from the original input, since
the filter reader doesn't know what the original input feature
set was.)
2017-08-08 16:41:20 -07:00
Eric Fischer 635429cd87 Fix dangling pointer. Defer tilestats generation until tiling if filtering. 2017-08-08 13:38:48 -07:00
Eric Fischer eebc8f7639 Remember to close polygons before sending them to the prefilter 2017-08-08 11:58:51 -07:00
Eric Fischer c79f19e3ca Merge branch 'master' into plugins 2017-08-08 11:08:10 -07:00
Eric Fischer fa0e38da2b First stages of geobuf support 2017-08-08 10:31:26 -07:00
Eric Fischer e982b2f6a7 Merge pull request #436 from mapbox/tilestats
Generate layer, feature, and attribute statistics as part of tileset metadata
2017-07-27 14:11:42 -07:00
Eric Fischer 8280c3f99d Bump version number 2017-07-27 13:44:51 -07:00
Eric Fischer cc28bbab3a Move the tilestats into the "json" row of the metadata 2017-07-26 09:54:49 -07:00
Eric Fischer 5a09fcc35e Some basic unit tests for string truncation 2017-07-21 14:27:30 -07:00
Eric Fischer a373c2516a Remove debugging code 2017-07-21 13:17:21 -07:00
Eric Fischer 9ec52f2c90 Merge branch 'master' into tilestats 2017-07-21 13:08:33 -07:00
Eric Fischer 7e6d10c2fa In tilestats, truncate and merge layers and attributes with long names 2017-07-21 12:56:30 -07:00
Eric Fischer 62f135a97d Exclude long attribute values from tilestats output, as specified 2017-07-21 12:28:14 -07:00
Eric Fischer 00aed42c0e Add missing #include 2017-07-20 23:10:45 -07:00
Eric Fischer 518c8db790 Straighten out the extra tilestat attributes in some joined tilesets
The problem was in the case where the CSV provided a new value for
an attribute that replaced an existing value. Both the old and new
value were being included in the tilestats instead of just the new.
2017-07-20 17:39:41 -07:00
Eric Fischer 54cbc570f1 Don't write to a directory that contains an existing tileset.
The -f option will clear the directory now, as with mbtiles.
2017-07-20 14:17:09 -07:00
Eric Fischer 855e344552 Don't keep tilestats for features that are filtered out in tile-join 2017-07-19 16:53:53 -07:00
Eric Fischer 97d0b2a1b5 Retain attributes in alphabetical order, for consistency 2017-07-19 16:40:06 -07:00
Eric Fischer 3cafef89f1 Factor out duplicated tilestats code 2017-07-19 14:45:15 -07:00
Eric Fischer 7b03e1ee87 Include tilestats in the metadata table. (Not all tests are passing) 2017-07-19 13:09:47 -07:00
Eric Fischer 9078098511 Only insert a new tilestats record if there isn't already one 2017-07-18 17:28:30 -07:00
Eric Fischer b3078ddeec Also make tilestats in tile-join 2017-07-18 16:53:06 -07:00
Eric Fischer 81e3f09024 Merge pull request #440 from mapbox/no-geoms
Close mbtiles properly when exiting because there are no features
2017-07-18 14:21:11 -07:00
Eric Fischer 9304bc5ca1 Generate the rest of the tilestats 2017-07-18 14:20:33 -07:00
Eric Fischer ba82ef8274 Complain if the output file or directory is specified more than once 2017-07-18 14:11:48 -07:00
Eric Fischer 3eb1237b0a Progress on generating tilestats as JSON 2017-07-18 13:27:37 -07:00
Eric Fischer 6ac9ca3709 Bump version number 2017-07-18 10:50:25 -07:00
Eric Fischer 18f9a8dbb7 Close mbtiles properly when exiting because there are no features 2017-07-18 09:54:59 -07:00
Eric Fischer 71f57793fd Derive tilejson attribute types from sample attribute values 2017-07-17 17:31:46 -07:00
Eric Fischer 77bf14bfb0 Track sample values for each attribute in each layer 2017-07-17 13:28:46 -07:00
Eric Fischer b1771a3365 Make layer attributes a map to sample values 2017-07-17 11:58:37 -07:00
Eric Fischer 7445feb845 Work in the direction of tracking representative attribute values 2017-07-14 17:59:24 -07:00
Eric Fischer 62ee53992b Track how many features of each type are in each layer 2017-07-14 17:23:41 -07:00
Eric Fischer 65c095cc2b Clean up #includes and add fields for counting attributes 2017-07-14 16:56:23 -07:00
Eric Fischer 6a505cdba7 Add an example of a zoom level filter 2017-07-07 17:41:06 -07:00
Eric Fischer 24a182772f Merge pull request #433 from mapbox/getopt
Add long options to tippecanoe-decode and tile-join. Add --quiet to to tile-join.
2017-07-07 14:44:28 -07:00
Eric Fischer c164a3e69b Add long options to tippecanoe-decode and tile-join. Add --quiet to tile-join. 2017-07-07 12:51:49 -07:00
Eric Fischer 04d0cc6fa1 Merge branch 'master' into plugins 2017-07-06 22:28:35 -07:00
Eric Fischer 412be8e6fc Merge pull request #431 from mapbox/protozero-1.5.2
Upgrade protozero to version 1.5.2
2017-06-30 15:37:35 -07:00
Eric Fischer 3ba45c7277 Upgrade protozero to version 1.5.2 2017-06-30 11:20:26 -07:00
Eric Fischer bd845ac57d Merge pull request #429 from mapbox/bom2
Ignore UTF-8 byte order mark if present
2017-06-29 15:25:31 -07:00
Eric Fischer dd0a135b01 Ignore UTF-8 byte order mark if present 2017-06-29 14:42:42 -07:00
Eric Fischer 240ccbd219 Merge pull request #426 from mapbox/extend-zooms
Add an option to increase maxzoom if features are still being dropped
2017-05-31 14:07:57 -07:00
Eric Fischer dba24959ba Avoid potential infinite loop from choosing the same min density again 2017-05-31 11:02:02 -07:00
Eric Fischer cf3a0800b8 Add an option to increase maxzoom if features are still being dropped 2017-05-31 10:47:34 -07:00
Eric Fischer b80a1d7621 Merge pull request #425 from mapbox/better-maxzoom-guessing
Better maxzoom guessing by considering resolution within features
2017-05-30 17:22:40 -07:00
Eric Fischer c7d146ea48 Don't do work for guessing maxzoom unless needed. Add a better test. 2017-05-30 16:58:56 -07:00
Eric Fischer 8776f17980 Bump version number, give better warning message 2017-05-30 16:02:08 -07:00
Eric Fischer 977effc96d Merge pull request #424 from joykuotw/master
Add tile-join directory support
2017-05-30 15:43:56 -07:00
Eric Fischer ab8ecb7e00 Add missing #include 2017-05-30 13:41:24 -07:00
Eric Fischer 331707f88a Better maxzoom guessing by considering resolution within features 2017-05-30 13:28:25 -07:00
Eric Fischer 5db7b504e8 Merge pull request #421 from mapbox/long-attributes
Fix crash with very long (>128K) attribute values
2017-05-18 15:11:42 -07:00
Eric Fischer eb8ab1dd58 Fix crash with very long (>128K) attribute values 2017-05-18 14:48:18 -07:00
Eric Fischer d0980e29d0 Merge pull request #419 from Burke9077/master
Add basic support for Docker
2017-05-18 11:47:21 -07:00
Eric Fischer b301512860 Merge branch 'master' into plugins 2017-05-12 17:20:30 -07:00
Eric Fischer 27dadc8ade Merge pull request #418 from mapbox/no-compression-test
There should be a test for the no-compression mbtiles output format
2017-05-12 17:09:41 -07:00
Eric Fischer 2f7b5d8afd There should be a test for the no-compression mbtiles output format 2017-05-12 16:21:25 -07:00
Eric Fischer 733092abf6 Merge pull request #417 from mapbox/only-warn-once
Only warn once about invalid polygon encoding in tippecanoe-decode
2017-05-12 11:24:02 -07:00
Eric Fischer 9632c14551 Only warn once about invalid polygon encoding in tippecanoe-decode 2017-05-12 11:15:27 -07:00
Eric Fischer 7fe3de9cfa Merge pull request #416 from mapbox/tile-join-compression
Tile-join had not been compressing its tiles.
2017-05-11 12:51:14 -07:00
Eric Fischer fb6551c59e Calculate the tileset bounding box in tile-join from the tile boundaries 2017-05-11 12:36:35 -07:00
Eric Fischer 30d54ff50d Tile-join had not been compressing its tiles. 2017-05-11 12:08:47 -07:00
Eric Fischer 685e1a4360 Merge pull request #412 from mapbox/polygon-closure
Enforce polygon winding and closure rules in tippecanoe-decode
2017-05-05 11:47:54 -07:00
Eric Fischer 922bef72c8 Fix array bounds error found by -fsanitize=address 2017-05-05 11:22:40 -07:00
Eric Fischer 9eb3a7f7ec Enforce polygon winding and closure rules in tippecanoe-decode 2017-05-05 10:56:50 -07:00
Eric Fischer eab593fea5 Merge pull request #411 from mapbox/tile-join-name
Add tile-join options to set tileset name, description, attribution
2017-05-04 15:27:40 -07:00
Eric Fischer f87a9d1660 Add tile-join options to set tileset name, description, attribution 2017-05-04 15:08:31 -07:00
Eric Fischer 92deeb58f9 Merge pull request #410 from mapbox/tile-join-name
Preserve the tileset names from the source mbtiles in tile-join
2017-05-04 14:17:52 -07:00
Eric Fischer 6ec453229c Preserve the tileset names from the source mbtiles in tile-join 2017-05-04 13:31:30 -07:00
Eric Fischer 24bde0be03 Fix formatting 2017-05-04 10:39:48 -07:00