diff --git a/CHANGELOG.md b/CHANGELOG.md index fd8fefe..c9aec6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,20 @@ Date format: `YYYY-MM-DD` --- +## [1.56.0] - 2025-12-29 + +### Added +### Changed +- **risk:** Refactored structure to avoid naming collisions when vendored by consumers. +- **debt:** Buf is now used for linting and code generation. + +### Deprecated +### Removed +### Fixed +### Security + +--- + ## [1.55.0] - 2025-12-13 ### Added @@ -421,7 +435,8 @@ Date format: `YYYY-MM-DD` ### Fixed ### Security -[Unreleased]: https://github.com/sixafter/types/compare/v1.55.0...HEAD +[Unreleased]: https://github.com/sixafter/types/compare/v1.56.0...HEAD +[1.56.0]: https://github.com/sixafter/types/compare/v1.55.0...v1.56.0 [1.55.0]: https://github.com/sixafter/types/compare/v1.54.0...v1.55.0 [1.54.0]: https://github.com/sixafter/types/compare/v1.53.0...v1.54.0 [1.53.0]: https://github.com/sixafter/types/compare/v1.52.0...v1.53.0 diff --git a/Makefile b/Makefile index d6e8f4a..f992af5 100644 --- a/Makefile +++ b/Makefile @@ -30,9 +30,8 @@ FUZZTIME ?= 20s export BINARY_NAME=main.out -.PHONY: build -build: ## Build the binary file - @sbin/go-build.sh +.PHONY: all +all: deps tidy vendor clean proto-generate test fmt ## Run all the targets .PHONY: test test: ## Execute unit tests @@ -60,7 +59,7 @@ deps: ## Get the dependencies and vendor .PHONY: fmt fmt: ## Format the files - $(GO_FMT) ./.. + $(GO_FMT) ./... .PHONY: vet vet: ## Vet the files @@ -102,6 +101,29 @@ mod-verify: ## Verify Go module integrity signature-verify: ## Verify latest release's digital signatures @sbin/verify-sig.sh +# --------------------------------------------------------------------------- +# Protobuf Operations +# --------------------------------------------------------------------------- +.PHONY: proto-format +proto-format: ## buf format -w (writes canonical formatting) + @sbin/proto-format.sh + +.PHONY: proto-lint +proto-lint: ## buf lint (style & sanity checks) + @sbin/proto-lint.sh + +.PHONY: proto-breaking +proto-breaking: ## buf breaking --against $(BUF_BREAK_AGAINST) + @sbin/proto-breaking.sh + +.PHONY: proto-generate +proto-generate: ## buf generate (no-op if buf.gen.yaml absent) + @sbin/proto-generate.sh + +.PHONY: proto-docs +proto-docs: ## Generate SDK documentation from protobuf files + @sbin/proto-docs.sh + .PHONY: help help: ## Display this help screen @grep -h -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' | sort diff --git a/README.md b/README.md index 2609f59..0f7a6da 100644 --- a/README.md +++ b/README.md @@ -29,10 +29,10 @@ This module is a set of common types expressed as [Google Protocol Buffers](http To verify the integrity of the `types` source, run the following commands: ```sh -# Fetch the latest release tag from GitHub API (e.g., "v1.52.0") +# Fetch the latest release tag from GitHub API (e.g., "v1.56.0") TAG=$(curl -s https://api.github.com/repos/sixafter/types/releases/latest | jq -r .tag_name) -# Remove the leading "v" for filenames (e.g., "v1.52.0" -> "1.52.0") +# Remove the leading "v" for filenames (e.g., "v1.56.0" -> "1.56.0") VERSION=${TAG#v} # --------------------------------------------------------------------- @@ -82,7 +82,7 @@ Verified OK To use this module, execute the following command: ```shell -go get -u github.com/sixafter/types +go get -u github.com/sixafter/types/sixafter/types ``` In your Go code, you can import the module as follows. @@ -91,7 +91,7 @@ In your Go code, you can import the module as follows. package main import ( - "github.com/sixafter/types" + pb "github.com/sixafter/types/proto/v1/pb" ) ``` diff --git a/buf.gen.docs.yaml b/buf.gen.docs.yaml new file mode 100644 index 0000000..34baa0b --- /dev/null +++ b/buf.gen.docs.yaml @@ -0,0 +1,55 @@ +# Copyright 2020-2025 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. + +# Ref: https://buf.build/docs/configuration/v2/buf-gen-yaml/ +version: v2 + +# 'clean', when set to true, deletes the directories, zip files, and/or jar files specified in the +# `out` field for all plugins before running code generation. +clean: false + +# 'managed' contains the configuration for managed mode: https://buf.build/docs/generate/managed-mode +# It has three top-level keys: 'enabled', 'disable', and 'override'. +# +# When managed mode is enabled, it uses default values for certain file and field options during code +# generation. Options, accepted values, and defaults are documented here: +# https://buf.build/docs/generate/managed-mode#default-behavior +# The 'disable' key configures modules, paths, fields, and/or options that are excluded from managed +# mode's behavior. The 'override' key configures field and file option values that override the +# default values managed mode uses during code generation. +# +# In the case of options that combine with other options (for example java_package + java_package_prefix +# + java_package_suffix), they're all applied if possible. If not (for example when all three are set) +# then the last configuration rule wins. +managed: + # 'enabled: true' turns managed mode on, 'enabled: false' ignores all managed mode options. + # default: false + enabled: false + +# Only generate code for your service’s protos +inputs: + - directory: proto/v1 + +plugins: + # Docs (HTML) + - local: protoc-gen-doc + out: docs/sdk/_generated/html + opt: + - html,index.html + + # Docs (Markdown) + - local: protoc-gen-doc + out: docs/sdk/_generated/markdown + opt: + - markdown,README.md diff --git a/buf.gen.yaml b/buf.gen.yaml new file mode 100644 index 0000000..702372e --- /dev/null +++ b/buf.gen.yaml @@ -0,0 +1,55 @@ +# Copyright 2020-2025 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. + +# Ref: https://buf.build/docs/configuration/v2/buf-gen-yaml/ +version: v2 + +# 'clean', when set to true, deletes the directories, zip files, and/or jar files specified in the +# `out` field for all plugins before running code generation. +clean: false + +# 'managed' contains the configuration for managed mode: https://buf.build/docs/generate/managed-mode +# It has three top-level keys: 'enabled', 'disable', and 'override'. +# +# When managed mode is enabled, it uses default values for certain file and field options during code +# generation. Options, accepted values, and defaults are documented here: +# https://buf.build/docs/generate/managed-mode#default-behavior +# The 'disable' key configures modules, paths, fields, and/or options that are excluded from managed +# mode's behavior. The 'override' key configures field and file option values that override the +# default values managed mode uses during code generation. +# +# In the case of options that combine with other options (for example java_package + java_package_prefix +# + java_package_suffix), they're all applied if possible. If not (for example when all three are set) +# then the last configuration rule wins. +managed: + # 'enabled: true' turns managed mode on, 'enabled: false' ignores all managed mode options. + # default: false + enabled: false + +# Only generate code for your service's protos +inputs: + - directory: proto/v1 + +plugins: + # Go models + gRPC + - local: protoc-gen-go + out: proto/v1/pb + opt: + - paths=source_relative + + - local: protoc-gen-go-grpc + out: proto/v1/pb + opt: + - paths=source_relative + - require_unimplemented_servers=false diff --git a/buf.yaml b/buf.yaml new file mode 100644 index 0000000..835ddc0 --- /dev/null +++ b/buf.yaml @@ -0,0 +1,42 @@ +# Copyright 2020-2025 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. + +# ref: https://buf.build/docs/configuration/v2/buf-yaml/ +version: v2 + +# Define the module for this proto package +modules: + - path: proto/v1 + lint: + use: [STANDARD] + except: + - PACKAGE_DIRECTORY_MATCH + breaking: + use: [FILE] + # - path: vendor/github.com/otherorg/otherpackage + # lint: + # disable_builtin: true + # use: [] + # breaking: + # disable_builtin: true + # use: [] + +# Default lint/breaking for modules that don't override them. +lint: + use: + - STANDARD + +breaking: + use: + - FILE diff --git a/sixafter/types/compass_heading.proto b/proto/v1/compass_heading.proto similarity index 93% rename from sixafter/types/compass_heading.proto rename to proto/v1/compass_heading.proto index dcb4f10..1383c08 100644 --- a/sixafter/types/compass_heading.proto +++ b/proto/v1/compass_heading.proto @@ -17,24 +17,22 @@ syntax = "proto3"; -package sixafter.types; +package proto.v1; -option go_package="github.com/sixafter/types/sixafter/types;types"; +import "google/protobuf/timestamp.proto"; option cc_enable_arenas = true; -option java_package = "com.sixafter.types"; +option csharp_namespace = "SixAfter.Types.V1.WellKnownTypes"; +option go_package = "github.com/sixafter/types/proto/v1/pb;types"; option java_multiple_files = true; option java_outer_classname = "CompassHeadingProto"; +option java_package = "com.sixafter.types.v1"; option objc_class_prefix = "TPB"; -option csharp_namespace = "SixAfter.Types.WellKnownTypes"; - -import "google/protobuf/timestamp.proto"; // The `CompassHeading` message represents the orientation of an object // in the Compass Geodetic System (CGS). This can be used in geolocation // systems, navigation tools, or applications requiring orientation data. message CompassHeading { - // The heading (measured in degrees) relative to magnetic north. // Values range from 0 to 360, where 0 indicates north, 90 indicates east, // 180 indicates south, and 270 indicates west. diff --git a/sixafter/types/country.proto b/proto/v1/country.proto similarity index 90% rename from sixafter/types/country.proto rename to proto/v1/country.proto index dec8c51..365dba2 100644 --- a/sixafter/types/country.proto +++ b/proto/v1/country.proto @@ -15,22 +15,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -syntax="proto3"; +syntax = "proto3"; -package sixafter.types; +package proto.v1; -option go_package="github.com/sixafter/types/sixafter/types;types"; option cc_enable_arenas = true; -option java_package = "com.sixafter.types"; +option csharp_namespace = "SixAfter.Types.V1.WellKnownTypes"; +option go_package = "github.com/sixafter/types/proto/v1/pb;types"; option java_multiple_files = true; option java_outer_classname = "CountryProto"; +option java_package = "com.sixafter.types.v1"; option objc_class_prefix = "TPB"; -option csharp_namespace = "SixAfter.Types.WellKnownTypes"; // The `Country` message represents a country as defined by the ISO-3166-1 standard. // It is commonly used for internationalization, geolocation, and regulatory purposes. message Country { - // The commonly used name of the country. // Example: "United States". string name = 1; diff --git a/sixafter/types/country_subdivision.proto b/proto/v1/country_subdivision.proto similarity index 83% rename from sixafter/types/country_subdivision.proto rename to proto/v1/country_subdivision.proto index 443d610..b32a31b 100644 --- a/sixafter/types/country_subdivision.proto +++ b/proto/v1/country_subdivision.proto @@ -15,19 +15,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -syntax="proto3"; +syntax = "proto3"; -package sixafter.types; +package proto.v1; + +import "country.proto"; -option go_package="github.com/sixafter/types/sixafter/types;types"; option cc_enable_arenas = true; -option java_package = "com.sixafter.types"; +option csharp_namespace = "SixAfter.Types.V1.WellKnownTypes"; +option go_package = "github.com/sixafter/types/proto/v1/pb;types"; option java_multiple_files = true; option java_outer_classname = "CountrySubdivisionProto"; +option java_package = "com.sixafter.types.v1"; option objc_class_prefix = "TPB"; -option csharp_namespace = "SixAfter.Types.WellKnownTypes"; - -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. - sixafter.types.Country country = 3; + proto.v1.Country country = 3; } diff --git a/sixafter/types/email_address.proto b/proto/v1/email_address.proto similarity index 88% rename from sixafter/types/email_address.proto rename to proto/v1/email_address.proto index cee2908..96c9d8c 100644 --- a/sixafter/types/email_address.proto +++ b/proto/v1/email_address.proto @@ -15,23 +15,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -syntax="proto3"; +syntax = "proto3"; -package sixafter.types; +package proto.v1; -option go_package="github.com/sixafter/types/sixafter/types;types"; option cc_enable_arenas = true; -option java_package = "com.sixafter.types"; +option csharp_namespace = "SixAfter.Types.V1.WellKnownTypes"; +option go_package = "github.com/sixafter/types/proto/v1/pb;types"; option java_multiple_files = true; option java_outer_classname = "EmailAddressProto"; +option java_package = "com.sixafter.types.v1"; option objc_class_prefix = "TPB"; -option csharp_namespace = "SixAfter.Types.WellKnownTypes"; // The `EmailAddress` message represents an electronic mail (email) address // as defined by RFC 5322. It separates the email address into its two main // components: the local part and the domain part. message EmailAddress { - // The local part of the email address. // This is the portion of the address before the "@" symbol. // Example: "john.doe" in the email address "john.doe@example.com". diff --git a/sixafter/types/entity_metadata.proto b/proto/v1/entity_metadata.proto similarity index 92% rename from sixafter/types/entity_metadata.proto rename to proto/v1/entity_metadata.proto index 58c9cc3..869bfd3 100644 --- a/sixafter/types/entity_metadata.proto +++ b/proto/v1/entity_metadata.proto @@ -15,27 +15,26 @@ // See the License for the specific language governing permissions and // limitations under the License. -syntax="proto3"; +syntax = "proto3"; -package sixafter.types; +package proto.v1; + +import "google/protobuf/struct.proto"; +import "google/protobuf/timestamp.proto"; +import "version.proto"; -option go_package="github.com/sixafter/types/sixafter/types;types"; option cc_enable_arenas = true; -option java_package = "com.sixafter.types"; +option csharp_namespace = "SixAfter.Types.V1.WellKnownTypes"; +option go_package = "github.com/sixafter/types/proto/v1/pb;types"; option java_multiple_files = true; option java_outer_classname = "EntityMetadataProto"; +option java_package = "com.sixafter.types.v1"; option objc_class_prefix = "TPB"; -option csharp_namespace = "SixAfter.Types.WellKnownTypes"; - -import "google/protobuf/struct.proto"; -import "google/protobuf/timestamp.proto"; -import "sixafter/types/version.proto"; // The `EntityMetadata` message represents metadata associated with an entity. // This includes timestamps, versioning, and additional descriptive properties, // providing a comprehensive overview of the entity's lifecycle and characteristics. message EntityMetadata { - // The timestamp at which the entity was created. // Example: "2024-11-17T12:34:56Z" for an entity created on November 17, 2024. google.protobuf.Timestamp created_at = 1; @@ -65,7 +64,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. - sixafter.types.Version version = 7; + proto.v1.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/sixafter/types/geofence.proto b/proto/v1/geofence.proto similarity index 82% rename from sixafter/types/geofence.proto rename to proto/v1/geofence.proto index 1630a4b..e30a192 100644 --- a/sixafter/types/geofence.proto +++ b/proto/v1/geofence.proto @@ -15,25 +15,24 @@ // See the License for the specific language governing permissions and // limitations under the License. -syntax="proto3"; +syntax = "proto3"; -package sixafter.types; +package proto.v1; + +import "map_polygon.proto"; -option go_package="github.com/sixafter/types/sixafter/types;types"; option cc_enable_arenas = true; -option java_package = "com.sixafter.types"; +option csharp_namespace = "SixAfter.Types.V1.WellKnownTypes"; +option go_package = "github.com/sixafter/types/proto/v1/pb;types"; option java_multiple_files = true; option java_outer_classname = "GeofenceProto"; +option java_package = "com.sixafter.types.v1"; option objc_class_prefix = "TPB"; -option csharp_namespace = "SixAfter.Types.WellKnownTypes"; - -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, // and geo-restriction. message Geofence { - // The name of the geofence. // Example: "Campus Zone", "Restricted Area". string name = 1; @@ -42,5 +41,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 sixafter.types.MapPolygon polygon = 2; + repeated proto.v1.MapPolygon polygon = 2; } diff --git a/sixafter/types/geographic_region.proto b/proto/v1/geographic_region.proto similarity index 90% rename from sixafter/types/geographic_region.proto rename to proto/v1/geographic_region.proto index ba8929b..2c9405e 100644 --- a/sixafter/types/geographic_region.proto +++ b/proto/v1/geographic_region.proto @@ -15,24 +15,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -syntax="proto3"; +syntax = "proto3"; -package sixafter.types; +package proto.v1; -option go_package="github.com/sixafter/types/sixafter/types;types"; option cc_enable_arenas = true; -option java_package = "com.sixafter.types"; +option csharp_namespace = "SixAfter.Types.V1.WellKnownTypes"; +option go_package = "github.com/sixafter/types/proto/v1/pb;types"; option java_multiple_files = true; option java_outer_classname = "GeographicRegionProto"; +option java_package = "com.sixafter.types.v1"; option objc_class_prefix = "TPB"; -option csharp_namespace = "SixAfter.Types.WellKnownTypes"; // The `GeographicRegion` message represents a region as defined by the ISO 3166-2 standard. // ISO 3166-2 defines codes for identifying the principal subdivisions (e.g., states or provinces) // of countries coded in ISO 3166-1. This message can be used in applications requiring // geographic or administrative classification. message GeographicRegion { - // The commonly used name of the region. // Example: "Texas". string name = 1; diff --git a/sixafter/types/geometry.proto b/proto/v1/geometry.proto similarity index 97% rename from sixafter/types/geometry.proto rename to proto/v1/geometry.proto index 3c951b5..a8dc4b2 100644 --- a/sixafter/types/geometry.proto +++ b/proto/v1/geometry.proto @@ -15,17 +15,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -syntax="proto3"; +syntax = "proto3"; -package sixafter.types; +package proto.v1; -option go_package="github.com/sixafter/types/sixafter/types;types"; option cc_enable_arenas = true; -option java_package = "com.sixafter.types"; +option csharp_namespace = "SixAfter.Types.V1.WellKnownTypes"; +option go_package = "github.com/sixafter/types/proto/v1/pb;types"; option java_multiple_files = true; option java_outer_classname = "GeometryProto"; +option java_package = "com.sixafter.types.v1"; option objc_class_prefix = "TPB"; -option csharp_namespace = "SixAfter.Types.WellKnownTypes"; // The following are example messages representing geometric entities in various mathematical spaces. // Geometry Types: @@ -48,7 +48,6 @@ option csharp_namespace = "SixAfter.Types.WellKnownTypes"; // - Klein disk model. // - Homogeneous coordinate system. - // Example 1: Euclidean Geometry with Cartesian Coordinates // A point at (10, 20) in a 2D Cartesian plane under Euclidean geometry. // { diff --git a/sixafter/types/geospatial_coordinate.proto b/proto/v1/geospatial_coordinate.proto similarity index 86% rename from sixafter/types/geospatial_coordinate.proto rename to proto/v1/geospatial_coordinate.proto index 26e259b..100cd4b 100644 --- a/sixafter/types/geospatial_coordinate.proto +++ b/proto/v1/geospatial_coordinate.proto @@ -17,23 +17,22 @@ syntax = "proto3"; -package sixafter.types; +package proto.v1; + +import "geospatial_elevation.proto"; -option go_package="github.com/sixafter/types/sixafter/types;types"; option cc_enable_arenas = true; -option java_package = "com.sixafter.types"; +option csharp_namespace = "SixAfter.Types.V1.WellKnownTypes"; +option go_package = "github.com/sixafter/types/proto/v1/pb;types"; option java_multiple_files = true; option java_outer_classname = "GeospatialCoordinateProto"; +option java_package = "com.sixafter.types.v1"; option objc_class_prefix = "TPB"; -option csharp_namespace = "SixAfter.Types.WellKnownTypes"; - -import "sixafter/types/geospatial_elevation.proto"; // The `GeospatialCoordinate` message represents a geospatial location, // defined by latitude, longitude, and elevation. This is commonly used // in geolocation, navigation, and geographic information systems (GIS). message GeospatialCoordinate { - // The latitude of the geospatial coordinate. // Latitude measures the distance north or south of the equator and is // expressed in degrees ranging from -90 (south) to +90 (north). @@ -49,5 +48,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. - sixafter.types.GeospatialElevation elevation = 3; + proto.v1.GeospatialElevation elevation = 3; } diff --git a/sixafter/types/geospatial_elevation.proto b/proto/v1/geospatial_elevation.proto similarity index 83% rename from sixafter/types/geospatial_elevation.proto rename to proto/v1/geospatial_elevation.proto index cd35f5b..3fde406 100644 --- a/sixafter/types/geospatial_elevation.proto +++ b/proto/v1/geospatial_elevation.proto @@ -17,32 +17,35 @@ syntax = "proto3"; -package sixafter.types; +package proto.v1; -option go_package="github.com/sixafter/types/sixafter/types;types"; option cc_enable_arenas = true; -option java_package = "com.sixafter.types"; +option csharp_namespace = "SixAfter.Types.V1.WellKnownTypes"; +option go_package = "github.com/sixafter/types/proto/v1/pb;types"; option java_multiple_files = true; option java_outer_classname = "GeospatialElevationProto"; +option java_package = "com.sixafter.types.v1"; option objc_class_prefix = "TPB"; -option csharp_namespace = "SixAfter.Types.WellKnownTypes"; // The `GeospatialElevation` message represents the vertical direction // or height of a point relative to a specified reference datum. This // is commonly used in geolocation, mapping, and geographic information systems (GIS). message GeospatialElevation { - // The `GeodeticDatum` enum defines the reference system or surface // against which the elevation is measured. These reference systems are // approximations of the Earth's surface. enum GeodeticDatum { + // Unspecified datum. This indicates that no specific reference system + // has been defined for the elevation measurement. + GEODETIC_DATUM_UNSPECIFIED = 0; + // The altitude above mean sea level (MSL), measured in meters. // This is a commonly used datum for everyday elevation measurements. - SEA_LEVEL = 0; + GEODETIC_DATUM_SEA_LEVEL = 1; // The altitude as a height above the World Geodetic System 1984 (WGS84) // ellipsoid, measured in meters. This is commonly used in GPS systems. - WGS_84 = 1; + GEODETIC_DATUM_WGS_84 = 2; } // The geodetic datum used as the reference point for the elevation measurement. diff --git a/sixafter/types/geospatial_location.proto b/proto/v1/geospatial_location.proto similarity index 85% rename from sixafter/types/geospatial_location.proto rename to proto/v1/geospatial_location.proto index d29245c..210eb6a 100644 --- a/sixafter/types/geospatial_location.proto +++ b/proto/v1/geospatial_location.proto @@ -15,37 +15,35 @@ // See the License for the specific language governing permissions and // limitations under the License. -syntax="proto3"; +syntax = "proto3"; -package sixafter.types; +package proto.v1; + +import "compass_heading.proto"; +import "geospatial_coordinate.proto"; +import "google/protobuf/timestamp.proto"; -option go_package="github.com/sixafter/types/sixafter/types;types"; option cc_enable_arenas = true; -option java_package = "com.sixafter.types"; +option csharp_namespace = "SixAfter.Types.V1.WellKnownTypes"; +option go_package = "github.com/sixafter/types/proto/v1/pb;types"; option java_multiple_files = true; option java_outer_classname = "GeospatialLocationProto"; +option java_package = "com.sixafter.types.v1"; option objc_class_prefix = "TPB"; -option csharp_namespace = "SixAfter.Types.WellKnownTypes"; - -import "google/protobuf/timestamp.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. // It is commonly used in location-based services, navigation systems, and // applications requiring geospatial data. message GeospatialLocation { - // The geographical coordinate information of the location. // Includes latitude, longitude, and elevation as defined in the `GeospatialCoordinate` message. - sixafter.types.GeospatialCoordinate coordinate = 1; + proto.v1.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. - sixafter.types.CompassHeading heading = 2; + proto.v1.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/sixafter/types/language.proto b/proto/v1/language.proto similarity index 91% rename from sixafter/types/language.proto rename to proto/v1/language.proto index a54051a..e0bbf9d 100644 --- a/sixafter/types/language.proto +++ b/proto/v1/language.proto @@ -17,15 +17,15 @@ syntax = "proto3"; -package sixafter.types; +package proto.v1; -option go_package="github.com/sixafter/types/sixafter/types;types"; option cc_enable_arenas = true; -option java_package = "com.sixafter.types"; +option csharp_namespace = "SixAfter.Types.V1.WellKnownTypes"; +option go_package = "github.com/sixafter/types/proto/v1/pb;types"; option java_multiple_files = true; option java_outer_classname = "LanguageProto"; +option java_package = "com.sixafter.types.v1"; option objc_class_prefix = "TPB"; -option csharp_namespace = "SixAfter.Types.WellKnownTypes"; // Language defines a human language using ISO 639 identifiers, // with optional IETF BCP 47 tags for locale variants. diff --git a/sixafter/types/map_point.proto b/proto/v1/map_point.proto similarity index 85% rename from sixafter/types/map_point.proto rename to proto/v1/map_point.proto index 9470335..ef928f4 100644 --- a/sixafter/types/map_point.proto +++ b/proto/v1/map_point.proto @@ -15,25 +15,24 @@ // See the License for the specific language governing permissions and // limitations under the License. -syntax="proto3"; +syntax = "proto3"; -package sixafter.types; +package proto.v1; + +import "geospatial_coordinate.proto"; -option go_package="github.com/sixafter/types/sixafter/types;types"; option cc_enable_arenas = true; -option java_package = "com.sixafter.types"; +option csharp_namespace = "SixAfter.Types.V1.WellKnownTypes"; +option go_package = "github.com/sixafter/types/proto/v1/pb;types"; option java_multiple_files = true; option java_outer_classname = "MapPointProto"; +option java_package = "com.sixafter.types.v1"; option objc_class_prefix = "TPB"; -option csharp_namespace = "SixAfter.Types.WellKnownTypes"; - -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. // This structure is commonly used in mapping, GIS, and location-based applications. message MapPoint { - // The x-coordinate of the map point. // Represents the horizontal position on the two-dimensional map. // Example: A value of 200.5 could represent a position on a Mercator projection. @@ -48,5 +47,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. - sixafter.types.GeospatialCoordinate coordinate = 3; + proto.v1.GeospatialCoordinate coordinate = 3; } diff --git a/sixafter/types/map_polygon.proto b/proto/v1/map_polygon.proto similarity index 84% rename from sixafter/types/map_polygon.proto rename to proto/v1/map_polygon.proto index a746d47..104ec3f 100644 --- a/sixafter/types/map_polygon.proto +++ b/proto/v1/map_polygon.proto @@ -15,26 +15,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -syntax="proto3"; +syntax = "proto3"; -package sixafter.types; +package proto.v1; + +import "map_point.proto"; -option go_package="github.com/sixafter/types/sixafter/types;types"; option cc_enable_arenas = true; -option java_package = "com.sixafter.types"; +option csharp_namespace = "SixAfter.Types.V1.WellKnownTypes"; +option go_package = "github.com/sixafter/types/proto/v1/pb;types"; option java_multiple_files = true; option java_outer_classname = "MapPolygonProto"; +option java_package = "com.sixafter.types.v1"; option objc_class_prefix = "TPB"; -option csharp_namespace = "SixAfter.Types.WellKnownTypes"; - -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, // with the first and last points also connected to form a closed shape. // This structure is commonly used in mapping applications, GIS, and geofencing. message MapPolygon { - // The set of points that define the polygon. // Each point is represented by a `MapPoint` message, which specifies the // location on the map. The points should be provided in the order they are @@ -45,5 +44,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 sixafter.types.MapPoint points = 1; + repeated proto.v1.MapPoint points = 1; } diff --git a/sixafter/types/compass_heading.pb.go b/proto/v1/pb/compass_heading.pb.go similarity index 71% rename from sixafter/types/compass_heading.pb.go rename to proto/v1/pb/compass_heading.pb.go index e78068f..7992e85 100644 --- a/sixafter/types/compass_heading.pb.go +++ b/proto/v1/pb/compass_heading.pb.go @@ -18,8 +18,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.2 -// source: sixafter/types/compass_heading.proto +// protoc (unknown) +// source: compass_heading.proto package types @@ -77,7 +77,7 @@ type CompassHeading struct { func (x *CompassHeading) Reset() { *x = CompassHeading{} - mi := &file_sixafter_types_compass_heading_proto_msgTypes[0] + mi := &file_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_sixafter_types_compass_heading_proto_msgTypes[0] + mi := &file_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_sixafter_types_compass_heading_proto_rawDescGZIP(), []int{0} + return file_compass_heading_proto_rawDescGZIP(), []int{0} } func (x *CompassHeading) GetMagneticHeading() float32 { @@ -154,11 +154,11 @@ func (x *CompassHeading) GetZ() float32 { return 0 } -var File_sixafter_types_compass_heading_proto protoreflect.FileDescriptor +var File_compass_heading_proto protoreflect.FileDescriptor -const file_sixafter_types_compass_heading_proto_rawDesc = "" + +const file_compass_heading_proto_rawDesc = "" + "\n" + - "$sixafter/types/compass_heading.proto\x12\x0esixafter.types\x1a\x1fgoogle/protobuf/timestamp.proto\"\xed\x01\n" + + "\x15compass_heading.proto\x12\bproto.v1\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" + @@ -166,28 +166,28 @@ const file_sixafter_types_compass_heading_proto_rawDesc = "" + "\ttimestamp\x18\x04 \x01(\v2\x1a.google.protobuf.TimestampR\ttimestamp\x12\f\n" + "\x01x\x18\x05 \x01(\x02R\x01x\x12\f\n" + "\x01y\x18\x06 \x01(\x02R\x01y\x12\f\n" + - "\x01z\x18\a \x01(\x02R\x01zB\x84\x01\n" + - "\x12com.sixafter.typesB\x13CompassHeadingProtoP\x01Z.github.com/sixafter/types/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" + "\x01z\x18\a \x01(\x02R\x01zB\x87\x01\n" + + "\x15com.sixafter.types.v1B\x13CompassHeadingProtoP\x01Z+github.com/sixafter/types/proto/v1/pb;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02 SixAfter.Types.V1.WellKnownTypesb\x06proto3" var ( - file_sixafter_types_compass_heading_proto_rawDescOnce sync.Once - file_sixafter_types_compass_heading_proto_rawDescData []byte + file_compass_heading_proto_rawDescOnce sync.Once + file_compass_heading_proto_rawDescData []byte ) -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))) +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))) }) - return file_sixafter_types_compass_heading_proto_rawDescData + return file_compass_heading_proto_rawDescData } -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 +var file_compass_heading_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_compass_heading_proto_goTypes = []any{ + (*CompassHeading)(nil), // 0: proto.v1.CompassHeading (*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp } -var file_sixafter_types_compass_heading_proto_depIdxs = []int32{ - 1, // 0: sixafter.types.CompassHeading.timestamp:type_name -> google.protobuf.Timestamp +var file_compass_heading_proto_depIdxs = []int32{ + 1, // 0: proto.v1.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 1, // [1:1] is the sub-list for extension type_name @@ -195,26 +195,26 @@ var file_sixafter_types_compass_heading_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -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 { +func init() { file_compass_heading_proto_init() } +func file_compass_heading_proto_init() { + if File_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_sixafter_types_compass_heading_proto_rawDesc), len(file_sixafter_types_compass_heading_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_compass_heading_proto_rawDesc), len(file_compass_heading_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_sixafter_types_compass_heading_proto_goTypes, - DependencyIndexes: file_sixafter_types_compass_heading_proto_depIdxs, - MessageInfos: file_sixafter_types_compass_heading_proto_msgTypes, + GoTypes: file_compass_heading_proto_goTypes, + DependencyIndexes: file_compass_heading_proto_depIdxs, + MessageInfos: file_compass_heading_proto_msgTypes, }.Build() - File_sixafter_types_compass_heading_proto = out.File - file_sixafter_types_compass_heading_proto_goTypes = nil - file_sixafter_types_compass_heading_proto_depIdxs = nil + File_compass_heading_proto = out.File + file_compass_heading_proto_goTypes = nil + file_compass_heading_proto_depIdxs = nil } diff --git a/sixafter/types/country.pb.go b/proto/v1/pb/country.pb.go similarity index 70% rename from sixafter/types/country.pb.go rename to proto/v1/pb/country.pb.go index 2df313d..ac639c8 100644 --- a/sixafter/types/country.pb.go +++ b/proto/v1/pb/country.pb.go @@ -18,8 +18,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.2 -// source: sixafter/types/country.proto +// protoc (unknown) +// source: country.proto package types @@ -67,7 +67,7 @@ type Country struct { func (x *Country) Reset() { *x = Country{} - mi := &file_sixafter_types_country_proto_msgTypes[0] + mi := &file_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_sixafter_types_country_proto_msgTypes[0] + mi := &file_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_sixafter_types_country_proto_rawDescGZIP(), []int{0} + return file_country_proto_rawDescGZIP(), []int{0} } func (x *Country) GetName() string { @@ -130,37 +130,37 @@ func (x *Country) GetNumericCode() uint32 { return 0 } -var File_sixafter_types_country_proto protoreflect.FileDescriptor +var File_country_proto protoreflect.FileDescriptor -const file_sixafter_types_country_proto_rawDesc = "" + +const file_country_proto_rawDesc = "" + "\n" + - "\x1csixafter/types/country.proto\x12\x0esixafter.types\"\xb9\x01\n" + + "\rcountry.proto\x12\bproto.v1\"\xb9\x01\n" + "\aCountry\x12\x12\n" + "\x04name\x18\x01 \x01(\tR\x04name\x12\x1f\n" + "\vformal_name\x18\x02 \x01(\tR\n" + "formalName\x12*\n" + "\x11alphabetic_code_2\x18\x03 \x01(\tR\x0falphabeticCode2\x12*\n" + "\x11alphabetic_code_3\x18\x04 \x01(\tR\x0falphabeticCode3\x12!\n" + - "\fnumeric_code\x18\x05 \x01(\rR\vnumericCodeB}\n" + - "\x12com.sixafter.typesB\fCountryProtoP\x01Z.github.com/sixafter/types/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" + "\fnumeric_code\x18\x05 \x01(\rR\vnumericCodeB\x80\x01\n" + + "\x15com.sixafter.types.v1B\fCountryProtoP\x01Z+github.com/sixafter/types/proto/v1/pb;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02 SixAfter.Types.V1.WellKnownTypesb\x06proto3" var ( - file_sixafter_types_country_proto_rawDescOnce sync.Once - file_sixafter_types_country_proto_rawDescData []byte + file_country_proto_rawDescOnce sync.Once + file_country_proto_rawDescData []byte ) -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))) +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))) }) - return file_sixafter_types_country_proto_rawDescData + return file_country_proto_rawDescData } -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_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_country_proto_goTypes = []any{ + (*Country)(nil), // 0: proto.v1.Country } -var file_sixafter_types_country_proto_depIdxs = []int32{ +var file_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_sixafter_types_country_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_sixafter_types_country_proto_init() } -func file_sixafter_types_country_proto_init() { - if File_sixafter_types_country_proto != nil { +func init() { file_country_proto_init() } +func file_country_proto_init() { + if File_country_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_country_proto_rawDesc), len(file_sixafter_types_country_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_country_proto_rawDesc), len(file_country_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_sixafter_types_country_proto_goTypes, - DependencyIndexes: file_sixafter_types_country_proto_depIdxs, - MessageInfos: file_sixafter_types_country_proto_msgTypes, + GoTypes: file_country_proto_goTypes, + DependencyIndexes: file_country_proto_depIdxs, + MessageInfos: file_country_proto_msgTypes, }.Build() - File_sixafter_types_country_proto = out.File - file_sixafter_types_country_proto_goTypes = nil - file_sixafter_types_country_proto_depIdxs = nil + File_country_proto = out.File + file_country_proto_goTypes = nil + file_country_proto_depIdxs = nil } diff --git a/sixafter/types/country_subdivision.pb.go b/proto/v1/pb/country_subdivision.pb.go similarity index 58% rename from sixafter/types/country_subdivision.pb.go rename to proto/v1/pb/country_subdivision.pb.go index 9453d32..1b38179 100644 --- a/sixafter/types/country_subdivision.pb.go +++ b/proto/v1/pb/country_subdivision.pb.go @@ -18,8 +18,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.2 -// source: sixafter/types/country_subdivision.proto +// protoc (unknown) +// source: country_subdivision.proto package types @@ -58,7 +58,7 @@ type CountrySubdivision struct { func (x *CountrySubdivision) Reset() { *x = CountrySubdivision{} - mi := &file_sixafter_types_country_subdivision_proto_msgTypes[0] + mi := &file_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_sixafter_types_country_subdivision_proto_msgTypes[0] + mi := &file_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_sixafter_types_country_subdivision_proto_rawDescGZIP(), []int{0} + return file_country_subdivision_proto_rawDescGZIP(), []int{0} } func (x *CountrySubdivision) GetName() string { @@ -107,36 +107,36 @@ func (x *CountrySubdivision) GetCountry() *Country { return nil } -var File_sixafter_types_country_subdivision_proto protoreflect.FileDescriptor +var File_country_subdivision_proto protoreflect.FileDescriptor -const file_sixafter_types_country_subdivision_proto_rawDesc = "" + +const file_country_subdivision_proto_rawDesc = "" + "\n" + - "(sixafter/types/country_subdivision.proto\x12\x0esixafter.types\x1a\x1csixafter/types/country.proto\"o\n" + + "\x19country_subdivision.proto\x12\bproto.v1\x1a\rcountry.proto\"i\n" + "\x12CountrySubdivision\x12\x12\n" + "\x04name\x18\x01 \x01(\tR\x04name\x12\x12\n" + - "\x04code\x18\x02 \x01(\tR\x04code\x121\n" + - "\acountry\x18\x03 \x01(\v2\x17.sixafter.types.CountryR\acountryB\x88\x01\n" + - "\x12com.sixafter.typesB\x17CountrySubdivisionProtoP\x01Z.github.com/sixafter/types/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" + "\x04code\x18\x02 \x01(\tR\x04code\x12+\n" + + "\acountry\x18\x03 \x01(\v2\x11.proto.v1.CountryR\acountryB\x8b\x01\n" + + "\x15com.sixafter.types.v1B\x17CountrySubdivisionProtoP\x01Z+github.com/sixafter/types/proto/v1/pb;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02 SixAfter.Types.V1.WellKnownTypesb\x06proto3" var ( - file_sixafter_types_country_subdivision_proto_rawDescOnce sync.Once - file_sixafter_types_country_subdivision_proto_rawDescData []byte + file_country_subdivision_proto_rawDescOnce sync.Once + file_country_subdivision_proto_rawDescData []byte ) -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))) +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))) }) - return file_sixafter_types_country_subdivision_proto_rawDescData + return file_country_subdivision_proto_rawDescData } -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_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_country_subdivision_proto_goTypes = []any{ + (*CountrySubdivision)(nil), // 0: proto.v1.CountrySubdivision + (*Country)(nil), // 1: proto.v1.Country } -var file_sixafter_types_country_subdivision_proto_depIdxs = []int32{ - 1, // 0: sixafter.types.CountrySubdivision.country:type_name -> sixafter.types.Country +var file_country_subdivision_proto_depIdxs = []int32{ + 1, // 0: proto.v1.CountrySubdivision.country:type_name -> proto.v1.Country 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name @@ -144,27 +144,27 @@ var file_sixafter_types_country_subdivision_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -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 { +func init() { file_country_subdivision_proto_init() } +func file_country_subdivision_proto_init() { + if File_country_subdivision_proto != nil { return } - file_sixafter_types_country_proto_init() + file_country_proto_init() type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_country_subdivision_proto_rawDesc), len(file_sixafter_types_country_subdivision_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_country_subdivision_proto_rawDesc), len(file_country_subdivision_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_sixafter_types_country_subdivision_proto_goTypes, - DependencyIndexes: file_sixafter_types_country_subdivision_proto_depIdxs, - MessageInfos: file_sixafter_types_country_subdivision_proto_msgTypes, + GoTypes: file_country_subdivision_proto_goTypes, + DependencyIndexes: file_country_subdivision_proto_depIdxs, + MessageInfos: file_country_subdivision_proto_msgTypes, }.Build() - File_sixafter_types_country_subdivision_proto = out.File - file_sixafter_types_country_subdivision_proto_goTypes = nil - file_sixafter_types_country_subdivision_proto_depIdxs = nil + File_country_subdivision_proto = out.File + file_country_subdivision_proto_goTypes = nil + file_country_subdivision_proto_depIdxs = nil } diff --git a/sixafter/types/email_address.pb.go b/proto/v1/pb/email_address.pb.go similarity index 63% rename from sixafter/types/email_address.pb.go rename to proto/v1/pb/email_address.pb.go index f1855dc..f1c68d2 100644 --- a/sixafter/types/email_address.pb.go +++ b/proto/v1/pb/email_address.pb.go @@ -18,8 +18,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.2 -// source: sixafter/types/email_address.proto +// protoc (unknown) +// source: email_address.proto package types @@ -58,7 +58,7 @@ type EmailAddress struct { func (x *EmailAddress) Reset() { *x = EmailAddress{} - mi := &file_sixafter_types_email_address_proto_msgTypes[0] + mi := &file_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_sixafter_types_email_address_proto_msgTypes[0] + mi := &file_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_sixafter_types_email_address_proto_rawDescGZIP(), []int{0} + return file_email_address_proto_rawDescGZIP(), []int{0} } func (x *EmailAddress) GetLocalPart() string { @@ -100,35 +100,35 @@ func (x *EmailAddress) GetDomainPart() string { return "" } -var File_sixafter_types_email_address_proto protoreflect.FileDescriptor +var File_email_address_proto protoreflect.FileDescriptor -const file_sixafter_types_email_address_proto_rawDesc = "" + +const file_email_address_proto_rawDesc = "" + "\n" + - "\"sixafter/types/email_address.proto\x12\x0esixafter.types\"N\n" + + "\x13email_address.proto\x12\bproto.v1\"N\n" + "\fEmailAddress\x12\x1d\n" + "\n" + "local_part\x18\x01 \x01(\tR\tlocalPart\x12\x1f\n" + "\vdomain_part\x18\x02 \x01(\tR\n" + - "domainPartB\x82\x01\n" + - "\x12com.sixafter.typesB\x11EmailAddressProtoP\x01Z.github.com/sixafter/types/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" + "domainPartB\x85\x01\n" + + "\x15com.sixafter.types.v1B\x11EmailAddressProtoP\x01Z+github.com/sixafter/types/proto/v1/pb;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02 SixAfter.Types.V1.WellKnownTypesb\x06proto3" var ( - file_sixafter_types_email_address_proto_rawDescOnce sync.Once - file_sixafter_types_email_address_proto_rawDescData []byte + file_email_address_proto_rawDescOnce sync.Once + file_email_address_proto_rawDescData []byte ) -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))) +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))) }) - return file_sixafter_types_email_address_proto_rawDescData + return file_email_address_proto_rawDescData } -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_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_email_address_proto_goTypes = []any{ + (*EmailAddress)(nil), // 0: proto.v1.EmailAddress } -var file_sixafter_types_email_address_proto_depIdxs = []int32{ +var file_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_sixafter_types_email_address_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -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 { +func init() { file_email_address_proto_init() } +func file_email_address_proto_init() { + if File_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_sixafter_types_email_address_proto_rawDesc), len(file_sixafter_types_email_address_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_email_address_proto_rawDesc), len(file_email_address_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_sixafter_types_email_address_proto_goTypes, - DependencyIndexes: file_sixafter_types_email_address_proto_depIdxs, - MessageInfos: file_sixafter_types_email_address_proto_msgTypes, + GoTypes: file_email_address_proto_goTypes, + DependencyIndexes: file_email_address_proto_depIdxs, + MessageInfos: file_email_address_proto_msgTypes, }.Build() - File_sixafter_types_email_address_proto = out.File - file_sixafter_types_email_address_proto_goTypes = nil - file_sixafter_types_email_address_proto_depIdxs = nil + File_email_address_proto = out.File + file_email_address_proto_goTypes = nil + file_email_address_proto_depIdxs = nil } diff --git a/sixafter/types/entity_metadata.pb.go b/proto/v1/pb/entity_metadata.pb.go similarity index 71% rename from sixafter/types/entity_metadata.pb.go rename to proto/v1/pb/entity_metadata.pb.go index d54d340..28d5b7a 100644 --- a/sixafter/types/entity_metadata.pb.go +++ b/proto/v1/pb/entity_metadata.pb.go @@ -18,8 +18,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.2 -// source: sixafter/types/entity_metadata.proto +// protoc (unknown) +// source: entity_metadata.proto package types @@ -91,7 +91,7 @@ type EntityMetadata struct { func (x *EntityMetadata) Reset() { *x = EntityMetadata{} - mi := &file_sixafter_types_entity_metadata_proto_msgTypes[0] + mi := &file_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_sixafter_types_entity_metadata_proto_msgTypes[0] + mi := &file_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_sixafter_types_entity_metadata_proto_rawDescGZIP(), []int{0} + return file_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_sixafter_types_entity_metadata_proto protoreflect.FileDescriptor +var File_entity_metadata_proto protoreflect.FileDescriptor -const file_sixafter_types_entity_metadata_proto_rawDesc = "" + +const file_entity_metadata_proto_rawDesc = "" + "\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" + + "\x15entity_metadata.proto\x12\bproto.v1\x1a\x1cgoogle/protobuf/struct.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\rversion.proto\"\xb7\x03\n" + "\x0eEntityMetadata\x129\n" + "\n" + "created_at\x18\x01 \x01(\v2\x1a.google.protobuf.TimestampR\tcreatedAt\x12;\n" + @@ -205,41 +205,41 @@ const file_sixafter_types_entity_metadata_proto_rawDesc = "" + "\n" + "replicable\x18\x05 \x01(\bR\n" + "replicable\x12\x1c\n" + - "\timmutable\x18\x06 \x01(\bR\timmutable\x121\n" + - "\aversion\x18\a \x01(\v2\x17.sixafter.types.VersionR\aversion\x12\x1c\n" + + "\timmutable\x18\x06 \x01(\bR\timmutable\x12+\n" + + "\aversion\x18\a \x01(\v2\x11.proto.v1.VersionR\aversion\x12\x1c\n" + "\tsynthetic\x18\b \x01(\bR\tsynthetic\x12\x12\n" + "\x04tags\x18\t \x03(\tR\x04tags\x127\n" + "\n" + "attributes\x18\n" + " \x01(\v2\x17.google.protobuf.StructR\n" + - "attributesB\x84\x01\n" + - "\x12com.sixafter.typesB\x13EntityMetadataProtoP\x01Z.github.com/sixafter/types/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" + "attributesB\x87\x01\n" + + "\x15com.sixafter.types.v1B\x13EntityMetadataProtoP\x01Z+github.com/sixafter/types/proto/v1/pb;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02 SixAfter.Types.V1.WellKnownTypesb\x06proto3" var ( - file_sixafter_types_entity_metadata_proto_rawDescOnce sync.Once - file_sixafter_types_entity_metadata_proto_rawDescData []byte + file_entity_metadata_proto_rawDescOnce sync.Once + file_entity_metadata_proto_rawDescData []byte ) -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))) +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))) }) - return file_sixafter_types_entity_metadata_proto_rawDescData + return file_entity_metadata_proto_rawDescData } -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 +var file_entity_metadata_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_entity_metadata_proto_goTypes = []any{ + (*EntityMetadata)(nil), // 0: proto.v1.EntityMetadata (*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp - (*Version)(nil), // 2: sixafter.types.Version + (*Version)(nil), // 2: proto.v1.Version (*structpb.Struct)(nil), // 3: google.protobuf.Struct } -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 - 2, // 3: sixafter.types.EntityMetadata.version:type_name -> sixafter.types.Version - 3, // 4: sixafter.types.EntityMetadata.attributes:type_name -> google.protobuf.Struct +var file_entity_metadata_proto_depIdxs = []int32{ + 1, // 0: proto.v1.EntityMetadata.created_at:type_name -> google.protobuf.Timestamp + 1, // 1: proto.v1.EntityMetadata.modified_at:type_name -> google.protobuf.Timestamp + 1, // 2: proto.v1.EntityMetadata.deleted_at:type_name -> google.protobuf.Timestamp + 2, // 3: proto.v1.EntityMetadata.version:type_name -> proto.v1.Version + 3, // 4: proto.v1.EntityMetadata.attributes:type_name -> google.protobuf.Struct 5, // [5:5] is the sub-list for method output_type 5, // [5:5] is the sub-list for method input_type 5, // [5:5] is the sub-list for extension type_name @@ -247,27 +247,27 @@ var file_sixafter_types_entity_metadata_proto_depIdxs = []int32{ 0, // [0:5] is the sub-list for field type_name } -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 { +func init() { file_entity_metadata_proto_init() } +func file_entity_metadata_proto_init() { + if File_entity_metadata_proto != nil { return } - file_sixafter_types_version_proto_init() + file_version_proto_init() type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_entity_metadata_proto_rawDesc), len(file_sixafter_types_entity_metadata_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_entity_metadata_proto_rawDesc), len(file_entity_metadata_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_sixafter_types_entity_metadata_proto_goTypes, - DependencyIndexes: file_sixafter_types_entity_metadata_proto_depIdxs, - MessageInfos: file_sixafter_types_entity_metadata_proto_msgTypes, + GoTypes: file_entity_metadata_proto_goTypes, + DependencyIndexes: file_entity_metadata_proto_depIdxs, + MessageInfos: file_entity_metadata_proto_msgTypes, }.Build() - File_sixafter_types_entity_metadata_proto = out.File - file_sixafter_types_entity_metadata_proto_goTypes = nil - file_sixafter_types_entity_metadata_proto_depIdxs = nil + File_entity_metadata_proto = out.File + file_entity_metadata_proto_goTypes = nil + file_entity_metadata_proto_depIdxs = nil } diff --git a/sixafter/types/geofence.pb.go b/proto/v1/pb/geofence.pb.go similarity index 59% rename from sixafter/types/geofence.pb.go rename to proto/v1/pb/geofence.pb.go index 534cf71..ec3b422 100644 --- a/sixafter/types/geofence.pb.go +++ b/proto/v1/pb/geofence.pb.go @@ -18,8 +18,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.2 -// source: sixafter/types/geofence.proto +// protoc (unknown) +// source: geofence.proto package types @@ -57,7 +57,7 @@ type Geofence struct { func (x *Geofence) Reset() { *x = Geofence{} - mi := &file_sixafter_types_geofence_proto_msgTypes[0] + mi := &file_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_sixafter_types_geofence_proto_msgTypes[0] + mi := &file_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_sixafter_types_geofence_proto_rawDescGZIP(), []int{0} + return file_geofence_proto_rawDescGZIP(), []int{0} } func (x *Geofence) GetName() string { @@ -99,35 +99,35 @@ func (x *Geofence) GetPolygon() []*MapPolygon { return nil } -var File_sixafter_types_geofence_proto protoreflect.FileDescriptor +var File_geofence_proto protoreflect.FileDescriptor -const file_sixafter_types_geofence_proto_rawDesc = "" + +const file_geofence_proto_rawDesc = "" + "\n" + - "\x1dsixafter/types/geofence.proto\x12\x0esixafter.types\x1a sixafter/types/map_polygon.proto\"T\n" + + "\x0egeofence.proto\x12\bproto.v1\x1a\x11map_polygon.proto\"N\n" + "\bGeofence\x12\x12\n" + - "\x04name\x18\x01 \x01(\tR\x04name\x124\n" + - "\apolygon\x18\x02 \x03(\v2\x1a.sixafter.types.MapPolygonR\apolygonB~\n" + - "\x12com.sixafter.typesB\rGeofenceProtoP\x01Z.github.com/sixafter/types/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" + "\x04name\x18\x01 \x01(\tR\x04name\x12.\n" + + "\apolygon\x18\x02 \x03(\v2\x14.proto.v1.MapPolygonR\apolygonB\x81\x01\n" + + "\x15com.sixafter.types.v1B\rGeofenceProtoP\x01Z+github.com/sixafter/types/proto/v1/pb;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02 SixAfter.Types.V1.WellKnownTypesb\x06proto3" var ( - file_sixafter_types_geofence_proto_rawDescOnce sync.Once - file_sixafter_types_geofence_proto_rawDescData []byte + file_geofence_proto_rawDescOnce sync.Once + file_geofence_proto_rawDescData []byte ) -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))) +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))) }) - return file_sixafter_types_geofence_proto_rawDescData + return file_geofence_proto_rawDescData } -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_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_geofence_proto_goTypes = []any{ + (*Geofence)(nil), // 0: proto.v1.Geofence + (*MapPolygon)(nil), // 1: proto.v1.MapPolygon } -var file_sixafter_types_geofence_proto_depIdxs = []int32{ - 1, // 0: sixafter.types.Geofence.polygon:type_name -> sixafter.types.MapPolygon +var file_geofence_proto_depIdxs = []int32{ + 1, // 0: proto.v1.Geofence.polygon:type_name -> proto.v1.MapPolygon 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name @@ -135,27 +135,27 @@ var file_sixafter_types_geofence_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_sixafter_types_geofence_proto_init() } -func file_sixafter_types_geofence_proto_init() { - if File_sixafter_types_geofence_proto != nil { +func init() { file_geofence_proto_init() } +func file_geofence_proto_init() { + if File_geofence_proto != nil { return } - file_sixafter_types_map_polygon_proto_init() + file_map_polygon_proto_init() type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_geofence_proto_rawDesc), len(file_sixafter_types_geofence_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_geofence_proto_rawDesc), len(file_geofence_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_sixafter_types_geofence_proto_goTypes, - DependencyIndexes: file_sixafter_types_geofence_proto_depIdxs, - MessageInfos: file_sixafter_types_geofence_proto_msgTypes, + GoTypes: file_geofence_proto_goTypes, + DependencyIndexes: file_geofence_proto_depIdxs, + MessageInfos: file_geofence_proto_msgTypes, }.Build() - File_sixafter_types_geofence_proto = out.File - file_sixafter_types_geofence_proto_goTypes = nil - file_sixafter_types_geofence_proto_depIdxs = nil + File_geofence_proto = out.File + file_geofence_proto_goTypes = nil + file_geofence_proto_depIdxs = nil } diff --git a/sixafter/types/geographic_region.pb.go b/proto/v1/pb/geographic_region.pb.go similarity index 68% rename from sixafter/types/geographic_region.pb.go rename to proto/v1/pb/geographic_region.pb.go index e2528e2..72e884b 100644 --- a/sixafter/types/geographic_region.pb.go +++ b/proto/v1/pb/geographic_region.pb.go @@ -18,8 +18,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.2 -// source: sixafter/types/geographic_region.proto +// protoc (unknown) +// source: geographic_region.proto package types @@ -69,7 +69,7 @@ type GeographicRegion struct { func (x *GeographicRegion) Reset() { *x = GeographicRegion{} - mi := &file_sixafter_types_geographic_region_proto_msgTypes[0] + mi := &file_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_sixafter_types_geographic_region_proto_msgTypes[0] + mi := &file_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_sixafter_types_geographic_region_proto_rawDescGZIP(), []int{0} + return file_geographic_region_proto_rawDescGZIP(), []int{0} } func (x *GeographicRegion) GetName() string { @@ -132,37 +132,37 @@ func (x *GeographicRegion) GetCountrySubdivision() string { return "" } -var File_sixafter_types_geographic_region_proto protoreflect.FileDescriptor +var File_geographic_region_proto protoreflect.FileDescriptor -const file_sixafter_types_geographic_region_proto_rawDesc = "" + +const file_geographic_region_proto_rawDesc = "" + "\n" + - "&sixafter/types/geographic_region.proto\x12\x0esixafter.types\"\xb5\x01\n" + + "\x17geographic_region.proto\x12\bproto.v1\"\xb5\x01\n" + "\x10GeographicRegion\x12\x12\n" + "\x04name\x18\x01 \x01(\tR\x04name\x12\x1f\n" + "\vformal_name\x18\x02 \x01(\tR\n" + "formalName\x12!\n" + "\fnumeric_code\x18\x03 \x01(\rR\vnumericCode\x12\x18\n" + "\acountry\x18\x04 \x01(\tR\acountry\x12/\n" + - "\x13country_subdivision\x18\x05 \x01(\tR\x12countrySubdivisionB\x86\x01\n" + - "\x12com.sixafter.typesB\x15GeographicRegionProtoP\x01Z.github.com/sixafter/types/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" + "\x13country_subdivision\x18\x05 \x01(\tR\x12countrySubdivisionB\x89\x01\n" + + "\x15com.sixafter.types.v1B\x15GeographicRegionProtoP\x01Z+github.com/sixafter/types/proto/v1/pb;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02 SixAfter.Types.V1.WellKnownTypesb\x06proto3" var ( - file_sixafter_types_geographic_region_proto_rawDescOnce sync.Once - file_sixafter_types_geographic_region_proto_rawDescData []byte + file_geographic_region_proto_rawDescOnce sync.Once + file_geographic_region_proto_rawDescData []byte ) -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))) +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))) }) - return file_sixafter_types_geographic_region_proto_rawDescData + return file_geographic_region_proto_rawDescData } -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_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_geographic_region_proto_goTypes = []any{ + (*GeographicRegion)(nil), // 0: proto.v1.GeographicRegion } -var file_sixafter_types_geographic_region_proto_depIdxs = []int32{ +var file_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_sixafter_types_geographic_region_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -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 { +func init() { file_geographic_region_proto_init() } +func file_geographic_region_proto_init() { + if File_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_sixafter_types_geographic_region_proto_rawDesc), len(file_sixafter_types_geographic_region_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_geographic_region_proto_rawDesc), len(file_geographic_region_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_sixafter_types_geographic_region_proto_goTypes, - DependencyIndexes: file_sixafter_types_geographic_region_proto_depIdxs, - MessageInfos: file_sixafter_types_geographic_region_proto_msgTypes, + GoTypes: file_geographic_region_proto_goTypes, + DependencyIndexes: file_geographic_region_proto_depIdxs, + MessageInfos: file_geographic_region_proto_msgTypes, }.Build() - File_sixafter_types_geographic_region_proto = out.File - file_sixafter_types_geographic_region_proto_goTypes = nil - file_sixafter_types_geographic_region_proto_depIdxs = nil + File_geographic_region_proto = out.File + file_geographic_region_proto_goTypes = nil + file_geographic_region_proto_depIdxs = nil } diff --git a/sixafter/types/geometry.pb.go b/proto/v1/pb/geometry.pb.go similarity index 70% rename from sixafter/types/geometry.pb.go rename to proto/v1/pb/geometry.pb.go index d57875f..ec6356a 100644 --- a/sixafter/types/geometry.pb.go +++ b/proto/v1/pb/geometry.pb.go @@ -18,8 +18,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.2 -// source: sixafter/types/geometry.proto +// protoc (unknown) +// source: geometry.proto package types @@ -58,7 +58,7 @@ type Scalar struct { func (x *Scalar) Reset() { *x = Scalar{} - mi := &file_sixafter_types_geometry_proto_msgTypes[0] + mi := &file_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_sixafter_types_geometry_proto_msgTypes[0] + mi := &file_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_sixafter_types_geometry_proto_rawDescGZIP(), []int{0} + return file_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_sixafter_types_geometry_proto_msgTypes[1] + mi := &file_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_sixafter_types_geometry_proto_msgTypes[1] + mi := &file_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_sixafter_types_geometry_proto_rawDescGZIP(), []int{1} + return file_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_sixafter_types_geometry_proto_msgTypes[2] + mi := &file_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_sixafter_types_geometry_proto_msgTypes[2] + mi := &file_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_sixafter_types_geometry_proto_rawDescGZIP(), []int{2} + return file_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_sixafter_types_geometry_proto_msgTypes[3] + mi := &file_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_sixafter_types_geometry_proto_msgTypes[3] + mi := &file_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_sixafter_types_geometry_proto_rawDescGZIP(), []int{3} + return file_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_sixafter_types_geometry_proto_msgTypes[4] + mi := &file_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_sixafter_types_geometry_proto_msgTypes[4] + mi := &file_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_sixafter_types_geometry_proto_rawDescGZIP(), []int{4} + return file_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_sixafter_types_geometry_proto_msgTypes[5] + mi := &file_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_sixafter_types_geometry_proto_msgTypes[5] + mi := &file_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_sixafter_types_geometry_proto_rawDescGZIP(), []int{5} + return file_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_sixafter_types_geometry_proto_msgTypes[6] + mi := &file_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_sixafter_types_geometry_proto_msgTypes[6] + mi := &file_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_sixafter_types_geometry_proto_rawDescGZIP(), []int{6} + return file_geometry_proto_rawDescGZIP(), []int{6} } func (x *Polygon) GetVertices() []*Point { @@ -461,79 +461,79 @@ func (x *Polygon) GetIsClosed() bool { return false } -var File_sixafter_types_geometry_proto protoreflect.FileDescriptor +var File_geometry_proto protoreflect.FileDescriptor -const file_sixafter_types_geometry_proto_rawDesc = "" + +const file_geometry_proto_rawDesc = "" + "\n" + - "\x1dsixafter/types/geometry.proto\x12\x0esixafter.types\"E\n" + + "\x0egeometry.proto\x12\bproto.v1\"E\n" + "\x06Scalar\x12%\n" + "\x0eunscaled_value\x18\x01 \x01(\x12R\runscaledValue\x12\x14\n" + - "\x05scale\x18\x02 \x01(\rR\x05scale\"\xb7\x01\n" + + "\x05scale\x18\x02 \x01(\rR\x05scale\"\xb1\x01\n" + "\x10CoordinateSystem\x12\x12\n" + - "\x04name\x18\x01 \x01(\tR\x04name\x12P\n" + + "\x04name\x18\x01 \x01(\tR\x04name\x12J\n" + "\n" + - "parameters\x18\x02 \x03(\v20.sixafter.types.CoordinateSystem.ParametersEntryR\n" + + "parameters\x18\x02 \x03(\v2*.proto.v1.CoordinateSystem.ParametersEntryR\n" + "parameters\x1a=\n" + "\x0fParametersEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xaf\x01\n" + + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xa9\x01\n" + "\fGeometryType\x12\x12\n" + - "\x04name\x18\x01 \x01(\tR\x04name\x12L\n" + + "\x04name\x18\x01 \x01(\tR\x04name\x12F\n" + "\n" + - "parameters\x18\x02 \x03(\v2,.sixafter.types.GeometryType.ParametersEntryR\n" + + "parameters\x18\x02 \x03(\v2&.proto.v1.GeometryType.ParametersEntryR\n" + "parameters\x1a=\n" + "\x0fParametersEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xce\x01\n" + + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xbc\x01\n" + "\n" + - "Coordinate\x12.\n" + - "\x06values\x18\x01 \x03(\v2\x16.sixafter.types.ScalarR\x06values\x12A\n" + - "\rgeometry_type\x18\x02 \x01(\v2\x1c.sixafter.types.GeometryTypeR\fgeometryType\x12M\n" + - "\x11coordinate_system\x18\x03 \x01(\v2 .sixafter.types.CoordinateSystemR\x10coordinateSystem\"?\n" + - "\x05Point\x126\n" + - "\bposition\x18\x01 \x01(\v2\x1a.sixafter.types.CoordinateR\bposition\"\\\n" + - "\x04Line\x12+\n" + - "\x05start\x18\x01 \x01(\v2\x15.sixafter.types.PointR\x05start\x12'\n" + - "\x03end\x18\x02 \x01(\v2\x15.sixafter.types.PointR\x03end\"Y\n" + - "\aPolygon\x121\n" + - "\bvertices\x18\x01 \x03(\v2\x15.sixafter.types.PointR\bvertices\x12\x1b\n" + - "\tis_closed\x18\x02 \x01(\bR\bisClosedB~\n" + - "\x12com.sixafter.typesB\rGeometryProtoP\x01Z.github.com/sixafter/types/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" + "Coordinate\x12(\n" + + "\x06values\x18\x01 \x03(\v2\x10.proto.v1.ScalarR\x06values\x12;\n" + + "\rgeometry_type\x18\x02 \x01(\v2\x16.proto.v1.GeometryTypeR\fgeometryType\x12G\n" + + "\x11coordinate_system\x18\x03 \x01(\v2\x1a.proto.v1.CoordinateSystemR\x10coordinateSystem\"9\n" + + "\x05Point\x120\n" + + "\bposition\x18\x01 \x01(\v2\x14.proto.v1.CoordinateR\bposition\"P\n" + + "\x04Line\x12%\n" + + "\x05start\x18\x01 \x01(\v2\x0f.proto.v1.PointR\x05start\x12!\n" + + "\x03end\x18\x02 \x01(\v2\x0f.proto.v1.PointR\x03end\"S\n" + + "\aPolygon\x12+\n" + + "\bvertices\x18\x01 \x03(\v2\x0f.proto.v1.PointR\bvertices\x12\x1b\n" + + "\tis_closed\x18\x02 \x01(\bR\bisClosedB\x81\x01\n" + + "\x15com.sixafter.types.v1B\rGeometryProtoP\x01Z+github.com/sixafter/types/proto/v1/pb;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02 SixAfter.Types.V1.WellKnownTypesb\x06proto3" var ( - file_sixafter_types_geometry_proto_rawDescOnce sync.Once - file_sixafter_types_geometry_proto_rawDescData []byte + file_geometry_proto_rawDescOnce sync.Once + file_geometry_proto_rawDescData []byte ) -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))) +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))) }) - return file_sixafter_types_geometry_proto_rawDescData -} - -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 - (*Coordinate)(nil), // 3: sixafter.types.Coordinate - (*Point)(nil), // 4: sixafter.types.Point - (*Line)(nil), // 5: sixafter.types.Line - (*Polygon)(nil), // 6: sixafter.types.Polygon - nil, // 7: sixafter.types.CoordinateSystem.ParametersEntry - nil, // 8: sixafter.types.GeometryType.ParametersEntry -} -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 - 2, // 3: sixafter.types.Coordinate.geometry_type:type_name -> sixafter.types.GeometryType - 1, // 4: sixafter.types.Coordinate.coordinate_system:type_name -> sixafter.types.CoordinateSystem - 3, // 5: sixafter.types.Point.position:type_name -> sixafter.types.Coordinate - 4, // 6: sixafter.types.Line.start:type_name -> sixafter.types.Point - 4, // 7: sixafter.types.Line.end:type_name -> sixafter.types.Point - 4, // 8: sixafter.types.Polygon.vertices:type_name -> sixafter.types.Point + return file_geometry_proto_rawDescData +} + +var file_geometry_proto_msgTypes = make([]protoimpl.MessageInfo, 9) +var file_geometry_proto_goTypes = []any{ + (*Scalar)(nil), // 0: proto.v1.Scalar + (*CoordinateSystem)(nil), // 1: proto.v1.CoordinateSystem + (*GeometryType)(nil), // 2: proto.v1.GeometryType + (*Coordinate)(nil), // 3: proto.v1.Coordinate + (*Point)(nil), // 4: proto.v1.Point + (*Line)(nil), // 5: proto.v1.Line + (*Polygon)(nil), // 6: proto.v1.Polygon + nil, // 7: proto.v1.CoordinateSystem.ParametersEntry + nil, // 8: proto.v1.GeometryType.ParametersEntry +} +var file_geometry_proto_depIdxs = []int32{ + 7, // 0: proto.v1.CoordinateSystem.parameters:type_name -> proto.v1.CoordinateSystem.ParametersEntry + 8, // 1: proto.v1.GeometryType.parameters:type_name -> proto.v1.GeometryType.ParametersEntry + 0, // 2: proto.v1.Coordinate.values:type_name -> proto.v1.Scalar + 2, // 3: proto.v1.Coordinate.geometry_type:type_name -> proto.v1.GeometryType + 1, // 4: proto.v1.Coordinate.coordinate_system:type_name -> proto.v1.CoordinateSystem + 3, // 5: proto.v1.Point.position:type_name -> proto.v1.Coordinate + 4, // 6: proto.v1.Line.start:type_name -> proto.v1.Point + 4, // 7: proto.v1.Line.end:type_name -> proto.v1.Point + 4, // 8: proto.v1.Polygon.vertices:type_name -> proto.v1.Point 9, // [9:9] is the sub-list for method output_type 9, // [9:9] is the sub-list for method input_type 9, // [9:9] is the sub-list for extension type_name @@ -541,26 +541,26 @@ var file_sixafter_types_geometry_proto_depIdxs = []int32{ 0, // [0:9] is the sub-list for field type_name } -func init() { file_sixafter_types_geometry_proto_init() } -func file_sixafter_types_geometry_proto_init() { - if File_sixafter_types_geometry_proto != nil { +func init() { file_geometry_proto_init() } +func file_geometry_proto_init() { + if File_geometry_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_geometry_proto_rawDesc), len(file_sixafter_types_geometry_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_geometry_proto_rawDesc), len(file_geometry_proto_rawDesc)), NumEnums: 0, NumMessages: 9, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_sixafter_types_geometry_proto_goTypes, - DependencyIndexes: file_sixafter_types_geometry_proto_depIdxs, - MessageInfos: file_sixafter_types_geometry_proto_msgTypes, + GoTypes: file_geometry_proto_goTypes, + DependencyIndexes: file_geometry_proto_depIdxs, + MessageInfos: file_geometry_proto_msgTypes, }.Build() - File_sixafter_types_geometry_proto = out.File - file_sixafter_types_geometry_proto_goTypes = nil - file_sixafter_types_geometry_proto_depIdxs = nil + File_geometry_proto = out.File + file_geometry_proto_goTypes = nil + file_geometry_proto_depIdxs = nil } diff --git a/sixafter/types/geospatial_coordinate.pb.go b/proto/v1/pb/geospatial_coordinate.pb.go similarity index 59% rename from sixafter/types/geospatial_coordinate.pb.go rename to proto/v1/pb/geospatial_coordinate.pb.go index 6d25b53..9c42427 100644 --- a/sixafter/types/geospatial_coordinate.pb.go +++ b/proto/v1/pb/geospatial_coordinate.pb.go @@ -18,8 +18,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.2 -// source: sixafter/types/geospatial_coordinate.proto +// protoc (unknown) +// source: geospatial_coordinate.proto package types @@ -63,7 +63,7 @@ type GeospatialCoordinate struct { func (x *GeospatialCoordinate) Reset() { *x = GeospatialCoordinate{} - mi := &file_sixafter_types_geospatial_coordinate_proto_msgTypes[0] + mi := &file_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_sixafter_types_geospatial_coordinate_proto_msgTypes[0] + mi := &file_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_sixafter_types_geospatial_coordinate_proto_rawDescGZIP(), []int{0} + return file_geospatial_coordinate_proto_rawDescGZIP(), []int{0} } func (x *GeospatialCoordinate) GetLatitude() float64 { @@ -112,36 +112,36 @@ func (x *GeospatialCoordinate) GetElevation() *GeospatialElevation { return nil } -var File_sixafter_types_geospatial_coordinate_proto protoreflect.FileDescriptor +var File_geospatial_coordinate_proto protoreflect.FileDescriptor -const file_sixafter_types_geospatial_coordinate_proto_rawDesc = "" + +const file_geospatial_coordinate_proto_rawDesc = "" + "\n" + - "*sixafter/types/geospatial_coordinate.proto\x12\x0esixafter.types\x1a)sixafter/types/geospatial_elevation.proto\"\x93\x01\n" + + "\x1bgeospatial_coordinate.proto\x12\bproto.v1\x1a\x1ageospatial_elevation.proto\"\x8d\x01\n" + "\x14GeospatialCoordinate\x12\x1a\n" + "\blatitude\x18\x01 \x01(\x01R\blatitude\x12\x1c\n" + - "\tlongitude\x18\x02 \x01(\x01R\tlongitude\x12A\n" + - "\televation\x18\x03 \x01(\v2#.sixafter.types.GeospatialElevationR\televationB\x8a\x01\n" + - "\x12com.sixafter.typesB\x19GeospatialCoordinateProtoP\x01Z.github.com/sixafter/types/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" + "\tlongitude\x18\x02 \x01(\x01R\tlongitude\x12;\n" + + "\televation\x18\x03 \x01(\v2\x1d.proto.v1.GeospatialElevationR\televationB\x8d\x01\n" + + "\x15com.sixafter.types.v1B\x19GeospatialCoordinateProtoP\x01Z+github.com/sixafter/types/proto/v1/pb;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02 SixAfter.Types.V1.WellKnownTypesb\x06proto3" var ( - file_sixafter_types_geospatial_coordinate_proto_rawDescOnce sync.Once - file_sixafter_types_geospatial_coordinate_proto_rawDescData []byte + file_geospatial_coordinate_proto_rawDescOnce sync.Once + file_geospatial_coordinate_proto_rawDescData []byte ) -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))) +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))) }) - return file_sixafter_types_geospatial_coordinate_proto_rawDescData + return file_geospatial_coordinate_proto_rawDescData } -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_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_geospatial_coordinate_proto_goTypes = []any{ + (*GeospatialCoordinate)(nil), // 0: proto.v1.GeospatialCoordinate + (*GeospatialElevation)(nil), // 1: proto.v1.GeospatialElevation } -var file_sixafter_types_geospatial_coordinate_proto_depIdxs = []int32{ - 1, // 0: sixafter.types.GeospatialCoordinate.elevation:type_name -> sixafter.types.GeospatialElevation +var file_geospatial_coordinate_proto_depIdxs = []int32{ + 1, // 0: proto.v1.GeospatialCoordinate.elevation:type_name -> proto.v1.GeospatialElevation 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name @@ -149,27 +149,27 @@ var file_sixafter_types_geospatial_coordinate_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -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 { +func init() { file_geospatial_coordinate_proto_init() } +func file_geospatial_coordinate_proto_init() { + if File_geospatial_coordinate_proto != nil { return } - file_sixafter_types_geospatial_elevation_proto_init() + file_geospatial_elevation_proto_init() type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_geospatial_coordinate_proto_rawDesc), len(file_sixafter_types_geospatial_coordinate_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_geospatial_coordinate_proto_rawDesc), len(file_geospatial_coordinate_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_sixafter_types_geospatial_coordinate_proto_goTypes, - DependencyIndexes: file_sixafter_types_geospatial_coordinate_proto_depIdxs, - MessageInfos: file_sixafter_types_geospatial_coordinate_proto_msgTypes, + GoTypes: file_geospatial_coordinate_proto_goTypes, + DependencyIndexes: file_geospatial_coordinate_proto_depIdxs, + MessageInfos: file_geospatial_coordinate_proto_msgTypes, }.Build() - File_sixafter_types_geospatial_coordinate_proto = out.File - file_sixafter_types_geospatial_coordinate_proto_goTypes = nil - file_sixafter_types_geospatial_coordinate_proto_depIdxs = nil + File_geospatial_coordinate_proto = out.File + file_geospatial_coordinate_proto_goTypes = nil + file_geospatial_coordinate_proto_depIdxs = nil } diff --git a/sixafter/types/geospatial_elevation.pb.go b/proto/v1/pb/geospatial_elevation.pb.go similarity index 58% rename from sixafter/types/geospatial_elevation.pb.go rename to proto/v1/pb/geospatial_elevation.pb.go index ace8fdc..4d06e67 100644 --- a/sixafter/types/geospatial_elevation.pb.go +++ b/proto/v1/pb/geospatial_elevation.pb.go @@ -18,8 +18,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.2 -// source: sixafter/types/geospatial_elevation.proto +// protoc (unknown) +// source: geospatial_elevation.proto package types @@ -44,23 +44,28 @@ const ( type GeospatialElevation_GeodeticDatum int32 const ( + // Unspecified datum. This indicates that no specific reference system + // has been defined for the elevation measurement. + GeospatialElevation_GEODETIC_DATUM_UNSPECIFIED GeospatialElevation_GeodeticDatum = 0 // The altitude above mean sea level (MSL), measured in meters. // This is a commonly used datum for everyday elevation measurements. - GeospatialElevation_SEA_LEVEL GeospatialElevation_GeodeticDatum = 0 + GeospatialElevation_GEODETIC_DATUM_SEA_LEVEL GeospatialElevation_GeodeticDatum = 1 // The altitude as a height above the World Geodetic System 1984 (WGS84) // ellipsoid, measured in meters. This is commonly used in GPS systems. - GeospatialElevation_WGS_84 GeospatialElevation_GeodeticDatum = 1 + GeospatialElevation_GEODETIC_DATUM_WGS_84 GeospatialElevation_GeodeticDatum = 2 ) // Enum value maps for GeospatialElevation_GeodeticDatum. var ( GeospatialElevation_GeodeticDatum_name = map[int32]string{ - 0: "SEA_LEVEL", - 1: "WGS_84", + 0: "GEODETIC_DATUM_UNSPECIFIED", + 1: "GEODETIC_DATUM_SEA_LEVEL", + 2: "GEODETIC_DATUM_WGS_84", } GeospatialElevation_GeodeticDatum_value = map[string]int32{ - "SEA_LEVEL": 0, - "WGS_84": 1, + "GEODETIC_DATUM_UNSPECIFIED": 0, + "GEODETIC_DATUM_SEA_LEVEL": 1, + "GEODETIC_DATUM_WGS_84": 2, } ) @@ -75,11 +80,11 @@ func (x GeospatialElevation_GeodeticDatum) String() string { } func (GeospatialElevation_GeodeticDatum) Descriptor() protoreflect.EnumDescriptor { - return file_sixafter_types_geospatial_elevation_proto_enumTypes[0].Descriptor() + return file_geospatial_elevation_proto_enumTypes[0].Descriptor() } func (GeospatialElevation_GeodeticDatum) Type() protoreflect.EnumType { - return &file_sixafter_types_geospatial_elevation_proto_enumTypes[0] + return &file_geospatial_elevation_proto_enumTypes[0] } func (x GeospatialElevation_GeodeticDatum) Number() protoreflect.EnumNumber { @@ -88,7 +93,7 @@ func (x GeospatialElevation_GeodeticDatum) Number() protoreflect.EnumNumber { // Deprecated: Use GeospatialElevation_GeodeticDatum.Descriptor instead. func (GeospatialElevation_GeodeticDatum) EnumDescriptor() ([]byte, []int) { - return file_sixafter_types_geospatial_elevation_proto_rawDescGZIP(), []int{0, 0} + return file_geospatial_elevation_proto_rawDescGZIP(), []int{0, 0} } // The `GeospatialElevation` message represents the vertical direction @@ -98,7 +103,7 @@ type GeospatialElevation struct { state protoimpl.MessageState `protogen:"open.v1"` // The geodetic datum used as the reference point for the elevation measurement. // Example: `SEA_LEVEL` for altitude above mean sea level. - Datum GeospatialElevation_GeodeticDatum `protobuf:"varint,1,opt,name=datum,proto3,enum=sixafter.types.GeospatialElevation_GeodeticDatum" json:"datum,omitempty"` + Datum GeospatialElevation_GeodeticDatum `protobuf:"varint,1,opt,name=datum,proto3,enum=proto.v1.GeospatialElevation_GeodeticDatum" json:"datum,omitempty"` // The altitude or vertical elevation of the point, measured in meters. // This value can be positive (above the datum) or negative (below the datum). // Example: An altitude of 212 meters above sea level for Westlake, Texas. @@ -109,7 +114,7 @@ type GeospatialElevation struct { func (x *GeospatialElevation) Reset() { *x = GeospatialElevation{} - mi := &file_sixafter_types_geospatial_elevation_proto_msgTypes[0] + mi := &file_geospatial_elevation_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -121,7 +126,7 @@ func (x *GeospatialElevation) String() string { func (*GeospatialElevation) ProtoMessage() {} func (x *GeospatialElevation) ProtoReflect() protoreflect.Message { - mi := &file_sixafter_types_geospatial_elevation_proto_msgTypes[0] + mi := &file_geospatial_elevation_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -134,14 +139,14 @@ func (x *GeospatialElevation) ProtoReflect() protoreflect.Message { // Deprecated: Use GeospatialElevation.ProtoReflect.Descriptor instead. func (*GeospatialElevation) Descriptor() ([]byte, []int) { - return file_sixafter_types_geospatial_elevation_proto_rawDescGZIP(), []int{0} + return file_geospatial_elevation_proto_rawDescGZIP(), []int{0} } func (x *GeospatialElevation) GetDatum() GeospatialElevation_GeodeticDatum { if x != nil { return x.Datum } - return GeospatialElevation_SEA_LEVEL + return GeospatialElevation_GEODETIC_DATUM_UNSPECIFIED } func (x *GeospatialElevation) GetAltitude() float64 { @@ -151,40 +156,40 @@ func (x *GeospatialElevation) GetAltitude() float64 { return 0 } -var File_sixafter_types_geospatial_elevation_proto protoreflect.FileDescriptor +var File_geospatial_elevation_proto protoreflect.FileDescriptor -const file_sixafter_types_geospatial_elevation_proto_rawDesc = "" + +const file_geospatial_elevation_proto_rawDesc = "" + "\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" + - "\rGeodeticDatum\x12\r\n" + - "\tSEA_LEVEL\x10\x00\x12\n" + - "\n" + - "\x06WGS_84\x10\x01B\x89\x01\n" + - "\x12com.sixafter.typesB\x18GeospatialElevationProtoP\x01Z.github.com/sixafter/types/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" + "\x1ageospatial_elevation.proto\x12\bproto.v1\"\xde\x01\n" + + "\x13GeospatialElevation\x12A\n" + + "\x05datum\x18\x01 \x01(\x0e2+.proto.v1.GeospatialElevation.GeodeticDatumR\x05datum\x12\x1a\n" + + "\baltitude\x18\x02 \x01(\x01R\baltitude\"h\n" + + "\rGeodeticDatum\x12\x1e\n" + + "\x1aGEODETIC_DATUM_UNSPECIFIED\x10\x00\x12\x1c\n" + + "\x18GEODETIC_DATUM_SEA_LEVEL\x10\x01\x12\x19\n" + + "\x15GEODETIC_DATUM_WGS_84\x10\x02B\x8c\x01\n" + + "\x15com.sixafter.types.v1B\x18GeospatialElevationProtoP\x01Z+github.com/sixafter/types/proto/v1/pb;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02 SixAfter.Types.V1.WellKnownTypesb\x06proto3" var ( - file_sixafter_types_geospatial_elevation_proto_rawDescOnce sync.Once - file_sixafter_types_geospatial_elevation_proto_rawDescData []byte + file_geospatial_elevation_proto_rawDescOnce sync.Once + file_geospatial_elevation_proto_rawDescData []byte ) -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))) +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))) }) - return file_sixafter_types_geospatial_elevation_proto_rawDescData + return file_geospatial_elevation_proto_rawDescData } -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_enumTypes = make([]protoimpl.EnumInfo, 1) +var file_geospatial_elevation_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_geospatial_elevation_proto_goTypes = []any{ + (GeospatialElevation_GeodeticDatum)(0), // 0: proto.v1.GeospatialElevation.GeodeticDatum + (*GeospatialElevation)(nil), // 1: proto.v1.GeospatialElevation } -var file_sixafter_types_geospatial_elevation_proto_depIdxs = []int32{ - 0, // 0: sixafter.types.GeospatialElevation.datum:type_name -> sixafter.types.GeospatialElevation.GeodeticDatum +var file_geospatial_elevation_proto_depIdxs = []int32{ + 0, // 0: proto.v1.GeospatialElevation.datum:type_name -> proto.v1.GeospatialElevation.GeodeticDatum 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name @@ -192,27 +197,27 @@ var file_sixafter_types_geospatial_elevation_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -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 { +func init() { file_geospatial_elevation_proto_init() } +func file_geospatial_elevation_proto_init() { + if File_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_sixafter_types_geospatial_elevation_proto_rawDesc), len(file_sixafter_types_geospatial_elevation_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_geospatial_elevation_proto_rawDesc), len(file_geospatial_elevation_proto_rawDesc)), NumEnums: 1, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - 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, + GoTypes: file_geospatial_elevation_proto_goTypes, + DependencyIndexes: file_geospatial_elevation_proto_depIdxs, + EnumInfos: file_geospatial_elevation_proto_enumTypes, + MessageInfos: file_geospatial_elevation_proto_msgTypes, }.Build() - File_sixafter_types_geospatial_elevation_proto = out.File - file_sixafter_types_geospatial_elevation_proto_goTypes = nil - file_sixafter_types_geospatial_elevation_proto_depIdxs = nil + File_geospatial_elevation_proto = out.File + file_geospatial_elevation_proto_goTypes = nil + file_geospatial_elevation_proto_depIdxs = nil } diff --git a/sixafter/types/geospatial_location.pb.go b/proto/v1/pb/geospatial_location.pb.go similarity index 62% rename from sixafter/types/geospatial_location.pb.go rename to proto/v1/pb/geospatial_location.pb.go index c054c47..c1c3eee 100644 --- a/sixafter/types/geospatial_location.pb.go +++ b/proto/v1/pb/geospatial_location.pb.go @@ -18,8 +18,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.2 -// source: sixafter/types/geospatial_location.proto +// protoc (unknown) +// source: geospatial_location.proto package types @@ -74,7 +74,7 @@ type GeospatialLocation struct { func (x *GeospatialLocation) Reset() { *x = GeospatialLocation{} - mi := &file_sixafter_types_geospatial_location_proto_msgTypes[0] + mi := &file_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_sixafter_types_geospatial_location_proto_msgTypes[0] + mi := &file_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_sixafter_types_geospatial_location_proto_rawDescGZIP(), []int{0} + return file_geospatial_location_proto_rawDescGZIP(), []int{0} } func (x *GeospatialLocation) GetCoordinate() *GeospatialCoordinate { @@ -137,44 +137,44 @@ func (x *GeospatialLocation) GetTimestamp() *timestamppb.Timestamp { return nil } -var File_sixafter_types_geospatial_location_proto protoreflect.FileDescriptor +var File_geospatial_location_proto protoreflect.FileDescriptor -const file_sixafter_types_geospatial_location_proto_rawDesc = "" + +const file_geospatial_location_proto_rawDesc = "" + "\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" + + "\x19geospatial_location.proto\x12\bproto.v1\x1a\x15compass_heading.proto\x1a\x1bgeospatial_coordinate.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xf0\x01\n" + + "\x12GeospatialLocation\x12>\n" + "\n" + - "coordinate\x18\x01 \x01(\v2$.sixafter.types.GeospatialCoordinateR\n" + - "coordinate\x128\n" + - "\aheading\x18\x02 \x01(\v2\x1e.sixafter.types.CompassHeadingR\aheading\x12\x16\n" + + "coordinate\x18\x01 \x01(\v2\x1e.proto.v1.GeospatialCoordinateR\n" + + "coordinate\x122\n" + + "\aheading\x18\x02 \x01(\v2\x18.proto.v1.CompassHeadingR\aheading\x12\x16\n" + "\x06course\x18\x03 \x01(\x01R\x06course\x12\x14\n" + "\x05speed\x18\x04 \x01(\x02R\x05speed\x128\n" + - "\ttimestamp\x18\x05 \x01(\v2\x1a.google.protobuf.TimestampR\ttimestampB\x88\x01\n" + - "\x12com.sixafter.typesB\x17GeospatialLocationProtoP\x01Z.github.com/sixafter/types/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" + "\ttimestamp\x18\x05 \x01(\v2\x1a.google.protobuf.TimestampR\ttimestampB\x8b\x01\n" + + "\x15com.sixafter.types.v1B\x17GeospatialLocationProtoP\x01Z+github.com/sixafter/types/proto/v1/pb;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02 SixAfter.Types.V1.WellKnownTypesb\x06proto3" var ( - file_sixafter_types_geospatial_location_proto_rawDescOnce sync.Once - file_sixafter_types_geospatial_location_proto_rawDescData []byte + file_geospatial_location_proto_rawDescOnce sync.Once + file_geospatial_location_proto_rawDescData []byte ) -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))) +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))) }) - return file_sixafter_types_geospatial_location_proto_rawDescData + return file_geospatial_location_proto_rawDescData } -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 +var file_geospatial_location_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_geospatial_location_proto_goTypes = []any{ + (*GeospatialLocation)(nil), // 0: proto.v1.GeospatialLocation + (*GeospatialCoordinate)(nil), // 1: proto.v1.GeospatialCoordinate + (*CompassHeading)(nil), // 2: proto.v1.CompassHeading (*timestamppb.Timestamp)(nil), // 3: google.protobuf.Timestamp } -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 +var file_geospatial_location_proto_depIdxs = []int32{ + 1, // 0: proto.v1.GeospatialLocation.coordinate:type_name -> proto.v1.GeospatialCoordinate + 2, // 1: proto.v1.GeospatialLocation.heading:type_name -> proto.v1.CompassHeading + 3, // 2: proto.v1.GeospatialLocation.timestamp:type_name -> google.protobuf.Timestamp 3, // [3:3] is the sub-list for method output_type 3, // [3:3] is the sub-list for method input_type 3, // [3:3] is the sub-list for extension type_name @@ -182,28 +182,28 @@ var file_sixafter_types_geospatial_location_proto_depIdxs = []int32{ 0, // [0:3] is the sub-list for field type_name } -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 { +func init() { file_geospatial_location_proto_init() } +func file_geospatial_location_proto_init() { + if File_geospatial_location_proto != nil { return } - file_sixafter_types_compass_heading_proto_init() - file_sixafter_types_geospatial_coordinate_proto_init() + file_compass_heading_proto_init() + file_geospatial_coordinate_proto_init() type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_geospatial_location_proto_rawDesc), len(file_sixafter_types_geospatial_location_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_geospatial_location_proto_rawDesc), len(file_geospatial_location_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_sixafter_types_geospatial_location_proto_goTypes, - DependencyIndexes: file_sixafter_types_geospatial_location_proto_depIdxs, - MessageInfos: file_sixafter_types_geospatial_location_proto_msgTypes, + GoTypes: file_geospatial_location_proto_goTypes, + DependencyIndexes: file_geospatial_location_proto_depIdxs, + MessageInfos: file_geospatial_location_proto_msgTypes, }.Build() - File_sixafter_types_geospatial_location_proto = out.File - file_sixafter_types_geospatial_location_proto_goTypes = nil - file_sixafter_types_geospatial_location_proto_depIdxs = nil + File_geospatial_location_proto = out.File + file_geospatial_location_proto_goTypes = nil + file_geospatial_location_proto_depIdxs = nil } diff --git a/sixafter/types/language.pb.go b/proto/v1/pb/language.pb.go similarity index 69% rename from sixafter/types/language.pb.go rename to proto/v1/pb/language.pb.go index af8eabb..21069d6 100644 --- a/sixafter/types/language.pb.go +++ b/proto/v1/pb/language.pb.go @@ -18,8 +18,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.2 -// source: sixafter/types/language.proto +// protoc (unknown) +// source: language.proto package types @@ -65,7 +65,7 @@ type Language struct { func (x *Language) Reset() { *x = Language{} - mi := &file_sixafter_types_language_proto_msgTypes[0] + mi := &file_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_sixafter_types_language_proto_msgTypes[0] + mi := &file_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_sixafter_types_language_proto_rawDescGZIP(), []int{0} + return file_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_sixafter_types_language_proto_msgTypes[1] + mi := &file_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_sixafter_types_language_proto_msgTypes[1] + mi := &file_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_sixafter_types_language_proto_rawDescGZIP(), []int{0, 0} + return file_language_proto_rawDescGZIP(), []int{0, 0} } func (x *Language_Bcp47Tag) GetTag() string { @@ -178,40 +178,40 @@ func (x *Language_Bcp47Tag) GetDisplayName() string { return "" } -var File_sixafter_types_language_proto protoreflect.FileDescriptor +var File_language_proto protoreflect.FileDescriptor -const file_sixafter_types_language_proto_rawDesc = "" + +const file_language_proto_rawDesc = "" + "\n" + - "\x1dsixafter/types/language.proto\x12\x0esixafter.types\"\xf7\x01\n" + + "\x0elanguage.proto\x12\bproto.v1\"\xf1\x01\n" + "\bLanguage\x12\x12\n" + "\x04name\x18\x01 \x01(\tR\x04name\x12*\n" + "\x11alphabetic_code_2\x18\x02 \x01(\tR\x0falphabeticCode2\x12*\n" + - "\x11alphabetic_code_3\x18\x03 \x01(\tR\x0falphabeticCode3\x12>\n" + - "\tbcp47_tag\x18\x04 \x03(\v2!.sixafter.types.Language.Bcp47TagR\bbcp47Tag\x1a?\n" + + "\x11alphabetic_code_3\x18\x03 \x01(\tR\x0falphabeticCode3\x128\n" + + "\tbcp47_tag\x18\x04 \x03(\v2\x1b.proto.v1.Language.Bcp47TagR\bbcp47Tag\x1a?\n" + "\bBcp47Tag\x12\x10\n" + "\x03tag\x18\x01 \x01(\tR\x03tag\x12!\n" + - "\fdisplay_name\x18\x02 \x01(\tR\vdisplayNameB~\n" + - "\x12com.sixafter.typesB\rLanguageProtoP\x01Z.github.com/sixafter/types/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" + "\fdisplay_name\x18\x02 \x01(\tR\vdisplayNameB\x81\x01\n" + + "\x15com.sixafter.types.v1B\rLanguageProtoP\x01Z+github.com/sixafter/types/proto/v1/pb;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02 SixAfter.Types.V1.WellKnownTypesb\x06proto3" var ( - file_sixafter_types_language_proto_rawDescOnce sync.Once - file_sixafter_types_language_proto_rawDescData []byte + file_language_proto_rawDescOnce sync.Once + file_language_proto_rawDescData []byte ) -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))) +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))) }) - return file_sixafter_types_language_proto_rawDescData + return file_language_proto_rawDescData } -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_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_language_proto_goTypes = []any{ + (*Language)(nil), // 0: proto.v1.Language + (*Language_Bcp47Tag)(nil), // 1: proto.v1.Language.Bcp47Tag } -var file_sixafter_types_language_proto_depIdxs = []int32{ - 1, // 0: sixafter.types.Language.bcp47_tag:type_name -> sixafter.types.Language.Bcp47Tag +var file_language_proto_depIdxs = []int32{ + 1, // 0: proto.v1.Language.bcp47_tag:type_name -> proto.v1.Language.Bcp47Tag 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name @@ -219,26 +219,26 @@ var file_sixafter_types_language_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_sixafter_types_language_proto_init() } -func file_sixafter_types_language_proto_init() { - if File_sixafter_types_language_proto != nil { +func init() { file_language_proto_init() } +func file_language_proto_init() { + if File_language_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_language_proto_rawDesc), len(file_sixafter_types_language_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_language_proto_rawDesc), len(file_language_proto_rawDesc)), NumEnums: 0, NumMessages: 2, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_sixafter_types_language_proto_goTypes, - DependencyIndexes: file_sixafter_types_language_proto_depIdxs, - MessageInfos: file_sixafter_types_language_proto_msgTypes, + GoTypes: file_language_proto_goTypes, + DependencyIndexes: file_language_proto_depIdxs, + MessageInfos: file_language_proto_msgTypes, }.Build() - File_sixafter_types_language_proto = out.File - file_sixafter_types_language_proto_goTypes = nil - file_sixafter_types_language_proto_depIdxs = nil + File_language_proto = out.File + file_language_proto_goTypes = nil + file_language_proto_depIdxs = nil } diff --git a/sixafter/types/map_point.pb.go b/proto/v1/pb/map_point.pb.go similarity index 62% rename from sixafter/types/map_point.pb.go rename to proto/v1/pb/map_point.pb.go index cf554fa..073ad31 100644 --- a/sixafter/types/map_point.pb.go +++ b/proto/v1/pb/map_point.pb.go @@ -18,8 +18,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.2 -// source: sixafter/types/map_point.proto +// protoc (unknown) +// source: map_point.proto package types @@ -62,7 +62,7 @@ type MapPoint struct { func (x *MapPoint) Reset() { *x = MapPoint{} - mi := &file_sixafter_types_map_point_proto_msgTypes[0] + mi := &file_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_sixafter_types_map_point_proto_msgTypes[0] + mi := &file_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_sixafter_types_map_point_proto_rawDescGZIP(), []int{0} + return file_map_point_proto_rawDescGZIP(), []int{0} } func (x *MapPoint) GetX() float32 { @@ -111,38 +111,38 @@ func (x *MapPoint) GetCoordinate() *GeospatialCoordinate { return nil } -var File_sixafter_types_map_point_proto protoreflect.FileDescriptor +var File_map_point_proto protoreflect.FileDescriptor -const file_sixafter_types_map_point_proto_rawDesc = "" + +const file_map_point_proto_rawDesc = "" + "\n" + - "\x1esixafter/types/map_point.proto\x12\x0esixafter.types\x1a*sixafter/types/geospatial_coordinate.proto\"l\n" + + "\x0fmap_point.proto\x12\bproto.v1\x1a\x1bgeospatial_coordinate.proto\"f\n" + "\bMapPoint\x12\f\n" + "\x01x\x18\x01 \x01(\x02R\x01x\x12\f\n" + - "\x01y\x18\x02 \x01(\x02R\x01y\x12D\n" + + "\x01y\x18\x02 \x01(\x02R\x01y\x12>\n" + "\n" + - "coordinate\x18\x03 \x01(\v2$.sixafter.types.GeospatialCoordinateR\n" + - "coordinateB~\n" + - "\x12com.sixafter.typesB\rMapPointProtoP\x01Z.github.com/sixafter/types/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" + "coordinate\x18\x03 \x01(\v2\x1e.proto.v1.GeospatialCoordinateR\n" + + "coordinateB\x81\x01\n" + + "\x15com.sixafter.types.v1B\rMapPointProtoP\x01Z+github.com/sixafter/types/proto/v1/pb;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02 SixAfter.Types.V1.WellKnownTypesb\x06proto3" var ( - file_sixafter_types_map_point_proto_rawDescOnce sync.Once - file_sixafter_types_map_point_proto_rawDescData []byte + file_map_point_proto_rawDescOnce sync.Once + file_map_point_proto_rawDescData []byte ) -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))) +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))) }) - return file_sixafter_types_map_point_proto_rawDescData + return file_map_point_proto_rawDescData } -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_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_map_point_proto_goTypes = []any{ + (*MapPoint)(nil), // 0: proto.v1.MapPoint + (*GeospatialCoordinate)(nil), // 1: proto.v1.GeospatialCoordinate } -var file_sixafter_types_map_point_proto_depIdxs = []int32{ - 1, // 0: sixafter.types.MapPoint.coordinate:type_name -> sixafter.types.GeospatialCoordinate +var file_map_point_proto_depIdxs = []int32{ + 1, // 0: proto.v1.MapPoint.coordinate:type_name -> proto.v1.GeospatialCoordinate 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name @@ -150,27 +150,27 @@ var file_sixafter_types_map_point_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -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 { +func init() { file_map_point_proto_init() } +func file_map_point_proto_init() { + if File_map_point_proto != nil { return } - file_sixafter_types_geospatial_coordinate_proto_init() + file_geospatial_coordinate_proto_init() type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_map_point_proto_rawDesc), len(file_sixafter_types_map_point_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_map_point_proto_rawDesc), len(file_map_point_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_sixafter_types_map_point_proto_goTypes, - DependencyIndexes: file_sixafter_types_map_point_proto_depIdxs, - MessageInfos: file_sixafter_types_map_point_proto_msgTypes, + GoTypes: file_map_point_proto_goTypes, + DependencyIndexes: file_map_point_proto_depIdxs, + MessageInfos: file_map_point_proto_msgTypes, }.Build() - File_sixafter_types_map_point_proto = out.File - file_sixafter_types_map_point_proto_goTypes = nil - file_sixafter_types_map_point_proto_depIdxs = nil + File_map_point_proto = out.File + file_map_point_proto_goTypes = nil + file_map_point_proto_depIdxs = nil } diff --git a/sixafter/types/map_polygon.pb.go b/proto/v1/pb/map_polygon.pb.go similarity index 59% rename from sixafter/types/map_polygon.pb.go rename to proto/v1/pb/map_polygon.pb.go index a4bbda4..631a623 100644 --- a/sixafter/types/map_polygon.pb.go +++ b/proto/v1/pb/map_polygon.pb.go @@ -18,8 +18,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.2 -// source: sixafter/types/map_polygon.proto +// protoc (unknown) +// source: map_polygon.proto package types @@ -61,7 +61,7 @@ type MapPolygon struct { func (x *MapPolygon) Reset() { *x = MapPolygon{} - mi := &file_sixafter_types_map_polygon_proto_msgTypes[0] + mi := &file_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_sixafter_types_map_polygon_proto_msgTypes[0] + mi := &file_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_sixafter_types_map_polygon_proto_rawDescGZIP(), []int{0} + return file_map_polygon_proto_rawDescGZIP(), []int{0} } func (x *MapPolygon) GetPoints() []*MapPoint { @@ -96,35 +96,35 @@ func (x *MapPolygon) GetPoints() []*MapPoint { return nil } -var File_sixafter_types_map_polygon_proto protoreflect.FileDescriptor +var File_map_polygon_proto protoreflect.FileDescriptor -const file_sixafter_types_map_polygon_proto_rawDesc = "" + +const file_map_polygon_proto_rawDesc = "" + "\n" + - " sixafter/types/map_polygon.proto\x12\x0esixafter.types\x1a\x1esixafter/types/map_point.proto\">\n" + + "\x11map_polygon.proto\x12\bproto.v1\x1a\x0fmap_point.proto\"8\n" + "\n" + - "MapPolygon\x120\n" + - "\x06points\x18\x01 \x03(\v2\x18.sixafter.types.MapPointR\x06pointsB\x80\x01\n" + - "\x12com.sixafter.typesB\x0fMapPolygonProtoP\x01Z.github.com/sixafter/types/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" + "MapPolygon\x12*\n" + + "\x06points\x18\x01 \x03(\v2\x12.proto.v1.MapPointR\x06pointsB\x83\x01\n" + + "\x15com.sixafter.types.v1B\x0fMapPolygonProtoP\x01Z+github.com/sixafter/types/proto/v1/pb;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02 SixAfter.Types.V1.WellKnownTypesb\x06proto3" var ( - file_sixafter_types_map_polygon_proto_rawDescOnce sync.Once - file_sixafter_types_map_polygon_proto_rawDescData []byte + file_map_polygon_proto_rawDescOnce sync.Once + file_map_polygon_proto_rawDescData []byte ) -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))) +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))) }) - return file_sixafter_types_map_polygon_proto_rawDescData + return file_map_polygon_proto_rawDescData } -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_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_map_polygon_proto_goTypes = []any{ + (*MapPolygon)(nil), // 0: proto.v1.MapPolygon + (*MapPoint)(nil), // 1: proto.v1.MapPoint } -var file_sixafter_types_map_polygon_proto_depIdxs = []int32{ - 1, // 0: sixafter.types.MapPolygon.points:type_name -> sixafter.types.MapPoint +var file_map_polygon_proto_depIdxs = []int32{ + 1, // 0: proto.v1.MapPolygon.points:type_name -> proto.v1.MapPoint 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name @@ -132,27 +132,27 @@ var file_sixafter_types_map_polygon_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -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 { +func init() { file_map_polygon_proto_init() } +func file_map_polygon_proto_init() { + if File_map_polygon_proto != nil { return } - file_sixafter_types_map_point_proto_init() + file_map_point_proto_init() type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_map_polygon_proto_rawDesc), len(file_sixafter_types_map_polygon_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_map_polygon_proto_rawDesc), len(file_map_polygon_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_sixafter_types_map_polygon_proto_goTypes, - DependencyIndexes: file_sixafter_types_map_polygon_proto_depIdxs, - MessageInfos: file_sixafter_types_map_polygon_proto_msgTypes, + GoTypes: file_map_polygon_proto_goTypes, + DependencyIndexes: file_map_polygon_proto_depIdxs, + MessageInfos: file_map_polygon_proto_msgTypes, }.Build() - File_sixafter_types_map_polygon_proto = out.File - file_sixafter_types_map_polygon_proto_goTypes = nil - file_sixafter_types_map_polygon_proto_depIdxs = nil + File_map_polygon_proto = out.File + file_map_polygon_proto_goTypes = nil + file_map_polygon_proto_depIdxs = nil } diff --git a/sixafter/types/radial_geofence.pb.go b/proto/v1/pb/radial_geofence.pb.go similarity index 60% rename from sixafter/types/radial_geofence.pb.go rename to proto/v1/pb/radial_geofence.pb.go index 3545795..3f35a0d 100644 --- a/sixafter/types/radial_geofence.pb.go +++ b/proto/v1/pb/radial_geofence.pb.go @@ -18,8 +18,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.2 -// source: sixafter/types/radial_geofence.proto +// protoc (unknown) +// source: radial_geofence.proto package types @@ -61,7 +61,7 @@ type RadialGeofence struct { func (x *RadialGeofence) Reset() { *x = RadialGeofence{} - mi := &file_sixafter_types_radial_geofence_proto_msgTypes[0] + mi := &file_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_sixafter_types_radial_geofence_proto_msgTypes[0] + mi := &file_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_sixafter_types_radial_geofence_proto_rawDescGZIP(), []int{0} + return file_radial_geofence_proto_rawDescGZIP(), []int{0} } func (x *RadialGeofence) GetName() string { @@ -110,36 +110,36 @@ func (x *RadialGeofence) GetRadius() float64 { return 0 } -var File_sixafter_types_radial_geofence_proto protoreflect.FileDescriptor +var File_radial_geofence_proto protoreflect.FileDescriptor -const file_sixafter_types_radial_geofence_proto_rawDesc = "" + +const file_radial_geofence_proto_rawDesc = "" + "\n" + - "$sixafter/types/radial_geofence.proto\x12\x0esixafter.types\x1a*sixafter/types/geospatial_coordinate.proto\"z\n" + + "\x15radial_geofence.proto\x12\bproto.v1\x1a\x1bgeospatial_coordinate.proto\"t\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" + - "\x06radius\x18\x03 \x01(\x01R\x06radiusB\x84\x01\n" + - "\x12com.sixafter.typesB\x13RadialGeofenceProtoP\x01Z.github.com/sixafter/types/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" + "\x04name\x18\x01 \x01(\tR\x04name\x126\n" + + "\x06center\x18\x02 \x01(\v2\x1e.proto.v1.GeospatialCoordinateR\x06center\x12\x16\n" + + "\x06radius\x18\x03 \x01(\x01R\x06radiusB\x87\x01\n" + + "\x15com.sixafter.types.v1B\x13RadialGeofenceProtoP\x01Z+github.com/sixafter/types/proto/v1/pb;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02 SixAfter.Types.V1.WellKnownTypesb\x06proto3" var ( - file_sixafter_types_radial_geofence_proto_rawDescOnce sync.Once - file_sixafter_types_radial_geofence_proto_rawDescData []byte + file_radial_geofence_proto_rawDescOnce sync.Once + file_radial_geofence_proto_rawDescData []byte ) -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))) +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))) }) - return file_sixafter_types_radial_geofence_proto_rawDescData + return file_radial_geofence_proto_rawDescData } -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_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_radial_geofence_proto_goTypes = []any{ + (*RadialGeofence)(nil), // 0: proto.v1.RadialGeofence + (*GeospatialCoordinate)(nil), // 1: proto.v1.GeospatialCoordinate } -var file_sixafter_types_radial_geofence_proto_depIdxs = []int32{ - 1, // 0: sixafter.types.RadialGeofence.center:type_name -> sixafter.types.GeospatialCoordinate +var file_radial_geofence_proto_depIdxs = []int32{ + 1, // 0: proto.v1.RadialGeofence.center:type_name -> proto.v1.GeospatialCoordinate 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name @@ -147,27 +147,27 @@ var file_sixafter_types_radial_geofence_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -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 { +func init() { file_radial_geofence_proto_init() } +func file_radial_geofence_proto_init() { + if File_radial_geofence_proto != nil { return } - file_sixafter_types_geospatial_coordinate_proto_init() + file_geospatial_coordinate_proto_init() type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_radial_geofence_proto_rawDesc), len(file_sixafter_types_radial_geofence_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_radial_geofence_proto_rawDesc), len(file_radial_geofence_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_sixafter_types_radial_geofence_proto_goTypes, - DependencyIndexes: file_sixafter_types_radial_geofence_proto_depIdxs, - MessageInfos: file_sixafter_types_radial_geofence_proto_msgTypes, + GoTypes: file_radial_geofence_proto_goTypes, + DependencyIndexes: file_radial_geofence_proto_depIdxs, + MessageInfos: file_radial_geofence_proto_msgTypes, }.Build() - File_sixafter_types_radial_geofence_proto = out.File - file_sixafter_types_radial_geofence_proto_goTypes = nil - file_sixafter_types_radial_geofence_proto_depIdxs = nil + File_radial_geofence_proto = out.File + file_radial_geofence_proto_goTypes = nil + file_radial_geofence_proto_depIdxs = nil } diff --git a/sixafter/types/temporal_range.pb.go b/proto/v1/pb/temporal_range.pb.go similarity index 62% rename from sixafter/types/temporal_range.pb.go rename to proto/v1/pb/temporal_range.pb.go index 850d4cb..6b9177b 100644 --- a/sixafter/types/temporal_range.pb.go +++ b/proto/v1/pb/temporal_range.pb.go @@ -18,8 +18,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.2 -// source: sixafter/types/temporal_range.proto +// protoc (unknown) +// source: temporal_range.proto package types @@ -61,7 +61,7 @@ type TemporalRange struct { func (x *TemporalRange) Reset() { *x = TemporalRange{} - mi := &file_sixafter_types_temporal_range_proto_msgTypes[0] + mi := &file_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_sixafter_types_temporal_range_proto_msgTypes[0] + mi := &file_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_sixafter_types_temporal_range_proto_rawDescGZIP(), []int{0} + return file_temporal_range_proto_rawDescGZIP(), []int{0} } func (x *TemporalRange) GetEpoch() *timestamppb.Timestamp { @@ -103,37 +103,37 @@ func (x *TemporalRange) GetDuration() *durationpb.Duration { return nil } -var File_sixafter_types_temporal_range_proto protoreflect.FileDescriptor +var File_temporal_range_proto protoreflect.FileDescriptor -const file_sixafter_types_temporal_range_proto_rawDesc = "" + +const file_temporal_range_proto_rawDesc = "" + "\n" + - "#sixafter/types/temporal_range.proto\x12\x0esixafter.types\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"x\n" + + "\x14temporal_range.proto\x12\bproto.v1\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\bdurationB\x83\x01\n" + - "\x12com.sixafter.typesB\x12TemporalRangeProtoP\x01Z.github.com/sixafter/types/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" + "\bduration\x18\x02 \x01(\v2\x19.google.protobuf.DurationR\bdurationB\x86\x01\n" + + "\x15com.sixafter.types.v1B\x12TemporalRangeProtoP\x01Z+github.com/sixafter/types/proto/v1/pb;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02 SixAfter.Types.V1.WellKnownTypesb\x06proto3" var ( - file_sixafter_types_temporal_range_proto_rawDescOnce sync.Once - file_sixafter_types_temporal_range_proto_rawDescData []byte + file_temporal_range_proto_rawDescOnce sync.Once + file_temporal_range_proto_rawDescData []byte ) -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))) +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))) }) - return file_sixafter_types_temporal_range_proto_rawDescData + return file_temporal_range_proto_rawDescData } -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 +var file_temporal_range_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_temporal_range_proto_goTypes = []any{ + (*TemporalRange)(nil), // 0: proto.v1.TemporalRange (*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp (*durationpb.Duration)(nil), // 2: google.protobuf.Duration } -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 +var file_temporal_range_proto_depIdxs = []int32{ + 1, // 0: proto.v1.TemporalRange.epoch:type_name -> google.protobuf.Timestamp + 2, // 1: proto.v1.TemporalRange.duration:type_name -> google.protobuf.Duration 2, // [2:2] is the sub-list for method output_type 2, // [2:2] is the sub-list for method input_type 2, // [2:2] is the sub-list for extension type_name @@ -141,26 +141,26 @@ var file_sixafter_types_temporal_range_proto_depIdxs = []int32{ 0, // [0:2] is the sub-list for field type_name } -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 { +func init() { file_temporal_range_proto_init() } +func file_temporal_range_proto_init() { + if File_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_sixafter_types_temporal_range_proto_rawDesc), len(file_sixafter_types_temporal_range_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_temporal_range_proto_rawDesc), len(file_temporal_range_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_sixafter_types_temporal_range_proto_goTypes, - DependencyIndexes: file_sixafter_types_temporal_range_proto_depIdxs, - MessageInfos: file_sixafter_types_temporal_range_proto_msgTypes, + GoTypes: file_temporal_range_proto_goTypes, + DependencyIndexes: file_temporal_range_proto_depIdxs, + MessageInfos: file_temporal_range_proto_msgTypes, }.Build() - File_sixafter_types_temporal_range_proto = out.File - file_sixafter_types_temporal_range_proto_goTypes = nil - file_sixafter_types_temporal_range_proto_depIdxs = nil + File_temporal_range_proto = out.File + file_temporal_range_proto_goTypes = nil + file_temporal_range_proto_depIdxs = nil } diff --git a/sixafter/types/time_zone.pb.go b/proto/v1/pb/time_zone.pb.go similarity index 66% rename from sixafter/types/time_zone.pb.go rename to proto/v1/pb/time_zone.pb.go index aaeb6eb..f006f58 100644 --- a/sixafter/types/time_zone.pb.go +++ b/proto/v1/pb/time_zone.pb.go @@ -18,8 +18,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.2 -// source: sixafter/types/time_zone.proto +// protoc (unknown) +// source: time_zone.proto package types @@ -65,7 +65,7 @@ type TimeZone struct { func (x *TimeZone) Reset() { *x = TimeZone{} - mi := &file_sixafter_types_time_zone_proto_msgTypes[0] + mi := &file_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_sixafter_types_time_zone_proto_msgTypes[0] + mi := &file_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_sixafter_types_time_zone_proto_rawDescGZIP(), []int{0} + return file_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_sixafter_types_time_zone_proto_msgTypes[1] + mi := &file_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_sixafter_types_time_zone_proto_msgTypes[1] + mi := &file_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_sixafter_types_time_zone_proto_rawDescGZIP(), []int{0, 0} + return file_time_zone_proto_rawDescGZIP(), []int{0, 0} } func (x *TimeZone_TimeOffset) GetHours() int32 { @@ -186,45 +186,45 @@ func (x *TimeZone_TimeOffset) GetMinutes() int32 { return 0 } -var File_sixafter_types_time_zone_proto protoreflect.FileDescriptor +var File_time_zone_proto protoreflect.FileDescriptor -const file_sixafter_types_time_zone_proto_rawDesc = "" + +const file_time_zone_proto_rawDesc = "" + "\n" + - "\x1esixafter/types/time_zone.proto\x12\x0esixafter.types\x1a*sixafter/types/geospatial_coordinate.proto\"\xeb\x02\n" + + "\x0ftime_zone.proto\x12\bproto.v1\x1a\x1bgeospatial_coordinate.proto\"\xd9\x02\n" + "\bTimeZone\x12\x12\n" + "\x04name\x18\x01 \x01(\tR\x04name\x12\"\n" + - "\fabbreviation\x18\x02 \x01(\tR\fabbreviation\x12I\n" + - "\x0eutc_offset_std\x18\x03 \x01(\v2#.sixafter.types.TimeZone.TimeOffsetR\futcOffsetStd\x12I\n" + - "\x0eutc_offset_dst\x18\x04 \x01(\v2#.sixafter.types.TimeZone.TimeOffsetR\futcOffsetDst\x12S\n" + - "\x12central_coordinate\x18\x05 \x01(\v2$.sixafter.types.GeospatialCoordinateR\x11centralCoordinate\x1a<\n" + + "\fabbreviation\x18\x02 \x01(\tR\fabbreviation\x12C\n" + + "\x0eutc_offset_std\x18\x03 \x01(\v2\x1d.proto.v1.TimeZone.TimeOffsetR\futcOffsetStd\x12C\n" + + "\x0eutc_offset_dst\x18\x04 \x01(\v2\x1d.proto.v1.TimeZone.TimeOffsetR\futcOffsetDst\x12M\n" + + "\x12central_coordinate\x18\x05 \x01(\v2\x1e.proto.v1.GeospatialCoordinateR\x11centralCoordinate\x1a<\n" + "\n" + "TimeOffset\x12\x14\n" + "\x05hours\x18\x01 \x01(\x05R\x05hours\x12\x18\n" + - "\aminutes\x18\x02 \x01(\x05R\aminutesB~\n" + - "\x12com.sixafter.typesB\rTimeZoneProtoP\x01Z.github.com/sixafter/types/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" + "\aminutes\x18\x02 \x01(\x05R\aminutesB\x81\x01\n" + + "\x15com.sixafter.types.v1B\rTimeZoneProtoP\x01Z+github.com/sixafter/types/proto/v1/pb;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02 SixAfter.Types.V1.WellKnownTypesb\x06proto3" var ( - file_sixafter_types_time_zone_proto_rawDescOnce sync.Once - file_sixafter_types_time_zone_proto_rawDescData []byte + file_time_zone_proto_rawDescOnce sync.Once + file_time_zone_proto_rawDescData []byte ) -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))) +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))) }) - return file_sixafter_types_time_zone_proto_rawDescData + return file_time_zone_proto_rawDescData } -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_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_time_zone_proto_goTypes = []any{ + (*TimeZone)(nil), // 0: proto.v1.TimeZone + (*TimeZone_TimeOffset)(nil), // 1: proto.v1.TimeZone.TimeOffset + (*GeospatialCoordinate)(nil), // 2: proto.v1.GeospatialCoordinate } -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 +var file_time_zone_proto_depIdxs = []int32{ + 1, // 0: proto.v1.TimeZone.utc_offset_std:type_name -> proto.v1.TimeZone.TimeOffset + 1, // 1: proto.v1.TimeZone.utc_offset_dst:type_name -> proto.v1.TimeZone.TimeOffset + 2, // 2: proto.v1.TimeZone.central_coordinate:type_name -> proto.v1.GeospatialCoordinate 3, // [3:3] is the sub-list for method output_type 3, // [3:3] is the sub-list for method input_type 3, // [3:3] is the sub-list for extension type_name @@ -232,27 +232,27 @@ var file_sixafter_types_time_zone_proto_depIdxs = []int32{ 0, // [0:3] is the sub-list for field type_name } -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 { +func init() { file_time_zone_proto_init() } +func file_time_zone_proto_init() { + if File_time_zone_proto != nil { return } - file_sixafter_types_geospatial_coordinate_proto_init() + file_geospatial_coordinate_proto_init() type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_time_zone_proto_rawDesc), len(file_sixafter_types_time_zone_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_time_zone_proto_rawDesc), len(file_time_zone_proto_rawDesc)), NumEnums: 0, NumMessages: 2, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_sixafter_types_time_zone_proto_goTypes, - DependencyIndexes: file_sixafter_types_time_zone_proto_depIdxs, - MessageInfos: file_sixafter_types_time_zone_proto_msgTypes, + GoTypes: file_time_zone_proto_goTypes, + DependencyIndexes: file_time_zone_proto_depIdxs, + MessageInfos: file_time_zone_proto_msgTypes, }.Build() - File_sixafter_types_time_zone_proto = out.File - file_sixafter_types_time_zone_proto_goTypes = nil - file_sixafter_types_time_zone_proto_depIdxs = nil + File_time_zone_proto = out.File + file_time_zone_proto_goTypes = nil + file_time_zone_proto_depIdxs = nil } diff --git a/sixafter/types/uri.pb.go b/proto/v1/pb/uri.pb.go similarity index 74% rename from sixafter/types/uri.pb.go rename to proto/v1/pb/uri.pb.go index 3d38641..c393bf7 100644 --- a/sixafter/types/uri.pb.go +++ b/proto/v1/pb/uri.pb.go @@ -18,8 +18,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.2 -// source: sixafter/types/uri.proto +// protoc (unknown) +// source: uri.proto package types @@ -78,7 +78,7 @@ type Uri struct { func (x *Uri) Reset() { *x = Uri{} - mi := &file_sixafter_types_uri_proto_msgTypes[0] + mi := &file_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_sixafter_types_uri_proto_msgTypes[0] + mi := &file_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_sixafter_types_uri_proto_rawDescGZIP(), []int{0} + return file_uri_proto_rawDescGZIP(), []int{0} } func (x *Uri) GetScheme() string { @@ -155,11 +155,11 @@ func (x *Uri) GetUserInfo() string { return "" } -var File_sixafter_types_uri_proto protoreflect.FileDescriptor +var File_uri_proto protoreflect.FileDescriptor -const file_sixafter_types_uri_proto_rawDesc = "" + +const file_uri_proto_rawDesc = "" + "\n" + - "\x18sixafter/types/uri.proto\x12\x0esixafter.types\"\xb2\x01\n" + + "\turi.proto\x12\bproto.v1\"\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" + @@ -167,26 +167,26 @@ const file_sixafter_types_uri_proto_rawDesc = "" + "\x04port\x18\x04 \x01(\x05R\x04port\x12\x14\n" + "\x05query\x18\x05 \x01(\tR\x05query\x12\x1c\n" + "\tauthority\x18\x06 \x01(\tR\tauthority\x12\x1b\n" + - "\tuser_info\x18\a \x01(\tR\buserInfoBy\n" + - "\x12com.sixafter.typesB\bUriProtoP\x01Z.github.com/sixafter/types/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" + "\tuser_info\x18\a \x01(\tR\buserInfoB|\n" + + "\x15com.sixafter.types.v1B\bUriProtoP\x01Z+github.com/sixafter/types/proto/v1/pb;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02 SixAfter.Types.V1.WellKnownTypesb\x06proto3" var ( - file_sixafter_types_uri_proto_rawDescOnce sync.Once - file_sixafter_types_uri_proto_rawDescData []byte + file_uri_proto_rawDescOnce sync.Once + file_uri_proto_rawDescData []byte ) -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))) +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))) }) - return file_sixafter_types_uri_proto_rawDescData + return file_uri_proto_rawDescData } -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_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_uri_proto_goTypes = []any{ + (*Uri)(nil), // 0: proto.v1.Uri } -var file_sixafter_types_uri_proto_depIdxs = []int32{ +var file_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_sixafter_types_uri_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_sixafter_types_uri_proto_init() } -func file_sixafter_types_uri_proto_init() { - if File_sixafter_types_uri_proto != nil { +func init() { file_uri_proto_init() } +func file_uri_proto_init() { + if File_uri_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_uri_proto_rawDesc), len(file_sixafter_types_uri_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_uri_proto_rawDesc), len(file_uri_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_sixafter_types_uri_proto_goTypes, - DependencyIndexes: file_sixafter_types_uri_proto_depIdxs, - MessageInfos: file_sixafter_types_uri_proto_msgTypes, + GoTypes: file_uri_proto_goTypes, + DependencyIndexes: file_uri_proto_depIdxs, + MessageInfos: file_uri_proto_msgTypes, }.Build() - File_sixafter_types_uri_proto = out.File - file_sixafter_types_uri_proto_goTypes = nil - file_sixafter_types_uri_proto_depIdxs = nil + File_uri_proto = out.File + file_uri_proto_goTypes = nil + file_uri_proto_depIdxs = nil } diff --git a/sixafter/types/url.pb.go b/proto/v1/pb/url.pb.go similarity index 76% rename from sixafter/types/url.pb.go rename to proto/v1/pb/url.pb.go index a4a8d4f..849e260 100644 --- a/sixafter/types/url.pb.go +++ b/proto/v1/pb/url.pb.go @@ -18,8 +18,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.2 -// source: sixafter/types/url.proto +// protoc (unknown) +// source: url.proto package types @@ -84,7 +84,7 @@ type Url struct { func (x *Url) Reset() { *x = Url{} - mi := &file_sixafter_types_url_proto_msgTypes[0] + mi := &file_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_sixafter_types_url_proto_msgTypes[0] + mi := &file_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_sixafter_types_url_proto_rawDescGZIP(), []int{0} + return file_url_proto_rawDescGZIP(), []int{0} } func (x *Url) GetProtocol() string { @@ -175,11 +175,11 @@ func (x *Url) GetRef() string { return "" } -var File_sixafter_types_url_proto protoreflect.FileDescriptor +var File_url_proto protoreflect.FileDescriptor -const file_sixafter_types_url_proto_rawDesc = "" + +const file_url_proto_rawDesc = "" + "\n" + - "\x18sixafter/types/url.proto\x12\x0esixafter.types\"\xd4\x01\n" + + "\turl.proto\x12\bproto.v1\"\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" + @@ -189,26 +189,26 @@ const file_sixafter_types_url_proto_rawDesc = "" + "\x05query\x18\x06 \x01(\tR\x05query\x12\x1c\n" + "\tauthority\x18\a \x01(\tR\tauthority\x12\x1b\n" + "\tuser_info\x18\b \x01(\tR\buserInfo\x12\x10\n" + - "\x03ref\x18\t \x01(\tR\x03refBy\n" + - "\x12com.sixafter.typesB\bUrlProtoP\x01Z.github.com/sixafter/types/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" + "\x03ref\x18\t \x01(\tR\x03refB|\n" + + "\x15com.sixafter.types.v1B\bUrlProtoP\x01Z+github.com/sixafter/types/proto/v1/pb;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02 SixAfter.Types.V1.WellKnownTypesb\x06proto3" var ( - file_sixafter_types_url_proto_rawDescOnce sync.Once - file_sixafter_types_url_proto_rawDescData []byte + file_url_proto_rawDescOnce sync.Once + file_url_proto_rawDescData []byte ) -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))) +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))) }) - return file_sixafter_types_url_proto_rawDescData + return file_url_proto_rawDescData } -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_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_url_proto_goTypes = []any{ + (*Url)(nil), // 0: proto.v1.Url } -var file_sixafter_types_url_proto_depIdxs = []int32{ +var file_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_sixafter_types_url_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_sixafter_types_url_proto_init() } -func file_sixafter_types_url_proto_init() { - if File_sixafter_types_url_proto != nil { +func init() { file_url_proto_init() } +func file_url_proto_init() { + if File_url_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_url_proto_rawDesc), len(file_sixafter_types_url_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_url_proto_rawDesc), len(file_url_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_sixafter_types_url_proto_goTypes, - DependencyIndexes: file_sixafter_types_url_proto_depIdxs, - MessageInfos: file_sixafter_types_url_proto_msgTypes, + GoTypes: file_url_proto_goTypes, + DependencyIndexes: file_url_proto_depIdxs, + MessageInfos: file_url_proto_msgTypes, }.Build() - File_sixafter_types_url_proto = out.File - file_sixafter_types_url_proto_goTypes = nil - file_sixafter_types_url_proto_depIdxs = nil + File_url_proto = out.File + file_url_proto_goTypes = nil + file_url_proto_depIdxs = nil } diff --git a/sixafter/types/uuid.go b/proto/v1/pb/uuid.go similarity index 79% rename from sixafter/types/uuid.go rename to proto/v1/pb/uuid.go index 51da638..03e4141 100644 --- a/sixafter/types/uuid.go +++ b/proto/v1/pb/uuid.go @@ -15,54 +15,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -/* -Package types provides helper functions for working with the sixafter.types.UUID -Protobuf message. This message represents a canonical 128-bit UUID (RFC 4122) -using a 16-byte binary encoding. - -These helpers allow for conversion between the Protobuf UUID message and the -native github.com/google/uuid.UUID type, as well as conversion to and from the -canonical string representation of a UUID. - -# Usage - - import ( - "github.com/google/uuid" - "github.com/sixafter/types" // path to your generated and helper packages - ) - - // Generate a UUID and convert to protobuf - u := uuid.New() - pbUUID := types.UUIDToProto(u) - - // Convert back to uuid.UUID - u2, err := types.ProtoToUUID(pbUUID) - if err != nil { - // handle error - } - - // Convert from string to protobuf - pbUUID2, err := types.StringToProto("2b7e1516-28ae-4c98-8c3d-9b1636b6033c") - if err != nil { - // handle error - } - - // Convert protobuf to string - s, err := types.ProtoToString(pbUUID2) - if err != nil { - // handle error - } - - // Validate protobuf message - if err := types.ValidateUUID(pbUUID2); err != nil { - // handle error - } - -# Validation - -The sixafter.types.UUID message MUST have a Value field of exactly 16 bytes. -These helpers perform validation and will return errors if the field is not valid. -*/ +// Package types provide helper functions for working with the sixafter.types.UUID +// Protobuf message. This message represents a canonical 128-bit UUID (RFC 4122) +// using a 16-byte binary encoding. +// +// These helpers allow for conversion between the Protobuf UUID message and the +// native github.com/google/uuid.UUID type, as well as conversion to and from the +// canonical string representation of a UUID. package types import ( diff --git a/sixafter/types/uuid.pb.go b/proto/v1/pb/uuid.pb.go similarity index 64% rename from sixafter/types/uuid.pb.go rename to proto/v1/pb/uuid.pb.go index 8e21394..51938fc 100644 --- a/sixafter/types/uuid.pb.go +++ b/proto/v1/pb/uuid.pb.go @@ -18,8 +18,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.2 -// source: sixafter/types/uuid.proto +// protoc (unknown) +// source: uuid.proto package types @@ -61,7 +61,7 @@ type UUID struct { func (x *UUID) Reset() { *x = UUID{} - mi := &file_sixafter_types_uuid_proto_msgTypes[0] + mi := &file_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_sixafter_types_uuid_proto_msgTypes[0] + mi := &file_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_sixafter_types_uuid_proto_rawDescGZIP(), []int{0} + return file_uuid_proto_rawDescGZIP(), []int{0} } func (x *UUID) GetValue() []byte { @@ -96,32 +96,33 @@ func (x *UUID) GetValue() []byte { return nil } -var File_sixafter_types_uuid_proto protoreflect.FileDescriptor +var File_uuid_proto protoreflect.FileDescriptor -const file_sixafter_types_uuid_proto_rawDesc = "" + +const file_uuid_proto_rawDesc = "" + "\n" + - "\x19sixafter/types/uuid.proto\x12\x0esixafter.types\"\x1c\n" + + "\n" + + "uuid.proto\x12\bproto.v1\"\x1c\n" + "\x04UUID\x12\x14\n" + - "\x05value\x18\x01 \x01(\fR\x05valueBz\n" + - "\x12com.sixafter.typesB\tUuidProtoP\x01Z.github.com/sixafter/types/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" + "\x05value\x18\x01 \x01(\fR\x05valueB}\n" + + "\x15com.sixafter.types.v1B\tUuidProtoP\x01Z+github.com/sixafter/types/proto/v1/pb;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02 SixAfter.Types.V1.WellKnownTypesb\x06proto3" var ( - file_sixafter_types_uuid_proto_rawDescOnce sync.Once - file_sixafter_types_uuid_proto_rawDescData []byte + file_uuid_proto_rawDescOnce sync.Once + file_uuid_proto_rawDescData []byte ) -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))) +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))) }) - return file_sixafter_types_uuid_proto_rawDescData + return file_uuid_proto_rawDescData } -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_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_uuid_proto_goTypes = []any{ + (*UUID)(nil), // 0: proto.v1.UUID } -var file_sixafter_types_uuid_proto_depIdxs = []int32{ +var file_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 @@ -129,26 +130,26 @@ var file_sixafter_types_uuid_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_sixafter_types_uuid_proto_init() } -func file_sixafter_types_uuid_proto_init() { - if File_sixafter_types_uuid_proto != nil { +func init() { file_uuid_proto_init() } +func file_uuid_proto_init() { + if File_uuid_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_uuid_proto_rawDesc), len(file_sixafter_types_uuid_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_uuid_proto_rawDesc), len(file_uuid_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_sixafter_types_uuid_proto_goTypes, - DependencyIndexes: file_sixafter_types_uuid_proto_depIdxs, - MessageInfos: file_sixafter_types_uuid_proto_msgTypes, + GoTypes: file_uuid_proto_goTypes, + DependencyIndexes: file_uuid_proto_depIdxs, + MessageInfos: file_uuid_proto_msgTypes, }.Build() - File_sixafter_types_uuid_proto = out.File - file_sixafter_types_uuid_proto_goTypes = nil - file_sixafter_types_uuid_proto_depIdxs = nil + File_uuid_proto = out.File + file_uuid_proto_goTypes = nil + file_uuid_proto_depIdxs = nil } diff --git a/sixafter/types/uuid_test.go b/proto/v1/pb/uuid_test.go similarity index 100% rename from sixafter/types/uuid_test.go rename to proto/v1/pb/uuid_test.go diff --git a/sixafter/types/version.pb.go b/proto/v1/pb/version.pb.go similarity index 74% rename from sixafter/types/version.pb.go rename to proto/v1/pb/version.pb.go index a16e3ce..0d6519a 100644 --- a/sixafter/types/version.pb.go +++ b/proto/v1/pb/version.pb.go @@ -18,8 +18,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.2 -// source: sixafter/types/version.proto +// protoc (unknown) +// source: version.proto package types @@ -94,7 +94,7 @@ type Version struct { func (x *Version) Reset() { *x = Version{} - mi := &file_sixafter_types_version_proto_msgTypes[0] + mi := &file_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_sixafter_types_version_proto_msgTypes[0] + mi := &file_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_sixafter_types_version_proto_rawDescGZIP(), []int{0} + return file_version_proto_rawDescGZIP(), []int{0} } func (x *Version) GetMajor() uint32 { @@ -157,11 +157,11 @@ func (x *Version) GetBuildMetadata() string { return "" } -var File_sixafter_types_version_proto protoreflect.FileDescriptor +var File_version_proto protoreflect.FileDescriptor -const file_sixafter_types_version_proto_rawDesc = "" + +const file_version_proto_rawDesc = "" + "\n" + - "\x1csixafter/types/version.proto\x12\x0esixafter.types\"\x92\x01\n" + + "\rversion.proto\x12\bproto.v1\"\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" + @@ -169,26 +169,26 @@ const file_sixafter_types_version_proto_rawDesc = "" + "\n" + "prerelease\x18\x04 \x01(\tR\n" + "prerelease\x12%\n" + - "\x0ebuild_metadata\x18\x05 \x01(\tR\rbuildMetadataB}\n" + - "\x12com.sixafter.typesB\fVersionProtoP\x01Z.github.com/sixafter/types/sixafter/types;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02\x1dSixAfter.Types.WellKnownTypesb\x06proto3" + "\x0ebuild_metadata\x18\x05 \x01(\tR\rbuildMetadataB\x80\x01\n" + + "\x15com.sixafter.types.v1B\fVersionProtoP\x01Z+github.com/sixafter/types/proto/v1/pb;types\xf8\x01\x01\xa2\x02\x03TPB\xaa\x02 SixAfter.Types.V1.WellKnownTypesb\x06proto3" var ( - file_sixafter_types_version_proto_rawDescOnce sync.Once - file_sixafter_types_version_proto_rawDescData []byte + file_version_proto_rawDescOnce sync.Once + file_version_proto_rawDescData []byte ) -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))) +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))) }) - return file_sixafter_types_version_proto_rawDescData + return file_version_proto_rawDescData } -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_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_version_proto_goTypes = []any{ + (*Version)(nil), // 0: proto.v1.Version } -var file_sixafter_types_version_proto_depIdxs = []int32{ +var file_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_sixafter_types_version_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_sixafter_types_version_proto_init() } -func file_sixafter_types_version_proto_init() { - if File_sixafter_types_version_proto != nil { +func init() { file_version_proto_init() } +func file_version_proto_init() { + if File_version_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_sixafter_types_version_proto_rawDesc), len(file_sixafter_types_version_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_version_proto_rawDesc), len(file_version_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_sixafter_types_version_proto_goTypes, - DependencyIndexes: file_sixafter_types_version_proto_depIdxs, - MessageInfos: file_sixafter_types_version_proto_msgTypes, + GoTypes: file_version_proto_goTypes, + DependencyIndexes: file_version_proto_depIdxs, + MessageInfos: file_version_proto_msgTypes, }.Build() - File_sixafter_types_version_proto = out.File - file_sixafter_types_version_proto_goTypes = nil - file_sixafter_types_version_proto_depIdxs = nil + File_version_proto = out.File + file_version_proto_goTypes = nil + file_version_proto_depIdxs = nil } diff --git a/sixafter/types/radial_geofence.proto b/proto/v1/radial_geofence.proto similarity index 85% rename from sixafter/types/radial_geofence.proto rename to proto/v1/radial_geofence.proto index 308e501..fdf8f7b 100644 --- a/sixafter/types/radial_geofence.proto +++ b/proto/v1/radial_geofence.proto @@ -15,26 +15,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -syntax="proto3"; +syntax = "proto3"; -package sixafter.types; +package proto.v1; + +import "geospatial_coordinate.proto"; -option go_package="github.com/sixafter/types/sixafter/types;types"; option cc_enable_arenas = true; -option java_package = "com.sixafter.types"; +option csharp_namespace = "SixAfter.Types.V1.WellKnownTypes"; +option go_package = "github.com/sixafter/types/proto/v1/pb;types"; option java_multiple_files = true; option java_outer_classname = "RadialGeofenceProto"; +option java_package = "com.sixafter.types.v1"; option objc_class_prefix = "TPB"; -option csharp_namespace = "SixAfter.Types.WellKnownTypes"; - -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. // The radial geofence is defined by a center point and a radius, forming a circular boundary. // It is commonly used in applications like location-based alerts, tracking, and geofencing. message RadialGeofence { - // The name of this geofence. // Example: "Warehouse Perimeter", "Restricted Zone". string name = 1; @@ -42,7 +41,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`. - sixafter.types.GeospatialCoordinate center = 2; + proto.v1.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/sixafter/types/temporal_range.proto b/proto/v1/temporal_range.proto similarity index 89% rename from sixafter/types/temporal_range.proto rename to proto/v1/temporal_range.proto index a5c6ba4..5fd3950 100644 --- a/sixafter/types/temporal_range.proto +++ b/proto/v1/temporal_range.proto @@ -15,26 +15,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -syntax="proto3"; +syntax = "proto3"; -package sixafter.types; +package proto.v1; + +import "google/protobuf/duration.proto"; +import "google/protobuf/timestamp.proto"; -option go_package="github.com/sixafter/types/sixafter/types;types"; option cc_enable_arenas = true; -option java_package = "com.sixafter.types"; +option csharp_namespace = "SixAfter.Types.V1.WellKnownTypes"; +option go_package = "github.com/sixafter/types/proto/v1/pb;types"; option java_multiple_files = true; option java_outer_classname = "TemporalRangeProto"; +option java_package = "com.sixafter.types.v1"; option objc_class_prefix = "TPB"; -option csharp_namespace = "SixAfter.Types.WellKnownTypes"; - -import "google/protobuf/duration.proto"; -import "google/protobuf/timestamp.proto"; // The `TemporalRange` message represents a time range defined by a starting // reference point (epoch) and a duration. It is commonly used in time-based // applications such as scheduling, analytics, and temporal data analysis. message TemporalRange { - // The starting point of the temporal range, known as the epoch. // This timestamp serves as the reference point from which the duration is // measured. diff --git a/sixafter/types/time_zone.proto b/proto/v1/time_zone.proto similarity index 87% rename from sixafter/types/time_zone.proto rename to proto/v1/time_zone.proto index 1aa5ad0..206754b 100644 --- a/sixafter/types/time_zone.proto +++ b/proto/v1/time_zone.proto @@ -15,24 +15,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -syntax="proto3"; +syntax = "proto3"; -package sixafter.types; +package proto.v1; + +import "geospatial_coordinate.proto"; -option go_package="github.com/sixafter/types/sixafter/types;types"; option cc_enable_arenas = true; -option java_package = "com.sixafter.types"; +option csharp_namespace = "SixAfter.Types.V1.WellKnownTypes"; +option go_package = "github.com/sixafter/types/proto/v1/pb;types"; option java_multiple_files = true; option java_outer_classname = "TimeZoneProto"; +option java_package = "com.sixafter.types.v1"; option objc_class_prefix = "TPB"; -option csharp_namespace = "SixAfter.Types.WellKnownTypes"; - -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. message TimeZone { - // The `TimeOffset` message represents a time offset from Coordinated // Universal Time (UTC) in terms of hours and minutes. message TimeOffset { @@ -62,8 +61,8 @@ message TimeZone { // This represents the time zone's offset when daylight saving time is in effect. // Example: For "America/New_York", the daylight saving time offset is UTC-4. TimeOffset utc_offset_dst = 4; - + // The geographic coordinates of the time zone's central point. // This is commonly used to determine the time zone based on location. - sixafter.types.GeospatialCoordinate central_coordinate = 5; + proto.v1.GeospatialCoordinate central_coordinate = 5; } diff --git a/sixafter/types/uri.proto b/proto/v1/uri.proto similarity index 92% rename from sixafter/types/uri.proto rename to proto/v1/uri.proto index b1066b6..3bebc44 100644 --- a/sixafter/types/uri.proto +++ b/proto/v1/uri.proto @@ -15,24 +15,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -syntax="proto3"; +syntax = "proto3"; -package sixafter.types; +package proto.v1; -option go_package="github.com/sixafter/types/sixafter/types;types"; option cc_enable_arenas = true; -option java_package = "com.sixafter.types"; +option csharp_namespace = "SixAfter.Types.V1.WellKnownTypes"; +option go_package = "github.com/sixafter/types/proto/v1/pb;types"; option java_multiple_files = true; option java_outer_classname = "UriProto"; +option java_package = "com.sixafter.types.v1"; option objc_class_prefix = "TPB"; -option csharp_namespace = "SixAfter.Types.WellKnownTypes"; // The `Uri` message represents a Uniform Resource Identifier (URI) as defined by // [RFC 2396: Uniform Resource Identifiers (URI): Generic Syntax](http://www.ietf.org/rfc/rfc2396.txt), // amended by [RFC 2732: Format for Literal IPv6 Addresses in URLs](http://www.ietf.org/rfc/rfc2732.txt). // A URI is a compact string used to identify a resource in a generic syntax. message Uri { - // The scheme component of the URI. // Example: "https", "ftp", or "mailto". string scheme = 1; diff --git a/sixafter/types/url.proto b/proto/v1/url.proto similarity index 93% rename from sixafter/types/url.proto rename to proto/v1/url.proto index 6d369fc..5fbd630 100644 --- a/sixafter/types/url.proto +++ b/proto/v1/url.proto @@ -15,23 +15,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -syntax="proto3"; +syntax = "proto3"; -package sixafter.types; +package proto.v1; -option go_package="github.com/sixafter/types/sixafter/types;types"; option cc_enable_arenas = true; -option java_package = "com.sixafter.types"; +option csharp_namespace = "SixAfter.Types.V1.WellKnownTypes"; +option go_package = "github.com/sixafter/types/proto/v1/pb;types"; option java_multiple_files = true; option java_outer_classname = "UrlProto"; +option java_package = "com.sixafter.types.v1"; option objc_class_prefix = "TPB"; -option csharp_namespace = "SixAfter.Types.WellKnownTypes"; // The `Url` message represents a Uniform Resource Locator (URL), which is a specific // type of Uniform Resource Identifier (URI) used to locate resources on the web. // A URL consists of various components like protocol, host, path, query, and more. message Url { - // The protocol (or scheme) component of the URL. // Example: "https", "http", or "ftp". string protocol = 1; diff --git a/sixafter/types/uuid.proto b/proto/v1/uuid.proto similarity index 89% rename from sixafter/types/uuid.proto rename to proto/v1/uuid.proto index 72dc773..07a80de 100644 --- a/sixafter/types/uuid.proto +++ b/proto/v1/uuid.proto @@ -17,15 +17,15 @@ syntax = "proto3"; -package sixafter.types; +package proto.v1; -option go_package="github.com/sixafter/types/sixafter/types;types"; option cc_enable_arenas = true; -option java_package = "com.sixafter.types"; +option csharp_namespace = "SixAfter.Types.V1.WellKnownTypes"; +option go_package = "github.com/sixafter/types/proto/v1/pb;types"; option java_multiple_files = true; option java_outer_classname = "UuidProto"; +option java_package = "com.sixafter.types.v1"; option objc_class_prefix = "TPB"; -option csharp_namespace = "SixAfter.Types.WellKnownTypes"; // UUID represents a Universally Unique Identifier (UUID/GUID) according to RFC 4122. // The value field MUST be exactly 16 bytes in length (128 bits). diff --git a/sixafter/types/version.proto b/proto/v1/version.proto similarity index 94% rename from sixafter/types/version.proto rename to proto/v1/version.proto index 39f1893..474e7a0 100644 --- a/sixafter/types/version.proto +++ b/proto/v1/version.proto @@ -15,22 +15,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -syntax="proto3"; +syntax = "proto3"; -package sixafter.types; +package proto.v1; -option go_package="github.com/sixafter/types/sixafter/types;types"; option cc_enable_arenas = true; -option java_package = "com.sixafter.types"; +option csharp_namespace = "SixAfter.Types.V1.WellKnownTypes"; +option go_package = "github.com/sixafter/types/proto/v1/pb;types"; option java_multiple_files = true; option java_outer_classname = "VersionProto"; +option java_package = "com.sixafter.types.v1"; option objc_class_prefix = "TPB"; -option csharp_namespace = "SixAfter.Types.WellKnownTypes"; // The `Version` message represents a Semantic Versioning 2.0.0 compliant version number. // For details, see: https://semver.org message Version { - // Major version number. // // Major version zero (0.y.z) is for initial development. Anything MAY change diff --git a/sbin/go-clean.sh b/sbin/go-clean.sh index d2cef9e..ed56a05 100755 --- a/sbin/go-clean.sh +++ b/sbin/go-clean.sh @@ -24,4 +24,3 @@ if is_windows; then fi go clean -rm -f ./sixafter/types/*.pb.go diff --git a/sbin/proto-breaking.sh b/sbin/proto-breaking.sh new file mode 100755 index 0000000..6bfc29b --- /dev/null +++ b/sbin/proto-breaking.sh @@ -0,0 +1,52 @@ +#!/bin/bash +# Copyright 2020-2025 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. + +set -euo pipefail + +__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${__dir}/os-type.sh" + +if is_windows; then + echo "[ERROR] Windows is not currently supported." >&2 + exit 1 +fi + +command -v buf >/dev/null 2>&1 || { echo "[ERROR] buf not found in PATH"; exit 1; } +command -v git >/dev/null 2>&1 || { echo "[ERROR] git not found in PATH"; exit 1; } + +# Allow running from service root (has buf.yaml v2) or module dir +if [[ ! -f buf.yaml && ! -f buf.work.yaml ]]; then + echo "[ERROR] Neither buf.yaml nor buf.work.yaml found in: $(pwd)" + exit 1 +fi + +# Resolve repo root and service subdir +GIT_ROOT="$(git rev-parse --show-toplevel)" +REL_SUBDIR="$(git rev-parse --show-prefix)"; REL_SUBDIR="${REL_SUBDIR%/}" + +BRANCH="${BUF_BREAK_BRANCH:-main}" +AGAINST="${BUF_BREAK_AGAINST:-${GIT_ROOT}/.git#branch=${BRANCH},subdir=${REL_SUBDIR}}" + +# Strip accidental quotes +AGAINST="${AGAINST%\"}"; AGAINST="${AGAINST#\"}" +AGAINST="${AGAINST%\'}"; AGAINST="${AGAINST#\'}" + +if [[ -n "${BUF_BREAK_PATHS:-}" ]]; then + echo "[INFO] Running: proto breaking --against ${AGAINST} --path ${BUF_BREAK_PATHS}" + buf breaking --against "${AGAINST}" --path "${BUF_BREAK_PATHS}" +else + echo "[INFO] Running: proto breaking --against ${AGAINST}" + buf breaking --against "${AGAINST}" +fi diff --git a/sbin/proto-docs.sh b/sbin/proto-docs.sh new file mode 100755 index 0000000..7264132 --- /dev/null +++ b/sbin/proto-docs.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# Copyright 2020-2025 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. + +set -euo pipefail + +__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${__dir}/os-type.sh" + +if is_windows; then + echo "[ERROR] Windows is not currently supported." >&2 + exit 1 +fi + +command -v buf >/dev/null 2>&1 || { echo "[ERROR] buf not found in PATH"; exit 1; } +[[ -f buf.yaml ]] || { echo "[ERROR] Run 'deps' make target."; exit 1; } + +if [[ ! -f buf.gen.doc.yaml ]]; then + echo "[INFO] buf.gen.doc.yaml not found; skipping generation." + exit 0 +fi + +echo "[INFO] Running: proto generate docs" +buf generate --clean --template buf.gen.docs.yaml diff --git a/sbin/proto-format.sh b/sbin/proto-format.sh new file mode 100755 index 0000000..c4475b5 --- /dev/null +++ b/sbin/proto-format.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# Copyright 2020-2025 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. + +set -euo pipefail + +__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${__dir}/os-type.sh" + +if is_windows; then + echo "[ERROR] Windows is not currently supported." >&2 + exit 1 +fi + +command -v buf >/dev/null 2>&1 || { echo "[ERROR] buf not found in PATH"; exit 1; } +[[ -f buf.yaml ]] || { echo "[ERROR] buf.yaml not found in current directory: $(pwd)"; exit 1; } + +echo "[INFO] Running: proto format -w (scoped to proto/v1)" +( + cd proto/v1 + buf format -w +) \ No newline at end of file diff --git a/sbin/proto-generate.sh b/sbin/proto-generate.sh new file mode 100755 index 0000000..137ddf3 --- /dev/null +++ b/sbin/proto-generate.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# Copyright 2020-2025 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. + +set -euo pipefail + +__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${__dir}/os-type.sh" + +if is_windows; then + echo "[ERROR] Windows is not currently supported." >&2 + exit 1 +fi + +command -v buf >/dev/null 2>&1 || { echo "[ERROR] buf not found in PATH"; exit 1; } +[[ -f buf.yaml ]] || { echo "[ERROR] buf.yaml not found in current directory: $(pwd)"; exit 1; } + +if [[ ! -f buf.gen.yaml ]]; then + echo "[INFO] buf.gen.yaml not found; skipping generation (your protoc flow remains unchanged)." + exit 0 +fi + +echo "[INFO] Running: proto generate" +buf generate --template buf.gen.yaml diff --git a/sbin/go-build.sh b/sbin/proto-lint.sh similarity index 67% rename from sbin/go-build.sh rename to sbin/proto-lint.sh index fe65b28..d0ee867 100755 --- a/sbin/go-build.sh +++ b/sbin/proto-lint.sh @@ -13,14 +13,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +set -euo pipefail -source "${__dir}"/os-type.sh +__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${__dir}/os-type.sh" -# Windows if is_windows; then - echo "Windows is not currently supported." - exit 1 + echo "[ERROR] Windows is not currently supported." >&2 + exit 1 fi -protoc --go_out=. --go_opt=paths=source_relative --proto_path=. sixafter/types/*.proto +command -v buf >/dev/null 2>&1 || { echo "[ERROR] buf not found in PATH"; exit 1; } +[[ -f buf.yaml ]] || { echo "[ERROR] buf.yaml not found in current directory: $(pwd)"; exit 1; } + +echo "[INFO] Running: proto lint" +buf lint diff --git a/vendor/modules.txt b/vendor/modules.txt index 50ef569..579e267 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.6.0 -## explicit; go 1.24.0 # google.golang.org/protobuf v1.36.11 ## explicit; go 1.23 google.golang.org/protobuf/encoding/protojson