Merge pull request #37 from LdDl/wkt

Switch geometry import format from GeoJSON to WKT

Author: LdDl

README.md

@@ -1,4 +1,4 @@
-# Horizon v0.9.0 [![GoDoc](https://godoc.org/github.com/LdDl/horizon?status.svg)](https://godoc.org/github.com/LdDl/horizon) [![Build Status](https://travis-ci.com/LdDl/horizon.svg?branch=master)](https://travis-ci.com/LdDl/horizon) [![Sourcegraph](https://sourcegraph.com/github.com/LdDl/horizon/-/badge.svg)](https://sourcegraph.com/github.com/LdDl/horizon?badge) [![Go Report Card](https://goreportcard.com/badge/github.com/LdDl/horizon)](https://goreportcard.com/report/github.com/LdDl/horizon) [![GitHub tag](https://img.shields.io/github/tag/LdDl/horizon.svg)](https://github.com/LdDl/horizon/releases)
+# Horizon v0.10.0 [![GoDoc](https://godoc.org/github.com/LdDl/horizon?status.svg)](https://godoc.org/github.com/LdDl/horizon) [![Build Status](https://travis-ci.com/LdDl/horizon.svg?branch=master)](https://travis-ci.com/LdDl/horizon) [![Sourcegraph](https://sourcegraph.com/github.com/LdDl/horizon/-/badge.svg)](https://sourcegraph.com/github.com/LdDl/horizon?badge) [![Go Report Card](https://goreportcard.com/badge/github.com/LdDl/horizon)](https://goreportcard.com/report/github.com/LdDl/horizon) [![GitHub tag](https://img.shields.io/github/tag/LdDl/horizon.svg)](https://github.com/LdDl/horizon/releases)
 
 # Work in progress
 Horizon is project aimed to do map matching (snap GPS data to map) and routing (find shortest path between two points)
@@ -25,12 +25,12 @@ Demonstration:
 Via _go get_:
 ```shell
 go get github.com/LdDl/horizon
-go install github.com/LdDl/horizon/cmd/horizon@v0.9.0
+go install github.com/LdDl/horizon/cmd/horizon@v0.10.0
 ```
 
 Via downloading prebuilt binary and making updates in yours PATH environment varibale (both Linux and Windows):
-* Windows - https://github.com/LdDl/horizon/releases/download/v0.9.0/windows-horizon.zip
-* Linux - https://github.com/LdDl/horizon/releases/download/v0.9.0/linux-amd64-horizon.tar.gz
+* Windows - https://github.com/LdDl/horizon/releases/download/v0.10.0/windows-horizon.zip
+* Linux - https://github.com/LdDl/horizon/releases/download/v0.10.0/linux-amd64-horizon.tar.gz
 
 Check if **horizon** binary was installed properly:
 ```shell
@@ -87,11 +87,11 @@ Instruction has been made for Linux mainly. For Windows or OSX the way may vary.
 3. Convert *.osm.pbf to CSV via [osm2ch](https://github.com/LdDl/osm2ch#osm2ch).
 
     Notice:
-    * osm2ch's default output geometry format is WKT and units is 'km' (kilometers). We are going to change those default values. We are going to extract only edges adapted for cars also. 
+    * osm2ch's default output geometry format is WKT and units is 'km' (kilometers). We are going to change units to meters. We are going to extract only edges adapted for cars also.
     * Don't forget to prepare contraction hierarchies via flag 'contract=true'
 
     ```shell
