a_adli/colouring-montreal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve cache logging, update ruleset

Browse Source
This commit is contained in:
Tom Russell 2019-02-24 19:23:21 +00:00
parent a8485643e0
commit 65fd7c5f22
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/tiles/cache.js
View File

@ -18,12 +18,11 @@
// and then use stdlib `import fs from 'fs';` // and then use stdlib `import fs from 'fs';`
import fs from 'node-fs'; import fs from 'node-fs';
// const CACHE_PATH = process.env.CACHE_PATH const CACHE_PATH = process.env.TILECACHE_PATH
const CACHE_PATH = '/home/tom/projects/colouring-london/colouring-london/app/tilecache'
function get(tileset, z, x, y, cb){ function get(tileset, z, x, y, cb){
if (!should_try_cache(tileset, z)) { if (!should_try_cache(tileset, z)) {
cb("Skip cache", null) cb(`Skip cache get ${tileset}/${z}/${x}/${y}`, null)
return return
} }
const dir = `${CACHE_PATH}/${tileset}/${z}/${x}` const dir = `${CACHE_PATH}/${tileset}/${z}/${x}`
@ -33,7 +32,7 @@ function get(tileset, z, x, y, cb){
function put(im, tileset, z, x, y, cb){ function put(im, tileset, z, x, y, cb){
if (!should_try_cache(tileset, z)) { if (!should_try_cache(tileset, z)) {
cb("Skip cache") cb(`Skip cache put ${tileset}/${z}/${x}/${y}`)
return return
} }
const dir = `${CACHE_PATH}/${tileset}/${z}/${x}` const dir = `${CACHE_PATH}/${tileset}/${z}/${x}`
@ -54,12 +53,16 @@ function put(im, tileset, z, x, y, cb){
} }
function should_try_cache(tileset, z) { function should_try_cache(tileset, z) {
if (tileset === 'date_year'){
// cache high zoom because of front page hits
return z <= 16
}
if (tileset === 'base_light' || tileset === 'base_night') { if (tileset === 'base_light' || tileset === 'base_night') {
// cache for higher zoom levels (unlikely to change) // cache for higher zoom levels (unlikely to change)
return z <= 15 return z <= 17
} }
// else cache for lower zoom levels (change slowly) // else cache for lower zoom levels (change slowly)
return z <= 12 return z <= 13
} }
export { get, put }; export { get, put };