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

make go gettable

master
Oliver Tonnhofer 2014-08-04 15:19:35 +02:00
parent 8ad4c8f1d2
commit 3b73f91a0d
58 changed files with 156 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -36,8 +36,8 @@ clean:
test: test-unit test-system test: test-unit test-system
test-unit: imposm3 test-unit: imposm3
go test imposm3/... -i go test ./... -i
go test imposm3/... go test ./...
test-system: imposm3 test-system: imposm3
(cd test && make test) (cd test && make test)

2
cache/binary/deltacoords.go vendored
View File

@ -3,7 +3,7 @@ package binary
import ( import (
"encoding/binary" "encoding/binary"
"errors" "errors"
"imposm3/element" "github.com/omniscale/imposm3/element"
) )
func MarshalDeltaNodes(nodes []element.Node, buf []byte) []byte { func MarshalDeltaNodes(nodes []element.Node, buf []byte) []byte {

2
cache/binary/deltacoords_test.go vendored
View File

@ -2,7 +2,7 @@ package binary
import ( import (
"code.google.com/p/goprotobuf/proto" "code.google.com/p/goprotobuf/proto"
"imposm3/element" "github.com/omniscale/imposm3/element"
"math" "math"
"math/rand" "math/rand"
"runtime" "runtime"

2
cache/binary/diff.go vendored
View File

@ -3,7 +3,7 @@ package binary
import ( import (
"encoding/binary" "encoding/binary"
"imposm3/element" "github.com/omniscale/imposm3/element"
) )
func MarshalIdRefsBunch(idRefs []element.IdRefs) []byte { func MarshalIdRefsBunch(idRefs []element.IdRefs) []byte {

2
cache/binary/diff_test.go vendored
View File

@ -3,7 +3,7 @@ package binary
import ( import (
"testing" "testing"
"imposm3/element" "github.com/omniscale/imposm3/element"
) )
func TestmarshalBunch(t *testing.T) { func TestmarshalBunch(t *testing.T) {

2
cache/binary/serialize.go vendored
View File

@ -2,7 +2,7 @@ package binary
import ( import (
"code.google.com/p/goprotobuf/proto" "code.google.com/p/goprotobuf/proto"
"imposm3/element" "github.com/omniscale/imposm3/element"
) )
const COORD_FACTOR float64 = 11930464.7083 // ((2<<31)-1)/360.0 const COORD_FACTOR float64 = 11930464.7083 // ((2<<31)-1)/360.0

2
cache/binary/serialize_test.go vendored
View File

@ -1,7 +1,7 @@
package binary package binary
import ( import (
"imposm3/element" "github.com/omniscale/imposm3/element"
"testing" "testing"
) )

2
cache/binary/tags.go vendored
View File

@ -15,7 +15,7 @@ package binary
// etc.) are converted to a single ASCII control char (0x01-0x1f) // etc.) are converted to a single ASCII control char (0x01-0x1f)
import ( import (
"imposm3/element" "github.com/omniscale/imposm3/element"
"unicode/utf8" "unicode/utf8"
) )

2
cache/binary/tags_test.go vendored
View File

@ -1,7 +1,7 @@
package binary package binary
import ( import (
"imposm3/element" "github.com/omniscale/imposm3/element"
"sort" "sort"
"testing" "testing"
) )

4
cache/delta.go vendored
View File

@ -2,8 +2,8 @@ package cache
import ( import (
"container/list" "container/list"
"imposm3/cache/binary" "github.com/omniscale/imposm3/cache/binary"
"imposm3/element" "github.com/omniscale/imposm3/element"
"sort" "sort"
"sync" "sync"
) )

2
cache/delta_test.go vendored
View File

@ -1,7 +1,7 @@
package cache package cache
import ( import (
"imposm3/element" "github.com/omniscale/imposm3/element"
"io/ioutil" "io/ioutil"
"math/rand" "math/rand"
"os" "os"

4
cache/diff.go vendored
View File

@ -9,8 +9,8 @@ import (
"sort" "sort"
"sync" "sync"
"imposm3/cache/binary" "github.com/omniscale/imposm3/cache/binary"
"imposm3/element" "github.com/omniscale/imposm3/element"
) )
type byInt64 []int64 type byInt64 []int64

2
cache/diff_test.go vendored
View File

@ -5,7 +5,7 @@ import (
"os" "os"
"testing" "testing"
"imposm3/element" "github.com/omniscale/imposm3/element"
) )
func TestDiffCache(t *testing.T) { func TestDiffCache(t *testing.T) {

4
cache/nodes.go vendored
View File

@ -2,8 +2,8 @@ package cache
import ( import (
"github.com/jmhodges/levigo" "github.com/jmhodges/levigo"
"imposm3/cache/binary" "github.com/omniscale/imposm3/cache/binary"
"imposm3/element" "github.com/omniscale/imposm3/element"
) )
type NodesCache struct { type NodesCache struct {

2
cache/osm_test.go vendored
View File

@ -1,7 +1,7 @@
package cache package cache
import ( import (
"imposm3/element" "github.com/omniscale/imposm3/element"
"io/ioutil" "io/ioutil"
"math/rand" "math/rand"
"os" "os"

4
cache/query/query.go vendored
View File

@ -9,8 +9,8 @@ import (
"strconv" "strconv"
"strings" "strings"
"imposm3/cache" "github.com/omniscale/imposm3/cache"
"imposm3/element" "github.com/omniscale/imposm3/element"
) )
var flags = flag.NewFlagSet("query-cache", flag.ExitOnError) var flags = flag.NewFlagSet("query-cache", flag.ExitOnError)

4
cache/relations.go vendored
View File

@ -2,8 +2,8 @@ package cache
import ( import (
"github.com/jmhodges/levigo" "github.com/jmhodges/levigo"
"imposm3/cache/binary" "github.com/omniscale/imposm3/cache/binary"
"imposm3/element" "github.com/omniscale/imposm3/element"
) )
type RelationsCache struct { type RelationsCache struct {

4
cache/ways.go vendored
View File

@ -2,8 +2,8 @@ package cache
import ( import (
"github.com/jmhodges/levigo" "github.com/jmhodges/levigo"
"imposm3/cache/binary" "github.com/omniscale/imposm3/cache/binary"
"imposm3/element" "github.com/omniscale/imposm3/element"
) )
type WaysCache struct { type WaysCache struct {

16
cmd/main.go
View File

@ -2,18 +2,18 @@ package cmd
import ( import (
"fmt" "fmt"
"imposm3/cache" "github.com/omniscale/imposm3/cache"
golog "log" golog "log"
"os" "os"
"runtime" "runtime"
"imposm3/cache/query" "github.com/omniscale/imposm3/cache/query"
"imposm3/config" "github.com/omniscale/imposm3/config"
"imposm3/diff" "github.com/omniscale/imposm3/diff"
"imposm3/geom/limit" "github.com/omniscale/imposm3/geom/limit"
"imposm3/import_" "github.com/omniscale/imposm3/import_"
"imposm3/logging" "github.com/omniscale/imposm3/logging"
"imposm3/stats" "github.com/omniscale/imposm3/stats"
) )
var log = logging.NewLogger("") var log = logging.NewLogger("")

4
database/database.go
View File

@ -2,8 +2,8 @@ package database
import ( import (
"errors" "errors"
"imposm3/element" "github.com/omniscale/imposm3/element"
"imposm3/mapping" "github.com/omniscale/imposm3/mapping"
"strings" "strings"
) )

8
database/postgis/postgis.go
View File

@ -4,10 +4,10 @@ import (
"database/sql" "database/sql"
"fmt" "fmt"
pq "github.com/lib/pq" pq "github.com/lib/pq"
"imposm3/database" "github.com/omniscale/imposm3/database"
"imposm3/element" "github.com/omniscale/imposm3/element"
"imposm3/logging" "github.com/omniscale/imposm3/logging"
"imposm3/mapping" "github.com/omniscale/imposm3/mapping"
"runtime" "runtime"
"strings" "strings"
"sync/atomic" "sync/atomic"

2
database/postgis/spec.go
View File

@ -2,7 +2,7 @@ package postgis
import ( import (
"fmt" "fmt"
"imposm3/mapping" "github.com/omniscale/imposm3/mapping"
"strings" "strings"
) )

14
diff/deleter.go
View File

@ -1,13 +1,13 @@
package diff package diff
import ( import (
"imposm3/cache" "github.com/omniscale/imposm3/cache"
"imposm3/database" "github.com/omniscale/imposm3/database"
"imposm3/diff/parser" "github.com/omniscale/imposm3/diff/parser"
"imposm3/element" "github.com/omniscale/imposm3/element"
"imposm3/expire" "github.com/omniscale/imposm3/expire"
"imposm3/mapping" "github.com/omniscale/imposm3/mapping"
"imposm3/proj" "github.com/omniscale/imposm3/proj"
) )
type Deleter struct { type Deleter struct {

4
diff/parser/parser.go
View File

@ -3,8 +3,8 @@ package parser
import ( import (
"compress/gzip" "compress/gzip"
"encoding/xml" "encoding/xml"
"imposm3/element" "github.com/omniscale/imposm3/element"
"imposm3/logging" "github.com/omniscale/imposm3/logging"
"os" "os"
"strconv" "strconv"
) )

30
diff/process.go
View File

@ -5,21 +5,21 @@ import (
"fmt" "fmt"
"io" "io"
"imposm3/cache" "github.com/omniscale/imposm3/cache"
"imposm3/config" "github.com/omniscale/imposm3/config"
"imposm3/database" "github.com/omniscale/imposm3/database"
_ "imposm3/database/postgis" _ "github.com/omniscale/imposm3/database/postgis"
"imposm3/diff/parser" "github.com/omniscale/imposm3/diff/parser"
diffstate "imposm3/diff/state" diffstate "github.com/omniscale/imposm3/diff/state"
"imposm3/element" "github.com/omniscale/imposm3/element"
"imposm3/expire" "github.com/omniscale/imposm3/expire"
"imposm3/geom/geos" "github.com/omniscale/imposm3/geom/geos"
"imposm3/geom/limit" "github.com/omniscale/imposm3/geom/limit"
"imposm3/logging" "github.com/omniscale/imposm3/logging"
"imposm3/mapping" "github.com/omniscale/imposm3/mapping"
"imposm3/proj" "github.com/omniscale/imposm3/proj"
"imposm3/stats" "github.com/omniscale/imposm3/stats"
"imposm3/writer" "github.com/omniscale/imposm3/writer"
) )
var log = logging.NewLogger("diff") var log = logging.NewLogger("diff")

4
diff/state/state.go
View File

@ -4,8 +4,8 @@ import (
"bufio" "bufio"
"errors" "errors"
"fmt" "fmt"
"imposm3/logging" "github.com/omniscale/imposm3/logging"
"imposm3/parser/pbf" "github.com/omniscale/imposm3/parser/pbf"
"io" "io"
"net/http" "net/http"
"os" "os"

2
element/element.go
View File

@ -3,7 +3,7 @@ package element
import ( import (
"sort" "sort"
"imposm3/geom/geos" "github.com/omniscale/imposm3/geom/geos"
) )
type Tags map[string]string type Tags map[string]string

2
expire/expire.go
View File

@ -1,7 +1,7 @@
package expire package expire
import ( import (
"imposm3/element" "github.com/omniscale/imposm3/element"
) )
type Expireor interface { type Expireor interface {

4
geom/geojson/geojson.go
View File

@ -4,8 +4,8 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"imposm3/geom/geos" "github.com/omniscale/imposm3/geom/geos"
"imposm3/proj" "github.com/omniscale/imposm3/proj"
"io" "io"
) )

4
geom/geom.go
View File

@ -2,8 +2,8 @@ package geom
import ( import (
"errors" "errors"
"imposm3/element" "github.com/omniscale/imposm3/element"
"imposm3/geom/geos" "github.com/omniscale/imposm3/geom/geos"
"math" "math"
) )

4
geom/geom_test.go
View File

@ -1,8 +1,8 @@
package geom package geom
import ( import (
"imposm3/element" "github.com/omniscale/imposm3/element"
"imposm3/geom/geos" "github.com/omniscale/imposm3/geom/geos"
"testing" "testing"
) )

2
geom/geos/geos.go
View File

@ -13,7 +13,7 @@ extern void initGEOS_debug();
import "C" import "C"
import ( import (
"imposm3/logging" "github.com/omniscale/imposm3/logging"
"runtime" "runtime"
"unsafe" "unsafe"
) )

6
geom/limit/limit.go
View File

@ -2,9 +2,9 @@ package limit
import ( import (
"errors" "errors"
"imposm3/geom/geojson" "github.com/omniscale/imposm3/geom/geojson"
"imposm3/geom/geos" "github.com/omniscale/imposm3/geom/geos"
"imposm3/logging" "github.com/omniscale/imposm3/logging"
"math" "math"
"os" "os"
"strings" "strings"

2
geom/limit/limit_test.go
View File

@ -1,7 +1,7 @@
package limit package limit
import ( import (
"imposm3/geom/geos" "github.com/omniscale/imposm3/geom/geos"
"testing" "testing"
) )

4
geom/multipolygon.go
View File

@ -2,8 +2,8 @@ package geom
import ( import (
"errors" "errors"
"imposm3/element" "github.com/omniscale/imposm3/element"
"imposm3/geom/geos" "github.com/omniscale/imposm3/geom/geos"
"sort" "sort"
) )

4
geom/multipolygon_test.go
View File

@ -1,8 +1,8 @@
package geom package geom
import ( import (
"imposm3/element" "github.com/omniscale/imposm3/element"
"imposm3/geom/geos" "github.com/omniscale/imposm3/geom/geos"
"math" "math"
"testing" "testing"
) )

4
geom/ring.go
View File

@ -1,8 +1,8 @@
package geom package geom
import ( import (
"imposm3/element" "github.com/omniscale/imposm3/element"
"imposm3/geom/geos" "github.com/omniscale/imposm3/geom/geos"
) )
type Ring struct { type Ring struct {

2
geom/ring_test.go
View File

@ -1,7 +1,7 @@
package geom package geom
import ( import (
"imposm3/element" "github.com/omniscale/imposm3/element"
"sort" "sort"
"testing" "testing"
) )

24
import_/import.go
View File

@ -7,18 +7,18 @@ import (
"os" "os"
"path" "path"
"imposm3/cache" "github.com/omniscale/imposm3/cache"
"imposm3/config" "github.com/omniscale/imposm3/config"
"imposm3/database" "github.com/omniscale/imposm3/database"
_ "imposm3/database/postgis" _ "github.com/omniscale/imposm3/database/postgis"
state "imposm3/diff/state" state "github.com/omniscale/imposm3/diff/state"
"imposm3/geom/limit" "github.com/omniscale/imposm3/geom/limit"
"imposm3/logging" "github.com/omniscale/imposm3/logging"
"imposm3/mapping" "github.com/omniscale/imposm3/mapping"
"imposm3/parser/pbf" "github.com/omniscale/imposm3/parser/pbf"
"imposm3/reader" "github.com/omniscale/imposm3/reader"
"imposm3/stats" "github.com/omniscale/imposm3/stats"
"imposm3/writer" "github.com/omniscale/imposm3/writer"
) )
var log = logging.NewLogger("") var log = logging.NewLogger("")

2
imposm3.go
View File

@ -1,7 +1,7 @@
package main package main
import ( import (
"imposm3/cmd" "github.com/omniscale/imposm3/cmd"
) )
func main() { func main() {

2
mapping/config.go
View File

@ -3,7 +3,7 @@ package mapping
import ( import (
"encoding/json" "encoding/json"
"errors" "errors"
"imposm3/element" "github.com/omniscale/imposm3/element"
"os" "os"
) )

4
mapping/fields.go
View File

@ -2,8 +2,8 @@ package mapping
import ( import (
"errors" "errors"
"imposm3/element" "github.com/omniscale/imposm3/element"
"imposm3/logging" "github.com/omniscale/imposm3/logging"
"regexp" "regexp"
"strconv" "strconv"
"strings" "strings"

2
mapping/fields_test.go
View File

@ -1,7 +1,7 @@
package mapping package mapping
import ( import (
"imposm3/element" "github.com/omniscale/imposm3/element"
"testing" "testing"
) )

2
mapping/filter.go
View File

@ -1,7 +1,7 @@
package mapping package mapping
import ( import (
"imposm3/element" "github.com/omniscale/imposm3/element"
) )
func (m *Mapping) NodeTagFilter() TagFilterer { func (m *Mapping) NodeTagFilter() TagFilterer {

2
mapping/filter_test.go
View File

@ -1,7 +1,7 @@
package mapping package mapping
import ( import (
"imposm3/element" "github.com/omniscale/imposm3/element"
"testing" "testing"
) )

2
mapping/matcher.go
View File

@ -1,7 +1,7 @@
package mapping package mapping
import ( import (
"imposm3/element" "github.com/omniscale/imposm3/element"
) )
func (m *Mapping) PointMatcher() NodeMatcher { func (m *Mapping) PointMatcher() NodeMatcher {

2
mapping/matcher_test.go
View File

@ -1,7 +1,7 @@
package mapping package mapping
import ( import (
"imposm3/element" "github.com/omniscale/imposm3/element"
"testing" "testing"
) )

2
parser/pbf/lowlevel.go
View File

@ -7,7 +7,7 @@ import (
structs "encoding/binary" structs "encoding/binary"
"errors" "errors"
"fmt" "fmt"
"imposm3/parser/pbf/osmpbf" "github.com/omniscale/imposm3/parser/pbf/osmpbf"
"io" "io"
"log" "log"
"os" "os"

4
parser/pbf/pbf.go
View File

@ -1,8 +1,8 @@
package pbf package pbf
import ( import (
"imposm3/element" "github.com/omniscale/imposm3/element"
"imposm3/parser/pbf/osmpbf" "github.com/omniscale/imposm3/parser/pbf/osmpbf"
"log" "log"
) )

2
parser/pbf/pbf_test.go
View File

@ -5,7 +5,7 @@ import (
"code.google.com/p/goprotobuf/proto" "code.google.com/p/goprotobuf/proto"
"compress/zlib" "compress/zlib"
"fmt" "fmt"
"imposm3/parser/pbf/osmpbf" "github.com/omniscale/imposm3/parser/pbf/osmpbf"
"io" "io"
"log" "log"
"os" "os"

4
parser/pbf/process.go
View File

@ -1,8 +1,8 @@
package pbf package pbf
import ( import (
"imposm3/element" "github.com/omniscale/imposm3/element"
"imposm3/util" "github.com/omniscale/imposm3/util"
"runtime" "runtime"
"sync" "sync"
) )

2
proj/proj.go
View File

@ -1,7 +1,7 @@
package proj package proj
import ( import (
"imposm3/element" "github.com/omniscale/imposm3/element"
"math" "math"
) )

20
reader/reader.go
View File

@ -8,16 +8,16 @@ import (
"strings" "strings"
"sync" "sync"
osmcache "imposm3/cache" osmcache "github.com/omniscale/imposm3/cache"
"imposm3/element" "github.com/omniscale/imposm3/element"
"imposm3/geom/geos" "github.com/omniscale/imposm3/geom/geos"
"imposm3/geom/limit" "github.com/omniscale/imposm3/geom/limit"
"imposm3/logging" "github.com/omniscale/imposm3/logging"
"imposm3/mapping" "github.com/omniscale/imposm3/mapping"
"imposm3/parser/pbf" "github.com/omniscale/imposm3/parser/pbf"
"imposm3/proj" "github.com/omniscale/imposm3/proj"
"imposm3/stats" "github.com/omniscale/imposm3/stats"
"imposm3/util" "github.com/omniscale/imposm3/util"
) )
var log = logging.NewLogger("reader") var log = logging.NewLogger("reader")

2
stats/stats.go
View File

@ -2,7 +2,7 @@ package stats
import ( import (
"fmt" "fmt"
"imposm3/logging" "github.com/omniscale/imposm3/logging"
"time" "time"
) )

14
writer/nodes.go
View File

@ -1,13 +1,13 @@
package writer package writer
import ( import (
"imposm3/cache" "github.com/omniscale/imposm3/cache"
"imposm3/database" "github.com/omniscale/imposm3/database"
"imposm3/element" "github.com/omniscale/imposm3/element"
"imposm3/geom" "github.com/omniscale/imposm3/geom"
"imposm3/geom/geos" "github.com/omniscale/imposm3/geom/geos"
"imposm3/mapping" "github.com/omniscale/imposm3/mapping"
"imposm3/stats" "github.com/omniscale/imposm3/stats"
"sync" "sync"
) )

16
writer/relations.go
View File

@ -1,14 +1,14 @@
package writer package writer
import ( import (
"imposm3/cache" "github.com/omniscale/imposm3/cache"
"imposm3/database" "github.com/omniscale/imposm3/database"
"imposm3/element" "github.com/omniscale/imposm3/element"
"imposm3/expire" "github.com/omniscale/imposm3/expire"
"imposm3/geom" "github.com/omniscale/imposm3/geom"
"imposm3/geom/geos" "github.com/omniscale/imposm3/geom/geos"
"imposm3/mapping" "github.com/omniscale/imposm3/mapping"
"imposm3/stats" "github.com/omniscale/imposm3/stats"
"sync" "sync"
"time" "time"
) )

16
writer/ways.go
View File

@ -1,14 +1,14 @@
package writer package writer
import ( import (
"imposm3/cache" "github.com/omniscale/imposm3/cache"
"imposm3/database" "github.com/omniscale/imposm3/database"
"imposm3/element" "github.com/omniscale/imposm3/element"
"imposm3/expire" "github.com/omniscale/imposm3/expire"
"imposm3/geom" "github.com/omniscale/imposm3/geom"
"imposm3/geom/geos" "github.com/omniscale/imposm3/geom/geos"
"imposm3/mapping" "github.com/omniscale/imposm3/mapping"
"imposm3/stats" "github.com/omniscale/imposm3/stats"
"sync" "sync"
) )

16
writer/writer.go
View File

@ -4,14 +4,14 @@ import (
"runtime" "runtime"
"sync" "sync"
"imposm3/cache" "github.com/omniscale/imposm3/cache"
"imposm3/database" "github.com/omniscale/imposm3/database"
"imposm3/element" "github.com/omniscale/imposm3/element"
"imposm3/expire" "github.com/omniscale/imposm3/expire"
"imposm3/geom/limit" "github.com/omniscale/imposm3/geom/limit"
"imposm3/logging" "github.com/omniscale/imposm3/logging"
"imposm3/proj" "github.com/omniscale/imposm3/proj"
"imposm3/stats" "github.com/omniscale/imposm3/stats"
) )
var log = logging.NewLogger("writer") var log = logging.NewLogger("writer")