Merge pull request #67 from tianpf/main

add example encoding.

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
-
+## [1.1.0] - 2022-05-26
+### 新增
+- Optimize the topological relation algorithm and geometric operation algorithm of geometry, 
+ and improve the performance of calculation
+- The encoding and decoding methods of geoencoding are standardized, and the encoder interface is realized
+- Added support for coordinate system
 ## [1.0.4] - 2021-12-31
 ### Added
 - Delaunay triangle method and Voronoi diagram

CHANGELOG.zh-CN.md

@@ -1,5 +1,9 @@
 # 更新日志
-
+## [1.1.0] - 2022-05-26
+### 新增
+- 优化几何体的拓扑关系算法以及几何运算算法，提升了计算的性能
+- 规范了geoencoding的编码和解码方法，实现了encoder接口
+- 增加了对坐标系的支持
 ## [1.0.4] - 2021-12-31
 ### 新增
 - 德劳内三角形方法与沃罗诺伊图

README.md

@@ -47,29 +47,11 @@ func main() {
     fmt.Printf(e.Error())
   }
   fmt.Printf("%f", area)
-  // get result 4.0
-
-  rawJSON := []byte(`
-  { "type": "FeatureCollection",
-  "features": [
-    { "type": "Feature",
-    "geometry": {"type": "Point", "coordinates": [102.0, 0.5]},
-    "properties": {"prop0": "value0"}
-    }
-  ]
-  }`)
-
-  fc := geojson.NewFeatureCollection()
-  _ = json.Unmarshal(rawJSON, &fc)
-  println("%p", fc)
-
-  // Geometry will be unmarshalled into the correct geo.Geometry type.
-  point := fc.Features[0].Geometry.(geoos.Point)
-  println("%p", &point)
-
 }
 
 ```
+Example: geoencoding 
+[example_encoding.go](https://github.com/spatial-go/geoos/example/example_encoding.go)
 
 ## Maintainer
 

README.zh-CN.md

@@ -42,29 +42,11 @@ func main() {
     fmt.Printf(e.Error())
   }
   fmt.Printf("%f", area)
-  // get result 4.0
-
-  rawJSON := []byte(`
-  { "type": "FeatureCollection",
-  "features": [
-    { "type": "Feature",
-    "geometry": {"type": "Point", "coordinates": [102.0, 0.5]},
-    "properties": {"prop0": "value0"}
-    }
-  ]
-  }`)
-
-  fc := geojson.NewFeatureCollection()
-  _ = json.Unmarshal(rawJSON, &fc)
-  println("%p", fc)
-
-  // Geometry will be unmarshalled into the correct geo.Geometry type.
-  point := fc.Features[0].Geometry.(geoos.Point)
-  println("%p", &point)
-
 }
 
 ```
+Example: geoencoding 
+[example_encoding.go](https://github.com/spatial-go/geoos/example/example_encoding.go)
 
 ## 维护者
 

algorithm/graph/clipping/link.go

@@ -9,8 +9,7 @@ import (
 	"github.com/spatial-go/geoos/algorithm/calc"
 	"github.com/spatial-go/geoos/algorithm/graph"
 	"github.com/spatial-go/geoos/algorithm/matrix"
-	"github.com/spatial-go/geoos/encoding/geojson"
-
+	"github.com/spatial-go/geoos/geoencoding/geojson"
 	"github.com/spatial-go/geoos/space"
 )
 

algorithm/subdivision/voronoi_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/spatial-go/geoos/algorithm/matrix"
 	"github.com/spatial-go/geoos/algorithm/matrix/envelope"
-	"github.com/spatial-go/geoos/encoding/wkt"
+	"github.com/spatial-go/geoos/geoencoding/wkt"
 	"github.com/spatial-go/geoos/space"
 )
 

clusters/dbscan/kdtree_test.go

@@ -198,11 +198,11 @@ func isSortedOnDim(dim int, nodes []int, pts pointSlice) bool {
 		return true
 	}
 	prev := pts[nodes[0]][dim]
-	for _, n := range nodes {
-		if pts[n][dim] < prev {
+	for i := 0; i < len(nodes); i++ {
+		if pts[nodes[i]][dim] < prev {
 			return false
 		}
-		prev = pts[n][dim]
+		prev = pts[nodes[i]][dim]
 	}
 	return true
 }

example/data/geocsv.csv

@@ -0,0 +1,2 @@
+way_id,pt_id,x,y
+0,0,102,0.5

example/data/geojson.json

@@ -0,0 +1 @@
+{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[102,0.5]},"properties":{"prop0":"value0"}}]}

example/data/geowkb.wkb

@@ -0,0 +1 @@
+01070000000100000001010000000000000000805940000000000000e03f

example/data/geowkt.wkt

@@ -0,0 +1 @@
+GEOMETRYCOLLECTION(POINT(102 0.5))

example/encoding/example_encoding.go

