Eric Fischer
9ec52f2c90
Merge branch 'master' into tilestats
2017-07-21 13:08:33 -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
3cafef89f1
Factor out duplicated tilestats code
2017-07-19 14:45:15 -07:00
Eric Fischer
b3078ddeec
Also make tilestats in tile-join
2017-07-18 16:53:06 -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
b1771a3365
Make layer attributes a map to sample values
2017-07-17 11:58:37 -07:00
Eric Fischer
65c095cc2b
Clean up #includes and add fields for counting attributes
2017-07-14 16:56:23 -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
Shan-Chun Kuo
a5db055c50
Change fixed-size buffer to variable-length string
2017-05-30 20:11:13 +01:00
Shan-Chun Kuo
e8e949fac9
Fix memory leak
2017-05-30 18:40:22 +01:00
Shan-Chun Kuo
52ceaaddb6
Add tile-join source to directories of tiles
2017-05-30 14:53:55 +01:00
Shan-Chun Kuo
ef8af63ab4
Add tile-join options to no tile compression and output to directory
2017-05-25 11:25:57 +01: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
f87a9d1660
Add tile-join options to set tileset name, description, attribution
2017-05-04 15:08:31 -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
a7be83381a
Add tile-join options to include or exclude layers by name
2017-04-10 15:22:30 -07:00
Eric Fischer
f558b78380
Include tileset metadata when writing either to directory or mbtiles
2017-04-07 13:25:05 -07:00
Eric Fischer
1362ac448f
Add --description option to set mbtiles description
2017-03-21 11:07:15 -07:00
Eric Fischer
fa56adc530
Clean up utility functions that are also used in other projects
2017-03-16 15:06:58 -07:00
Eric Fischer
f928133993
Don't allow two attributes with the same name, and strip \r from CSV.
2016-12-13 14:35:51 -08:00
Eric Fischer
32f32e45b6
Trim whitespace after commas in tile-join .csv input
2016-09-21 12:32:03 -07:00
Eric Fischer
083a280659
Fix build errors on Linux (pthread library, signed comparison)
2016-09-20 16:01:10 -07:00
Eric Fischer
4ba98062d6
Recover memory from the pre-joined tiles after joining
2016-09-20 14:19:40 -07:00
Eric Fischer
87e4a338f6
Essentials of multithreaded tile-joining
2016-09-20 12:59:04 -07:00
Eric Fischer
021d792d33
Getting ready for multithreaded tile-joining
2016-09-20 11:04:24 -07:00
Eric Fischer
6c74f4a1cd
Keep tile data in a string instead of a pointer into the query
2016-09-20 10:17:02 -07:00
Eric Fischer
437152e02b
Track the minzoom and maxzoom for each layer separately
2016-09-19 17:53:31 -07:00
Eric Fischer
d7037f3d3a
Add tile-join -pk option not to care about byte limit. Update docs.
2016-09-19 17:20:44 -07:00
Eric Fischer
232056c0da
Make the global per-layer list of attribute types
2016-09-19 16:53:41 -07:00
Eric Fischer
470c0e2b5c
Remove debug output
2016-09-19 16:36:38 -07:00
Eric Fischer
7a30aeaa6b
Fix memory leak
2016-09-19 16:34:06 -07:00
Eric Fischer
8d57f031ee
Rescale geometry if layer extents don't match
2016-09-19 16:25:30 -07:00
Eric Fischer
a37fc361c2
Merge tiles and layers. Differing extents not handled yet.
2016-09-19 16:02:14 -07:00
Eric Fischer
47288ec05f
The query-merge part of multi-source tile joining
2016-09-19 15:29:13 -07:00
Eric Fischer
d490d8475e
Remove unused layer count and layer name list
2016-08-30 14:17:28 -07:00
Eric Fischer
31d2a3738a
Get rid of the old file_keys
2016-08-30 13:46:37 -07:00
Eric Fischer
7f49ce5caa
Merge per-thread layer names and file keys
2016-08-29 16:38:57 -07:00
Eric Fischer
c85303aada
Pass feature IDs through in tile-join
2016-08-16 13:21:15 -07:00
Eric Fischer
3d023f34d3
Fix a tile-join bug that would retain fields that were supposed to be excluded
2016-06-10 15:53:59 -07:00
Eric Fischer
0f1d2e4220
Fix additional g++ warnings
2016-05-03 16:39:26 -07:00
Eric Fischer
f1b3f6d231
Fix warnings about shadowed variables
2016-05-03 15:48:42 -07:00
Eric Fischer
5775d088eb
Get rid of the strdup for attribution
2016-05-03 11:40:36 -07:00
Eric Fischer
d712edcdc9
Stop using strdup for tile-join matching
2016-05-03 11:14:09 -07:00
Eric Fischer
271ec3d154
Stop using malloc for layer names
2016-05-03 10:52:49 -07:00
Eric Fischer
adc70341ad
Use std::set to track the layer-wide feature attribute types.
...
Track them during parsing, not tiling. Remove the old string pool code.
2016-04-28 14:59:58 -07:00
Eric Fischer
ee97e6c307
Whittle down tile.hpp to the things that actually related to tile.cpp
2016-04-27 15:09:06 -07:00
Eric Fischer