Commit Graph

160 Commits (master)

Author SHA1 Message Date
Oliver Tonnhofer d89a9f2832 implement DeleteFromWay 2013-08-06 15:29:30 +02:00
Oliver Tonnhofer 63794491f6 enable LinearImport for diffCache during import 2013-08-05 12:51:25 +02:00
Oliver Tonnhofer fedb2a8914 add linear import and direct import mode to diff cache 2013-08-05 12:05:06 +02:00
Oliver Tonnhofer e0e3358b6d query for multiple nodes/ways/relations 2013-08-02 10:14:05 +02:00
Oliver Tonnhofer 191632ea0c dump query-cache output as json 2013-08-02 10:08:01 +02:00
Oliver Tonnhofer 0aba137bb8 add cache/query as subcommand 2013-08-01 15:31:47 +02:00
Oliver Tonnhofer b5d578175f remove members of deleted relation from InsertedWaysCache 2013-08-01 14:07:06 +02:00
Oliver Tonnhofer efec87a40c improve cache/query output 2013-08-01 13:35:00 +02:00
Oliver Tonnhofer f75c8994c8 remove deleted elements from cache in diff mode 2013-07-05 15:14:21 +02:00
Oliver Tonnhofer 83af982f2c renamed test file 2013-07-05 09:23:14 +02:00
Oliver Tonnhofer 9d8166ce11 removed empty file 2013-07-05 09:23:05 +02:00
Oliver Tonnhofer 6c5b7e0201 refactored cache API 2013-07-05 09:21:51 +02:00
Oliver Tonnhofer 2ff97757d8 update tests for diff cache 2013-07-05 08:56:01 +02:00
Oliver Tonnhofer d092ba7807 refactored diff cache 2013-07-05 08:03:13 +02:00
Oliver Tonnhofer 0f09649775 Merge branch 'master' into diffbunch
Conflicts:
	cache/diff.go
	cache/diff_test.go
