vitalif
/
imposm3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

renamed -limittodiffbuffer to -limittocachebuffer

master
Oliver Tonnhofer 2013-11-04 08:55:10 +01:00
parent 2d2dad7b7e
commit 076926a417
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/config.go
View File

@ -14,7 +14,7 @@ type Config struct {
Connection string `json:"connection"` Connection string `json:"connection"`
MappingFile string `json:"mapping"` MappingFile string `json:"mapping"`
LimitTo string `json:"limitto"` LimitTo string `json:"limitto"`
LimitToDiffBuffer float64 `json:"limitto_cache_buffer"` LimitToCacheBuffer float64 `json:"limitto_cache_buffer"`
Srid int `json:"srid"` Srid int `json:"srid"`
} }
@ -30,7 +30,7 @@ type _BaseOptions struct {
MappingFile string MappingFile string
Srid int Srid int
LimitTo string LimitTo string
LimitToDiffBuffer float64 LimitToCacheBuffer float64
ConfigFile string ConfigFile string
Httpprofile string Httpprofile string
} }
@ -68,8 +68,8 @@ func (o *_BaseOptions) updateFromConfig() error {
if o.LimitTo == "" { if o.LimitTo == "" {
o.LimitTo = conf.LimitTo o.LimitTo = conf.LimitTo
} }
if o.LimitToDiffBuffer == 0.0 { if o.LimitToCacheBuffer == 0.0 {
o.LimitToDiffBuffer = conf.LimitToDiffBuffer o.LimitToCacheBuffer = conf.LimitToCacheBuffer
} }
if o.CacheDir == defaultCacheDir { if o.CacheDir == defaultCacheDir {
o.CacheDir = conf.CacheDir o.CacheDir = conf.CacheDir
@ -110,7 +110,7 @@ func addBaseFlags(flags *flag.FlagSet) {
flags.StringVar(&BaseOptions.MappingFile, "mapping", "", "mapping file") flags.StringVar(&BaseOptions.MappingFile, "mapping", "", "mapping file")
flags.IntVar(&BaseOptions.Srid, "srid", defaultSrid, "srs id") flags.IntVar(&BaseOptions.Srid, "srid", defaultSrid, "srs id")
flags.StringVar(&BaseOptions.LimitTo, "limitto", "", "limit to geometries") 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.ConfigFile, "config", "", "config (json)")
flags.StringVar(&BaseOptions.Httpprofile, "httpprofile", "", "bind address for profile server") flags.StringVar(&BaseOptions.Httpprofile, "httpprofile", "", "bind address for profile server")
} }

4
import_/import.go
View File

@ -41,7 +41,7 @@ func Import() {
step := log.StartStep("Reading limitto geometries") step := log.StartStep("Reading limitto geometries")
geometryLimiter, err = limit.NewFromGeoJsonWithBuffered( geometryLimiter, err = limit.NewFromGeoJsonWithBuffered(
config.BaseOptions.LimitTo, config.BaseOptions.LimitTo,
config.BaseOptions.LimitToDiffBuffer, config.BaseOptions.LimitToCacheBuffer,
) )
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
@ -103,7 +103,7 @@ func Import() {
osmCache.Coords.SetLinearImport(true) osmCache.Coords.SetLinearImport(true)
readLimiter := geometryLimiter readLimiter := geometryLimiter
if config.BaseOptions.LimitToDiffBuffer == 0.0 { if config.BaseOptions.LimitToCacheBuffer == 0.0 {
readLimiter = nil readLimiter = nil
} }
reader.ReadPbf(osmCache, progress, tagmapping, reader.ReadPbf(osmCache, progress, tagmapping,

2
imposm3.go
View File

@ -57,7 +57,7 @@ func main() {
step := log.StartStep("Reading limitto geometries") step := log.StartStep("Reading limitto geometries")
geometryLimiter, err = limit.NewFromGeoJsonWithBuffered( geometryLimiter, err = limit.NewFromGeoJsonWithBuffered(
config.BaseOptions.LimitTo, config.BaseOptions.LimitTo,
config.BaseOptions.LimitToDiffBuffer, config.BaseOptions.LimitToCacheBuffer,
) )
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)