diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9b09426..aec01fa 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -47,7 +47,7 @@ jobs: # Ref: https://github.com/actions/checkout - name: Checkout Source - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: # Number of commits to fetch. 0 indicates all history for all branches and tags. # Default: 1 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 74475a4..bde9f64 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -36,7 +36,7 @@ jobs: # Ref: https://github.com/actions/checkout - name: "Checkout Source" - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: fetch-depth: 0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 0df021c..f546746 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,18 @@ Date format: `YYYY-MM-DD` --- +## [1.53.0] - 2025-11-23 + +### Added +### Changed +- **risk:** Restructured proto files to `sixafter/types` subdirectory to prevent naming collisions when vendored by consumers. + +### Deprecated +### Removed +### Fixed + +--- + ## [1.52.0] - 2025-11-20 ### Added @@ -140,7 +152,7 @@ Date format: `YYYY-MM-DD` ## [1.43.0] - 2025-08-21 ### Added -**feature:** Added support for ISO 639 [Language](language.proto) message, which includes BCP 47 language tags. +**feature:** Added support for ISO 639 [Language](sixafter/types/language.proto) message, which includes BCP 47 language tags. ### Changed - **debt:** Upgraded dependencies to their latest stable versions; e.g. protoc-gen-go `v1.36.8`. @@ -338,7 +350,7 @@ Date format: `YYYY-MM-DD` ## [1.24.0] - 2024-11-17 ### Added -- **FEATURE:** Added [geometry.proto](geometry.proto) for defining geometrical constructs, including: +- **FEATURE:** Added [geometry.proto](sixafter/types/geometry.proto) for defining geometrical constructs, including: - Scalar: Represents a scalar number using an unscaled integer value and a scale for fixed-point arithmetic. - CoordinateSystem: Defines the coordinate system used to interpret geometric entities (e.g., Cartesian, Polar), with optional parameters. - GeometryType: Specifies the type of geometry abstracting the mathematical space (e.g., Euclidean, Hyperbolic), with optional parameters. @@ -383,7 +395,8 @@ Date format: `YYYY-MM-DD` ### Fixed ### Security -[Unreleased]: https://github.com/sixafter/types/compare/v1.52.0...HEAD +[Unreleased]: https://github.com/sixafter/types/compare/v1.53.0...HEAD +[1.53.0]: https://github.com/sixafter/types/compare/v1.52.0...v1.53.0 [1.52.0]: https://github.com/sixafter/types/compare/v1.51.3...v1.52.0 [1.51.3]: https://github.com/sixafter/types/compare/v1.50.0...v1.51.3 [1.50.0]: https://github.com/sixafter/types/compare/v1.49.0...v1.50.0 diff --git a/Makefile b/Makefile index 7518c4c..d6e8f4a 100644 --- a/Makefile +++ b/Makefile @@ -32,31 +32,31 @@ export BINARY_NAME=main.out .PHONY: build build: ## Build the binary file - @scripts/go-build.sh + @sbin/go-build.sh .PHONY: test test: ## Execute unit tests - @scripts/go-test.sh + @sbin/go-test.sh .PHONY: run run: - @scripts/go-run.sh + @sbin/go-run.sh .PHONY: clean clean: ## Remove previous build - @scripts/go-clean.sh + @sbin/go-clean.sh .PHONY: cover cover: ## Generate global code coverage report - @scripts/go-cover.sh + @sbin/go-cover.sh .PHONY: analyze analyze: ## Generate static analysis report - @scripts/go-analyze.sh + @sbin/go-analyze.sh .PHONY: deps deps: ## Get the dependencies and vendor - @scripts/go-deps.sh + @sbin/go-deps.sh .PHONY: fmt fmt: ## Format the files @@ -84,7 +84,7 @@ tidy: .PHONY: update update: - $(GO_GET) -u + $(GO_GET) -u ./... .PHONY: vuln vuln: ## Check for vulnerabilities @@ -92,15 +92,15 @@ vuln: ## Check for vulnerabilities .PHONY: release-verify release-verify: ## Verify the release - @scripts/verify-release.sh + @sbin/verify-release.sh .PHONY: module-verify mod-verify: ## Verify Go module integrity - @scripts/verify-mod.sh + @sbin/verify-mod.sh .PHONY: signature-verify signature-verify: ## Verify latest release's digital signatures - @scripts/verify-sig.sh + @sbin/verify-sig.sh .PHONY: help help: ## Display this help screen diff --git a/doc.go b/doc.go new file mode 100644 index 0000000..1a71894 --- /dev/null +++ b/doc.go @@ -0,0 +1,33 @@ +// Copyright 2020-2025 SIX AFTER, INC (SIX AFTER) +// +// SPDX-License-Identifier: Apache-2.0 +// SPDX-FileCopyrightText: SIX AFTER, INC (SIX AFTER) +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Package types provides protocol buffer definitions for common, reusable types +// used across SIX AFTER services and applications. +// +// These types include geographic coordinates, temporal ranges, entity metadata, +// and other well-known types that can be imported and used in other protobuf +// definitions or Go code. +// +// To import these proto files in your own .proto files: +// +// import "sixafter/types/uuid.proto"; +// import "sixafter/types/geospatial_coordinate.proto"; +// +// To use the generated Go types: +// +// import "github.com/sixafter/types/sixafter/types" +package types diff --git a/scripts/go-build.sh b/sbin/go-build.sh similarity index 97% rename from scripts/go-build.sh rename to sbin/go-build.sh index fc4a347..fe65b28 100755 --- a/scripts/go-build.sh +++ b/sbin/go-build.sh @@ -23,4 +23,4 @@ if is_windows; then exit 1 fi -protoc --go_out=. --go_opt=paths=source_relative --proto_path=. ./*.proto +protoc --go_out=. --go_opt=paths=source_relative --proto_path=. sixafter/types/*.proto diff --git a/scripts/go-clean.sh b/sbin/go-clean.sh similarity index 96% rename from scripts/go-clean.sh rename to sbin/go-clean.sh index 149ef32..d2cef9e 100755 --- a/scripts/go-clean.sh +++ b/sbin/go-clean.sh @@ -24,4 +24,4 @@ if is_windows; then fi go clean -rm -f ./*.pb.go +rm -f ./sixafter/types/*.pb.go diff --git a/scripts/go-deps.sh b/sbin/go-deps.sh similarity index 100% rename from scripts/go-deps.sh rename to sbin/go-deps.sh diff --git a/scripts/go-install.sh b/sbin/go-install.sh similarity index 100% rename from scripts/go-install.sh rename to sbin/go-install.sh diff --git a/scripts/go-test.sh b/sbin/go-test.sh similarity index 100% rename from scripts/go-test.sh rename to sbin/go-test.sh diff --git a/scripts/os-type.sh b/sbin/os-type.sh similarity index 100% rename from scripts/os-type.sh rename to sbin/os-type.sh diff --git a/scripts/verify-mod.sh b/sbin/verify-mod.sh similarity index 100% rename from scripts/verify-mod.sh rename to sbin/verify-mod.sh diff --git a/scripts/verify-release.sh b/sbin/verify-release.sh similarity index 100% rename from scripts/verify-release.sh rename to sbin/verify-release.sh diff --git a/scripts/verify-sig.sh b/sbin/verify-sig.sh similarity index 100% rename from scripts/verify-sig.sh rename to sbin/verify-sig.sh diff --git a/compass_heading.pb.go b/sixafter/types/compass_heading.pb.go similarity index 76% rename from compass_heading.pb.go rename to sixafter/types/compass_heading.pb.go index 286db51..062c252 100644 --- a/compass_heading.pb.go +++ b/sixafter/types/compass_heading.pb.go @@ -19,7 +19,7 @@ // versions: // protoc-gen-go v1.36.10 // protoc v6.33.1 -// source: compass_heading.proto +// source: sixafter/types/compass_heading.proto package types @@ -77,7 +77,7 @@ type CompassHeading struct { func (x *CompassHeading) Reset() { *x = CompassHeading{} - mi := &file_compass_heading_proto_msgTypes[0] + mi := &file_sixafter_types_compass_heading_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -89,7 +89,7 @@ func (x *CompassHeading) String() string { func (*CompassHeading) ProtoMessage() {} func (x *CompassHeading) ProtoReflect() protoreflect.Message { - mi := &file_compass_heading_proto_msgTypes[0] + mi := &file_sixafter_types_compass_heading_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -102,7 +102,7 @@ func (x *CompassHeading) ProtoReflect() protoreflect.Message { // Deprecated: Use CompassHeading.ProtoReflect.Descriptor instead. func (*CompassHeading) Descriptor() ([]byte, []int) { - return file_compass_heading_proto_rawDescGZIP(), []int{0} + return file_sixafter_types_compass_heading_proto_rawDescGZIP(), []int{0} } func (x *CompassHeading) GetMagneticHeading() float32 { @@ -154,11 +154,11 @@ func (x *CompassHeading) GetZ() float32 { return 0 } -var File_compass_heading_proto protoreflect.FileDescriptor +var File_sixafter_types_compass_heading_proto protoreflect.FileDescriptor -const file_compass_heading_proto_rawDesc = "" + +const file_sixafter_types_compass_heading_proto_rawDesc = "" + "\n" + - "\x15compass_heading.proto\x12\x0esixafter.types\x1a\x1fgoogle/protobuf/timestamp.proto\"\xed\x01\n" + + "$sixafter/types/compass_heading.proto\x12\x0esixafter.types\x1a\x1fgoogle/protobuf/timestamp.proto\"\xed\x01\n" + "\x0eCompassHeading\x12)\n" + "\x10magnetic_heading\x18\x01 \x01(\x02R\x0fmagneticHeading\x12!\n" + "\ftrue_heading\x18\x02 \x01(\x02R\vtrueHeading\x12)\n" + @@ -170,23 +170,23 @@ const file_compass_heading_proto_rawDesc = "" + "\x12com.sixafter.typesB\x13CompassHeadingProtoP\x01Z\x1fgithub.com/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" var ( - file_compass_heading_proto_rawDescOnce sync.Once - file_compass_heading_proto_rawDescData []byte + file_sixafter_types_compass_heading_proto_rawDescOnce sync.Once + file_sixafter_types_compass_heading_proto_rawDescData []byte ) -func file_compass_heading_proto_rawDescGZIP() []byte { - file_compass_heading_proto_rawDescOnce.Do(func() { - file_compass_heading_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_compass_heading_proto_rawDesc), len(file_compass_heading_proto_rawDesc))) +func file_sixafter_types_compass_heading_proto_rawDescGZIP() []byte { + file_sixafter_types_compass_heading_proto_rawDescOnce.Do(func() { + file_sixafter_types_compass_heading_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sixafter_types_compass_heading_proto_rawDesc), len(file_sixafter_types_compass_heading_proto_rawDesc))) }) - return file_compass_heading_proto_rawDescData + return file_sixafter_types_compass_heading_proto_rawDescData } -var file_compass_heading_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_compass_heading_proto_goTypes = []any{ +var file_sixafter_types_compass_heading_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_sixafter_types_compass_heading_proto_goTypes = []any{ (*CompassHeading)(nil), // 0: sixafter.types.CompassHeading (*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp } -var file_compass_heading_proto_depIdxs = []int32{ +var file_sixafter_types_compass_heading_proto_depIdxs = []int32{ 1, // 0: sixafter.types.CompassHeading.timestamp:type_name -> google.protobuf.Timestamp 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type @@ -195,26 +195,26 @@ var file_compass_heading_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_compass_heading_proto_init() } -func file_compass_heading_proto_init() { - if File_compass_heading_proto != nil { +func init() { file_sixafter_types_compass_heading_proto_init() } +func file_sixafter_types_compass_heading_proto_init() { + if File_sixafter_types_compass_heading_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_compass_heading_proto_rawDesc), len(file_compass_heading_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_compass_heading_proto_rawDesc), len(file_sixafter_types_compass_heading_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_compass_heading_proto_goTypes, - DependencyIndexes: file_compass_heading_proto_depIdxs, - MessageInfos: file_compass_heading_proto_msgTypes, + GoTypes: file_sixafter_types_compass_heading_proto_goTypes, + DependencyIndexes: file_sixafter_types_compass_heading_proto_depIdxs, + MessageInfos: file_sixafter_types_compass_heading_proto_msgTypes, }.Build() - File_compass_heading_proto = out.File - file_compass_heading_proto_goTypes = nil - file_compass_heading_proto_depIdxs = nil + File_sixafter_types_compass_heading_proto = out.File + file_sixafter_types_compass_heading_proto_goTypes = nil + file_sixafter_types_compass_heading_proto_depIdxs = nil } diff --git a/compass_heading.proto b/sixafter/types/compass_heading.proto similarity index 100% rename from compass_heading.proto rename to sixafter/types/compass_heading.proto diff --git a/country.pb.go b/sixafter/types/country.pb.go similarity index 74% rename from country.pb.go rename to sixafter/types/country.pb.go index 9c3a892..2824f11 100644 --- a/country.pb.go +++ b/sixafter/types/country.pb.go @@ -19,7 +19,7 @@ // versions: // protoc-gen-go v1.36.10 // protoc v6.33.1 -// source: country.proto +// source: sixafter/types/country.proto package types @@ -67,7 +67,7 @@ type Country struct { func (x *Country) Reset() { *x = Country{} - mi := &file_country_proto_msgTypes[0] + mi := &file_sixafter_types_country_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -79,7 +79,7 @@ func (x *Country) String() string { func (*Country) ProtoMessage() {} func (x *Country) ProtoReflect() protoreflect.Message { - mi := &file_country_proto_msgTypes[0] + mi := &file_sixafter_types_country_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -92,7 +92,7 @@ func (x *Country) ProtoReflect() protoreflect.Message { // Deprecated: Use Country.ProtoReflect.Descriptor instead. func (*Country) Descriptor() ([]byte, []int) { - return file_country_proto_rawDescGZIP(), []int{0} + return file_sixafter_types_country_proto_rawDescGZIP(), []int{0} } func (x *Country) GetName() string { @@ -130,11 +130,11 @@ func (x *Country) GetNumericCode() uint32 { return 0 } -var File_country_proto protoreflect.FileDescriptor +var File_sixafter_types_country_proto protoreflect.FileDescriptor -const file_country_proto_rawDesc = "" + +const file_sixafter_types_country_proto_rawDesc = "" + "\n" + - "\rcountry.proto\x12\x0esixafter.types\"\xb9\x01\n" + + "\x1csixafter/types/country.proto\x12\x0esixafter.types\"\xb9\x01\n" + "\aCountry\x12\x12\n" + "\x04name\x18\x01 \x01(\tR\x04name\x12\x1f\n" + "\vformal_name\x18\x02 \x01(\tR\n" + @@ -145,22 +145,22 @@ const file_country_proto_rawDesc = "" + "\x12com.sixafter.typesB\fCountryProtoP\x01Z\x1fgithub.com/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" var ( - file_country_proto_rawDescOnce sync.Once - file_country_proto_rawDescData []byte + file_sixafter_types_country_proto_rawDescOnce sync.Once + file_sixafter_types_country_proto_rawDescData []byte ) -func file_country_proto_rawDescGZIP() []byte { - file_country_proto_rawDescOnce.Do(func() { - file_country_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_country_proto_rawDesc), len(file_country_proto_rawDesc))) +func file_sixafter_types_country_proto_rawDescGZIP() []byte { + file_sixafter_types_country_proto_rawDescOnce.Do(func() { + file_sixafter_types_country_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sixafter_types_country_proto_rawDesc), len(file_sixafter_types_country_proto_rawDesc))) }) - return file_country_proto_rawDescData + return file_sixafter_types_country_proto_rawDescData } -var file_country_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_country_proto_goTypes = []any{ +var file_sixafter_types_country_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_sixafter_types_country_proto_goTypes = []any{ (*Country)(nil), // 0: sixafter.types.Country } -var file_country_proto_depIdxs = []int32{ +var file_sixafter_types_country_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -168,26 +168,26 @@ var file_country_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_country_proto_init() } -func file_country_proto_init() { - if File_country_proto != nil { +func init() { file_sixafter_types_country_proto_init() } +func file_sixafter_types_country_proto_init() { + if File_sixafter_types_country_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_country_proto_rawDesc), len(file_country_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_country_proto_rawDesc), len(file_sixafter_types_country_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_country_proto_goTypes, - DependencyIndexes: file_country_proto_depIdxs, - MessageInfos: file_country_proto_msgTypes, + GoTypes: file_sixafter_types_country_proto_goTypes, + DependencyIndexes: file_sixafter_types_country_proto_depIdxs, + MessageInfos: file_sixafter_types_country_proto_msgTypes, }.Build() - File_country_proto = out.File - file_country_proto_goTypes = nil - file_country_proto_depIdxs = nil + File_sixafter_types_country_proto = out.File + file_sixafter_types_country_proto_goTypes = nil + file_sixafter_types_country_proto_depIdxs = nil } diff --git a/country.proto b/sixafter/types/country.proto similarity index 100% rename from country.proto rename to sixafter/types/country.proto diff --git a/country_subdivision.pb.go b/sixafter/types/country_subdivision.pb.go similarity index 66% rename from country_subdivision.pb.go rename to sixafter/types/country_subdivision.pb.go index 3847945..1c14c56 100644 --- a/country_subdivision.pb.go +++ b/sixafter/types/country_subdivision.pb.go @@ -19,7 +19,7 @@ // versions: // protoc-gen-go v1.36.10 // protoc v6.33.1 -// source: country_subdivision.proto +// source: sixafter/types/country_subdivision.proto package types @@ -58,7 +58,7 @@ type CountrySubdivision struct { func (x *CountrySubdivision) Reset() { *x = CountrySubdivision{} - mi := &file_country_subdivision_proto_msgTypes[0] + mi := &file_sixafter_types_country_subdivision_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -70,7 +70,7 @@ func (x *CountrySubdivision) String() string { func (*CountrySubdivision) ProtoMessage() {} func (x *CountrySubdivision) ProtoReflect() protoreflect.Message { - mi := &file_country_subdivision_proto_msgTypes[0] + mi := &file_sixafter_types_country_subdivision_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -83,7 +83,7 @@ func (x *CountrySubdivision) ProtoReflect() protoreflect.Message { // Deprecated: Use CountrySubdivision.ProtoReflect.Descriptor instead. func (*CountrySubdivision) Descriptor() ([]byte, []int) { - return file_country_subdivision_proto_rawDescGZIP(), []int{0} + return file_sixafter_types_country_subdivision_proto_rawDescGZIP(), []int{0} } func (x *CountrySubdivision) GetName() string { @@ -107,11 +107,11 @@ func (x *CountrySubdivision) GetCountry() *Country { return nil } -var File_country_subdivision_proto protoreflect.FileDescriptor +var File_sixafter_types_country_subdivision_proto protoreflect.FileDescriptor -const file_country_subdivision_proto_rawDesc = "" + +const file_sixafter_types_country_subdivision_proto_rawDesc = "" + "\n" + - "\x19country_subdivision.proto\x12\x0esixafter.types\x1a\rcountry.proto\"o\n" + + "(sixafter/types/country_subdivision.proto\x12\x0esixafter.types\x1a\x1csixafter/types/country.proto\"o\n" + "\x12CountrySubdivision\x12\x12\n" + "\x04name\x18\x01 \x01(\tR\x04name\x12\x12\n" + "\x04code\x18\x02 \x01(\tR\x04code\x121\n" + @@ -119,23 +119,23 @@ const file_country_subdivision_proto_rawDesc = "" + "\x12com.sixafter.typesB\x17CountrySubdivisionProtoP\x01Z\x1fgithub.com/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" var ( - file_country_subdivision_proto_rawDescOnce sync.Once - file_country_subdivision_proto_rawDescData []byte + file_sixafter_types_country_subdivision_proto_rawDescOnce sync.Once + file_sixafter_types_country_subdivision_proto_rawDescData []byte ) -func file_country_subdivision_proto_rawDescGZIP() []byte { - file_country_subdivision_proto_rawDescOnce.Do(func() { - file_country_subdivision_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_country_subdivision_proto_rawDesc), len(file_country_subdivision_proto_rawDesc))) +func file_sixafter_types_country_subdivision_proto_rawDescGZIP() []byte { + file_sixafter_types_country_subdivision_proto_rawDescOnce.Do(func() { + file_sixafter_types_country_subdivision_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sixafter_types_country_subdivision_proto_rawDesc), len(file_sixafter_types_country_subdivision_proto_rawDesc))) }) - return file_country_subdivision_proto_rawDescData + return file_sixafter_types_country_subdivision_proto_rawDescData } -var file_country_subdivision_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_country_subdivision_proto_goTypes = []any{ +var file_sixafter_types_country_subdivision_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_sixafter_types_country_subdivision_proto_goTypes = []any{ (*CountrySubdivision)(nil), // 0: sixafter.types.CountrySubdivision (*Country)(nil), // 1: sixafter.types.Country } -var file_country_subdivision_proto_depIdxs = []int32{ +var file_sixafter_types_country_subdivision_proto_depIdxs = []int32{ 1, // 0: sixafter.types.CountrySubdivision.country:type_name -> sixafter.types.Country 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type @@ -144,27 +144,27 @@ var file_country_subdivision_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_country_subdivision_proto_init() } -func file_country_subdivision_proto_init() { - if File_country_subdivision_proto != nil { +func init() { file_sixafter_types_country_subdivision_proto_init() } +func file_sixafter_types_country_subdivision_proto_init() { + if File_sixafter_types_country_subdivision_proto != nil { return } - file_country_proto_init() + file_sixafter_types_country_proto_init() type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_country_subdivision_proto_rawDesc), len(file_country_subdivision_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_country_subdivision_proto_rawDesc), len(file_sixafter_types_country_subdivision_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_country_subdivision_proto_goTypes, - DependencyIndexes: file_country_subdivision_proto_depIdxs, - MessageInfos: file_country_subdivision_proto_msgTypes, + GoTypes: file_sixafter_types_country_subdivision_proto_goTypes, + DependencyIndexes: file_sixafter_types_country_subdivision_proto_depIdxs, + MessageInfos: file_sixafter_types_country_subdivision_proto_msgTypes, }.Build() - File_country_subdivision_proto = out.File - file_country_subdivision_proto_goTypes = nil - file_country_subdivision_proto_depIdxs = nil + File_sixafter_types_country_subdivision_proto = out.File + file_sixafter_types_country_subdivision_proto_goTypes = nil + file_sixafter_types_country_subdivision_proto_depIdxs = nil } diff --git a/country_subdivision.proto b/sixafter/types/country_subdivision.proto similarity index 95% rename from country_subdivision.proto rename to sixafter/types/country_subdivision.proto index fa87aa6..7bbc059 100644 --- a/country_subdivision.proto +++ b/sixafter/types/country_subdivision.proto @@ -27,7 +27,7 @@ option java_outer_classname = "CountrySubdivisionProto"; option objc_class_prefix = "TPB"; option csharp_namespace = "SixAfter.Types.WellKnownTypes"; -import "country.proto"; +import "sixafter/types/country.proto"; // The `CountrySubdivision` message represents a subdivision of a country, // such as a state, province, or territory, as defined by the ISO-3166-2 standard. @@ -43,5 +43,5 @@ message CountrySubdivision { string code = 2; // The country to which this subdivision belongs. - Country country = 3; + sixafter.types.Country country = 3; } diff --git a/email_address.pb.go b/sixafter/types/email_address.pb.go similarity index 68% rename from email_address.pb.go rename to sixafter/types/email_address.pb.go index 844bd20..74e7caa 100644 --- a/email_address.pb.go +++ b/sixafter/types/email_address.pb.go @@ -19,7 +19,7 @@ // versions: // protoc-gen-go v1.36.10 // protoc v6.33.1 -// source: email_address.proto +// source: sixafter/types/email_address.proto package types @@ -58,7 +58,7 @@ type EmailAddress struct { func (x *EmailAddress) Reset() { *x = EmailAddress{} - mi := &file_email_address_proto_msgTypes[0] + mi := &file_sixafter_types_email_address_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -70,7 +70,7 @@ func (x *EmailAddress) String() string { func (*EmailAddress) ProtoMessage() {} func (x *EmailAddress) ProtoReflect() protoreflect.Message { - mi := &file_email_address_proto_msgTypes[0] + mi := &file_sixafter_types_email_address_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -83,7 +83,7 @@ func (x *EmailAddress) ProtoReflect() protoreflect.Message { // Deprecated: Use EmailAddress.ProtoReflect.Descriptor instead. func (*EmailAddress) Descriptor() ([]byte, []int) { - return file_email_address_proto_rawDescGZIP(), []int{0} + return file_sixafter_types_email_address_proto_rawDescGZIP(), []int{0} } func (x *EmailAddress) GetLocalPart() string { @@ -100,11 +100,11 @@ func (x *EmailAddress) GetDomainPart() string { return "" } -var File_email_address_proto protoreflect.FileDescriptor +var File_sixafter_types_email_address_proto protoreflect.FileDescriptor -const file_email_address_proto_rawDesc = "" + +const file_sixafter_types_email_address_proto_rawDesc = "" + "\n" + - "\x13email_address.proto\x12\x0esixafter.types\"N\n" + + "\"sixafter/types/email_address.proto\x12\x0esixafter.types\"N\n" + "\fEmailAddress\x12\x1d\n" + "\n" + "local_part\x18\x01 \x01(\tR\tlocalPart\x12\x1f\n" + @@ -113,22 +113,22 @@ const file_email_address_proto_rawDesc = "" + "\x12com.sixafter.typesB\x11EmailAddressProtoP\x01Z\x1fgithub.com/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" var ( - file_email_address_proto_rawDescOnce sync.Once - file_email_address_proto_rawDescData []byte + file_sixafter_types_email_address_proto_rawDescOnce sync.Once + file_sixafter_types_email_address_proto_rawDescData []byte ) -func file_email_address_proto_rawDescGZIP() []byte { - file_email_address_proto_rawDescOnce.Do(func() { - file_email_address_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_email_address_proto_rawDesc), len(file_email_address_proto_rawDesc))) +func file_sixafter_types_email_address_proto_rawDescGZIP() []byte { + file_sixafter_types_email_address_proto_rawDescOnce.Do(func() { + file_sixafter_types_email_address_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sixafter_types_email_address_proto_rawDesc), len(file_sixafter_types_email_address_proto_rawDesc))) }) - return file_email_address_proto_rawDescData + return file_sixafter_types_email_address_proto_rawDescData } -var file_email_address_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_email_address_proto_goTypes = []any{ +var file_sixafter_types_email_address_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_sixafter_types_email_address_proto_goTypes = []any{ (*EmailAddress)(nil), // 0: sixafter.types.EmailAddress } -var file_email_address_proto_depIdxs = []int32{ +var file_sixafter_types_email_address_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -136,26 +136,26 @@ var file_email_address_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_email_address_proto_init() } -func file_email_address_proto_init() { - if File_email_address_proto != nil { +func init() { file_sixafter_types_email_address_proto_init() } +func file_sixafter_types_email_address_proto_init() { + if File_sixafter_types_email_address_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_email_address_proto_rawDesc), len(file_email_address_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_email_address_proto_rawDesc), len(file_sixafter_types_email_address_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_email_address_proto_goTypes, - DependencyIndexes: file_email_address_proto_depIdxs, - MessageInfos: file_email_address_proto_msgTypes, + GoTypes: file_sixafter_types_email_address_proto_goTypes, + DependencyIndexes: file_sixafter_types_email_address_proto_depIdxs, + MessageInfos: file_sixafter_types_email_address_proto_msgTypes, }.Build() - File_email_address_proto = out.File - file_email_address_proto_goTypes = nil - file_email_address_proto_depIdxs = nil + File_sixafter_types_email_address_proto = out.File + file_sixafter_types_email_address_proto_goTypes = nil + file_sixafter_types_email_address_proto_depIdxs = nil } diff --git a/email_address.proto b/sixafter/types/email_address.proto similarity index 100% rename from email_address.proto rename to sixafter/types/email_address.proto diff --git a/entity_metadata.pb.go b/sixafter/types/entity_metadata.pb.go similarity index 80% rename from entity_metadata.pb.go rename to sixafter/types/entity_metadata.pb.go index 3225190..cbeee4a 100644 --- a/entity_metadata.pb.go +++ b/sixafter/types/entity_metadata.pb.go @@ -19,7 +19,7 @@ // versions: // protoc-gen-go v1.36.10 // protoc v6.33.1 -// source: entity_metadata.proto +// source: sixafter/types/entity_metadata.proto package types @@ -91,7 +91,7 @@ type EntityMetadata struct { func (x *EntityMetadata) Reset() { *x = EntityMetadata{} - mi := &file_entity_metadata_proto_msgTypes[0] + mi := &file_sixafter_types_entity_metadata_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -103,7 +103,7 @@ func (x *EntityMetadata) String() string { func (*EntityMetadata) ProtoMessage() {} func (x *EntityMetadata) ProtoReflect() protoreflect.Message { - mi := &file_entity_metadata_proto_msgTypes[0] + mi := &file_sixafter_types_entity_metadata_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -116,7 +116,7 @@ func (x *EntityMetadata) ProtoReflect() protoreflect.Message { // Deprecated: Use EntityMetadata.ProtoReflect.Descriptor instead. func (*EntityMetadata) Descriptor() ([]byte, []int) { - return file_entity_metadata_proto_rawDescGZIP(), []int{0} + return file_sixafter_types_entity_metadata_proto_rawDescGZIP(), []int{0} } func (x *EntityMetadata) GetCreatedAt() *timestamppb.Timestamp { @@ -189,11 +189,11 @@ func (x *EntityMetadata) GetAttributes() *structpb.Struct { return nil } -var File_entity_metadata_proto protoreflect.FileDescriptor +var File_sixafter_types_entity_metadata_proto protoreflect.FileDescriptor -const file_entity_metadata_proto_rawDesc = "" + +const file_sixafter_types_entity_metadata_proto_rawDesc = "" + "\n" + - "\x15entity_metadata.proto\x12\x0esixafter.types\x1a\x1cgoogle/protobuf/struct.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\rversion.proto\"\xbd\x03\n" + + "$sixafter/types/entity_metadata.proto\x12\x0esixafter.types\x1a\x1cgoogle/protobuf/struct.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1csixafter/types/version.proto\"\xbd\x03\n" + "\x0eEntityMetadata\x129\n" + "\n" + "created_at\x18\x01 \x01(\v2\x1a.google.protobuf.TimestampR\tcreatedAt\x12;\n" + @@ -216,25 +216,25 @@ const file_entity_metadata_proto_rawDesc = "" + "\x12com.sixafter.typesB\x13EntityMetadataProtoP\x01Z\x1fgithub.com/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" var ( - file_entity_metadata_proto_rawDescOnce sync.Once - file_entity_metadata_proto_rawDescData []byte + file_sixafter_types_entity_metadata_proto_rawDescOnce sync.Once + file_sixafter_types_entity_metadata_proto_rawDescData []byte ) -func file_entity_metadata_proto_rawDescGZIP() []byte { - file_entity_metadata_proto_rawDescOnce.Do(func() { - file_entity_metadata_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_entity_metadata_proto_rawDesc), len(file_entity_metadata_proto_rawDesc))) +func file_sixafter_types_entity_metadata_proto_rawDescGZIP() []byte { + file_sixafter_types_entity_metadata_proto_rawDescOnce.Do(func() { + file_sixafter_types_entity_metadata_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sixafter_types_entity_metadata_proto_rawDesc), len(file_sixafter_types_entity_metadata_proto_rawDesc))) }) - return file_entity_metadata_proto_rawDescData + return file_sixafter_types_entity_metadata_proto_rawDescData } -var file_entity_metadata_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_entity_metadata_proto_goTypes = []any{ +var file_sixafter_types_entity_metadata_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_sixafter_types_entity_metadata_proto_goTypes = []any{ (*EntityMetadata)(nil), // 0: sixafter.types.EntityMetadata (*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp (*Version)(nil), // 2: sixafter.types.Version (*structpb.Struct)(nil), // 3: google.protobuf.Struct } -var file_entity_metadata_proto_depIdxs = []int32{ +var file_sixafter_types_entity_metadata_proto_depIdxs = []int32{ 1, // 0: sixafter.types.EntityMetadata.created_at:type_name -> google.protobuf.Timestamp 1, // 1: sixafter.types.EntityMetadata.modified_at:type_name -> google.protobuf.Timestamp 1, // 2: sixafter.types.EntityMetadata.deleted_at:type_name -> google.protobuf.Timestamp @@ -247,27 +247,27 @@ var file_entity_metadata_proto_depIdxs = []int32{ 0, // [0:5] is the sub-list for field type_name } -func init() { file_entity_metadata_proto_init() } -func file_entity_metadata_proto_init() { - if File_entity_metadata_proto != nil { +func init() { file_sixafter_types_entity_metadata_proto_init() } +func file_sixafter_types_entity_metadata_proto_init() { + if File_sixafter_types_entity_metadata_proto != nil { return } - file_version_proto_init() + file_sixafter_types_version_proto_init() type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_entity_metadata_proto_rawDesc), len(file_entity_metadata_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_entity_metadata_proto_rawDesc), len(file_sixafter_types_entity_metadata_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_entity_metadata_proto_goTypes, - DependencyIndexes: file_entity_metadata_proto_depIdxs, - MessageInfos: file_entity_metadata_proto_msgTypes, + GoTypes: file_sixafter_types_entity_metadata_proto_goTypes, + DependencyIndexes: file_sixafter_types_entity_metadata_proto_depIdxs, + MessageInfos: file_sixafter_types_entity_metadata_proto_msgTypes, }.Build() - File_entity_metadata_proto = out.File - file_entity_metadata_proto_goTypes = nil - file_entity_metadata_proto_depIdxs = nil + File_sixafter_types_entity_metadata_proto = out.File + file_sixafter_types_entity_metadata_proto_goTypes = nil + file_sixafter_types_entity_metadata_proto_depIdxs = nil } diff --git a/entity_metadata.proto b/sixafter/types/entity_metadata.proto similarity index 97% rename from entity_metadata.proto rename to sixafter/types/entity_metadata.proto index 58f98d3..1bfa641 100644 --- a/entity_metadata.proto +++ b/sixafter/types/entity_metadata.proto @@ -29,7 +29,7 @@ option csharp_namespace = "SixAfter.Types.WellKnownTypes"; import "google/protobuf/struct.proto"; import "google/protobuf/timestamp.proto"; -import "version.proto"; +import "sixafter/types/version.proto"; // The `EntityMetadata` message represents metadata associated with an entity. // This includes timestamps, versioning, and additional descriptive properties, @@ -65,7 +65,7 @@ message EntityMetadata { // The Semantic Version v2.0 compliant version of the entity. // This provides versioning information for tracking changes and compatibility. // Example: Version `1.0.0` for the initial release of the entity. - Version version = 7; + sixafter.types.Version version = 7; // Indicates whether the entity was synthesized (or is synthetic). // A synthetic entity is derived or generated, rather than directly created by users. diff --git a/geofence.pb.go b/sixafter/types/geofence.pb.go similarity index 68% rename from geofence.pb.go rename to sixafter/types/geofence.pb.go index 2a6a280..0aac623 100644 --- a/geofence.pb.go +++ b/sixafter/types/geofence.pb.go @@ -19,7 +19,7 @@ // versions: // protoc-gen-go v1.36.10 // protoc v6.33.1 -// source: geofence.proto +// source: sixafter/types/geofence.proto package types @@ -57,7 +57,7 @@ type Geofence struct { func (x *Geofence) Reset() { *x = Geofence{} - mi := &file_geofence_proto_msgTypes[0] + mi := &file_sixafter_types_geofence_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -69,7 +69,7 @@ func (x *Geofence) String() string { func (*Geofence) ProtoMessage() {} func (x *Geofence) ProtoReflect() protoreflect.Message { - mi := &file_geofence_proto_msgTypes[0] + mi := &file_sixafter_types_geofence_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -82,7 +82,7 @@ func (x *Geofence) ProtoReflect() protoreflect.Message { // Deprecated: Use Geofence.ProtoReflect.Descriptor instead. func (*Geofence) Descriptor() ([]byte, []int) { - return file_geofence_proto_rawDescGZIP(), []int{0} + return file_sixafter_types_geofence_proto_rawDescGZIP(), []int{0} } func (x *Geofence) GetName() string { @@ -99,34 +99,34 @@ func (x *Geofence) GetPolygon() []*MapPolygon { return nil } -var File_geofence_proto protoreflect.FileDescriptor +var File_sixafter_types_geofence_proto protoreflect.FileDescriptor -const file_geofence_proto_rawDesc = "" + +const file_sixafter_types_geofence_proto_rawDesc = "" + "\n" + - "\x0egeofence.proto\x12\x0esixafter.types\x1a\x11map_polygon.proto\"T\n" + + "\x1dsixafter/types/geofence.proto\x12\x0esixafter.types\x1a sixafter/types/map_polygon.proto\"T\n" + "\bGeofence\x12\x12\n" + "\x04name\x18\x01 \x01(\tR\x04name\x124\n" + "\apolygon\x18\x02 \x03(\v2\x1a.sixafter.types.MapPolygonR\apolygonBo\n" + "\x12com.sixafter.typesB\rGeofenceProtoP\x01Z\x1fgithub.com/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" var ( - file_geofence_proto_rawDescOnce sync.Once - file_geofence_proto_rawDescData []byte + file_sixafter_types_geofence_proto_rawDescOnce sync.Once + file_sixafter_types_geofence_proto_rawDescData []byte ) -func file_geofence_proto_rawDescGZIP() []byte { - file_geofence_proto_rawDescOnce.Do(func() { - file_geofence_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_geofence_proto_rawDesc), len(file_geofence_proto_rawDesc))) +func file_sixafter_types_geofence_proto_rawDescGZIP() []byte { + file_sixafter_types_geofence_proto_rawDescOnce.Do(func() { + file_sixafter_types_geofence_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sixafter_types_geofence_proto_rawDesc), len(file_sixafter_types_geofence_proto_rawDesc))) }) - return file_geofence_proto_rawDescData + return file_sixafter_types_geofence_proto_rawDescData } -var file_geofence_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_geofence_proto_goTypes = []any{ +var file_sixafter_types_geofence_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_sixafter_types_geofence_proto_goTypes = []any{ (*Geofence)(nil), // 0: sixafter.types.Geofence (*MapPolygon)(nil), // 1: sixafter.types.MapPolygon } -var file_geofence_proto_depIdxs = []int32{ +var file_sixafter_types_geofence_proto_depIdxs = []int32{ 1, // 0: sixafter.types.Geofence.polygon:type_name -> sixafter.types.MapPolygon 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type @@ -135,27 +135,27 @@ var file_geofence_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_geofence_proto_init() } -func file_geofence_proto_init() { - if File_geofence_proto != nil { +func init() { file_sixafter_types_geofence_proto_init() } +func file_sixafter_types_geofence_proto_init() { + if File_sixafter_types_geofence_proto != nil { return } - file_map_polygon_proto_init() + file_sixafter_types_map_polygon_proto_init() type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_geofence_proto_rawDesc), len(file_geofence_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_geofence_proto_rawDesc), len(file_sixafter_types_geofence_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_geofence_proto_goTypes, - DependencyIndexes: file_geofence_proto_depIdxs, - MessageInfos: file_geofence_proto_msgTypes, + GoTypes: file_sixafter_types_geofence_proto_goTypes, + DependencyIndexes: file_sixafter_types_geofence_proto_depIdxs, + MessageInfos: file_sixafter_types_geofence_proto_msgTypes, }.Build() - File_geofence_proto = out.File - file_geofence_proto_goTypes = nil - file_geofence_proto_depIdxs = nil + File_sixafter_types_geofence_proto = out.File + file_sixafter_types_geofence_proto_goTypes = nil + file_sixafter_types_geofence_proto_depIdxs = nil } diff --git a/geofence.proto b/sixafter/types/geofence.proto similarity index 94% rename from geofence.proto rename to sixafter/types/geofence.proto index b0535c3..d39650a 100644 --- a/geofence.proto +++ b/sixafter/types/geofence.proto @@ -27,7 +27,7 @@ option java_outer_classname = "GeofenceProto"; option objc_class_prefix = "TPB"; option csharp_namespace = "SixAfter.Types.WellKnownTypes"; -import "map_polygon.proto"; +import "sixafter/types/map_polygon.proto"; // The `Geofence` message represents a virtual boundary around a geographic area. // Geofences are used in applications such as location-based services, navigation, @@ -42,5 +42,5 @@ message Geofence { // A geofence may consist of one or more polygons, where each polygon represents // a distinct area. The polygons can define complex, multi-vertex boundaries. // Example: A campus geofence with multiple disconnected zones. - repeated MapPolygon polygon = 2; + repeated sixafter.types.MapPolygon polygon = 2; } diff --git a/geographic_region.pb.go b/sixafter/types/geographic_region.pb.go similarity index 72% rename from geographic_region.pb.go rename to sixafter/types/geographic_region.pb.go index 47b6ae3..47055ad 100644 --- a/geographic_region.pb.go +++ b/sixafter/types/geographic_region.pb.go @@ -19,7 +19,7 @@ // versions: // protoc-gen-go v1.36.10 // protoc v6.33.1 -// source: geographic_region.proto +// source: sixafter/types/geographic_region.proto package types @@ -69,7 +69,7 @@ type GeographicRegion struct { func (x *GeographicRegion) Reset() { *x = GeographicRegion{} - mi := &file_geographic_region_proto_msgTypes[0] + mi := &file_sixafter_types_geographic_region_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -81,7 +81,7 @@ func (x *GeographicRegion) String() string { func (*GeographicRegion) ProtoMessage() {} func (x *GeographicRegion) ProtoReflect() protoreflect.Message { - mi := &file_geographic_region_proto_msgTypes[0] + mi := &file_sixafter_types_geographic_region_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -94,7 +94,7 @@ func (x *GeographicRegion) ProtoReflect() protoreflect.Message { // Deprecated: Use GeographicRegion.ProtoReflect.Descriptor instead. func (*GeographicRegion) Descriptor() ([]byte, []int) { - return file_geographic_region_proto_rawDescGZIP(), []int{0} + return file_sixafter_types_geographic_region_proto_rawDescGZIP(), []int{0} } func (x *GeographicRegion) GetName() string { @@ -132,11 +132,11 @@ func (x *GeographicRegion) GetCountrySubdivision() string { return "" } -var File_geographic_region_proto protoreflect.FileDescriptor +var File_sixafter_types_geographic_region_proto protoreflect.FileDescriptor -const file_geographic_region_proto_rawDesc = "" + +const file_sixafter_types_geographic_region_proto_rawDesc = "" + "\n" + - "\x17geographic_region.proto\x12\x0esixafter.types\"\xb5\x01\n" + + "&sixafter/types/geographic_region.proto\x12\x0esixafter.types\"\xb5\x01\n" + "\x10GeographicRegion\x12\x12\n" + "\x04name\x18\x01 \x01(\tR\x04name\x12\x1f\n" + "\vformal_name\x18\x02 \x01(\tR\n" + @@ -147,22 +147,22 @@ const file_geographic_region_proto_rawDesc = "" + "\x12com.sixafter.typesB\x15GeographicRegionProtoP\x01Z\x1fgithub.com/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" var ( - file_geographic_region_proto_rawDescOnce sync.Once - file_geographic_region_proto_rawDescData []byte + file_sixafter_types_geographic_region_proto_rawDescOnce sync.Once + file_sixafter_types_geographic_region_proto_rawDescData []byte ) -func file_geographic_region_proto_rawDescGZIP() []byte { - file_geographic_region_proto_rawDescOnce.Do(func() { - file_geographic_region_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_geographic_region_proto_rawDesc), len(file_geographic_region_proto_rawDesc))) +func file_sixafter_types_geographic_region_proto_rawDescGZIP() []byte { + file_sixafter_types_geographic_region_proto_rawDescOnce.Do(func() { + file_sixafter_types_geographic_region_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sixafter_types_geographic_region_proto_rawDesc), len(file_sixafter_types_geographic_region_proto_rawDesc))) }) - return file_geographic_region_proto_rawDescData + return file_sixafter_types_geographic_region_proto_rawDescData } -var file_geographic_region_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_geographic_region_proto_goTypes = []any{ +var file_sixafter_types_geographic_region_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_sixafter_types_geographic_region_proto_goTypes = []any{ (*GeographicRegion)(nil), // 0: sixafter.types.GeographicRegion } -var file_geographic_region_proto_depIdxs = []int32{ +var file_sixafter_types_geographic_region_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -170,26 +170,26 @@ var file_geographic_region_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_geographic_region_proto_init() } -func file_geographic_region_proto_init() { - if File_geographic_region_proto != nil { +func init() { file_sixafter_types_geographic_region_proto_init() } +func file_sixafter_types_geographic_region_proto_init() { + if File_sixafter_types_geographic_region_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_geographic_region_proto_rawDesc), len(file_geographic_region_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_geographic_region_proto_rawDesc), len(file_sixafter_types_geographic_region_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_geographic_region_proto_goTypes, - DependencyIndexes: file_geographic_region_proto_depIdxs, - MessageInfos: file_geographic_region_proto_msgTypes, + GoTypes: file_sixafter_types_geographic_region_proto_goTypes, + DependencyIndexes: file_sixafter_types_geographic_region_proto_depIdxs, + MessageInfos: file_sixafter_types_geographic_region_proto_msgTypes, }.Build() - File_geographic_region_proto = out.File - file_geographic_region_proto_goTypes = nil - file_geographic_region_proto_depIdxs = nil + File_sixafter_types_geographic_region_proto = out.File + file_sixafter_types_geographic_region_proto_goTypes = nil + file_sixafter_types_geographic_region_proto_depIdxs = nil } diff --git a/geographic_region.proto b/sixafter/types/geographic_region.proto similarity index 100% rename from geographic_region.proto rename to sixafter/types/geographic_region.proto diff --git a/geometry.pb.go b/sixafter/types/geometry.pb.go similarity index 85% rename from geometry.pb.go rename to sixafter/types/geometry.pb.go index 7593020..6bd724b 100644 --- a/geometry.pb.go +++ b/sixafter/types/geometry.pb.go @@ -19,7 +19,7 @@ // versions: // protoc-gen-go v1.36.10 // protoc v6.33.1 -// source: geometry.proto +// source: sixafter/types/geometry.proto package types @@ -58,7 +58,7 @@ type Scalar struct { func (x *Scalar) Reset() { *x = Scalar{} - mi := &file_geometry_proto_msgTypes[0] + mi := &file_sixafter_types_geometry_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -70,7 +70,7 @@ func (x *Scalar) String() string { func (*Scalar) ProtoMessage() {} func (x *Scalar) ProtoReflect() protoreflect.Message { - mi := &file_geometry_proto_msgTypes[0] + mi := &file_sixafter_types_geometry_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -83,7 +83,7 @@ func (x *Scalar) ProtoReflect() protoreflect.Message { // Deprecated: Use Scalar.ProtoReflect.Descriptor instead. func (*Scalar) Descriptor() ([]byte, []int) { - return file_geometry_proto_rawDescGZIP(), []int{0} + return file_sixafter_types_geometry_proto_rawDescGZIP(), []int{0} } func (x *Scalar) GetUnscaledValue() int64 { @@ -114,7 +114,7 @@ type CoordinateSystem struct { func (x *CoordinateSystem) Reset() { *x = CoordinateSystem{} - mi := &file_geometry_proto_msgTypes[1] + mi := &file_sixafter_types_geometry_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -126,7 +126,7 @@ func (x *CoordinateSystem) String() string { func (*CoordinateSystem) ProtoMessage() {} func (x *CoordinateSystem) ProtoReflect() protoreflect.Message { - mi := &file_geometry_proto_msgTypes[1] + mi := &file_sixafter_types_geometry_proto_msgTypes[1] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -139,7 +139,7 @@ func (x *CoordinateSystem) ProtoReflect() protoreflect.Message { // Deprecated: Use CoordinateSystem.ProtoReflect.Descriptor instead. func (*CoordinateSystem) Descriptor() ([]byte, []int) { - return file_geometry_proto_rawDescGZIP(), []int{1} + return file_sixafter_types_geometry_proto_rawDescGZIP(), []int{1} } func (x *CoordinateSystem) GetName() string { @@ -170,7 +170,7 @@ type GeometryType struct { func (x *GeometryType) Reset() { *x = GeometryType{} - mi := &file_geometry_proto_msgTypes[2] + mi := &file_sixafter_types_geometry_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -182,7 +182,7 @@ func (x *GeometryType) String() string { func (*GeometryType) ProtoMessage() {} func (x *GeometryType) ProtoReflect() protoreflect.Message { - mi := &file_geometry_proto_msgTypes[2] + mi := &file_sixafter_types_geometry_proto_msgTypes[2] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -195,7 +195,7 @@ func (x *GeometryType) ProtoReflect() protoreflect.Message { // Deprecated: Use GeometryType.ProtoReflect.Descriptor instead. func (*GeometryType) Descriptor() ([]byte, []int) { - return file_geometry_proto_rawDescGZIP(), []int{2} + return file_sixafter_types_geometry_proto_rawDescGZIP(), []int{2} } func (x *GeometryType) GetName() string { @@ -235,7 +235,7 @@ type Coordinate struct { func (x *Coordinate) Reset() { *x = Coordinate{} - mi := &file_geometry_proto_msgTypes[3] + mi := &file_sixafter_types_geometry_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -247,7 +247,7 @@ func (x *Coordinate) String() string { func (*Coordinate) ProtoMessage() {} func (x *Coordinate) ProtoReflect() protoreflect.Message { - mi := &file_geometry_proto_msgTypes[3] + mi := &file_sixafter_types_geometry_proto_msgTypes[3] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -260,7 +260,7 @@ func (x *Coordinate) ProtoReflect() protoreflect.Message { // Deprecated: Use Coordinate.ProtoReflect.Descriptor instead. func (*Coordinate) Descriptor() ([]byte, []int) { - return file_geometry_proto_rawDescGZIP(), []int{3} + return file_sixafter_types_geometry_proto_rawDescGZIP(), []int{3} } func (x *Coordinate) GetValues() []*Scalar { @@ -301,7 +301,7 @@ type Point struct { func (x *Point) Reset() { *x = Point{} - mi := &file_geometry_proto_msgTypes[4] + mi := &file_sixafter_types_geometry_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -313,7 +313,7 @@ func (x *Point) String() string { func (*Point) ProtoMessage() {} func (x *Point) ProtoReflect() protoreflect.Message { - mi := &file_geometry_proto_msgTypes[4] + mi := &file_sixafter_types_geometry_proto_msgTypes[4] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -326,7 +326,7 @@ func (x *Point) ProtoReflect() protoreflect.Message { // Deprecated: Use Point.ProtoReflect.Descriptor instead. func (*Point) Descriptor() ([]byte, []int) { - return file_geometry_proto_rawDescGZIP(), []int{4} + return file_sixafter_types_geometry_proto_rawDescGZIP(), []int{4} } func (x *Point) GetPosition() *Coordinate { @@ -354,7 +354,7 @@ type Line struct { func (x *Line) Reset() { *x = Line{} - mi := &file_geometry_proto_msgTypes[5] + mi := &file_sixafter_types_geometry_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -366,7 +366,7 @@ func (x *Line) String() string { func (*Line) ProtoMessage() {} func (x *Line) ProtoReflect() protoreflect.Message { - mi := &file_geometry_proto_msgTypes[5] + mi := &file_sixafter_types_geometry_proto_msgTypes[5] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -379,7 +379,7 @@ func (x *Line) ProtoReflect() protoreflect.Message { // Deprecated: Use Line.ProtoReflect.Descriptor instead. func (*Line) Descriptor() ([]byte, []int) { - return file_geometry_proto_rawDescGZIP(), []int{5} + return file_sixafter_types_geometry_proto_rawDescGZIP(), []int{5} } func (x *Line) GetStart() *Point { @@ -419,7 +419,7 @@ type Polygon struct { func (x *Polygon) Reset() { *x = Polygon{} - mi := &file_geometry_proto_msgTypes[6] + mi := &file_sixafter_types_geometry_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -431,7 +431,7 @@ func (x *Polygon) String() string { func (*Polygon) ProtoMessage() {} func (x *Polygon) ProtoReflect() protoreflect.Message { - mi := &file_geometry_proto_msgTypes[6] + mi := &file_sixafter_types_geometry_proto_msgTypes[6] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -444,7 +444,7 @@ func (x *Polygon) ProtoReflect() protoreflect.Message { // Deprecated: Use Polygon.ProtoReflect.Descriptor instead. func (*Polygon) Descriptor() ([]byte, []int) { - return file_geometry_proto_rawDescGZIP(), []int{6} + return file_sixafter_types_geometry_proto_rawDescGZIP(), []int{6} } func (x *Polygon) GetVertices() []*Point { @@ -461,11 +461,11 @@ func (x *Polygon) GetIsClosed() bool { return false } -var File_geometry_proto protoreflect.FileDescriptor +var File_sixafter_types_geometry_proto protoreflect.FileDescriptor -const file_geometry_proto_rawDesc = "" + +const file_sixafter_types_geometry_proto_rawDesc = "" + "\n" + - "\x0egeometry.proto\x12\x0esixafter.types\"E\n" + + "\x1dsixafter/types/geometry.proto\x12\x0esixafter.types\"E\n" + "\x06Scalar\x12%\n" + "\x0eunscaled_value\x18\x01 \x01(\x12R\runscaledValue\x12\x14\n" + "\x05scale\x18\x02 \x01(\rR\x05scale\"\xb7\x01\n" + @@ -501,19 +501,19 @@ const file_geometry_proto_rawDesc = "" + "\x12com.sixafter.typesB\rGeometryProtoP\x01Z\x1fgithub.com/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" var ( - file_geometry_proto_rawDescOnce sync.Once - file_geometry_proto_rawDescData []byte + file_sixafter_types_geometry_proto_rawDescOnce sync.Once + file_sixafter_types_geometry_proto_rawDescData []byte ) -func file_geometry_proto_rawDescGZIP() []byte { - file_geometry_proto_rawDescOnce.Do(func() { - file_geometry_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_geometry_proto_rawDesc), len(file_geometry_proto_rawDesc))) +func file_sixafter_types_geometry_proto_rawDescGZIP() []byte { + file_sixafter_types_geometry_proto_rawDescOnce.Do(func() { + file_sixafter_types_geometry_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sixafter_types_geometry_proto_rawDesc), len(file_sixafter_types_geometry_proto_rawDesc))) }) - return file_geometry_proto_rawDescData + return file_sixafter_types_geometry_proto_rawDescData } -var file_geometry_proto_msgTypes = make([]protoimpl.MessageInfo, 9) -var file_geometry_proto_goTypes = []any{ +var file_sixafter_types_geometry_proto_msgTypes = make([]protoimpl.MessageInfo, 9) +var file_sixafter_types_geometry_proto_goTypes = []any{ (*Scalar)(nil), // 0: sixafter.types.Scalar (*CoordinateSystem)(nil), // 1: sixafter.types.CoordinateSystem (*GeometryType)(nil), // 2: sixafter.types.GeometryType @@ -524,7 +524,7 @@ var file_geometry_proto_goTypes = []any{ nil, // 7: sixafter.types.CoordinateSystem.ParametersEntry nil, // 8: sixafter.types.GeometryType.ParametersEntry } -var file_geometry_proto_depIdxs = []int32{ +var file_sixafter_types_geometry_proto_depIdxs = []int32{ 7, // 0: sixafter.types.CoordinateSystem.parameters:type_name -> sixafter.types.CoordinateSystem.ParametersEntry 8, // 1: sixafter.types.GeometryType.parameters:type_name -> sixafter.types.GeometryType.ParametersEntry 0, // 2: sixafter.types.Coordinate.values:type_name -> sixafter.types.Scalar @@ -541,26 +541,26 @@ var file_geometry_proto_depIdxs = []int32{ 0, // [0:9] is the sub-list for field type_name } -func init() { file_geometry_proto_init() } -func file_geometry_proto_init() { - if File_geometry_proto != nil { +func init() { file_sixafter_types_geometry_proto_init() } +func file_sixafter_types_geometry_proto_init() { + if File_sixafter_types_geometry_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_geometry_proto_rawDesc), len(file_geometry_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_geometry_proto_rawDesc), len(file_sixafter_types_geometry_proto_rawDesc)), NumEnums: 0, NumMessages: 9, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_geometry_proto_goTypes, - DependencyIndexes: file_geometry_proto_depIdxs, - MessageInfos: file_geometry_proto_msgTypes, + GoTypes: file_sixafter_types_geometry_proto_goTypes, + DependencyIndexes: file_sixafter_types_geometry_proto_depIdxs, + MessageInfos: file_sixafter_types_geometry_proto_msgTypes, }.Build() - File_geometry_proto = out.File - file_geometry_proto_goTypes = nil - file_geometry_proto_depIdxs = nil + File_sixafter_types_geometry_proto = out.File + file_sixafter_types_geometry_proto_goTypes = nil + file_sixafter_types_geometry_proto_depIdxs = nil } diff --git a/geometry.proto b/sixafter/types/geometry.proto similarity index 100% rename from geometry.proto rename to sixafter/types/geometry.proto diff --git a/geospatial_coordinate.pb.go b/sixafter/types/geospatial_coordinate.pb.go similarity index 68% rename from geospatial_coordinate.pb.go rename to sixafter/types/geospatial_coordinate.pb.go index 0769274..6d0fd54 100644 --- a/geospatial_coordinate.pb.go +++ b/sixafter/types/geospatial_coordinate.pb.go @@ -19,7 +19,7 @@ // versions: // protoc-gen-go v1.36.10 // protoc v6.33.1 -// source: geospatial_coordinate.proto +// source: sixafter/types/geospatial_coordinate.proto package types @@ -63,7 +63,7 @@ type GeospatialCoordinate struct { func (x *GeospatialCoordinate) Reset() { *x = GeospatialCoordinate{} - mi := &file_geospatial_coordinate_proto_msgTypes[0] + mi := &file_sixafter_types_geospatial_coordinate_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -75,7 +75,7 @@ func (x *GeospatialCoordinate) String() string { func (*GeospatialCoordinate) ProtoMessage() {} func (x *GeospatialCoordinate) ProtoReflect() protoreflect.Message { - mi := &file_geospatial_coordinate_proto_msgTypes[0] + mi := &file_sixafter_types_geospatial_coordinate_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -88,7 +88,7 @@ func (x *GeospatialCoordinate) ProtoReflect() protoreflect.Message { // Deprecated: Use GeospatialCoordinate.ProtoReflect.Descriptor instead. func (*GeospatialCoordinate) Descriptor() ([]byte, []int) { - return file_geospatial_coordinate_proto_rawDescGZIP(), []int{0} + return file_sixafter_types_geospatial_coordinate_proto_rawDescGZIP(), []int{0} } func (x *GeospatialCoordinate) GetLatitude() float64 { @@ -112,11 +112,11 @@ func (x *GeospatialCoordinate) GetElevation() *GeospatialElevation { return nil } -var File_geospatial_coordinate_proto protoreflect.FileDescriptor +var File_sixafter_types_geospatial_coordinate_proto protoreflect.FileDescriptor -const file_geospatial_coordinate_proto_rawDesc = "" + +const file_sixafter_types_geospatial_coordinate_proto_rawDesc = "" + "\n" + - "\x1bgeospatial_coordinate.proto\x12\x0esixafter.types\x1a\x1ageospatial_elevation.proto\"\x93\x01\n" + + "*sixafter/types/geospatial_coordinate.proto\x12\x0esixafter.types\x1a)sixafter/types/geospatial_elevation.proto\"\x93\x01\n" + "\x14GeospatialCoordinate\x12\x1a\n" + "\blatitude\x18\x01 \x01(\x01R\blatitude\x12\x1c\n" + "\tlongitude\x18\x02 \x01(\x01R\tlongitude\x12A\n" + @@ -124,23 +124,23 @@ const file_geospatial_coordinate_proto_rawDesc = "" + "\x12com.sixafter.typesB\x19GeospatialCoordinateProtoP\x01Z\x1fgithub.com/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" var ( - file_geospatial_coordinate_proto_rawDescOnce sync.Once - file_geospatial_coordinate_proto_rawDescData []byte + file_sixafter_types_geospatial_coordinate_proto_rawDescOnce sync.Once + file_sixafter_types_geospatial_coordinate_proto_rawDescData []byte ) -func file_geospatial_coordinate_proto_rawDescGZIP() []byte { - file_geospatial_coordinate_proto_rawDescOnce.Do(func() { - file_geospatial_coordinate_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_geospatial_coordinate_proto_rawDesc), len(file_geospatial_coordinate_proto_rawDesc))) +func file_sixafter_types_geospatial_coordinate_proto_rawDescGZIP() []byte { + file_sixafter_types_geospatial_coordinate_proto_rawDescOnce.Do(func() { + file_sixafter_types_geospatial_coordinate_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sixafter_types_geospatial_coordinate_proto_rawDesc), len(file_sixafter_types_geospatial_coordinate_proto_rawDesc))) }) - return file_geospatial_coordinate_proto_rawDescData + return file_sixafter_types_geospatial_coordinate_proto_rawDescData } -var file_geospatial_coordinate_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_geospatial_coordinate_proto_goTypes = []any{ +var file_sixafter_types_geospatial_coordinate_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_sixafter_types_geospatial_coordinate_proto_goTypes = []any{ (*GeospatialCoordinate)(nil), // 0: sixafter.types.GeospatialCoordinate (*GeospatialElevation)(nil), // 1: sixafter.types.GeospatialElevation } -var file_geospatial_coordinate_proto_depIdxs = []int32{ +var file_sixafter_types_geospatial_coordinate_proto_depIdxs = []int32{ 1, // 0: sixafter.types.GeospatialCoordinate.elevation:type_name -> sixafter.types.GeospatialElevation 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type @@ -149,27 +149,27 @@ var file_geospatial_coordinate_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_geospatial_coordinate_proto_init() } -func file_geospatial_coordinate_proto_init() { - if File_geospatial_coordinate_proto != nil { +func init() { file_sixafter_types_geospatial_coordinate_proto_init() } +func file_sixafter_types_geospatial_coordinate_proto_init() { + if File_sixafter_types_geospatial_coordinate_proto != nil { return } - file_geospatial_elevation_proto_init() + file_sixafter_types_geospatial_elevation_proto_init() type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_geospatial_coordinate_proto_rawDesc), len(file_geospatial_coordinate_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_geospatial_coordinate_proto_rawDesc), len(file_sixafter_types_geospatial_coordinate_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_geospatial_coordinate_proto_goTypes, - DependencyIndexes: file_geospatial_coordinate_proto_depIdxs, - MessageInfos: file_geospatial_coordinate_proto_msgTypes, + GoTypes: file_sixafter_types_geospatial_coordinate_proto_goTypes, + DependencyIndexes: file_sixafter_types_geospatial_coordinate_proto_depIdxs, + MessageInfos: file_sixafter_types_geospatial_coordinate_proto_msgTypes, }.Build() - File_geospatial_coordinate_proto = out.File - file_geospatial_coordinate_proto_goTypes = nil - file_geospatial_coordinate_proto_depIdxs = nil + File_sixafter_types_geospatial_coordinate_proto = out.File + file_sixafter_types_geospatial_coordinate_proto_goTypes = nil + file_sixafter_types_geospatial_coordinate_proto_depIdxs = nil } diff --git a/geospatial_coordinate.proto b/sixafter/types/geospatial_coordinate.proto similarity index 95% rename from geospatial_coordinate.proto rename to sixafter/types/geospatial_coordinate.proto index 44033e8..2068e52 100644 --- a/geospatial_coordinate.proto +++ b/sixafter/types/geospatial_coordinate.proto @@ -27,7 +27,7 @@ option java_outer_classname = "GeospatialCoordinateProto"; option objc_class_prefix = "TPB"; option csharp_namespace = "SixAfter.Types.WellKnownTypes"; -import "geospatial_elevation.proto"; +import "sixafter/types/geospatial_elevation.proto"; // The `GeospatialCoordinate` message represents a geospatial location, // defined by latitude, longitude, and elevation. This is commonly used @@ -49,5 +49,5 @@ message GeospatialCoordinate { // The elevation of the geospatial coordinate relative to sea level. // This includes additional geospatial information such as altitude or height. // Example: Elevation of 212 meters for Westlake, Texas. - GeospatialElevation elevation = 3; + sixafter.types.GeospatialElevation elevation = 3; } diff --git a/geospatial_elevation.pb.go b/sixafter/types/geospatial_elevation.pb.go similarity index 71% rename from geospatial_elevation.pb.go rename to sixafter/types/geospatial_elevation.pb.go index 0ec8eaf..c0af551 100644 --- a/geospatial_elevation.pb.go +++ b/sixafter/types/geospatial_elevation.pb.go @@ -19,7 +19,7 @@ // versions: // protoc-gen-go v1.36.10 // protoc v6.33.1 -// source: geospatial_elevation.proto +// source: sixafter/types/geospatial_elevation.proto package types @@ -75,11 +75,11 @@ func (x GeospatialElevation_GeodeticDatum) String() string { } func (GeospatialElevation_GeodeticDatum) Descriptor() protoreflect.EnumDescriptor { - return file_geospatial_elevation_proto_enumTypes[0].Descriptor() + return file_sixafter_types_geospatial_elevation_proto_enumTypes[0].Descriptor() } func (GeospatialElevation_GeodeticDatum) Type() protoreflect.EnumType { - return &file_geospatial_elevation_proto_enumTypes[0] + return &file_sixafter_types_geospatial_elevation_proto_enumTypes[0] } func (x GeospatialElevation_GeodeticDatum) Number() protoreflect.EnumNumber { @@ -88,7 +88,7 @@ func (x GeospatialElevation_GeodeticDatum) Number() protoreflect.EnumNumber { // Deprecated: Use GeospatialElevation_GeodeticDatum.Descriptor instead. func (GeospatialElevation_GeodeticDatum) EnumDescriptor() ([]byte, []int) { - return file_geospatial_elevation_proto_rawDescGZIP(), []int{0, 0} + return file_sixafter_types_geospatial_elevation_proto_rawDescGZIP(), []int{0, 0} } // The `GeospatialElevation` message represents the vertical direction @@ -109,7 +109,7 @@ type GeospatialElevation struct { func (x *GeospatialElevation) Reset() { *x = GeospatialElevation{} - mi := &file_geospatial_elevation_proto_msgTypes[0] + mi := &file_sixafter_types_geospatial_elevation_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -121,7 +121,7 @@ func (x *GeospatialElevation) String() string { func (*GeospatialElevation) ProtoMessage() {} func (x *GeospatialElevation) ProtoReflect() protoreflect.Message { - mi := &file_geospatial_elevation_proto_msgTypes[0] + mi := &file_sixafter_types_geospatial_elevation_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -134,7 +134,7 @@ func (x *GeospatialElevation) ProtoReflect() protoreflect.Message { // Deprecated: Use GeospatialElevation.ProtoReflect.Descriptor instead. func (*GeospatialElevation) Descriptor() ([]byte, []int) { - return file_geospatial_elevation_proto_rawDescGZIP(), []int{0} + return file_sixafter_types_geospatial_elevation_proto_rawDescGZIP(), []int{0} } func (x *GeospatialElevation) GetDatum() GeospatialElevation_GeodeticDatum { @@ -151,11 +151,11 @@ func (x *GeospatialElevation) GetAltitude() float64 { return 0 } -var File_geospatial_elevation_proto protoreflect.FileDescriptor +var File_sixafter_types_geospatial_elevation_proto protoreflect.FileDescriptor -const file_geospatial_elevation_proto_rawDesc = "" + +const file_sixafter_types_geospatial_elevation_proto_rawDesc = "" + "\n" + - "\x1ageospatial_elevation.proto\x12\x0esixafter.types\"\xa6\x01\n" + + ")sixafter/types/geospatial_elevation.proto\x12\x0esixafter.types\"\xa6\x01\n" + "\x13GeospatialElevation\x12G\n" + "\x05datum\x18\x01 \x01(\x0e21.sixafter.types.GeospatialElevation.GeodeticDatumR\x05datum\x12\x1a\n" + "\baltitude\x18\x02 \x01(\x01R\baltitude\"*\n" + @@ -166,24 +166,24 @@ const file_geospatial_elevation_proto_rawDesc = "" + "\x12com.sixafter.typesB\x18GeospatialElevationProtoP\x01Z\x1fgithub.com/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" var ( - file_geospatial_elevation_proto_rawDescOnce sync.Once - file_geospatial_elevation_proto_rawDescData []byte + file_sixafter_types_geospatial_elevation_proto_rawDescOnce sync.Once + file_sixafter_types_geospatial_elevation_proto_rawDescData []byte ) -func file_geospatial_elevation_proto_rawDescGZIP() []byte { - file_geospatial_elevation_proto_rawDescOnce.Do(func() { - file_geospatial_elevation_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_geospatial_elevation_proto_rawDesc), len(file_geospatial_elevation_proto_rawDesc))) +func file_sixafter_types_geospatial_elevation_proto_rawDescGZIP() []byte { + file_sixafter_types_geospatial_elevation_proto_rawDescOnce.Do(func() { + file_sixafter_types_geospatial_elevation_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sixafter_types_geospatial_elevation_proto_rawDesc), len(file_sixafter_types_geospatial_elevation_proto_rawDesc))) }) - return file_geospatial_elevation_proto_rawDescData + return file_sixafter_types_geospatial_elevation_proto_rawDescData } -var file_geospatial_elevation_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_geospatial_elevation_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_geospatial_elevation_proto_goTypes = []any{ +var file_sixafter_types_geospatial_elevation_proto_enumTypes = make([]protoimpl.EnumInfo, 1) +var file_sixafter_types_geospatial_elevation_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_sixafter_types_geospatial_elevation_proto_goTypes = []any{ (GeospatialElevation_GeodeticDatum)(0), // 0: sixafter.types.GeospatialElevation.GeodeticDatum (*GeospatialElevation)(nil), // 1: sixafter.types.GeospatialElevation } -var file_geospatial_elevation_proto_depIdxs = []int32{ +var file_sixafter_types_geospatial_elevation_proto_depIdxs = []int32{ 0, // 0: sixafter.types.GeospatialElevation.datum:type_name -> sixafter.types.GeospatialElevation.GeodeticDatum 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type @@ -192,27 +192,27 @@ var file_geospatial_elevation_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_geospatial_elevation_proto_init() } -func file_geospatial_elevation_proto_init() { - if File_geospatial_elevation_proto != nil { +func init() { file_sixafter_types_geospatial_elevation_proto_init() } +func file_sixafter_types_geospatial_elevation_proto_init() { + if File_sixafter_types_geospatial_elevation_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_geospatial_elevation_proto_rawDesc), len(file_geospatial_elevation_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_geospatial_elevation_proto_rawDesc), len(file_sixafter_types_geospatial_elevation_proto_rawDesc)), NumEnums: 1, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_geospatial_elevation_proto_goTypes, - DependencyIndexes: file_geospatial_elevation_proto_depIdxs, - EnumInfos: file_geospatial_elevation_proto_enumTypes, - MessageInfos: file_geospatial_elevation_proto_msgTypes, + GoTypes: file_sixafter_types_geospatial_elevation_proto_goTypes, + DependencyIndexes: file_sixafter_types_geospatial_elevation_proto_depIdxs, + EnumInfos: file_sixafter_types_geospatial_elevation_proto_enumTypes, + MessageInfos: file_sixafter_types_geospatial_elevation_proto_msgTypes, }.Build() - File_geospatial_elevation_proto = out.File - file_geospatial_elevation_proto_goTypes = nil - file_geospatial_elevation_proto_depIdxs = nil + File_sixafter_types_geospatial_elevation_proto = out.File + file_sixafter_types_geospatial_elevation_proto_goTypes = nil + file_sixafter_types_geospatial_elevation_proto_depIdxs = nil } diff --git a/geospatial_elevation.proto b/sixafter/types/geospatial_elevation.proto similarity index 100% rename from geospatial_elevation.proto rename to sixafter/types/geospatial_elevation.proto diff --git a/geospatial_location.pb.go b/sixafter/types/geospatial_location.pb.go similarity index 73% rename from geospatial_location.pb.go rename to sixafter/types/geospatial_location.pb.go index 49142d4..e5f6697 100644 --- a/geospatial_location.pb.go +++ b/sixafter/types/geospatial_location.pb.go @@ -19,7 +19,7 @@ // versions: // protoc-gen-go v1.36.10 // protoc v6.33.1 -// source: geospatial_location.proto +// source: sixafter/types/geospatial_location.proto package types @@ -74,7 +74,7 @@ type GeospatialLocation struct { func (x *GeospatialLocation) Reset() { *x = GeospatialLocation{} - mi := &file_geospatial_location_proto_msgTypes[0] + mi := &file_sixafter_types_geospatial_location_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -86,7 +86,7 @@ func (x *GeospatialLocation) String() string { func (*GeospatialLocation) ProtoMessage() {} func (x *GeospatialLocation) ProtoReflect() protoreflect.Message { - mi := &file_geospatial_location_proto_msgTypes[0] + mi := &file_sixafter_types_geospatial_location_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -99,7 +99,7 @@ func (x *GeospatialLocation) ProtoReflect() protoreflect.Message { // Deprecated: Use GeospatialLocation.ProtoReflect.Descriptor instead. func (*GeospatialLocation) Descriptor() ([]byte, []int) { - return file_geospatial_location_proto_rawDescGZIP(), []int{0} + return file_sixafter_types_geospatial_location_proto_rawDescGZIP(), []int{0} } func (x *GeospatialLocation) GetCoordinate() *GeospatialCoordinate { @@ -137,11 +137,11 @@ func (x *GeospatialLocation) GetTimestamp() *timestamppb.Timestamp { return nil } -var File_geospatial_location_proto protoreflect.FileDescriptor +var File_sixafter_types_geospatial_location_proto protoreflect.FileDescriptor -const file_geospatial_location_proto_rawDesc = "" + +const file_sixafter_types_geospatial_location_proto_rawDesc = "" + "\n" + - "\x19geospatial_location.proto\x12\x0esixafter.types\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x15compass_heading.proto\x1a\x1bgeospatial_coordinate.proto\"\xfc\x01\n" + + "(sixafter/types/geospatial_location.proto\x12\x0esixafter.types\x1a\x1fgoogle/protobuf/timestamp.proto\x1a$sixafter/types/compass_heading.proto\x1a*sixafter/types/geospatial_coordinate.proto\"\xfc\x01\n" + "\x12GeospatialLocation\x12D\n" + "\n" + "coordinate\x18\x01 \x01(\v2$.sixafter.types.GeospatialCoordinateR\n" + @@ -153,25 +153,25 @@ const file_geospatial_location_proto_rawDesc = "" + "\x12com.sixafter.typesB\x17GeospatialLocationProtoP\x01Z\x1fgithub.com/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" var ( - file_geospatial_location_proto_rawDescOnce sync.Once - file_geospatial_location_proto_rawDescData []byte + file_sixafter_types_geospatial_location_proto_rawDescOnce sync.Once + file_sixafter_types_geospatial_location_proto_rawDescData []byte ) -func file_geospatial_location_proto_rawDescGZIP() []byte { - file_geospatial_location_proto_rawDescOnce.Do(func() { - file_geospatial_location_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_geospatial_location_proto_rawDesc), len(file_geospatial_location_proto_rawDesc))) +func file_sixafter_types_geospatial_location_proto_rawDescGZIP() []byte { + file_sixafter_types_geospatial_location_proto_rawDescOnce.Do(func() { + file_sixafter_types_geospatial_location_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sixafter_types_geospatial_location_proto_rawDesc), len(file_sixafter_types_geospatial_location_proto_rawDesc))) }) - return file_geospatial_location_proto_rawDescData + return file_sixafter_types_geospatial_location_proto_rawDescData } -var file_geospatial_location_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_geospatial_location_proto_goTypes = []any{ +var file_sixafter_types_geospatial_location_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_sixafter_types_geospatial_location_proto_goTypes = []any{ (*GeospatialLocation)(nil), // 0: sixafter.types.GeospatialLocation (*GeospatialCoordinate)(nil), // 1: sixafter.types.GeospatialCoordinate (*CompassHeading)(nil), // 2: sixafter.types.CompassHeading (*timestamppb.Timestamp)(nil), // 3: google.protobuf.Timestamp } -var file_geospatial_location_proto_depIdxs = []int32{ +var file_sixafter_types_geospatial_location_proto_depIdxs = []int32{ 1, // 0: sixafter.types.GeospatialLocation.coordinate:type_name -> sixafter.types.GeospatialCoordinate 2, // 1: sixafter.types.GeospatialLocation.heading:type_name -> sixafter.types.CompassHeading 3, // 2: sixafter.types.GeospatialLocation.timestamp:type_name -> google.protobuf.Timestamp @@ -182,28 +182,28 @@ var file_geospatial_location_proto_depIdxs = []int32{ 0, // [0:3] is the sub-list for field type_name } -func init() { file_geospatial_location_proto_init() } -func file_geospatial_location_proto_init() { - if File_geospatial_location_proto != nil { +func init() { file_sixafter_types_geospatial_location_proto_init() } +func file_sixafter_types_geospatial_location_proto_init() { + if File_sixafter_types_geospatial_location_proto != nil { return } - file_compass_heading_proto_init() - file_geospatial_coordinate_proto_init() + file_sixafter_types_compass_heading_proto_init() + file_sixafter_types_geospatial_coordinate_proto_init() type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_geospatial_location_proto_rawDesc), len(file_geospatial_location_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_geospatial_location_proto_rawDesc), len(file_sixafter_types_geospatial_location_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_geospatial_location_proto_goTypes, - DependencyIndexes: file_geospatial_location_proto_depIdxs, - MessageInfos: file_geospatial_location_proto_msgTypes, + GoTypes: file_sixafter_types_geospatial_location_proto_goTypes, + DependencyIndexes: file_sixafter_types_geospatial_location_proto_depIdxs, + MessageInfos: file_sixafter_types_geospatial_location_proto_msgTypes, }.Build() - File_geospatial_location_proto = out.File - file_geospatial_location_proto_goTypes = nil - file_geospatial_location_proto_depIdxs = nil + File_sixafter_types_geospatial_location_proto = out.File + file_sixafter_types_geospatial_location_proto_goTypes = nil + file_sixafter_types_geospatial_location_proto_depIdxs = nil } diff --git a/geospatial_location.proto b/sixafter/types/geospatial_location.proto similarity index 93% rename from geospatial_location.proto rename to sixafter/types/geospatial_location.proto index 71b5f9e..5c6a15d 100644 --- a/geospatial_location.proto +++ b/sixafter/types/geospatial_location.proto @@ -29,8 +29,8 @@ option csharp_namespace = "SixAfter.Types.WellKnownTypes"; import "google/protobuf/timestamp.proto"; -import "compass_heading.proto"; -import "geospatial_coordinate.proto"; +import "sixafter/types/compass_heading.proto"; +import "sixafter/types/geospatial_coordinate.proto"; // The `GeospatialLocation` message represents a spatial or temporal scale, // combining geographical coordinates, heading, movement, and timestamp. @@ -40,12 +40,12 @@ message GeospatialLocation { // The geographical coordinate information of the location. // Includes latitude, longitude, and elevation as defined in the `GeospatialCoordinate` message. - GeospatialCoordinate coordinate = 1; + sixafter.types.GeospatialCoordinate coordinate = 1; // The azimuth (orientation) of the device relative to true or magnetic north. // Defined using the `CompassHeading` message, it represents the heading // of the device at the time of measurement. - CompassHeading heading = 2; + sixafter.types.CompassHeading heading = 2; // The direction in which the device is traveling, measured in degrees // relative to true north (0°). This reflects the course or trajectory diff --git a/language.pb.go b/sixafter/types/language.pb.go similarity index 76% rename from language.pb.go rename to sixafter/types/language.pb.go index 1708754..b1d2481 100644 --- a/language.pb.go +++ b/sixafter/types/language.pb.go @@ -19,7 +19,7 @@ // versions: // protoc-gen-go v1.36.10 // protoc v6.33.1 -// source: language.proto +// source: sixafter/types/language.proto package types @@ -65,7 +65,7 @@ type Language struct { func (x *Language) Reset() { *x = Language{} - mi := &file_language_proto_msgTypes[0] + mi := &file_sixafter_types_language_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -77,7 +77,7 @@ func (x *Language) String() string { func (*Language) ProtoMessage() {} func (x *Language) ProtoReflect() protoreflect.Message { - mi := &file_language_proto_msgTypes[0] + mi := &file_sixafter_types_language_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -90,7 +90,7 @@ func (x *Language) ProtoReflect() protoreflect.Message { // Deprecated: Use Language.ProtoReflect.Descriptor instead. func (*Language) Descriptor() ([]byte, []int) { - return file_language_proto_rawDescGZIP(), []int{0} + return file_sixafter_types_language_proto_rawDescGZIP(), []int{0} } func (x *Language) GetName() string { @@ -136,7 +136,7 @@ type Language_Bcp47Tag struct { func (x *Language_Bcp47Tag) Reset() { *x = Language_Bcp47Tag{} - mi := &file_language_proto_msgTypes[1] + mi := &file_sixafter_types_language_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -148,7 +148,7 @@ func (x *Language_Bcp47Tag) String() string { func (*Language_Bcp47Tag) ProtoMessage() {} func (x *Language_Bcp47Tag) ProtoReflect() protoreflect.Message { - mi := &file_language_proto_msgTypes[1] + mi := &file_sixafter_types_language_proto_msgTypes[1] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -161,7 +161,7 @@ func (x *Language_Bcp47Tag) ProtoReflect() protoreflect.Message { // Deprecated: Use Language_Bcp47Tag.ProtoReflect.Descriptor instead. func (*Language_Bcp47Tag) Descriptor() ([]byte, []int) { - return file_language_proto_rawDescGZIP(), []int{0, 0} + return file_sixafter_types_language_proto_rawDescGZIP(), []int{0, 0} } func (x *Language_Bcp47Tag) GetTag() string { @@ -178,11 +178,11 @@ func (x *Language_Bcp47Tag) GetDisplayName() string { return "" } -var File_language_proto protoreflect.FileDescriptor +var File_sixafter_types_language_proto protoreflect.FileDescriptor -const file_language_proto_rawDesc = "" + +const file_sixafter_types_language_proto_rawDesc = "" + "\n" + - "\x0elanguage.proto\x12\x0esixafter.types\"\xf7\x01\n" + + "\x1dsixafter/types/language.proto\x12\x0esixafter.types\"\xf7\x01\n" + "\bLanguage\x12\x12\n" + "\x04name\x18\x01 \x01(\tR\x04name\x12*\n" + "\x11alphabetic_code_2\x18\x02 \x01(\tR\x0falphabeticCode2\x12*\n" + @@ -194,23 +194,23 @@ const file_language_proto_rawDesc = "" + "\x12com.sixafter.typesB\rLanguageProtoP\x01Z\x1fgithub.com/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" var ( - file_language_proto_rawDescOnce sync.Once - file_language_proto_rawDescData []byte + file_sixafter_types_language_proto_rawDescOnce sync.Once + file_sixafter_types_language_proto_rawDescData []byte ) -func file_language_proto_rawDescGZIP() []byte { - file_language_proto_rawDescOnce.Do(func() { - file_language_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_language_proto_rawDesc), len(file_language_proto_rawDesc))) +func file_sixafter_types_language_proto_rawDescGZIP() []byte { + file_sixafter_types_language_proto_rawDescOnce.Do(func() { + file_sixafter_types_language_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sixafter_types_language_proto_rawDesc), len(file_sixafter_types_language_proto_rawDesc))) }) - return file_language_proto_rawDescData + return file_sixafter_types_language_proto_rawDescData } -var file_language_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_language_proto_goTypes = []any{ +var file_sixafter_types_language_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_sixafter_types_language_proto_goTypes = []any{ (*Language)(nil), // 0: sixafter.types.Language (*Language_Bcp47Tag)(nil), // 1: sixafter.types.Language.Bcp47Tag } -var file_language_proto_depIdxs = []int32{ +var file_sixafter_types_language_proto_depIdxs = []int32{ 1, // 0: sixafter.types.Language.bcp47_tag:type_name -> sixafter.types.Language.Bcp47Tag 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type @@ -219,26 +219,26 @@ var file_language_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_language_proto_init() } -func file_language_proto_init() { - if File_language_proto != nil { +func init() { file_sixafter_types_language_proto_init() } +func file_sixafter_types_language_proto_init() { + if File_sixafter_types_language_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_language_proto_rawDesc), len(file_language_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_language_proto_rawDesc), len(file_sixafter_types_language_proto_rawDesc)), NumEnums: 0, NumMessages: 2, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_language_proto_goTypes, - DependencyIndexes: file_language_proto_depIdxs, - MessageInfos: file_language_proto_msgTypes, + GoTypes: file_sixafter_types_language_proto_goTypes, + DependencyIndexes: file_sixafter_types_language_proto_depIdxs, + MessageInfos: file_sixafter_types_language_proto_msgTypes, }.Build() - File_language_proto = out.File - file_language_proto_goTypes = nil - file_language_proto_depIdxs = nil + File_sixafter_types_language_proto = out.File + file_sixafter_types_language_proto_goTypes = nil + file_sixafter_types_language_proto_depIdxs = nil } diff --git a/language.proto b/sixafter/types/language.proto similarity index 100% rename from language.proto rename to sixafter/types/language.proto diff --git a/map_point.pb.go b/sixafter/types/map_point.pb.go similarity index 70% rename from map_point.pb.go rename to sixafter/types/map_point.pb.go index 8977bde..42d61e2 100644 --- a/map_point.pb.go +++ b/sixafter/types/map_point.pb.go @@ -19,7 +19,7 @@ // versions: // protoc-gen-go v1.36.10 // protoc v6.33.1 -// source: map_point.proto +// source: sixafter/types/map_point.proto package types @@ -62,7 +62,7 @@ type MapPoint struct { func (x *MapPoint) Reset() { *x = MapPoint{} - mi := &file_map_point_proto_msgTypes[0] + mi := &file_sixafter_types_map_point_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -74,7 +74,7 @@ func (x *MapPoint) String() string { func (*MapPoint) ProtoMessage() {} func (x *MapPoint) ProtoReflect() protoreflect.Message { - mi := &file_map_point_proto_msgTypes[0] + mi := &file_sixafter_types_map_point_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -87,7 +87,7 @@ func (x *MapPoint) ProtoReflect() protoreflect.Message { // Deprecated: Use MapPoint.ProtoReflect.Descriptor instead. func (*MapPoint) Descriptor() ([]byte, []int) { - return file_map_point_proto_rawDescGZIP(), []int{0} + return file_sixafter_types_map_point_proto_rawDescGZIP(), []int{0} } func (x *MapPoint) GetX() float32 { @@ -111,11 +111,11 @@ func (x *MapPoint) GetCoordinate() *GeospatialCoordinate { return nil } -var File_map_point_proto protoreflect.FileDescriptor +var File_sixafter_types_map_point_proto protoreflect.FileDescriptor -const file_map_point_proto_rawDesc = "" + +const file_sixafter_types_map_point_proto_rawDesc = "" + "\n" + - "\x0fmap_point.proto\x12\x0esixafter.types\x1a\x1bgeospatial_coordinate.proto\"l\n" + + "\x1esixafter/types/map_point.proto\x12\x0esixafter.types\x1a*sixafter/types/geospatial_coordinate.proto\"l\n" + "\bMapPoint\x12\f\n" + "\x01x\x18\x01 \x01(\x02R\x01x\x12\f\n" + "\x01y\x18\x02 \x01(\x02R\x01y\x12D\n" + @@ -125,23 +125,23 @@ const file_map_point_proto_rawDesc = "" + "\x12com.sixafter.typesB\rMapPointProtoP\x01Z\x1fgithub.com/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" var ( - file_map_point_proto_rawDescOnce sync.Once - file_map_point_proto_rawDescData []byte + file_sixafter_types_map_point_proto_rawDescOnce sync.Once + file_sixafter_types_map_point_proto_rawDescData []byte ) -func file_map_point_proto_rawDescGZIP() []byte { - file_map_point_proto_rawDescOnce.Do(func() { - file_map_point_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_map_point_proto_rawDesc), len(file_map_point_proto_rawDesc))) +func file_sixafter_types_map_point_proto_rawDescGZIP() []byte { + file_sixafter_types_map_point_proto_rawDescOnce.Do(func() { + file_sixafter_types_map_point_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sixafter_types_map_point_proto_rawDesc), len(file_sixafter_types_map_point_proto_rawDesc))) }) - return file_map_point_proto_rawDescData + return file_sixafter_types_map_point_proto_rawDescData } -var file_map_point_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_map_point_proto_goTypes = []any{ +var file_sixafter_types_map_point_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_sixafter_types_map_point_proto_goTypes = []any{ (*MapPoint)(nil), // 0: sixafter.types.MapPoint (*GeospatialCoordinate)(nil), // 1: sixafter.types.GeospatialCoordinate } -var file_map_point_proto_depIdxs = []int32{ +var file_sixafter_types_map_point_proto_depIdxs = []int32{ 1, // 0: sixafter.types.MapPoint.coordinate:type_name -> sixafter.types.GeospatialCoordinate 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type @@ -150,27 +150,27 @@ var file_map_point_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_map_point_proto_init() } -func file_map_point_proto_init() { - if File_map_point_proto != nil { +func init() { file_sixafter_types_map_point_proto_init() } +func file_sixafter_types_map_point_proto_init() { + if File_sixafter_types_map_point_proto != nil { return } - file_geospatial_coordinate_proto_init() + file_sixafter_types_geospatial_coordinate_proto_init() type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_map_point_proto_rawDesc), len(file_map_point_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_map_point_proto_rawDesc), len(file_sixafter_types_map_point_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_map_point_proto_goTypes, - DependencyIndexes: file_map_point_proto_depIdxs, - MessageInfos: file_map_point_proto_msgTypes, + GoTypes: file_sixafter_types_map_point_proto_goTypes, + DependencyIndexes: file_sixafter_types_map_point_proto_depIdxs, + MessageInfos: file_sixafter_types_map_point_proto_msgTypes, }.Build() - File_map_point_proto = out.File - file_map_point_proto_goTypes = nil - file_map_point_proto_depIdxs = nil + File_sixafter_types_map_point_proto = out.File + file_sixafter_types_map_point_proto_goTypes = nil + file_sixafter_types_map_point_proto_depIdxs = nil } diff --git a/map_point.proto b/sixafter/types/map_point.proto similarity index 94% rename from map_point.proto rename to sixafter/types/map_point.proto index 79ceff0..dbc2966 100644 --- a/map_point.proto +++ b/sixafter/types/map_point.proto @@ -27,7 +27,7 @@ option java_outer_classname = "MapPointProto"; option objc_class_prefix = "TPB"; option csharp_namespace = "SixAfter.Types.WellKnownTypes"; -import "geospatial_coordinate.proto"; +import "sixafter/types/geospatial_coordinate.proto"; // The `MapPoint` message represents a point on a two-dimensional map, // derived from projecting the curved surface of the globe onto a flat surface. @@ -48,5 +48,5 @@ message MapPoint { // Provides the latitude, longitude, and elevation information for the point. // Example: A map point with `x=200.5` and `y=150.2` could correspond to // `latitude=32.9829` and `longitude=-97.1876` for Westlake, Texas. - GeospatialCoordinate coordinate = 3; + sixafter.types.GeospatialCoordinate coordinate = 3; } diff --git a/map_polygon.pb.go b/sixafter/types/map_polygon.pb.go similarity index 67% rename from map_polygon.pb.go rename to sixafter/types/map_polygon.pb.go index 062deb2..4d92ae3 100644 --- a/map_polygon.pb.go +++ b/sixafter/types/map_polygon.pb.go @@ -19,7 +19,7 @@ // versions: // protoc-gen-go v1.36.10 // protoc v6.33.1 -// source: map_polygon.proto +// source: sixafter/types/map_polygon.proto package types @@ -61,7 +61,7 @@ type MapPolygon struct { func (x *MapPolygon) Reset() { *x = MapPolygon{} - mi := &file_map_polygon_proto_msgTypes[0] + mi := &file_sixafter_types_map_polygon_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -73,7 +73,7 @@ func (x *MapPolygon) String() string { func (*MapPolygon) ProtoMessage() {} func (x *MapPolygon) ProtoReflect() protoreflect.Message { - mi := &file_map_polygon_proto_msgTypes[0] + mi := &file_sixafter_types_map_polygon_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -86,7 +86,7 @@ func (x *MapPolygon) ProtoReflect() protoreflect.Message { // Deprecated: Use MapPolygon.ProtoReflect.Descriptor instead. func (*MapPolygon) Descriptor() ([]byte, []int) { - return file_map_polygon_proto_rawDescGZIP(), []int{0} + return file_sixafter_types_map_polygon_proto_rawDescGZIP(), []int{0} } func (x *MapPolygon) GetPoints() []*MapPoint { @@ -96,34 +96,34 @@ func (x *MapPolygon) GetPoints() []*MapPoint { return nil } -var File_map_polygon_proto protoreflect.FileDescriptor +var File_sixafter_types_map_polygon_proto protoreflect.FileDescriptor -const file_map_polygon_proto_rawDesc = "" + +const file_sixafter_types_map_polygon_proto_rawDesc = "" + "\n" + - "\x11map_polygon.proto\x12\x0esixafter.types\x1a\x0fmap_point.proto\">\n" + + " sixafter/types/map_polygon.proto\x12\x0esixafter.types\x1a\x1esixafter/types/map_point.proto\">\n" + "\n" + "MapPolygon\x120\n" + "\x06points\x18\x01 \x03(\v2\x18.sixafter.types.MapPointR\x06pointsBq\n" + "\x12com.sixafter.typesB\x0fMapPolygonProtoP\x01Z\x1fgithub.com/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" var ( - file_map_polygon_proto_rawDescOnce sync.Once - file_map_polygon_proto_rawDescData []byte + file_sixafter_types_map_polygon_proto_rawDescOnce sync.Once + file_sixafter_types_map_polygon_proto_rawDescData []byte ) -func file_map_polygon_proto_rawDescGZIP() []byte { - file_map_polygon_proto_rawDescOnce.Do(func() { - file_map_polygon_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_map_polygon_proto_rawDesc), len(file_map_polygon_proto_rawDesc))) +func file_sixafter_types_map_polygon_proto_rawDescGZIP() []byte { + file_sixafter_types_map_polygon_proto_rawDescOnce.Do(func() { + file_sixafter_types_map_polygon_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sixafter_types_map_polygon_proto_rawDesc), len(file_sixafter_types_map_polygon_proto_rawDesc))) }) - return file_map_polygon_proto_rawDescData + return file_sixafter_types_map_polygon_proto_rawDescData } -var file_map_polygon_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_map_polygon_proto_goTypes = []any{ +var file_sixafter_types_map_polygon_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_sixafter_types_map_polygon_proto_goTypes = []any{ (*MapPolygon)(nil), // 0: sixafter.types.MapPolygon (*MapPoint)(nil), // 1: sixafter.types.MapPoint } -var file_map_polygon_proto_depIdxs = []int32{ +var file_sixafter_types_map_polygon_proto_depIdxs = []int32{ 1, // 0: sixafter.types.MapPolygon.points:type_name -> sixafter.types.MapPoint 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type @@ -132,27 +132,27 @@ var file_map_polygon_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_map_polygon_proto_init() } -func file_map_polygon_proto_init() { - if File_map_polygon_proto != nil { +func init() { file_sixafter_types_map_polygon_proto_init() } +func file_sixafter_types_map_polygon_proto_init() { + if File_sixafter_types_map_polygon_proto != nil { return } - file_map_point_proto_init() + file_sixafter_types_map_point_proto_init() type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_map_polygon_proto_rawDesc), len(file_map_polygon_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_map_polygon_proto_rawDesc), len(file_sixafter_types_map_polygon_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_map_polygon_proto_goTypes, - DependencyIndexes: file_map_polygon_proto_depIdxs, - MessageInfos: file_map_polygon_proto_msgTypes, + GoTypes: file_sixafter_types_map_polygon_proto_goTypes, + DependencyIndexes: file_sixafter_types_map_polygon_proto_depIdxs, + MessageInfos: file_sixafter_types_map_polygon_proto_msgTypes, }.Build() - File_map_polygon_proto = out.File - file_map_polygon_proto_goTypes = nil - file_map_polygon_proto_depIdxs = nil + File_sixafter_types_map_polygon_proto = out.File + file_sixafter_types_map_polygon_proto_goTypes = nil + file_sixafter_types_map_polygon_proto_depIdxs = nil } diff --git a/map_polygon.proto b/sixafter/types/map_polygon.proto similarity index 95% rename from map_polygon.proto rename to sixafter/types/map_polygon.proto index d853f5a..4d9f9ee 100644 --- a/map_polygon.proto +++ b/sixafter/types/map_polygon.proto @@ -27,7 +27,7 @@ option java_outer_classname = "MapPolygonProto"; option objc_class_prefix = "TPB"; option csharp_namespace = "SixAfter.Types.WellKnownTypes"; -import "map_point.proto"; +import "sixafter/types/map_point.proto"; // The `MapPolygonPolygon` message represents a closed geometric shape on a map. // The shape is defined by a series of points that are connected end-to-end, @@ -45,5 +45,5 @@ message MapPolygon { // - Point 2: `x=10, y=0` // - Point 3: `x=5, y=5` // The first point is automatically connected to the last point to close the shape. - repeated MapPoint points = 1; + repeated sixafter.types.MapPoint points = 1; } diff --git a/radial_geofence.pb.go b/sixafter/types/radial_geofence.pb.go similarity index 69% rename from radial_geofence.pb.go rename to sixafter/types/radial_geofence.pb.go index 37bfd09..4edd3f8 100644 --- a/radial_geofence.pb.go +++ b/sixafter/types/radial_geofence.pb.go @@ -19,7 +19,7 @@ // versions: // protoc-gen-go v1.36.10 // protoc v6.33.1 -// source: radial_geofence.proto +// source: sixafter/types/radial_geofence.proto package types @@ -61,7 +61,7 @@ type RadialGeofence struct { func (x *RadialGeofence) Reset() { *x = RadialGeofence{} - mi := &file_radial_geofence_proto_msgTypes[0] + mi := &file_sixafter_types_radial_geofence_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -73,7 +73,7 @@ func (x *RadialGeofence) String() string { func (*RadialGeofence) ProtoMessage() {} func (x *RadialGeofence) ProtoReflect() protoreflect.Message { - mi := &file_radial_geofence_proto_msgTypes[0] + mi := &file_sixafter_types_radial_geofence_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -86,7 +86,7 @@ func (x *RadialGeofence) ProtoReflect() protoreflect.Message { // Deprecated: Use RadialGeofence.ProtoReflect.Descriptor instead. func (*RadialGeofence) Descriptor() ([]byte, []int) { - return file_radial_geofence_proto_rawDescGZIP(), []int{0} + return file_sixafter_types_radial_geofence_proto_rawDescGZIP(), []int{0} } func (x *RadialGeofence) GetName() string { @@ -110,11 +110,11 @@ func (x *RadialGeofence) GetRadius() float64 { return 0 } -var File_radial_geofence_proto protoreflect.FileDescriptor +var File_sixafter_types_radial_geofence_proto protoreflect.FileDescriptor -const file_radial_geofence_proto_rawDesc = "" + +const file_sixafter_types_radial_geofence_proto_rawDesc = "" + "\n" + - "\x15radial_geofence.proto\x12\x0esixafter.types\x1a\x1bgeospatial_coordinate.proto\"z\n" + + "$sixafter/types/radial_geofence.proto\x12\x0esixafter.types\x1a*sixafter/types/geospatial_coordinate.proto\"z\n" + "\x0eRadialGeofence\x12\x12\n" + "\x04name\x18\x01 \x01(\tR\x04name\x12<\n" + "\x06center\x18\x02 \x01(\v2$.sixafter.types.GeospatialCoordinateR\x06center\x12\x16\n" + @@ -122,23 +122,23 @@ const file_radial_geofence_proto_rawDesc = "" + "\x12com.sixafter.typesB\x13RadialGeofenceProtoP\x01Z\x1fgithub.com/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" var ( - file_radial_geofence_proto_rawDescOnce sync.Once - file_radial_geofence_proto_rawDescData []byte + file_sixafter_types_radial_geofence_proto_rawDescOnce sync.Once + file_sixafter_types_radial_geofence_proto_rawDescData []byte ) -func file_radial_geofence_proto_rawDescGZIP() []byte { - file_radial_geofence_proto_rawDescOnce.Do(func() { - file_radial_geofence_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_radial_geofence_proto_rawDesc), len(file_radial_geofence_proto_rawDesc))) +func file_sixafter_types_radial_geofence_proto_rawDescGZIP() []byte { + file_sixafter_types_radial_geofence_proto_rawDescOnce.Do(func() { + file_sixafter_types_radial_geofence_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sixafter_types_radial_geofence_proto_rawDesc), len(file_sixafter_types_radial_geofence_proto_rawDesc))) }) - return file_radial_geofence_proto_rawDescData + return file_sixafter_types_radial_geofence_proto_rawDescData } -var file_radial_geofence_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_radial_geofence_proto_goTypes = []any{ +var file_sixafter_types_radial_geofence_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_sixafter_types_radial_geofence_proto_goTypes = []any{ (*RadialGeofence)(nil), // 0: sixafter.types.RadialGeofence (*GeospatialCoordinate)(nil), // 1: sixafter.types.GeospatialCoordinate } -var file_radial_geofence_proto_depIdxs = []int32{ +var file_sixafter_types_radial_geofence_proto_depIdxs = []int32{ 1, // 0: sixafter.types.RadialGeofence.center:type_name -> sixafter.types.GeospatialCoordinate 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type @@ -147,27 +147,27 @@ var file_radial_geofence_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_radial_geofence_proto_init() } -func file_radial_geofence_proto_init() { - if File_radial_geofence_proto != nil { +func init() { file_sixafter_types_radial_geofence_proto_init() } +func file_sixafter_types_radial_geofence_proto_init() { + if File_sixafter_types_radial_geofence_proto != nil { return } - file_geospatial_coordinate_proto_init() + file_sixafter_types_geospatial_coordinate_proto_init() type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_radial_geofence_proto_rawDesc), len(file_radial_geofence_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_radial_geofence_proto_rawDesc), len(file_sixafter_types_radial_geofence_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_radial_geofence_proto_goTypes, - DependencyIndexes: file_radial_geofence_proto_depIdxs, - MessageInfos: file_radial_geofence_proto_msgTypes, + GoTypes: file_sixafter_types_radial_geofence_proto_goTypes, + DependencyIndexes: file_sixafter_types_radial_geofence_proto_depIdxs, + MessageInfos: file_sixafter_types_radial_geofence_proto_msgTypes, }.Build() - File_radial_geofence_proto = out.File - file_radial_geofence_proto_goTypes = nil - file_radial_geofence_proto_depIdxs = nil + File_sixafter_types_radial_geofence_proto = out.File + file_sixafter_types_radial_geofence_proto_goTypes = nil + file_sixafter_types_radial_geofence_proto_depIdxs = nil } diff --git a/radial_geofence.proto b/sixafter/types/radial_geofence.proto similarity index 95% rename from radial_geofence.proto rename to sixafter/types/radial_geofence.proto index dd6eef6..e24d5af 100644 --- a/radial_geofence.proto +++ b/sixafter/types/radial_geofence.proto @@ -27,7 +27,7 @@ option java_outer_classname = "RadialGeofenceProto"; option objc_class_prefix = "TPB"; option csharp_namespace = "SixAfter.Types.WellKnownTypes"; -import "geospatial_coordinate.proto"; +import "sixafter/types/geospatial_coordinate.proto"; // The `RadialGeofence` message represents a circular geofence. // A geofence is a virtual perimeter defined for a real-world geographic area. @@ -42,7 +42,7 @@ message RadialGeofence { // The geospatial coordinate representing the center of the circular geofence. // This is the point around which the radius is applied to form the boundary. // Example: The center coordinate for Westlake, Texas, with latitude `32.9829` and longitude `-97.1876`. - GeospatialCoordinate center = 2; + sixafter.types.GeospatialCoordinate center = 2; // The radius of the circular geofence, measured in meters. // This defines the distance from the center point to the boundary of the geofence. diff --git a/temporal_range.pb.go b/sixafter/types/temporal_range.pb.go similarity index 69% rename from temporal_range.pb.go rename to sixafter/types/temporal_range.pb.go index 4da0f82..c3010cd 100644 --- a/temporal_range.pb.go +++ b/sixafter/types/temporal_range.pb.go @@ -19,7 +19,7 @@ // versions: // protoc-gen-go v1.36.10 // protoc v6.33.1 -// source: temporal_range.proto +// source: sixafter/types/temporal_range.proto package types @@ -61,7 +61,7 @@ type TemporalRange struct { func (x *TemporalRange) Reset() { *x = TemporalRange{} - mi := &file_temporal_range_proto_msgTypes[0] + mi := &file_sixafter_types_temporal_range_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -73,7 +73,7 @@ func (x *TemporalRange) String() string { func (*TemporalRange) ProtoMessage() {} func (x *TemporalRange) ProtoReflect() protoreflect.Message { - mi := &file_temporal_range_proto_msgTypes[0] + mi := &file_sixafter_types_temporal_range_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -86,7 +86,7 @@ func (x *TemporalRange) ProtoReflect() protoreflect.Message { // Deprecated: Use TemporalRange.ProtoReflect.Descriptor instead. func (*TemporalRange) Descriptor() ([]byte, []int) { - return file_temporal_range_proto_rawDescGZIP(), []int{0} + return file_sixafter_types_temporal_range_proto_rawDescGZIP(), []int{0} } func (x *TemporalRange) GetEpoch() *timestamppb.Timestamp { @@ -103,35 +103,35 @@ func (x *TemporalRange) GetDuration() *durationpb.Duration { return nil } -var File_temporal_range_proto protoreflect.FileDescriptor +var File_sixafter_types_temporal_range_proto protoreflect.FileDescriptor -const file_temporal_range_proto_rawDesc = "" + +const file_sixafter_types_temporal_range_proto_rawDesc = "" + "\n" + - "\x14temporal_range.proto\x12\x0esixafter.types\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"x\n" + + "#sixafter/types/temporal_range.proto\x12\x0esixafter.types\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"x\n" + "\rTemporalRange\x120\n" + "\x05epoch\x18\x01 \x01(\v2\x1a.google.protobuf.TimestampR\x05epoch\x125\n" + "\bduration\x18\x02 \x01(\v2\x19.google.protobuf.DurationR\bdurationBt\n" + "\x12com.sixafter.typesB\x12TemporalRangeProtoP\x01Z\x1fgithub.com/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" var ( - file_temporal_range_proto_rawDescOnce sync.Once - file_temporal_range_proto_rawDescData []byte + file_sixafter_types_temporal_range_proto_rawDescOnce sync.Once + file_sixafter_types_temporal_range_proto_rawDescData []byte ) -func file_temporal_range_proto_rawDescGZIP() []byte { - file_temporal_range_proto_rawDescOnce.Do(func() { - file_temporal_range_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_temporal_range_proto_rawDesc), len(file_temporal_range_proto_rawDesc))) +func file_sixafter_types_temporal_range_proto_rawDescGZIP() []byte { + file_sixafter_types_temporal_range_proto_rawDescOnce.Do(func() { + file_sixafter_types_temporal_range_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sixafter_types_temporal_range_proto_rawDesc), len(file_sixafter_types_temporal_range_proto_rawDesc))) }) - return file_temporal_range_proto_rawDescData + return file_sixafter_types_temporal_range_proto_rawDescData } -var file_temporal_range_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_temporal_range_proto_goTypes = []any{ +var file_sixafter_types_temporal_range_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_sixafter_types_temporal_range_proto_goTypes = []any{ (*TemporalRange)(nil), // 0: sixafter.types.TemporalRange (*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp (*durationpb.Duration)(nil), // 2: google.protobuf.Duration } -var file_temporal_range_proto_depIdxs = []int32{ +var file_sixafter_types_temporal_range_proto_depIdxs = []int32{ 1, // 0: sixafter.types.TemporalRange.epoch:type_name -> google.protobuf.Timestamp 2, // 1: sixafter.types.TemporalRange.duration:type_name -> google.protobuf.Duration 2, // [2:2] is the sub-list for method output_type @@ -141,26 +141,26 @@ var file_temporal_range_proto_depIdxs = []int32{ 0, // [0:2] is the sub-list for field type_name } -func init() { file_temporal_range_proto_init() } -func file_temporal_range_proto_init() { - if File_temporal_range_proto != nil { +func init() { file_sixafter_types_temporal_range_proto_init() } +func file_sixafter_types_temporal_range_proto_init() { + if File_sixafter_types_temporal_range_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_temporal_range_proto_rawDesc), len(file_temporal_range_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_temporal_range_proto_rawDesc), len(file_sixafter_types_temporal_range_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_temporal_range_proto_goTypes, - DependencyIndexes: file_temporal_range_proto_depIdxs, - MessageInfos: file_temporal_range_proto_msgTypes, + GoTypes: file_sixafter_types_temporal_range_proto_goTypes, + DependencyIndexes: file_sixafter_types_temporal_range_proto_depIdxs, + MessageInfos: file_sixafter_types_temporal_range_proto_msgTypes, }.Build() - File_temporal_range_proto = out.File - file_temporal_range_proto_goTypes = nil - file_temporal_range_proto_depIdxs = nil + File_sixafter_types_temporal_range_proto = out.File + file_sixafter_types_temporal_range_proto_goTypes = nil + file_sixafter_types_temporal_range_proto_depIdxs = nil } diff --git a/temporal_range.proto b/sixafter/types/temporal_range.proto similarity index 100% rename from temporal_range.proto rename to sixafter/types/temporal_range.proto diff --git a/time_zone.pb.go b/sixafter/types/time_zone.pb.go similarity index 78% rename from time_zone.pb.go rename to sixafter/types/time_zone.pb.go index 69d8f73..8347b3f 100644 --- a/time_zone.pb.go +++ b/sixafter/types/time_zone.pb.go @@ -19,7 +19,7 @@ // versions: // protoc-gen-go v1.36.10 // protoc v6.33.1 -// source: time_zone.proto +// source: sixafter/types/time_zone.proto package types @@ -65,7 +65,7 @@ type TimeZone struct { func (x *TimeZone) Reset() { *x = TimeZone{} - mi := &file_time_zone_proto_msgTypes[0] + mi := &file_sixafter_types_time_zone_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -77,7 +77,7 @@ func (x *TimeZone) String() string { func (*TimeZone) ProtoMessage() {} func (x *TimeZone) ProtoReflect() protoreflect.Message { - mi := &file_time_zone_proto_msgTypes[0] + mi := &file_sixafter_types_time_zone_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -90,7 +90,7 @@ func (x *TimeZone) ProtoReflect() protoreflect.Message { // Deprecated: Use TimeZone.ProtoReflect.Descriptor instead. func (*TimeZone) Descriptor() ([]byte, []int) { - return file_time_zone_proto_rawDescGZIP(), []int{0} + return file_sixafter_types_time_zone_proto_rawDescGZIP(), []int{0} } func (x *TimeZone) GetName() string { @@ -144,7 +144,7 @@ type TimeZone_TimeOffset struct { func (x *TimeZone_TimeOffset) Reset() { *x = TimeZone_TimeOffset{} - mi := &file_time_zone_proto_msgTypes[1] + mi := &file_sixafter_types_time_zone_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -156,7 +156,7 @@ func (x *TimeZone_TimeOffset) String() string { func (*TimeZone_TimeOffset) ProtoMessage() {} func (x *TimeZone_TimeOffset) ProtoReflect() protoreflect.Message { - mi := &file_time_zone_proto_msgTypes[1] + mi := &file_sixafter_types_time_zone_proto_msgTypes[1] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -169,7 +169,7 @@ func (x *TimeZone_TimeOffset) ProtoReflect() protoreflect.Message { // Deprecated: Use TimeZone_TimeOffset.ProtoReflect.Descriptor instead. func (*TimeZone_TimeOffset) Descriptor() ([]byte, []int) { - return file_time_zone_proto_rawDescGZIP(), []int{0, 0} + return file_sixafter_types_time_zone_proto_rawDescGZIP(), []int{0, 0} } func (x *TimeZone_TimeOffset) GetHours() int32 { @@ -186,11 +186,11 @@ func (x *TimeZone_TimeOffset) GetMinutes() int32 { return 0 } -var File_time_zone_proto protoreflect.FileDescriptor +var File_sixafter_types_time_zone_proto protoreflect.FileDescriptor -const file_time_zone_proto_rawDesc = "" + +const file_sixafter_types_time_zone_proto_rawDesc = "" + "\n" + - "\x0ftime_zone.proto\x12\x0esixafter.types\x1a\x1bgeospatial_coordinate.proto\"\xeb\x02\n" + + "\x1esixafter/types/time_zone.proto\x12\x0esixafter.types\x1a*sixafter/types/geospatial_coordinate.proto\"\xeb\x02\n" + "\bTimeZone\x12\x12\n" + "\x04name\x18\x01 \x01(\tR\x04name\x12\"\n" + "\fabbreviation\x18\x02 \x01(\tR\fabbreviation\x12I\n" + @@ -204,24 +204,24 @@ const file_time_zone_proto_rawDesc = "" + "\x12com.sixafter.typesB\rTimeZoneProtoP\x01Z\x1fgithub.com/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" var ( - file_time_zone_proto_rawDescOnce sync.Once - file_time_zone_proto_rawDescData []byte + file_sixafter_types_time_zone_proto_rawDescOnce sync.Once + file_sixafter_types_time_zone_proto_rawDescData []byte ) -func file_time_zone_proto_rawDescGZIP() []byte { - file_time_zone_proto_rawDescOnce.Do(func() { - file_time_zone_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_time_zone_proto_rawDesc), len(file_time_zone_proto_rawDesc))) +func file_sixafter_types_time_zone_proto_rawDescGZIP() []byte { + file_sixafter_types_time_zone_proto_rawDescOnce.Do(func() { + file_sixafter_types_time_zone_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sixafter_types_time_zone_proto_rawDesc), len(file_sixafter_types_time_zone_proto_rawDesc))) }) - return file_time_zone_proto_rawDescData + return file_sixafter_types_time_zone_proto_rawDescData } -var file_time_zone_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_time_zone_proto_goTypes = []any{ +var file_sixafter_types_time_zone_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_sixafter_types_time_zone_proto_goTypes = []any{ (*TimeZone)(nil), // 0: sixafter.types.TimeZone (*TimeZone_TimeOffset)(nil), // 1: sixafter.types.TimeZone.TimeOffset (*GeospatialCoordinate)(nil), // 2: sixafter.types.GeospatialCoordinate } -var file_time_zone_proto_depIdxs = []int32{ +var file_sixafter_types_time_zone_proto_depIdxs = []int32{ 1, // 0: sixafter.types.TimeZone.utc_offset_std:type_name -> sixafter.types.TimeZone.TimeOffset 1, // 1: sixafter.types.TimeZone.utc_offset_dst:type_name -> sixafter.types.TimeZone.TimeOffset 2, // 2: sixafter.types.TimeZone.central_coordinate:type_name -> sixafter.types.GeospatialCoordinate @@ -232,27 +232,27 @@ var file_time_zone_proto_depIdxs = []int32{ 0, // [0:3] is the sub-list for field type_name } -func init() { file_time_zone_proto_init() } -func file_time_zone_proto_init() { - if File_time_zone_proto != nil { +func init() { file_sixafter_types_time_zone_proto_init() } +func file_sixafter_types_time_zone_proto_init() { + if File_sixafter_types_time_zone_proto != nil { return } - file_geospatial_coordinate_proto_init() + file_sixafter_types_geospatial_coordinate_proto_init() type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_time_zone_proto_rawDesc), len(file_time_zone_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_time_zone_proto_rawDesc), len(file_sixafter_types_time_zone_proto_rawDesc)), NumEnums: 0, NumMessages: 2, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_time_zone_proto_goTypes, - DependencyIndexes: file_time_zone_proto_depIdxs, - MessageInfos: file_time_zone_proto_msgTypes, + GoTypes: file_sixafter_types_time_zone_proto_goTypes, + DependencyIndexes: file_sixafter_types_time_zone_proto_depIdxs, + MessageInfos: file_sixafter_types_time_zone_proto_msgTypes, }.Build() - File_time_zone_proto = out.File - file_time_zone_proto_goTypes = nil - file_time_zone_proto_depIdxs = nil + File_sixafter_types_time_zone_proto = out.File + file_sixafter_types_time_zone_proto_goTypes = nil + file_sixafter_types_time_zone_proto_depIdxs = nil } diff --git a/time_zone.proto b/sixafter/types/time_zone.proto similarity index 95% rename from time_zone.proto rename to sixafter/types/time_zone.proto index 4b5abad..957c94d 100644 --- a/time_zone.proto +++ b/sixafter/types/time_zone.proto @@ -27,7 +27,7 @@ option java_outer_classname = "TimeZoneProto"; option objc_class_prefix = "TPB"; option csharp_namespace = "SixAfter.Types.WellKnownTypes"; -import "geospatial_coordinate.proto"; +import "sixafter/types/geospatial_coordinate.proto"; // The `TimeZone` message represents a time zone, which is an area // observing a uniform standard time for legal, commercial, and social purposes. @@ -65,5 +65,5 @@ message TimeZone { // The geographic coordinates of the time zone's central point. // This is commonly used to determine the time zone based on location. - GeospatialCoordinate central_coordinate = 5; + sixafter.types.GeospatialCoordinate central_coordinate = 5; } diff --git a/uri.pb.go b/sixafter/types/uri.pb.go similarity index 78% rename from uri.pb.go rename to sixafter/types/uri.pb.go index 601553b..035ffbb 100644 --- a/uri.pb.go +++ b/sixafter/types/uri.pb.go @@ -19,7 +19,7 @@ // versions: // protoc-gen-go v1.36.10 // protoc v6.33.1 -// source: uri.proto +// source: sixafter/types/uri.proto package types @@ -78,7 +78,7 @@ type Uri struct { func (x *Uri) Reset() { *x = Uri{} - mi := &file_uri_proto_msgTypes[0] + mi := &file_sixafter_types_uri_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -90,7 +90,7 @@ func (x *Uri) String() string { func (*Uri) ProtoMessage() {} func (x *Uri) ProtoReflect() protoreflect.Message { - mi := &file_uri_proto_msgTypes[0] + mi := &file_sixafter_types_uri_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -103,7 +103,7 @@ func (x *Uri) ProtoReflect() protoreflect.Message { // Deprecated: Use Uri.ProtoReflect.Descriptor instead. func (*Uri) Descriptor() ([]byte, []int) { - return file_uri_proto_rawDescGZIP(), []int{0} + return file_sixafter_types_uri_proto_rawDescGZIP(), []int{0} } func (x *Uri) GetScheme() string { @@ -155,11 +155,11 @@ func (x *Uri) GetUserInfo() string { return "" } -var File_uri_proto protoreflect.FileDescriptor +var File_sixafter_types_uri_proto protoreflect.FileDescriptor -const file_uri_proto_rawDesc = "" + +const file_sixafter_types_uri_proto_rawDesc = "" + "\n" + - "\turi.proto\x12\x0esixafter.types\"\xb2\x01\n" + + "\x18sixafter/types/uri.proto\x12\x0esixafter.types\"\xb2\x01\n" + "\x03Uri\x12\x16\n" + "\x06scheme\x18\x01 \x01(\tR\x06scheme\x12\x1a\n" + "\bfragment\x18\x02 \x01(\tR\bfragment\x12\x12\n" + @@ -171,22 +171,22 @@ const file_uri_proto_rawDesc = "" + "\x12com.sixafter.typesB\bUriProtoP\x01Z\x1fgithub.com/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" var ( - file_uri_proto_rawDescOnce sync.Once - file_uri_proto_rawDescData []byte + file_sixafter_types_uri_proto_rawDescOnce sync.Once + file_sixafter_types_uri_proto_rawDescData []byte ) -func file_uri_proto_rawDescGZIP() []byte { - file_uri_proto_rawDescOnce.Do(func() { - file_uri_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_uri_proto_rawDesc), len(file_uri_proto_rawDesc))) +func file_sixafter_types_uri_proto_rawDescGZIP() []byte { + file_sixafter_types_uri_proto_rawDescOnce.Do(func() { + file_sixafter_types_uri_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sixafter_types_uri_proto_rawDesc), len(file_sixafter_types_uri_proto_rawDesc))) }) - return file_uri_proto_rawDescData + return file_sixafter_types_uri_proto_rawDescData } -var file_uri_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_uri_proto_goTypes = []any{ +var file_sixafter_types_uri_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_sixafter_types_uri_proto_goTypes = []any{ (*Uri)(nil), // 0: sixafter.types.Uri } -var file_uri_proto_depIdxs = []int32{ +var file_sixafter_types_uri_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -194,26 +194,26 @@ var file_uri_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_uri_proto_init() } -func file_uri_proto_init() { - if File_uri_proto != nil { +func init() { file_sixafter_types_uri_proto_init() } +func file_sixafter_types_uri_proto_init() { + if File_sixafter_types_uri_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_uri_proto_rawDesc), len(file_uri_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_uri_proto_rawDesc), len(file_sixafter_types_uri_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_uri_proto_goTypes, - DependencyIndexes: file_uri_proto_depIdxs, - MessageInfos: file_uri_proto_msgTypes, + GoTypes: file_sixafter_types_uri_proto_goTypes, + DependencyIndexes: file_sixafter_types_uri_proto_depIdxs, + MessageInfos: file_sixafter_types_uri_proto_msgTypes, }.Build() - File_uri_proto = out.File - file_uri_proto_goTypes = nil - file_uri_proto_depIdxs = nil + File_sixafter_types_uri_proto = out.File + file_sixafter_types_uri_proto_goTypes = nil + file_sixafter_types_uri_proto_depIdxs = nil } diff --git a/uri.proto b/sixafter/types/uri.proto similarity index 100% rename from uri.proto rename to sixafter/types/uri.proto diff --git a/url.pb.go b/sixafter/types/url.pb.go similarity index 80% rename from url.pb.go rename to sixafter/types/url.pb.go index 539f1eb..d186cfb 100644 --- a/url.pb.go +++ b/sixafter/types/url.pb.go @@ -19,7 +19,7 @@ // versions: // protoc-gen-go v1.36.10 // protoc v6.33.1 -// source: url.proto +// source: sixafter/types/url.proto package types @@ -84,7 +84,7 @@ type Url struct { func (x *Url) Reset() { *x = Url{} - mi := &file_url_proto_msgTypes[0] + mi := &file_sixafter_types_url_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -96,7 +96,7 @@ func (x *Url) String() string { func (*Url) ProtoMessage() {} func (x *Url) ProtoReflect() protoreflect.Message { - mi := &file_url_proto_msgTypes[0] + mi := &file_sixafter_types_url_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -109,7 +109,7 @@ func (x *Url) ProtoReflect() protoreflect.Message { // Deprecated: Use Url.ProtoReflect.Descriptor instead. func (*Url) Descriptor() ([]byte, []int) { - return file_url_proto_rawDescGZIP(), []int{0} + return file_sixafter_types_url_proto_rawDescGZIP(), []int{0} } func (x *Url) GetProtocol() string { @@ -175,11 +175,11 @@ func (x *Url) GetRef() string { return "" } -var File_url_proto protoreflect.FileDescriptor +var File_sixafter_types_url_proto protoreflect.FileDescriptor -const file_url_proto_rawDesc = "" + +const file_sixafter_types_url_proto_rawDesc = "" + "\n" + - "\turl.proto\x12\x0esixafter.types\"\xd4\x01\n" + + "\x18sixafter/types/url.proto\x12\x0esixafter.types\"\xd4\x01\n" + "\x03Url\x12\x1a\n" + "\bprotocol\x18\x01 \x01(\tR\bprotocol\x12\x12\n" + "\x04host\x18\x02 \x01(\tR\x04host\x12\x12\n" + @@ -193,22 +193,22 @@ const file_url_proto_rawDesc = "" + "\x12com.sixafter.typesB\bUrlProtoP\x01Z\x1fgithub.com/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" var ( - file_url_proto_rawDescOnce sync.Once - file_url_proto_rawDescData []byte + file_sixafter_types_url_proto_rawDescOnce sync.Once + file_sixafter_types_url_proto_rawDescData []byte ) -func file_url_proto_rawDescGZIP() []byte { - file_url_proto_rawDescOnce.Do(func() { - file_url_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_url_proto_rawDesc), len(file_url_proto_rawDesc))) +func file_sixafter_types_url_proto_rawDescGZIP() []byte { + file_sixafter_types_url_proto_rawDescOnce.Do(func() { + file_sixafter_types_url_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sixafter_types_url_proto_rawDesc), len(file_sixafter_types_url_proto_rawDesc))) }) - return file_url_proto_rawDescData + return file_sixafter_types_url_proto_rawDescData } -var file_url_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_url_proto_goTypes = []any{ +var file_sixafter_types_url_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_sixafter_types_url_proto_goTypes = []any{ (*Url)(nil), // 0: sixafter.types.Url } -var file_url_proto_depIdxs = []int32{ +var file_sixafter_types_url_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -216,26 +216,26 @@ var file_url_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_url_proto_init() } -func file_url_proto_init() { - if File_url_proto != nil { +func init() { file_sixafter_types_url_proto_init() } +func file_sixafter_types_url_proto_init() { + if File_sixafter_types_url_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_url_proto_rawDesc), len(file_url_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_url_proto_rawDesc), len(file_sixafter_types_url_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_url_proto_goTypes, - DependencyIndexes: file_url_proto_depIdxs, - MessageInfos: file_url_proto_msgTypes, + GoTypes: file_sixafter_types_url_proto_goTypes, + DependencyIndexes: file_sixafter_types_url_proto_depIdxs, + MessageInfos: file_sixafter_types_url_proto_msgTypes, }.Build() - File_url_proto = out.File - file_url_proto_goTypes = nil - file_url_proto_depIdxs = nil + File_sixafter_types_url_proto = out.File + file_sixafter_types_url_proto_goTypes = nil + file_sixafter_types_url_proto_depIdxs = nil } diff --git a/url.proto b/sixafter/types/url.proto similarity index 100% rename from url.proto rename to sixafter/types/url.proto diff --git a/uuid.go b/sixafter/types/uuid.go similarity index 100% rename from uuid.go rename to sixafter/types/uuid.go diff --git a/uuid.pb.go b/sixafter/types/uuid.pb.go similarity index 69% rename from uuid.pb.go rename to sixafter/types/uuid.pb.go index 208e841..3a4067a 100644 --- a/uuid.pb.go +++ b/sixafter/types/uuid.pb.go @@ -19,7 +19,7 @@ // versions: // protoc-gen-go v1.36.10 // protoc v6.33.1 -// source: uuid.proto +// source: sixafter/types/uuid.proto package types @@ -61,7 +61,7 @@ type UUID struct { func (x *UUID) Reset() { *x = UUID{} - mi := &file_uuid_proto_msgTypes[0] + mi := &file_sixafter_types_uuid_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -73,7 +73,7 @@ func (x *UUID) String() string { func (*UUID) ProtoMessage() {} func (x *UUID) ProtoReflect() protoreflect.Message { - mi := &file_uuid_proto_msgTypes[0] + mi := &file_sixafter_types_uuid_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -86,7 +86,7 @@ func (x *UUID) ProtoReflect() protoreflect.Message { // Deprecated: Use UUID.ProtoReflect.Descriptor instead. func (*UUID) Descriptor() ([]byte, []int) { - return file_uuid_proto_rawDescGZIP(), []int{0} + return file_sixafter_types_uuid_proto_rawDescGZIP(), []int{0} } func (x *UUID) GetValue() []byte { @@ -96,33 +96,32 @@ func (x *UUID) GetValue() []byte { return nil } -var File_uuid_proto protoreflect.FileDescriptor +var File_sixafter_types_uuid_proto protoreflect.FileDescriptor -const file_uuid_proto_rawDesc = "" + +const file_sixafter_types_uuid_proto_rawDesc = "" + "\n" + - "\n" + - "uuid.proto\x12\x0esixafter.types\"\x1c\n" + + "\x19sixafter/types/uuid.proto\x12\x0esixafter.types\"\x1c\n" + "\x04UUID\x12\x14\n" + "\x05value\x18\x01 \x01(\fR\x05valueBk\n" + "\x12com.sixafter.typesB\tUuidProtoP\x01Z\x1fgithub.com/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" var ( - file_uuid_proto_rawDescOnce sync.Once - file_uuid_proto_rawDescData []byte + file_sixafter_types_uuid_proto_rawDescOnce sync.Once + file_sixafter_types_uuid_proto_rawDescData []byte ) -func file_uuid_proto_rawDescGZIP() []byte { - file_uuid_proto_rawDescOnce.Do(func() { - file_uuid_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_uuid_proto_rawDesc), len(file_uuid_proto_rawDesc))) +func file_sixafter_types_uuid_proto_rawDescGZIP() []byte { + file_sixafter_types_uuid_proto_rawDescOnce.Do(func() { + file_sixafter_types_uuid_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sixafter_types_uuid_proto_rawDesc), len(file_sixafter_types_uuid_proto_rawDesc))) }) - return file_uuid_proto_rawDescData + return file_sixafter_types_uuid_proto_rawDescData } -var file_uuid_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_uuid_proto_goTypes = []any{ +var file_sixafter_types_uuid_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_sixafter_types_uuid_proto_goTypes = []any{ (*UUID)(nil), // 0: sixafter.types.UUID } -var file_uuid_proto_depIdxs = []int32{ +var file_sixafter_types_uuid_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -130,26 +129,26 @@ var file_uuid_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_uuid_proto_init() } -func file_uuid_proto_init() { - if File_uuid_proto != nil { +func init() { file_sixafter_types_uuid_proto_init() } +func file_sixafter_types_uuid_proto_init() { + if File_sixafter_types_uuid_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_uuid_proto_rawDesc), len(file_uuid_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_uuid_proto_rawDesc), len(file_sixafter_types_uuid_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_uuid_proto_goTypes, - DependencyIndexes: file_uuid_proto_depIdxs, - MessageInfos: file_uuid_proto_msgTypes, + GoTypes: file_sixafter_types_uuid_proto_goTypes, + DependencyIndexes: file_sixafter_types_uuid_proto_depIdxs, + MessageInfos: file_sixafter_types_uuid_proto_msgTypes, }.Build() - File_uuid_proto = out.File - file_uuid_proto_goTypes = nil - file_uuid_proto_depIdxs = nil + File_sixafter_types_uuid_proto = out.File + file_sixafter_types_uuid_proto_goTypes = nil + file_sixafter_types_uuid_proto_depIdxs = nil } diff --git a/uuid.proto b/sixafter/types/uuid.proto similarity index 100% rename from uuid.proto rename to sixafter/types/uuid.proto diff --git a/uuid_test.go b/sixafter/types/uuid_test.go similarity index 100% rename from uuid_test.go rename to sixafter/types/uuid_test.go diff --git a/version.pb.go b/sixafter/types/version.pb.go similarity index 78% rename from version.pb.go rename to sixafter/types/version.pb.go index e28a73f..69f7085 100644 --- a/version.pb.go +++ b/sixafter/types/version.pb.go @@ -19,7 +19,7 @@ // versions: // protoc-gen-go v1.36.10 // protoc v6.33.1 -// source: version.proto +// source: sixafter/types/version.proto package types @@ -94,7 +94,7 @@ type Version struct { func (x *Version) Reset() { *x = Version{} - mi := &file_version_proto_msgTypes[0] + mi := &file_sixafter_types_version_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -106,7 +106,7 @@ func (x *Version) String() string { func (*Version) ProtoMessage() {} func (x *Version) ProtoReflect() protoreflect.Message { - mi := &file_version_proto_msgTypes[0] + mi := &file_sixafter_types_version_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -119,7 +119,7 @@ func (x *Version) ProtoReflect() protoreflect.Message { // Deprecated: Use Version.ProtoReflect.Descriptor instead. func (*Version) Descriptor() ([]byte, []int) { - return file_version_proto_rawDescGZIP(), []int{0} + return file_sixafter_types_version_proto_rawDescGZIP(), []int{0} } func (x *Version) GetMajor() uint32 { @@ -157,11 +157,11 @@ func (x *Version) GetBuildMetadata() string { return "" } -var File_version_proto protoreflect.FileDescriptor +var File_sixafter_types_version_proto protoreflect.FileDescriptor -const file_version_proto_rawDesc = "" + +const file_sixafter_types_version_proto_rawDesc = "" + "\n" + - "\rversion.proto\x12\x0esixafter.types\"\x92\x01\n" + + "\x1csixafter/types/version.proto\x12\x0esixafter.types\"\x92\x01\n" + "\aVersion\x12\x14\n" + "\x05major\x18\x01 \x01(\rR\x05major\x12\x14\n" + "\x05minor\x18\x02 \x01(\rR\x05minor\x12\x14\n" + @@ -173,22 +173,22 @@ const file_version_proto_rawDesc = "" + "\x12com.sixafter.typesB\fVersionProtoP\x01Z\x1fgithub.com/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" var ( - file_version_proto_rawDescOnce sync.Once - file_version_proto_rawDescData []byte + file_sixafter_types_version_proto_rawDescOnce sync.Once + file_sixafter_types_version_proto_rawDescData []byte ) -func file_version_proto_rawDescGZIP() []byte { - file_version_proto_rawDescOnce.Do(func() { - file_version_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_version_proto_rawDesc), len(file_version_proto_rawDesc))) +func file_sixafter_types_version_proto_rawDescGZIP() []byte { + file_sixafter_types_version_proto_rawDescOnce.Do(func() { + file_sixafter_types_version_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sixafter_types_version_proto_rawDesc), len(file_sixafter_types_version_proto_rawDesc))) }) - return file_version_proto_rawDescData + return file_sixafter_types_version_proto_rawDescData } -var file_version_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_version_proto_goTypes = []any{ +var file_sixafter_types_version_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_sixafter_types_version_proto_goTypes = []any{ (*Version)(nil), // 0: sixafter.types.Version } -var file_version_proto_depIdxs = []int32{ +var file_sixafter_types_version_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -196,26 +196,26 @@ var file_version_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_version_proto_init() } -func file_version_proto_init() { - if File_version_proto != nil { +func init() { file_sixafter_types_version_proto_init() } +func file_sixafter_types_version_proto_init() { + if File_sixafter_types_version_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_version_proto_rawDesc), len(file_version_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_version_proto_rawDesc), len(file_sixafter_types_version_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_version_proto_goTypes, - DependencyIndexes: file_version_proto_depIdxs, - MessageInfos: file_version_proto_msgTypes, + GoTypes: file_sixafter_types_version_proto_goTypes, + DependencyIndexes: file_sixafter_types_version_proto_depIdxs, + MessageInfos: file_sixafter_types_version_proto_msgTypes, }.Build() - File_version_proto = out.File - file_version_proto_goTypes = nil - file_version_proto_depIdxs = nil + File_sixafter_types_version_proto = out.File + file_sixafter_types_version_proto_goTypes = nil + file_sixafter_types_version_proto_depIdxs = nil } diff --git a/version.proto b/sixafter/types/version.proto similarity index 100% rename from version.proto rename to sixafter/types/version.proto diff --git a/vendor/modules.txt b/vendor/modules.txt index 8b86a36..6f315b6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -11,8 +11,6 @@ github.com/pmezard/go-difflib/difflib ## explicit; go 1.17 github.com/stretchr/testify/assert github.com/stretchr/testify/assert/yaml -# google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 -## explicit; go 1.21 # google.golang.org/protobuf v1.36.10 ## explicit; go 1.23 google.golang.org/protobuf/encoding/protojson