@@ -0,0 +1,162 @@
+// Example  This is an example .
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+
+	"github.com/spatial-go/geoos/geoencoding"
+)
+
+func main() {
+	rawJSON := []byte(`
+  { "type": "FeatureCollection",
+	"features": [
+	  { "type": "Feature",
+		"geometry": {"type": "Point", "coordinates": [102.0, 0.5]},
+		"properties": {"prop0": "value0"}
+	  }
+	]
+  }`)
+
+	buf := new(bytes.Buffer)
+	buf.Write(rawJSON)
+
+	if geomFeatureCollection, err := geoencoding.ReadGeoJSON(buf, geoencoding.GeoJSON); err != nil {
+		fmt.Printf("ReadGeoJSON error:%v", err)
+	} else {
+		fmt.Println(geomFeatureCollection)
+
+		filename := "../data/geojson.json"
+		if file, err := os.Create(filename); err != nil {
+			fmt.Println(err)
+		} else {
+			defer file.Close()
+
+			if err := geoencoding.WriteGeoJSON(file, geomFeatureCollection, geoencoding.GeoJSON); err != nil {
+				fmt.Printf("WriteGeoJSON error:%v", err)
+			}
+		}
+
+		filename = "../data/geojson.json"
+		if file, err := os.Open(filename); err != nil {
+			fmt.Println(err)
+		} else {
+			defer file.Close()
+
+			if geomFeatureCollection, err := geoencoding.ReadGeoJSON(file, geoencoding.GeoJSON); err != nil {
+				fmt.Printf("ReadGeoJSON error:%v", err)
+			} else {
+				buf := new(bytes.Buffer)
+				_ = geoencoding.WriteGeoJSON(buf, geomFeatureCollection, geoencoding.GeoJSON)
+				bufStr := buf.String()
+				fmt.Println(bufStr)
+			}
+		}
+
+		filename = "../data/geobuf.proto"
+		if file, err := os.Create(filename); err != nil {
+			fmt.Println(err)
+		} else {
+			defer file.Close()
+			if err := geoencoding.WriteGeoJSON(file, geomFeatureCollection, geoencoding.Geobuf); err != nil {
+				fmt.Printf("WriteGeoJSON error:%v", err)
+			}
+		}
+
+		filename = "../data/geobuf.proto"
+		if file, err := os.Open(filename); err != nil {
+			fmt.Println(err)
+		} else {
+			defer file.Close()
+
+			if geomFeatureCollection, err := geoencoding.ReadGeoJSON(file, geoencoding.Geobuf); err != nil {
+				fmt.Printf("ReadGeoJSON error:%v", err)
+			} else {
+				buf := new(bytes.Buffer)
+				_ = geoencoding.WriteGeoJSON(buf, geomFeatureCollection, geoencoding.GeoJSON)
+				bufStr := buf.String()
+				fmt.Println(bufStr)
+			}
+		}
+
+		filename = "../data/geocsv.csv"
+		if file, err := os.Create(filename); err != nil {
+			fmt.Println(err)
+		} else {
+			defer file.Close()
+			if err := geoencoding.WriteGeoJSON(file, geomFeatureCollection, geoencoding.GeoCSV); err != nil {
+				fmt.Printf("WriteGeoJSON error:%v", err)
+			}
+		}
+
+		filename = "../data/geocsv.csv"
+		if file, err := os.Open(filename); err != nil {
+			fmt.Println(err)
+		} else {
+			defer file.Close()
+
+			if geomFeatureCollection, err := geoencoding.ReadGeoJSON(file, geoencoding.GeoCSV); err != nil {
+				fmt.Printf("ReadGeoJSON error:%v", err)
+			} else {
+				buf := new(bytes.Buffer)
+				_ = geoencoding.WriteGeoJSON(buf, geomFeatureCollection, geoencoding.GeoJSON)
+				bufStr := buf.String()
+				fmt.Println(bufStr)
+			}
+		}
+
+		filename = "../data/geowkb.wkb"
+		if file, err := os.Create(filename); err != nil {
+			fmt.Println(err)
+		} else {
+			defer file.Close()
+			if err := geoencoding.WriteGeoJSON(file, geomFeatureCollection, geoencoding.WKB); err != nil {
+				fmt.Printf("WriteGeoJSON error:%v", err)
+			}
+		}
+
+		filename = "../data/geowkb.wkb"
+		if file, err := os.Open(filename); err != nil {
+			fmt.Println(err)
+		} else {
+			defer file.Close()
+
+			if geomFeatureCollection, err := geoencoding.ReadGeoJSON(file, geoencoding.WKB); err != nil {
+				fmt.Printf("ReadGeoJSON error:%v", err)
+			} else {
+				buf := new(bytes.Buffer)
+				_ = geoencoding.WriteGeoJSON(buf, geomFeatureCollection, geoencoding.GeoJSON)
+				bufStr := buf.String()
+				fmt.Println(bufStr)
+			}
+		}
+
+		filename = "../data/geowkt.wkt"
+		if file, err := os.Create(filename); err != nil {
+			fmt.Println(err)
+		} else {
+			defer file.Close()
+			if err := geoencoding.WriteGeoJSON(file, geomFeatureCollection, geoencoding.WKT); err != nil {
+				fmt.Printf("WriteGeoJSON error:%v", err)
+			}
+		}
+
+		filename = "../data/geowkt.wkt"
+		if file, err := os.Open(filename); err != nil {
+			fmt.Println(err)
+		} else {
+			defer file.Close()
+
+			if geomFeatureCollection, err := geoencoding.ReadGeoJSON(file, geoencoding.WKT); err != nil {
+				fmt.Printf("ReadGeoJSON error:%v", err)
+			} else {
+				buf := new(bytes.Buffer)
+				_ = geoencoding.WriteGeoJSON(buf, geomFeatureCollection, geoencoding.GeoJSON)
+				bufStr := buf.String()
+				fmt.Println(bufStr)
+			}
+		}
+	}
+}

