From 076926a41749243748ef6d356dd53997e203fa7a Mon Sep 17 00:00:00 2001 From: Oliver Tonnhofer Date: Mon, 4 Nov 2013 08:55:10 +0100 Subject: [PATCH] renamed -limittodiffbuffer to -limittocachebuffer --- config/config.go | 10 +++++----- import_/import.go | 4 ++-- imposm3.go | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/config.go b/config/config.go index eb43ad7..e6c6d3a 100644 --- a/config/config.go +++ b/config/config.go @@ -14,7 +14,7 @@ type Config struct { Connection string `json:"connection"` MappingFile string `json:"mapping"` LimitTo string `json:"limitto"` - LimitToDiffBuffer float64 `json:"limitto_cache_buffer"` + LimitToCacheBuffer float64 `json:"limitto_cache_buffer"` Srid int `json:"srid"` } @@ -30,7 +30,7 @@ type _BaseOptions struct { MappingFile string Srid int LimitTo string - LimitToDiffBuffer float64 + LimitToCacheBuffer float64 ConfigFile string Httpprofile string } @@ -68,8 +68,8 @@ func (o *_BaseOptions) updateFromConfig() error { if o.LimitTo == "" { o.LimitTo = conf.LimitTo } - if o.LimitToDiffBuffer == 0.0 { - o.LimitToDiffBuffer = conf.LimitToDiffBuffer + if o.LimitToCacheBuffer == 0.0 { + o.LimitToCacheBuffer = conf.LimitToCacheBuffer } if o.CacheDir == defaultCacheDir { o.CacheDir = conf.CacheDir @@ -110,7 +110,7 @@ func addBaseFlags(flags *flag.FlagSet) { flags.StringVar(&BaseOptions.MappingFile, "mapping", "", "mapping file") flags.IntVar(&BaseOptions.Srid, "srid", defaultSrid, "srs id") flags.StringVar(&BaseOptions.LimitTo, "limitto", "", "limit to geometries") - flags.Float64Var(&BaseOptions.LimitToDiffBuffer, "limittodiffbuffer", 0.0, "limit to buffer for cache") + flags.Float64Var(&BaseOptions.LimitToCacheBuffer, "limittocachebuffer", 0.0, "limit to buffer for cache") flags.StringVar(&BaseOptions.ConfigFile, "config", "", "config (json)") flags.StringVar(&BaseOptions.Httpprofile, "httpprofile", "", "bind address for profile server") } diff --git a/import_/import.go b/import_/import.go index 7b5c584..490bce4 100644 --- a/import_/import.go +++ b/import_/import.go @@ -41,7 +41,7 @@ func Import() { step := log.StartStep("Reading limitto geometries") geometryLimiter, err = limit.NewFromGeoJsonWithBuffered( config.BaseOptions.LimitTo, - config.BaseOptions.LimitToDiffBuffer, + config.BaseOptions.LimitToCacheBuffer, ) if err != nil { log.Fatal(err) @@ -103,7 +103,7 @@ func Import() { osmCache.Coords.SetLinearImport(true) readLimiter := geometryLimiter - if config.BaseOptions.LimitToDiffBuffer == 0.0 { + if config.BaseOptions.LimitToCacheBuffer == 0.0 { readLimiter = nil } reader.ReadPbf(osmCache, progress, tagmapping, diff --git a/imposm3.go b/imposm3.go index 804d32a..1f9abe3 100644 --- a/imposm3.go +++ b/imposm3.go @@ -57,7 +57,7 @@ func main() { step := log.StartStep("Reading limitto geometries") geometryLimiter, err = limit.NewFromGeoJsonWithBuffered( config.BaseOptions.LimitTo, - config.BaseOptions.LimitToDiffBuffer, + config.BaseOptions.LimitToCacheBuffer, ) if err != nil { log.Fatal(err)