From b2d25dd30636ade2a0401c4d186661896f4cb534 Mon Sep 17 00:00:00 2001 From: HarutakaMatsumoto Date: Mon, 5 Feb 2024 16:52:51 +0900 Subject: [PATCH] Fixed the version. Succeeded all of the tests --- .gitignore | 3 +-- common/object/coordinate.go | 2 +- common/object/spatial_id.go | 4 ++-- common/spatial/point3.go | 4 ++-- common/spatial/quat.go | 2 +- common/spatial/quat_test.go | 4 ++-- common/util.go | 2 +- examples/checkZoom/go.mod | 2 +- examples/checkZoom/main.go | 3 ++- go.mod | 2 +- integrate/change_zoom.go | 8 ++++---- integrate/merge_zoom.go | 10 +++++----- integrate/merge_zoom_test.go | 2 +- operated/shifting_spatial_id.go | 6 +++--- operated/shifting_spatial_id_test.go | 2 +- shape/line.go | 10 +++++----- shape/line_test.go | 6 +++--- shape/point.go | 10 +++++----- shape/point_test.go | 6 +++--- transform/convert_quadkey_and_Vertical_id.go | 8 ++++---- transform/convert_quadkey_and_Vertical_id_test.go | 4 ++-- transform/voxel_around_line.go | 12 ++++++------ transform/voxel_around_line_test.go | 6 +++--- transform/voxel_id.go | 2 +- 24 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.gitignore b/.gitignore index 4464f33..69145f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -*.log **/.DS_Store -.vscode/**/* \ No newline at end of file +.vscode/**/* diff --git a/common/object/coordinate.go b/common/object/coordinate.go index ccdbfea..a3cc992 100644 --- a/common/object/coordinate.go +++ b/common/object/coordinate.go @@ -4,7 +4,7 @@ package object import ( "math" - "github.com/trajectoryjp/spatial_id_go/common/errors" + "github.com/trajectoryjp/spatial_id_go/v2/common/errors" ) // Point 地理座標用の構造体 diff --git a/common/object/spatial_id.go b/common/object/spatial_id.go index fe6949c..ca982a2 100644 --- a/common/object/spatial_id.go +++ b/common/object/spatial_id.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - "github.com/trajectoryjp/spatial_id_go/common/consts" - "github.com/trajectoryjp/spatial_id_go/common/errors" + "github.com/trajectoryjp/spatial_id_go/v2/common/consts" + "github.com/trajectoryjp/spatial_id_go/v2/common/errors" ) // ExtendedSpatialID 拡張空間IDクラス diff --git a/common/spatial/point3.go b/common/spatial/point3.go index 87b9b62..fb689e2 100644 --- a/common/spatial/point3.go +++ b/common/spatial/point3.go @@ -2,8 +2,8 @@ package spatial import ( - "github.com/trajectoryjp/spatial_id_go/common" - "github.com/trajectoryjp/spatial_id_go/common/errors" + "github.com/trajectoryjp/spatial_id_go/v2/common" + "github.com/trajectoryjp/spatial_id_go/v2/common/errors" ) // UniqueAppend 点のユニークを保持した配列追加 diff --git a/common/spatial/quat.go b/common/spatial/quat.go index 745677b..c6becc4 100644 --- a/common/spatial/quat.go +++ b/common/spatial/quat.go @@ -4,7 +4,7 @@ package spatial import ( "math" - "github.com/trajectoryjp/spatial_id_go/common/consts" + "github.com/trajectoryjp/spatial_id_go/v2/common/consts" ) // Quat 四元数の構造体 diff --git a/common/spatial/quat_test.go b/common/spatial/quat_test.go index 3b96cad..9f32ddd 100755 --- a/common/spatial/quat_test.go +++ b/common/spatial/quat_test.go @@ -3,8 +3,8 @@ package spatial import ( "testing" - "github.com/trajectoryjp/spatial_id_go/common" - "github.com/trajectoryjp/spatial_id_go/common/consts" + "github.com/trajectoryjp/spatial_id_go/v2/common" + "github.com/trajectoryjp/spatial_id_go/v2/common/consts" ) // TestQuat 四元数の構造体(試験用) diff --git a/common/util.go b/common/util.go index 7f5e217..4288ffc 100644 --- a/common/util.go +++ b/common/util.go @@ -4,7 +4,7 @@ package common import ( "math" - "github.com/trajectoryjp/spatial_id_go/common/errors" + "github.com/trajectoryjp/spatial_id_go/v2/common/errors" ) // AlmostEqual 同値確認関数 diff --git a/examples/checkZoom/go.mod b/examples/checkZoom/go.mod index 3dfd414..7afa7c7 100644 --- a/examples/checkZoom/go.mod +++ b/examples/checkZoom/go.mod @@ -2,7 +2,7 @@ module checkZoom go 1.20 -require github.com/trajectoryjp/spatial_id_go v1.0.0 +require github.com/trajectoryjp/spatial_id_go v2.0.0 require ( github.com/wroge/wgs84 v1.1.7 // indirect diff --git a/examples/checkZoom/main.go b/examples/checkZoom/main.go index 4d573b8..c4d260e 100644 --- a/examples/checkZoom/main.go +++ b/examples/checkZoom/main.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/trajectoryjp/spatial_id_go/shape" + + "github.com/trajectoryjp/spatial_id_go/v2/shape" ) func main() { diff --git a/go.mod b/go.mod index bb83bcd..353c79a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/trajectoryjp/spatial_id_go +module github.com/trajectoryjp/spatial_id_go/v2 go 1.19 diff --git a/integrate/change_zoom.go b/integrate/change_zoom.go index 187d1dd..fa4e893 100644 --- a/integrate/change_zoom.go +++ b/integrate/change_zoom.go @@ -6,10 +6,10 @@ import ( "strconv" "strings" - "github.com/trajectoryjp/spatial_id_go/common" - "github.com/trajectoryjp/spatial_id_go/common/errors" - "github.com/trajectoryjp/spatial_id_go/common/object" - "github.com/trajectoryjp/spatial_id_go/shape" + "github.com/trajectoryjp/spatial_id_go/v2/common" + "github.com/trajectoryjp/spatial_id_go/v2/common/errors" + "github.com/trajectoryjp/spatial_id_go/v2/common/object" + "github.com/trajectoryjp/spatial_id_go/v2/shape" ) // ChangeSpatialIdsZoom 空間IDの精度変換関数 diff --git a/integrate/merge_zoom.go b/integrate/merge_zoom.go index 65ac530..a91e554 100644 --- a/integrate/merge_zoom.go +++ b/integrate/merge_zoom.go @@ -5,11 +5,11 @@ import ( "strconv" "strings" - "github.com/trajectoryjp/spatial_id_go/common" - "github.com/trajectoryjp/spatial_id_go/common/consts" - "github.com/trajectoryjp/spatial_id_go/common/errors" - "github.com/trajectoryjp/spatial_id_go/common/object" - "github.com/trajectoryjp/spatial_id_go/shape" + "github.com/trajectoryjp/spatial_id_go/v2/common" + "github.com/trajectoryjp/spatial_id_go/v2/common/consts" + "github.com/trajectoryjp/spatial_id_go/v2/common/errors" + "github.com/trajectoryjp/spatial_id_go/v2/common/object" + "github.com/trajectoryjp/spatial_id_go/v2/shape" ) // UnitDividedSpatialID 単位分割拡張空間ID構造体 diff --git a/integrate/merge_zoom_test.go b/integrate/merge_zoom_test.go index 56a00d9..f7f564a 100755 --- a/integrate/merge_zoom_test.go +++ b/integrate/merge_zoom_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/trajectoryjp/spatial_id_go/common/object" + "github.com/trajectoryjp/spatial_id_go/v2/common/object" ) // TestNewUnitDividedSpatialID01 単位分割拡張空間ID構造体のコンストラクタ 正常系動作確認 diff --git a/operated/shifting_spatial_id.go b/operated/shifting_spatial_id.go index 98ec0ea..24acdcf 100644 --- a/operated/shifting_spatial_id.go +++ b/operated/shifting_spatial_id.go @@ -7,9 +7,9 @@ import ( "strconv" "strings" - "github.com/trajectoryjp/spatial_id_go/common" - "github.com/trajectoryjp/spatial_id_go/common/consts" - "github.com/trajectoryjp/spatial_id_go/common/object" + "github.com/trajectoryjp/spatial_id_go/v2/common" + "github.com/trajectoryjp/spatial_id_go/v2/common/consts" + "github.com/trajectoryjp/spatial_id_go/v2/common/object" ) // Get6spatialIdsAdjacentToFaces 拡張空間IDの面6個の拡張空間ID取得関数 diff --git a/operated/shifting_spatial_id_test.go b/operated/shifting_spatial_id_test.go index 28c502d..00d861f 100755 --- a/operated/shifting_spatial_id_test.go +++ b/operated/shifting_spatial_id_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/trajectoryjp/spatial_id_go/common" + "github.com/trajectoryjp/spatial_id_go/v2/common" ) // TestGet6spatialIdsAdjacentToFaces01 正常系動作確認 diff --git a/shape/line.go b/shape/line.go index 61f2886..6dee43b 100644 --- a/shape/line.go +++ b/shape/line.go @@ -3,11 +3,11 @@ package shape import ( "math" - "github.com/trajectoryjp/spatial_id_go/common" - "github.com/trajectoryjp/spatial_id_go/common/errors" - "github.com/trajectoryjp/spatial_id_go/common/object" - "github.com/trajectoryjp/spatial_id_go/common/spatial" - "github.com/trajectoryjp/spatial_id_go/operated" + "github.com/trajectoryjp/spatial_id_go/v2/common" + "github.com/trajectoryjp/spatial_id_go/v2/common/errors" + "github.com/trajectoryjp/spatial_id_go/v2/common/object" + "github.com/trajectoryjp/spatial_id_go/v2/common/spatial" + "github.com/trajectoryjp/spatial_id_go/v2/operated" ) const ( diff --git a/shape/line_test.go b/shape/line_test.go index 13a199e..ea501d4 100755 --- a/shape/line_test.go +++ b/shape/line_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/trajectoryjp/spatial_id_go/common/enum" - "github.com/trajectoryjp/spatial_id_go/common/object" - "github.com/trajectoryjp/spatial_id_go/common/spatial" + "github.com/trajectoryjp/spatial_id_go/v2/common/enum" + "github.com/trajectoryjp/spatial_id_go/v2/common/object" + "github.com/trajectoryjp/spatial_id_go/v2/common/spatial" ) // TestGetSpatialIdsOnLine01 正常系動作確認 diff --git a/shape/point.go b/shape/point.go index c2c6e06..54b6180 100644 --- a/shape/point.go +++ b/shape/point.go @@ -24,11 +24,11 @@ import ( "strconv" "strings" - "github.com/trajectoryjp/spatial_id_go/common" - "github.com/trajectoryjp/spatial_id_go/common/consts" - "github.com/trajectoryjp/spatial_id_go/common/enum" - "github.com/trajectoryjp/spatial_id_go/common/errors" - "github.com/trajectoryjp/spatial_id_go/common/object" + "github.com/trajectoryjp/spatial_id_go/v2/common" + "github.com/trajectoryjp/spatial_id_go/v2/common/consts" + "github.com/trajectoryjp/spatial_id_go/v2/common/enum" + "github.com/trajectoryjp/spatial_id_go/v2/common/errors" + "github.com/trajectoryjp/spatial_id_go/v2/common/object" "github.com/wroge/wgs84" ) diff --git a/shape/point_test.go b/shape/point_test.go index b78f6ac..4d74819 100644 --- a/shape/point_test.go +++ b/shape/point_test.go @@ -5,9 +5,9 @@ import ( "reflect" "testing" - "github.com/trajectoryjp/spatial_id_go/common/consts" - "github.com/trajectoryjp/spatial_id_go/common/enum" - "github.com/trajectoryjp/spatial_id_go/common/object" + "github.com/trajectoryjp/spatial_id_go/v2/common/consts" + "github.com/trajectoryjp/spatial_id_go/v2/common/enum" + "github.com/trajectoryjp/spatial_id_go/v2/common/object" "github.com/wroge/wgs84" ) diff --git a/transform/convert_quadkey_and_Vertical_id.go b/transform/convert_quadkey_and_Vertical_id.go index 9eb8ce1..9a469a9 100644 --- a/transform/convert_quadkey_and_Vertical_id.go +++ b/transform/convert_quadkey_and_Vertical_id.go @@ -6,10 +6,10 @@ import ( "strconv" "strings" - "github.com/trajectoryjp/spatial_id_go/common/errors" - "github.com/trajectoryjp/spatial_id_go/common/object" - "github.com/trajectoryjp/spatial_id_go/integrate" - "github.com/trajectoryjp/spatial_id_go/shape" + "github.com/trajectoryjp/spatial_id_go/v2/common/errors" + "github.com/trajectoryjp/spatial_id_go/v2/common/object" + "github.com/trajectoryjp/spatial_id_go/v2/integrate" + "github.com/trajectoryjp/spatial_id_go/v2/shape" ) // 宣言 diff --git a/transform/convert_quadkey_and_Vertical_id_test.go b/transform/convert_quadkey_and_Vertical_id_test.go index 963a34d..cd06e83 100755 --- a/transform/convert_quadkey_and_Vertical_id_test.go +++ b/transform/convert_quadkey_and_Vertical_id_test.go @@ -7,8 +7,8 @@ import ( "strconv" "testing" - "github.com/trajectoryjp/spatial_id_go/common/errors" - "github.com/trajectoryjp/spatial_id_go/common/object" + "github.com/trajectoryjp/spatial_id_go/v2/common/errors" + "github.com/trajectoryjp/spatial_id_go/v2/common/object" ) func TestConvertQuadkeysAndVerticalIDsToExtendedSpatialIDs(t *testing.T) { diff --git a/transform/voxel_around_line.go b/transform/voxel_around_line.go index 7bdde37..09f05f7 100644 --- a/transform/voxel_around_line.go +++ b/transform/voxel_around_line.go @@ -4,12 +4,12 @@ import ( "fmt" "strings" - "github.com/trajectoryjp/spatial_id_go/common" - "github.com/trajectoryjp/spatial_id_go/common/consts" - "github.com/trajectoryjp/spatial_id_go/common/enum" - "github.com/trajectoryjp/spatial_id_go/common/object" - "github.com/trajectoryjp/spatial_id_go/operated" - "github.com/trajectoryjp/spatial_id_go/shape" + "github.com/trajectoryjp/spatial_id_go/v2/common" + "github.com/trajectoryjp/spatial_id_go/v2/common/consts" + "github.com/trajectoryjp/spatial_id_go/v2/common/enum" + "github.com/trajectoryjp/spatial_id_go/v2/common/object" + "github.com/trajectoryjp/spatial_id_go/v2/operated" + "github.com/trajectoryjp/spatial_id_go/v2/shape" "github.com/go-gl/mathgl/mgl64" diff --git a/transform/voxel_around_line_test.go b/transform/voxel_around_line_test.go index eb31d08..59450f1 100644 --- a/transform/voxel_around_line_test.go +++ b/transform/voxel_around_line_test.go @@ -8,9 +8,9 @@ import ( "github.com/go-gl/mathgl/mgl64" closest "github.com/trajectoryjp/closest_go" geodesy "github.com/trajectoryjp/geodesy_go/coordinates" - "github.com/trajectoryjp/spatial_id_go/common/errors" - "github.com/trajectoryjp/spatial_id_go/common/object" - "github.com/trajectoryjp/spatial_id_go/shape" + "github.com/trajectoryjp/spatial_id_go/v2/common/errors" + "github.com/trajectoryjp/spatial_id_go/v2/common/object" + "github.com/trajectoryjp/spatial_id_go/v2/shape" ) func TestGetSpatialIdsWithinRadiusOfLine10m_r0_horizontal(t *testing.T) { diff --git a/transform/voxel_id.go b/transform/voxel_id.go index 493b08f..440fee5 100644 --- a/transform/voxel_id.go +++ b/transform/voxel_id.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/trajectoryjp/spatial_id_go/common/consts" + "github.com/trajectoryjp/spatial_id_go/v2/common/consts" ) // GetVoxelIDfromSpatialID ボクセル成分ID取得