example/example.go

@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/spatial-go/geoos/encoding/geojson"
-	"github.com/spatial-go/geoos/encoding/wkt"
+	"github.com/spatial-go/geoos/geoencoding/geojson"
+	"github.com/spatial-go/geoos/geoencoding/wkt"
 	"github.com/spatial-go/geoos/planar"
 	"github.com/spatial-go/geoos/space"
 )

encoding/encoding.go → geoencoding/encoding.go

@@ -1,14 +1,14 @@
-// Package encoding  is a library for encoding and decoding into Go structs using the geometries.
-package encoding
+// Package geoencoding  is a library for encoding and decoding into Go structs using the geometries.
+package geoencoding
 
 import (
 	"io"
 
-	"github.com/spatial-go/geoos/encoding/geobuf"
-	"github.com/spatial-go/geoos/encoding/geocsv"
-	"github.com/spatial-go/geoos/encoding/geojson"
-	"github.com/spatial-go/geoos/encoding/wkb"
-	"github.com/spatial-go/geoos/encoding/wkt"
+	"github.com/spatial-go/geoos/geoencoding/geobuf"
+	"github.com/spatial-go/geoos/geoencoding/geocsv"
+	"github.com/spatial-go/geoos/geoencoding/geojson"
+	"github.com/spatial-go/geoos/geoencoding/wkb"
+	"github.com/spatial-go/geoos/geoencoding/wkt"
 	"github.com/spatial-go/geoos/space"
 )
 

encoding/encoding_test.go → geoencoding/encoding_test.go

@@ -1,5 +1,4 @@
-// Package encoding  is a library for encoding and decoding into Go structs using the geometries.
-package encoding
+package geoencoding
 
 import (
 	"bytes"

encoding/geobuf/decode/decode.go → geoencoding/geobuf/decode/decode.go

@@ -1,8 +1,8 @@
 package decode
 
 import (
-	"github.com/spatial-go/geoos/encoding/geobuf/protogeo"
-	"github.com/spatial-go/geoos/encoding/geojson"
+	"github.com/spatial-go/geoos/geoencoding/geobuf/protogeo"
+	"github.com/spatial-go/geoos/geoencoding/geojson"
 )
 
 // Decode ...

encoding/geobuf/decode/feature.go → geoencoding/geobuf/decode/feature.go

@@ -1,8 +1,8 @@
 package decode
 
 import (
-	"github.com/spatial-go/geoos/encoding/geobuf/protogeo"
-	"github.com/spatial-go/geoos/encoding/geojson"
+	"github.com/spatial-go/geoos/geoencoding/geobuf/protogeo"
+	"github.com/spatial-go/geoos/geoencoding/geojson"
 	"github.com/spatial-go/geoos/space"
 )
 

encoding/geobuf/decode/geometry.go → geoencoding/geobuf/decode/geometry.go

@@ -2,8 +2,8 @@ package decode
 
 import (
 	"github.com/spatial-go/geoos/algorithm/matrix"
-	"github.com/spatial-go/geoos/encoding/geobuf/protogeo"
-	"github.com/spatial-go/geoos/encoding/geojson"
+	"github.com/spatial-go/geoos/geoencoding/geobuf/protogeo"
+	"github.com/spatial-go/geoos/geoencoding/geojson"
 	"github.com/spatial-go/geoos/space"
 )
 

encoding/geobuf/encode/encode.go → geoencoding/geobuf/encode/encode.go

@@ -1,8 +1,8 @@
 package encode
 
 import (
-	"github.com/spatial-go/geoos/encoding/geobuf/protogeo"
-	"github.com/spatial-go/geoos/encoding/geojson"
+	"github.com/spatial-go/geoos/geoencoding/geobuf/protogeo"
+	"github.com/spatial-go/geoos/geoencoding/geojson"
 )
 
 // Encode ...

encoding/geobuf/encode/feature_encode.go → geoencoding/geobuf/encode/feature_encode.go

@@ -1,8 +1,8 @@
 package encode
 
 import (
-	"github.com/spatial-go/geoos/encoding/geobuf/protogeo"
-	"github.com/spatial-go/geoos/encoding/geojson"
+	"github.com/spatial-go/geoos/geoencoding/geobuf/protogeo"
+	"github.com/spatial-go/geoos/geoencoding/geojson"
 )
 
 // FeatureEncode ...