-    osm2ch --file map.osm.pbf --out map.csv --geomf geojson --units m --tags motorway,primary,primary_link,road,secondary,secondary_link,residential,tertiary,tertiary_link,unclassified,trunk,trunk_link --contract=true
+    osm2ch --file map.osm.pbf --out map.csv --geomf wkt --units m --tags motorway,primary,primary_link,road,secondary,secondary_link,residential,tertiary,tertiary_link,unclassified,trunk,trunk_link --contract=true
     ```
     <img src="images/inst6.png" width="720">
 

map_engine.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/LdDl/ch"
 	"github.com/LdDl/horizon/spatial"
-	geojson "github.com/paulmach/go.geojson"
 	"github.com/pkg/errors"
 )
 
@@ -183,14 +182,9 @@ func (engine *MapEngine) extractDataFromCSVs(edgesFname, verticesFname, shortcut
 		}
 
 		coordinates := record[3]
-		bytesCoordinates := []byte(coordinates)
-		geojsonPolyline, err := geojson.UnmarshalGeometry(bytesCoordinates)
+		s2Polyline, err := spatial.WKTToS2PolylineFeature(coordinates)
 		if err != nil {
-			return errors.Wrap(err, fmt.Sprintf("Can't parse GeoJSON geometry of the edge: from_vertex_id = '%d' | to_vertex_id = '%d' | geom = '%s'", sourceVertex, targetVertex, coordinates))
-		}
-		s2Polyline, err := spatial.GeoJSONToS2PolylineFeature(geojsonPolyline)
-		if err != nil {
-			return errors.Wrap(err, fmt.Sprintf("Can't prepare s2-polyline edge: from_vertex_id = '%d' | to_vertex_id = '%d' | geom = '%s'", sourceVertex, targetVertex, coordinates))
+			return errors.Wrap(err, fmt.Sprintf("Can't parse WKT geometry of the edge: from_vertex_id = '%d' | to_vertex_id = '%d' | geom = '%s'", sourceVertex, targetVertex, coordinates))
 		}
 		if _, ok := engine.edges[sourceVertex]; !ok {
 			engine.edges[sourceVertex] = make(map[int64]*spatial.Edge)
@@ -252,13 +246,9 @@ func (engine *MapEngine) extractDataFromCSVs(edgesFname, verticesFname, shortcut
 		engine.graph.Vertices[vertexInternal].SetImportance(vertexImportance)
 
 		coordinates := record[3]
-		geoJSONPoint, err := geojson.UnmarshalGeometry([]byte(coordinates))
-		if err != nil {
-			return errors.Wrap(err, fmt.Sprintf("Can't parse GeoJSON geometry of the vertex '%d' | geom = '%s'", vertexExternal, coordinates))
-		}
-		s2Point, err := spatial.GeoJSONToS2PointFeature(geoJSONPoint)
+		s2Point, err := spatial.WKTToS2PointFeature(coordinates)
 		if err != nil {
-			return errors.Wrap(err, fmt.Sprintf("Can't prepare s2-point vertex '%d' | geom = '%s'", vertexExternal, coordinates))
+			return errors.Wrap(err, fmt.Sprintf("Can't parse WKT geometry of the vertex '%d' | geom = '%s'", vertexExternal, coordinates))
 		}
 		engine.vertices[vertexExternal] = &spatial.Vertex{
 			ID:    vertexExternal,

spatial/utils.go

@@ -3,6 +3,8 @@ package spatial
 import (
 	"fmt"
 	"math"
+	"strconv"
+	"strings"
 
 	"github.com/golang/geo/s2"
 	geojson "github.com/paulmach/go.geojson"
@@ -145,6 +147,90 @@ func S2PointToGeoJSONFeature(pt *s2.Point) *geojson.Feature {
 	return geojson.NewPointFeature([]float64{latLng.Lng.Degrees(), latLng.Lat.Degrees()})
 }
 
+// WKTToS2PolylineFeature parses WKT LINESTRING and returns *s2.Polyline
+// Expected format: LINESTRING(lon1 lat1, lon2 lat2, ...)
+func WKTToS2PolylineFeature(wkt string) (*s2.Polyline, error) {
+	wkt = strings.TrimSpace(wkt)
+
+	// Check for LINESTRING prefix
+	if !strings.HasPrefix(strings.ToUpper(wkt), "LINESTRING") {
+		return nil, fmt.Errorf("expected LINESTRING, got: %s", wkt)
+	}
+
+	// Extract coordinates between parentheses
+	start := strings.Index(wkt, "(")
+	end := strings.LastIndex(wkt, ")")
+	if start == -1 || end == -1 || start >= end {
+		return nil, fmt.Errorf("invalid WKT LINESTRING format: %s", wkt)
+	}
+
+	coordsStr := wkt[start+1 : end]
+	pointStrs := strings.Split(coordsStr, ",")
+
+	latLngs := make([]s2.LatLng, 0, len(pointStrs))
+	for _, ptStr := range pointStrs {
+		ptStr = strings.TrimSpace(ptStr)
+		parts := strings.Fields(ptStr)
+		if len(parts) < 2 {
+			return nil, fmt.Errorf("invalid coordinate pair: %s", ptStr)
+		}
+
+		lon, err := strconv.ParseFloat(parts[0], 64)
+		if err != nil {
+			return nil, fmt.Errorf("invalid longitude: %s", parts[0])
+		}
+
+		lat, err := strconv.ParseFloat(parts[1], 64)
+		if err != nil {
+			return nil, fmt.Errorf("invalid latitude: %s", parts[1])
+		}
+
+		latLngs = append(latLngs, s2.LatLngFromDegrees(lat, lon))
+	}
+
+	if len(latLngs) < 2 {
+		return nil, fmt.Errorf("LINESTRING must have at least 2 points")
+	}
+
+	return s2.PolylineFromLatLngs(latLngs), nil
+}
+
+// WKTToS2PointFeature parses WKT POINT and returns s2.Point
+// Expected format: POINT(lon lat)
+func WKTToS2PointFeature(wkt string) (s2.Point, error) {
+	wkt = strings.TrimSpace(wkt)
+
+	// Check for POINT prefix
+	if !strings.HasPrefix(strings.ToUpper(wkt), "POINT") {
+		return s2.Point{}, fmt.Errorf("expected POINT, got: %s", wkt)
+	}
+
+	// Extract coordinates between parentheses
+	start := strings.Index(wkt, "(")
+	end := strings.LastIndex(wkt, ")")
+	if start == -1 || end == -1 || start >= end {
+		return s2.Point{}, fmt.Errorf("invalid WKT POINT format: %s", wkt)
+	}
+
+	coordsStr := strings.TrimSpace(wkt[start+1 : end])
+	parts := strings.Fields(coordsStr)
+	if len(parts) < 2 {
+		return s2.Point{}, fmt.Errorf("invalid coordinate pair: %s", coordsStr)
+	}
+
+	lon, err := strconv.ParseFloat(parts[0], 64)
+	if err != nil {
+		return s2.Point{}, fmt.Errorf("invalid longitude: %s", parts[0])
+	}
+
+	lat, err := strconv.ParseFloat(parts[1], 64)
+	if err != nil {
+		return s2.Point{}, fmt.Errorf("invalid latitude: %s", parts[1])
+	}
+
+	return s2.PointFromLatLng(s2.LatLngFromDegrees(lat, lon)), nil
+}
+
 // ExtractCutUpTo cuts geometry between very first point and neighbor of the projected point index in the polyline
 func ExtractCutUpTo(polyline s2.Polyline, projected s2.Point, projectedIdx int) (s2.Polyline, s2.Polyline) {
 	polyCopy := polyline

test_data/matcher_4326_test.csv

@@ -1,6 +1,6 @@
 from_vertex_id;to_vertex_id;weight;geom;was_one_way;edge_id
-101;102;131.30390541936353;"{""type"":""LineString"",""coordinates"":[[37.66309622043991,55.773079419469],[37.66313666122084,55.77327959082814],[37.66310430859609,55.773520704964014],[37.66309622043992,55.773934689906994],[37.66309167085209,55.774258254747494]]}";true;1
-102;103;91.47099061865808;"{""type"":""LineString"",""coordinates"":[[37.66309167085209,55.774258254747494],[37.66374731701271,55.77424602870825],[37.66423665046183,55.77426877482456],[37.664552088552995,55.7742642256024]]}";true;2
-102;105;91.0490951658074;"{""type"":""LineString"",""coordinates"":[[37.66309167085209,55.774258254747494],[37.66305982373708,55.77454627637461],[37.66307195597136,55.7747282435316],[37.66314474937702,55.7750739787893]]}";true;3
-103;106;93.3306443622582;"{""type"":""LineString"",""coordinates"":[[37.664552088552995,55.7742642256024],[37.66448333922546,55.77441434965456],[37.66457635302158,55.77458721905901],[37.664560176709216,55.774698673926395],[37.664544000396845,55.77488291494706],[37.66460061749012,55.7750307620498],[37.6645156918502,55.77506033140307]]}";true;4
-104;103;171.32733035056765;"{""type"":""LineString"",""coordinates"":[[37.66434988464841,55.77279479904767],[37.664544000396816,55.77293583000571],[37.66464105827104,55.77308140981424],[37.664657234583395,55.77327703182576],[37.66477046876997,55.77346810354034],[37.66476238061379,55.773713765797055],[37.66468149905196,55.77387299050682],[37.664624881958666,55.77409590400769],[37.664552088552995,55.7742642256024]]}";true;5
+101;102;131.30390541936353;LINESTRING(37.66309622043991 55.773079419469, 37.66313666122084 55.77327959082814, 37.66310430859609 55.773520704964014, 37.66309622043992 55.773934689906994, 37.66309167085209 55.774258254747494);true;1
+102;103;91.47099061865808;LINESTRING(37.66309167085209 55.774258254747494, 37.66374731701271 55.77424602870825, 37.66423665046183 55.77426877482456, 37.664552088552995 55.7742642256024);true;2
+102;105;91.0490951658074;LINESTRING(37.66309167085209 55.774258254747494, 37.66305982373708 55.77454627637461, 37.66307195597136 55.7747282435316, 37.66314474937702 55.7750739787893);true;3
+103;106;93.3306443622582;LINESTRING(37.664552088552995 55.7742642256024, 37.66448333922546 55.77441434965456, 37.66457635302158 55.77458721905901, 37.664560176709216 55.774698673926395, 37.664544000396845 55.77488291494706, 37.66460061749012 55.7750307620498, 37.6645156918502 55.77506033140307);true;4
+104;103;171.32733035056765;LINESTRING(37.66434988464841 55.77279479904767, 37.664544000396816 55.77293583000571, 37.66464105827104 55.77308140981424, 37.664657234583395 55.77327703182576, 37.66477046876997 55.77346810354034, 37.66476238061379 55.773713765797055, 37.66468149905196 55.77387299050682, 37.664624881958666 55.77409590400769, 37.664552088552995 55.7742642256024);true;5

test_data/matcher_4326_test_vertices.csv

@@ -1,7 +1,7 @@
 vertex_id;order_pos;importance;geom
-101;0;11;"{""type"":""Point"",""coordinates"":[37.66309622043991,55.773079419469]}"
-102;5;91;"{""type"":""Point"",""coordinates"":[37.66309167085209,55.774258254747494]}"
-103;4;81;"{""type"":""Point"",""coordinates"":[37.664552088552995,55.7742642256024]}"
-104;1;11;"{""type"":""Point"",""coordinates"":[37.66434988464841,55.77279479904767]}"
-105;2;11;"{""type"":""Point"",""coordinates"":[37.66314474937702,55.7750739787893]}"
-106;3;11;"{""type"":""Point"",""coordinates"":[37.6645156918502,55.77506033140307]}"
+101;0;11;POINT(37.66309622043991 55.773079419469)
+102;5;91;POINT(37.66309167085209 55.774258254747494)
+103;4;81;POINT(37.664552088552995 55.7742642256024)
+104;1;11;POINT(37.66434988464841 55.77279479904767)
+105;2;11;POINT(37.66314474937702 55.7750739787893)
+106;3;11;POINT(37.6645156918502 55.77506033140307)