2013-07-04 17:33:35 +02:00
Oliver Tonnhofer d62f11ff97 refactored cache API 2013-07-04 17:27:22 +02:00
Oliver Tonnhofer e38875a850 remove unused code; make private functions lowercase 2013-07-04 16:03:26 +02:00
Oliver Tonnhofer 32e4214351 refactored coords cache 2013-06-28 13:10:18 +02:00
Oliver Tonnhofer 94b5999756 refactored bunchCache; add more tests 2013-06-26 21:57:07 +02:00
Oliver Tonnhofer 64b2689ab8 optimize diff bunches 2013-06-26 19:43:30 +02:00
Oliver Tonnhofer 0a0a079d93 remove conversion to map 2013-06-25 05:12:59 +02:00
Oliver Tonnhofer 2e67df6f0f first bunched diff cache 2013-06-24 15:52:45 +02:00
Oliver Tonnhofer f8e34f37e2 return err immediately 2013-06-24 13:00:20 +02:00
Oliver Tonnhofer 003e5f8f0b Revert "unmarshal items in writer"
This reverts commit c314f01886.
2013-06-21 11:05:29 +02:00
Oliver Tonnhofer c314f01886 unmarshal items in writer 2013-06-20 14:21:20 +02:00
Oliver Tonnhofer 0b4bda5ef2 make bunch cache capacity configurable; incr default 2013-06-20 13:48:08 +02:00
Oliver Tonnhofer 03d96b5aae fixed closing of caches 2013-06-20 10:34:22 +02:00
Oliver Tonnhofer ecd5541c1e close caches earlier to release memory; optimize read only access for coords 2013-06-20 09:21:30 +02:00
Oliver Tonnhofer 1962abec78 fixed tests 2013-06-20 08:11:54 +02:00
Oliver Tonnhofer c071bdd15e tweaked refindex cache size 2013-06-19 16:23:04 +02:00
Oliver Tonnhofer 4d85c03f92 load refs in parallel 2013-06-19 16:05:36 +02:00
Oliver Tonnhofer 3d7a38c817 reuse refindex caches 2013-06-19 13:05:02 +02:00
Oliver Tonnhofer 99fc4dfef1 increase refindex cache size 2013-06-19 11:50:57 +02:00
Oliver Tonnhofer 4bf4cf712d add missing config.go file 2013-06-18 16:04:20 +02:00
Oliver Tonnhofer e6f880883b make cache options configurable 2013-06-18 15:53:04 +02:00
Oliver Tonnhofer bad86777af add script for taginfo extract 2013-06-11 10:31:22 +02:00
Oliver Tonnhofer 84ab38c33d update comment 2013-06-05 13:27:23 +02:00
Oliver Tonnhofer e1179a08b9 remove misplaced defer 2013-06-05 13:01:26 +02:00
Oliver Tonnhofer 4a61314f32 add tests for idToKeyBuf/idFromKeyBuf 2013-06-05 11:13:19 +02:00
Oliver Tonnhofer b1de9ebfdd store common keys as single char 2013-06-05 10:10:04 +02:00
Oliver Tonnhofer 618deea4a9 store common tags as single unicode char 2013-06-05 09:39:22 +02:00
Oliver Tonnhofer bd3024b88c release getBunch lock before loading missing coords from cache 2013-06-05 08:05:31 +02:00
Oliver Tonnhofer 9f48dbbab9 update serialize tests for removed ids 2013-06-05 08:04:53 +02:00
Oliver Tonnhofer f31323f975 do not store Ids in cache value, already stored as the key 2013-06-05 07:47:28 +02:00
Oliver Tonnhofer 659a140afc do not use bytes.Buffer for idToKeyBuf 2013-06-04 09:34:24 +02:00
Oliver Tonnhofer c00cfaf030 fixed idToKeyBuf result 2013-06-03 13:12:20 +02:00
Oliver Tonnhofer 2649fc05cf reduce delta cache size 2013-06-03 12:46:33 +02:00
Oliver Tonnhofer d95442d580 create keybuffer with fixed size 2013-06-03 11:21:34 +02:00
Oliver Tonnhofer 0237f72b27 improve reuse of cached []byte buffer 2013-06-03 11:04:15 +02:00
Oliver Tonnhofer 64da1ef0b0 cache []byte for MarshalDeltaNodes 2013-06-03 11:03:45 +02:00
Oliver Tonnhofer abda12bb77 renamed diffcache files 2013-05-31 14:57:08 +02:00
Oliver Tonnhofer 268703877b store way->rel coord->way->rel for relations in -diff mode 2013-05-30 16:04:40 +02:00
Oliver Tonnhofer 773cbaac94 write coords->way index 2013-05-30 12:00:11 +02:00
Oliver Tonnhofer 9993fb51c6 use buffered channel for freeNodes cache 2013-05-21 13:24:55 +02:00
Oliver Tonnhofer 86a1b85f02 reduce getBunch calls 2013-05-21 13:06:49 +02:00
Oliver Tonnhofer 0473597fa6 do not use protobuf for delta encoded nodes 2013-05-21 12:13:48 +02:00
Oliver Tonnhofer c4fb0d8a21 make chanels buffered 2013-05-17 17:15:02 +02:00
Oliver Tonnhofer 81d818a0c4 fixed cache tests 2013-05-17 15:33:36 +02:00
Oliver Tonnhofer 03dc885462 reorganized cache package 2013-05-17 15:30:22 +02:00
Oliver Tonnhofer 853a45296f combine internal.proto and model.proto 2013-05-17 15:16:24 +02:00
Oliver Tonnhofer 0833105371 move binary package into cache package 2013-05-17 15:10:59 +02:00
Oliver Tonnhofer decb17cb4c mark/skip inserted ways from mulitpolygon relations; reproject relation geometries 2013-05-17 12:06:50 +02:00
Oliver Tonnhofer 2776061ba7 insert relations into db 2013-05-17 11:42:19 +02:00
Oliver Tonnhofer dc59e013fe add simple query tool 2013-05-17 10:30:58 +02:00
Oliver Tonnhofer 051ad58a3c update cache test for updated error handling 2013-05-17 10:28:51 +02:00
Oliver Tonnhofer f4e9d2c841 make chache dir on Open() if missing 2013-05-17 10:28:32 +02:00
Oliver Tonnhofer 9b72f02381 improve error handling in cache; add NotFound error 2013-05-16 15:48:22 +02:00
Oliver Tonnhofer 516da08599 first mulitppolygon builder 2013-05-16 12:17:21 +02:00
Oliver Tonnhofer 5c174a3ff6 import nodes into db 2013-05-15 13:21:31 +02:00
Oliver Tonnhofer 6aaa753eb8 make fields in table mapping a list 2013-05-15 08:15:57 +02:00
Oliver Tonnhofer 8ea0572410 fixed cache/diff test 2013-05-14 11:54:39 +02:00
Oliver Tonnhofer 84bc8e0fb1 flush deltacoordscache after -read 2013-05-14 09:26:28 +02:00
Oliver Tonnhofer aea54fd050 limit max open files for leveldbs 2013-05-13 15:28:39 +02:00
Oliver Tonnhofer cba18797e9 removed go vet warnings 2013-05-13 10:55:08 +02:00
Oliver Tonnhofer 319927d47f update deltaCacheBunchSize 2013-05-13 10:40:18 +02:00
Oliver Tonnhofer ee13f30435 write to diff cache in batches 2013-05-13 09:54:00 +02:00
Oliver Tonnhofer c3cb785484 enable deltacoordscache optimizations only for linear imports 2013-05-13 08:08:52 +02:00
Oliver Tonnhofer 7a6bedb2e5 handle errors in putCoordsPacked 2013-05-13 07:39:38 +02:00
Oliver Tonnhofer 1e361975e2 add back sorting of delta nodes 2013-05-13 07:39:00 +02:00
Oliver Tonnhofer 094e5c4ace use delta encoding for ref cache 2013-05-13 07:36:54 +02:00
Oliver Tonnhofer 25b16b437c make bunchSize configurable with GOPOSM_DELTACACHE_BUNCHSIZE env 2013-05-10 11:18:15 +02:00
Oliver Tonnhofer 69ee95fa27 use idToKeyBuf in diff and delta cache 2013-05-10 11:11:29 +02:00
Oliver Tonnhofer 2f8a72777c fix bunchId when storing coords directly 2013-05-08 15:45:03 +02:00
Oliver Tonnhofer 8ad66f762f fixed long/lat mixup in unpackNodes 2013-05-08 15:44:34 +02:00
Oliver Tonnhofer 905df4f3e6 tweak leveldb blockrestartinterval 2013-05-08 09:12:57 +02:00
Oliver Tonnhofer 166a6dff02 do not use varint for leveldb key but int64 2013-05-07 13:56:32 +02:00
Oliver Tonnhofer cc28221bb8 add GOPOSM_LEVELDB_ env vars 2013-05-07 11:42:27 +02:00
Oliver Tonnhofer 768d04ad56 add first simple tag filtering 2013-05-07 10:13:09 +02:00
Oliver Tonnhofer 79db75e51a do not synchronize writes to "complete" bunches 2013-05-07 09:14:58 +02:00
Oliver Tonnhofer a7f58cbfe1 add test for DeltaaCoordsCache; fixed missing inserted nodes 2013-05-07 07:51:50 +02:00
Oliver Tonnhofer 8f5d0d0c44 new DiffCache; improved progress report 2013-05-06 14:20:00 +02:00
Oliver Tonnhofer 40c8b04181 keep ref ids in RefIndex sorted 2013-05-06 13:42:58 +02:00
Oliver Tonnhofer 1f0fca5552 move cache/index to cache/diff 2013-05-06 13:19:56 +02:00
Oliver Tonnhofer 6034befe52 add -read/-write/-overwritecache options 2013-05-06 12:51:30 +02:00
Oliver Tonnhofer 80d813d217 use smaller delta node bunch size 2013-05-06 11:09:21 +02:00
Oliver Tonnhofer 39d889bf9e reuse deltacoord slices 2013-05-06 07:28:02 +02:00
Oliver Tonnhofer bf4c5ee31f use slices for deltacoords; store ref index 2013-05-05 20:14:39 +02:00
Oliver Tonnhofer 6ab604da0e create OSMCache 2013-05-04 16:27:05 +02:00
Oliver Tonnhofer e543b05a16 refactored local var name in deltacoordscache 2013-05-02 21:11:24 +02:00
Oliver Tonnhofer 7247a1c7fd read back relations/ways; fill ways with nodes from cache 2013-05-02 20:37:31 +02:00