Store subset of opennames data in gob format and use that to restore index.
This commit is contained in:
Ray Miller
parent
66d4c6243a
commit
86022818da
13 changed files with 195 additions and 77 deletions
|
|
@ -1,44 +0,0 @@
|
|||
package openname
|
||||
|
||||
import (
|
||||
"archive/zip"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/dhconnelly/rtreego"
|
||||
)
|
||||
|
||||
func BuildIndex(filename string) (*rtreego.Rtree, error) {
|
||||
r, err := zip.OpenReader(filename)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error opening %s fo reading: %v", filename, err)
|
||||
}
|
||||
defer r.Close()
|
||||
rt := rtreego.NewTree(2, 25, 50)
|
||||
for _, f := range r.File {
|
||||
if !(strings.HasPrefix(f.Name, "DATA/") && strings.HasSuffix(f.Name, ".csv")) {
|
||||
continue
|
||||
}
|
||||
rc, err := f.Open()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("erorr opening %s: %v", filename, err)
|
||||
}
|
||||
s, err := NewScanner(rc)
|
||||
if err != nil {
|
||||
rc.Close()
|
||||
return nil, fmt.Errorf("error reading %s: %v", f.Name, err)
|
||||
}
|
||||
for s.Scan() {
|
||||
r := s.Record()
|
||||
if r.Type == "populatedPlace" && r.MbrXMax != r.MbrXMin && r.MbrYMax != r.MbrYMin {
|
||||
rt.Insert(r)
|
||||
}
|
||||
}
|
||||
if err = s.Err(); err != nil {
|
||||
rc.Close()
|
||||
return nil, fmt.Errorf("error parsing %s: %v", f.Name, err)
|
||||
}
|
||||
rc.Close()
|
||||
}
|
||||
return rt, nil
|
||||
}
|
||||
69
pkg/openname/io.go
Normal file
69
pkg/openname/io.go
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
package openname
|
||||
|
||||
import (
|
||||
"archive/zip"
|
||||
"encoding/gob"
|
||||
"fmt"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"github.com/ray1729/gpx-utils/pkg/placenames"
|
||||
)
|
||||
|
||||
// ProcessFile reads the compressed OS Open Names data set and calls the handler for each record.
|
||||
func ProcessFile(filename string, handler func(*Record) error) error {
|
||||
r, err := zip.OpenReader(filename)
|
||||
if err != nil {
|
||||
return fmt.Errorf("error opening %s for reading: %v", filename, err)
|
||||
}
|
||||
defer r.Close()
|
||||
|
||||
for _, f := range r.File {
|
||||
if !(strings.HasPrefix(f.Name, "DATA/") && strings.HasSuffix(f.Name, ".csv")) {
|
||||
continue
|
||||
}
|
||||
rc, err := f.Open()
|
||||
if err != nil {
|
||||
return fmt.Errorf("error opening %s: %v", filename, err)
|
||||
}
|
||||
s, err := NewScanner(rc)
|
||||
if err != nil {
|
||||
rc.Close()
|
||||
return fmt.Errorf("error reading %s: %v", f.Name, err)
|
||||
}
|
||||
for s.Scan() {
|
||||
r := s.Record()
|
||||
if r.Type == "populatedPlace" && r.MbrXMax != r.MbrXMin && r.MbrYMax != r.MbrYMin {
|
||||
if err := handler(r); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
if err = s.Err(); err != nil {
|
||||
rc.Close()
|
||||
return fmt.Errorf("error parsing %s: %v", f.Name, err)
|
||||
}
|
||||
rc.Close()
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// Save processes the OS OpenNames zip file and outputs bounded places in gob format.
|
||||
func Save(inFile string, outFile string) error {
|
||||
wc, err := os.OpenFile(outFile, os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0644)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer wc.Close()
|
||||
enc := gob.NewEncoder(wc)
|
||||
err = ProcessFile(inFile, func(r *Record) error {
|
||||
b := placenames.NamedBoundary{
|
||||
Name: r.Name,
|
||||
Xmin: r.MbrXMin,
|
||||
Ymin: r.MbrYMin,
|
||||
Xmax: r.MbrXMax,
|
||||
Ymax: r.MbrYMax}
|
||||
return enc.Encode(b)
|
||||
})
|
||||
return err
|
||||
}
|
||||
|
|
@ -1,117 +0,0 @@
|
|||
package openname
|
||||
|
||||
import (
|
||||
"io"
|
||||
"math"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/dhconnelly/rtreego"
|
||||
"github.com/fofanov/go-osgb"
|
||||
"github.com/twpayne/go-gpx"
|
||||
)
|
||||
|
||||
type GPXSummarizer struct {
|
||||
rt *rtreego.Rtree
|
||||
trans osgb.CoordinateTransformer
|
||||
}
|
||||
|
||||
func NewGPXSummarizer(rt *rtreego.Rtree) (*GPXSummarizer, error) {
|
||||
trans, err := osgb.NewOSTN15Transformer()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &GPXSummarizer{rt: rt, trans: trans}, nil
|
||||
}
|
||||
|
||||
func insideLoc(p rtreego.Point, loc *Record) bool {
|
||||
return p[0] >= loc.MbrXMin && p[0] <= loc.MbrXMax && p[1] >= loc.MbrYMin && p[1] <= loc.MbrYMax
|
||||
}
|
||||
|
||||
func distance(p1, p2 rtreego.Point) float64 {
|
||||
if len(p1) != len(p2) {
|
||||
panic("Length mismatch")
|
||||
}
|
||||
var s float64
|
||||
for i := range p1 {
|
||||
d := p1[i] - p2[i]
|
||||
s += d * d
|
||||
}
|
||||
return math.Sqrt(s) / 1000.0
|
||||
}
|
||||
|
||||
type POI struct {
|
||||
Name string
|
||||
Distance float64
|
||||
}
|
||||
|
||||
type TrackSummary struct {
|
||||
Name string
|
||||
Time time.Time
|
||||
Link string
|
||||
Start string
|
||||
Finish string
|
||||
Distance float64
|
||||
Ascent float64
|
||||
PointsOfInterest []POI
|
||||
}
|
||||
|
||||
func (gs *GPXSummarizer) SummarizeTrack(r io.Reader) (*TrackSummary, error) {
|
||||
g, err := gpx.Read(r)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var s TrackSummary
|
||||
s.Name = g.Metadata.Name
|
||||
s.Time = g.Metadata.Time
|
||||
for _, l := range g.Metadata.Link {
|
||||
if strings.HasPrefix(l.HREF, "http") {
|
||||
s.Link = l.HREF
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
var prevPlace string
|
||||
var prevPlacePoint rtreego.Point
|
||||
var prevPoint rtreego.Point
|
||||
var prevHeight float64
|
||||
|
||||
init := true
|
||||
for _, trk := range g.Trk {
|
||||
for _, seg := range trk.TrkSeg {
|
||||
for _, p := range seg.TrkPt {
|
||||
gpsCoord := osgb.NewETRS89Coord(p.Lon, p.Lat, p.Ele)
|
||||
ngCoord, err := gs.trans.ToNationalGrid(gpsCoord)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
thisPoint := rtreego.Point{ngCoord.Easting, ngCoord.Northing}
|
||||
thisHeight := ngCoord.Height
|
||||
nn, _ := gs.rt.NearestNeighbor(thisPoint).(*Record)
|
||||
if init {
|
||||
s.Start = nn.Name
|
||||
prevPlace = nn.Name
|
||||
prevPlacePoint = thisPoint
|
||||
prevPoint = thisPoint
|
||||
prevHeight = thisHeight
|
||||
s.PointsOfInterest = append(s.PointsOfInterest, POI{nn.Name, 0.0})
|
||||
init = false
|
||||
continue
|
||||
}
|
||||
s.Distance += distance(thisPoint, prevPoint)
|
||||
if ascent := thisHeight - prevHeight; ascent > 0 {
|
||||
s.Ascent += ascent
|
||||
}
|
||||
if insideLoc(thisPoint, nn) && nn.Name != prevPlace && distance(thisPoint, prevPlacePoint) > 0.2 {
|
||||
s.PointsOfInterest = append(s.PointsOfInterest, POI{nn.Name, s.Distance})
|
||||
prevPlace = nn.Name
|
||||
prevPlacePoint = thisPoint
|
||||
}
|
||||
prevPoint = thisPoint
|
||||
prevHeight = thisHeight
|
||||
}
|
||||
}
|
||||
}
|
||||
s.Finish = prevPlace
|
||||
return &s, nil
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue