diff --git a/README.md b/README.md
index 884ab9d..ee837c3 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ This repo contains the main data model for the Starwit Awareness Engine (SAE). S
### Python / Poetry
- Add the following to your `pyproject.toml` dependencies section\
- `visionapi = { git = "https://github.com/starwit/vision-api.git", subdirectory = "python/visionapi", tag = "3.5.3" }`
+ `visionapi = { git = "https://github.com/starwit/vision-api.git", subdirectory = "python/visionapi", tag = "3.6.0" }`
### Java / Maven
- Add dependency to your project:
@@ -14,7 +14,7 @@ This repo contains the main data model for the Starwit Awareness Engine (SAE). S
de.starwit
vision-api
- 3.5.3
+ 3.6.0
```
- Add maven repository to your `~/.m2/settings.xml` (adapt example / your config as necessary):
@@ -82,6 +82,9 @@ This repo contains the main data model for the Starwit Awareness Engine (SAE). S
```
## Changelog
+### 3.6.0
+- Add `raw_geo_coordinate` and `movement_vector` to `PositionMessage`
+
### 3.5.3
- Add `protobuf-java-util` to java library
- No protocol changes
diff --git a/VERSION b/VERSION
index 678fd88..084e244 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.5.3
\ No newline at end of file
+3.6.0
\ No newline at end of file
diff --git a/java/visionapi/pom.xml b/java/visionapi/pom.xml
index f18eb14..7ffe1b1 100644
--- a/java/visionapi/pom.xml
+++ b/java/visionapi/pom.xml
@@ -6,7 +6,7 @@
vision-api
jar
- 3.5.3
+ 3.6.0
visionapi
https://github.com/starwit/vision-api
diff --git a/java/visionapi/src/main/java/de/starwit/visionapi/Common.java b/java/visionapi/src/main/java/de/starwit/visionapi/Common.java
index d21fac9..6c6a91c 100644
--- a/java/visionapi/src/main/java/de/starwit/visionapi/Common.java
+++ b/java/visionapi/src/main/java/de/starwit/visionapi/Common.java
@@ -1347,6 +1347,516 @@ public de.starwit.visionapi.Common.GeoCoordinate getDefaultInstanceForType() {
}
+ public interface MovementVectorOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:visionapi.MovementVector)
+ com.google.protobuf.MessageOrBuilder {
+
+ /**
+ * double speed_kmh = 1;
+ * @return The speedKmh.
+ */
+ double getSpeedKmh();
+
+ /**
+ * double heading_deg = 2;
+ * @return The headingDeg.
+ */
+ double getHeadingDeg();
+ }
+ /**
+ * Protobuf type {@code visionapi.MovementVector}
+ */
+ public static final class MovementVector extends
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:visionapi.MovementVector)
+ MovementVectorOrBuilder {
+ private static final long serialVersionUID = 0L;
+ static {
+ com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+ com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+ /* major= */ 4,
+ /* minor= */ 31,
+ /* patch= */ 1,
+ /* suffix= */ "",
+ MovementVector.class.getName());
+ }
+ // Use MovementVector.newBuilder() to construct.
+ private MovementVector(com.google.protobuf.GeneratedMessage.Builder builder) {
+ super(builder);
+ }
+ private MovementVector() {
+ }
+
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return de.starwit.visionapi.Common.internal_static_visionapi_MovementVector_descriptor;
+ }
+
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return de.starwit.visionapi.Common.internal_static_visionapi_MovementVector_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ de.starwit.visionapi.Common.MovementVector.class, de.starwit.visionapi.Common.MovementVector.Builder.class);
+ }
+
+ public static final int SPEED_KMH_FIELD_NUMBER = 1;
+ private double speedKmh_ = 0D;
+ /**
+ * double speed_kmh = 1;
+ * @return The speedKmh.
+ */
+ @java.lang.Override
+ public double getSpeedKmh() {
+ return speedKmh_;
+ }
+
+ public static final int HEADING_DEG_FIELD_NUMBER = 2;
+ private double headingDeg_ = 0D;
+ /**
+ * double heading_deg = 2;
+ * @return The headingDeg.
+ */
+ @java.lang.Override
+ public double getHeadingDeg() {
+ return headingDeg_;
+ }
+
+ private byte memoizedIsInitialized = -1;
+ @java.lang.Override
+ public final boolean isInitialized() {
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
+
+ memoizedIsInitialized = 1;
+ return true;
+ }
+
+ @java.lang.Override
+ public void writeTo(com.google.protobuf.CodedOutputStream output)
+ throws java.io.IOException {
+ if (java.lang.Double.doubleToRawLongBits(speedKmh_) != 0) {
+ output.writeDouble(1, speedKmh_);
+ }
+ if (java.lang.Double.doubleToRawLongBits(headingDeg_) != 0) {
+ output.writeDouble(2, headingDeg_);
+ }
+ getUnknownFields().writeTo(output);
+ }
+
+ @java.lang.Override
+ public int getSerializedSize() {
+ int size = memoizedSize;
+ if (size != -1) return size;
+
+ size = 0;
+ if (java.lang.Double.doubleToRawLongBits(speedKmh_) != 0) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeDoubleSize(1, speedKmh_);
+ }
+ if (java.lang.Double.doubleToRawLongBits(headingDeg_) != 0) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeDoubleSize(2, headingDeg_);
+ }
+ size += getUnknownFields().getSerializedSize();
+ memoizedSize = size;
+ return size;
+ }
+
+ @java.lang.Override
+ public boolean equals(final java.lang.Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof de.starwit.visionapi.Common.MovementVector)) {
+ return super.equals(obj);
+ }
+ de.starwit.visionapi.Common.MovementVector other = (de.starwit.visionapi.Common.MovementVector) obj;
+
+ if (java.lang.Double.doubleToLongBits(getSpeedKmh())
+ != java.lang.Double.doubleToLongBits(
+ other.getSpeedKmh())) return false;
+ if (java.lang.Double.doubleToLongBits(getHeadingDeg())
+ != java.lang.Double.doubleToLongBits(
+ other.getHeadingDeg())) return false;
+ if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+ return true;
+ }
+
+ @java.lang.Override
+ public int hashCode() {
+ if (memoizedHashCode != 0) {
+ return memoizedHashCode;
+ }
+ int hash = 41;
+ hash = (19 * hash) + getDescriptor().hashCode();
+ hash = (37 * hash) + SPEED_KMH_FIELD_NUMBER;
+ hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+ java.lang.Double.doubleToLongBits(getSpeedKmh()));
+ hash = (37 * hash) + HEADING_DEG_FIELD_NUMBER;
+ hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+ java.lang.Double.doubleToLongBits(getHeadingDeg()));
+ hash = (29 * hash) + getUnknownFields().hashCode();
+ memoizedHashCode = hash;
+ return hash;
+ }
+
+ public static de.starwit.visionapi.Common.MovementVector parseFrom(
+ java.nio.ByteBuffer data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static de.starwit.visionapi.Common.MovementVector parseFrom(
+ java.nio.ByteBuffer data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static de.starwit.visionapi.Common.MovementVector parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static de.starwit.visionapi.Common.MovementVector parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static de.starwit.visionapi.Common.MovementVector parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static de.starwit.visionapi.Common.MovementVector parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static de.starwit.visionapi.Common.MovementVector parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessage
+ .parseWithIOException(PARSER, input);
+ }
+ public static de.starwit.visionapi.Common.MovementVector parseFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessage
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+
+ public static de.starwit.visionapi.Common.MovementVector parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessage
+ .parseDelimitedWithIOException(PARSER, input);
+ }
+
+ public static de.starwit.visionapi.Common.MovementVector parseDelimitedFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessage
+ .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static de.starwit.visionapi.Common.MovementVector parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessage
+ .parseWithIOException(PARSER, input);
+ }
+ public static de.starwit.visionapi.Common.MovementVector parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessage
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+
+ @java.lang.Override
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder() {
+ return DEFAULT_INSTANCE.toBuilder();
+ }
+ public static Builder newBuilder(de.starwit.visionapi.Common.MovementVector prototype) {
+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+ }
+ @java.lang.Override
+ public Builder toBuilder() {
+ return this == DEFAULT_INSTANCE
+ ? new Builder() : new Builder().mergeFrom(this);
+ }
+
+ @java.lang.Override
+ protected Builder newBuilderForType(
+ com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ Builder builder = new Builder(parent);
+ return builder;
+ }
+ /**
+ * Protobuf type {@code visionapi.MovementVector}
+ */
+ public static final class Builder extends
+ com.google.protobuf.GeneratedMessage.Builder implements
+ // @@protoc_insertion_point(builder_implements:visionapi.MovementVector)
+ de.starwit.visionapi.Common.MovementVectorOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return de.starwit.visionapi.Common.internal_static_visionapi_MovementVector_descriptor;
+ }
+
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return de.starwit.visionapi.Common.internal_static_visionapi_MovementVector_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ de.starwit.visionapi.Common.MovementVector.class, de.starwit.visionapi.Common.MovementVector.Builder.class);
+ }
+
+ // Construct using de.starwit.visionapi.Common.MovementVector.newBuilder()
+ private Builder() {
+
+ }
+
+ private Builder(
+ com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ super(parent);
+
+ }
+ @java.lang.Override
+ public Builder clear() {
+ super.clear();
+ bitField0_ = 0;
+ speedKmh_ = 0D;
+ headingDeg_ = 0D;
+ return this;
+ }
+
+ @java.lang.Override
+ public com.google.protobuf.Descriptors.Descriptor
+ getDescriptorForType() {
+ return de.starwit.visionapi.Common.internal_static_visionapi_MovementVector_descriptor;
+ }
+
+ @java.lang.Override
+ public de.starwit.visionapi.Common.MovementVector getDefaultInstanceForType() {
+ return de.starwit.visionapi.Common.MovementVector.getDefaultInstance();
+ }
+
+ @java.lang.Override
+ public de.starwit.visionapi.Common.MovementVector build() {
+ de.starwit.visionapi.Common.MovementVector result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ @java.lang.Override
+ public de.starwit.visionapi.Common.MovementVector buildPartial() {
+ de.starwit.visionapi.Common.MovementVector result = new de.starwit.visionapi.Common.MovementVector(this);
+ if (bitField0_ != 0) { buildPartial0(result); }
+ onBuilt();
+ return result;
+ }
+
+ private void buildPartial0(de.starwit.visionapi.Common.MovementVector result) {
+ int from_bitField0_ = bitField0_;
+ if (((from_bitField0_ & 0x00000001) != 0)) {
+ result.speedKmh_ = speedKmh_;
+ }
+ if (((from_bitField0_ & 0x00000002) != 0)) {
+ result.headingDeg_ = headingDeg_;
+ }
+ }
+
+ @java.lang.Override
+ public Builder mergeFrom(com.google.protobuf.Message other) {
+ if (other instanceof de.starwit.visionapi.Common.MovementVector) {
+ return mergeFrom((de.starwit.visionapi.Common.MovementVector)other);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(de.starwit.visionapi.Common.MovementVector other) {
+ if (other == de.starwit.visionapi.Common.MovementVector.getDefaultInstance()) return this;
+ if (java.lang.Double.doubleToRawLongBits(other.getSpeedKmh()) != 0) {
+ setSpeedKmh(other.getSpeedKmh());
+ }
+ if (java.lang.Double.doubleToRawLongBits(other.getHeadingDeg()) != 0) {
+ setHeadingDeg(other.getHeadingDeg());
+ }
+ this.mergeUnknownFields(other.getUnknownFields());
+ onChanged();
+ return this;
+ }
+
+ @java.lang.Override
+ public final boolean isInitialized() {
+ return true;
+ }
+
+ @java.lang.Override
+ public Builder mergeFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ if (extensionRegistry == null) {
+ throw new java.lang.NullPointerException();
+ }
+ try {
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ case 9: {
+ speedKmh_ = input.readDouble();
+ bitField0_ |= 0x00000001;
+ break;
+ } // case 9
+ case 17: {
+ headingDeg_ = input.readDouble();
+ bitField0_ |= 0x00000002;
+ break;
+ } // case 17
+ default: {
+ if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+ done = true; // was an endgroup tag
+ }
+ break;
+ } // default:
+ } // switch (tag)
+ } // while (!done)
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.unwrapIOException();
+ } finally {
+ onChanged();
+ } // finally
+ return this;
+ }
+ private int bitField0_;
+
+ private double speedKmh_ ;
+ /**
+ * double speed_kmh = 1;
+ * @return The speedKmh.
+ */
+ @java.lang.Override
+ public double getSpeedKmh() {
+ return speedKmh_;
+ }
+ /**
+ * double speed_kmh = 1;
+ * @param value The speedKmh to set.
+ * @return This builder for chaining.
+ */
+ public Builder setSpeedKmh(double value) {
+
+ speedKmh_ = value;
+ bitField0_ |= 0x00000001;
+ onChanged();
+ return this;
+ }
+ /**
+ * double speed_kmh = 1;
+ * @return This builder for chaining.
+ */
+ public Builder clearSpeedKmh() {
+ bitField0_ = (bitField0_ & ~0x00000001);
+ speedKmh_ = 0D;
+ onChanged();
+ return this;
+ }
+
+ private double headingDeg_ ;
+ /**
+ * double heading_deg = 2;
+ * @return The headingDeg.
+ */
+ @java.lang.Override
+ public double getHeadingDeg() {
+ return headingDeg_;
+ }
+ /**
+ * double heading_deg = 2;
+ * @param value The headingDeg to set.
+ * @return This builder for chaining.
+ */
+ public Builder setHeadingDeg(double value) {
+
+ headingDeg_ = value;
+ bitField0_ |= 0x00000002;
+ onChanged();
+ return this;
+ }
+ /**
+ * double heading_deg = 2;
+ * @return This builder for chaining.
+ */
+ public Builder clearHeadingDeg() {
+ bitField0_ = (bitField0_ & ~0x00000002);
+ headingDeg_ = 0D;
+ onChanged();
+ return this;
+ }
+
+ // @@protoc_insertion_point(builder_scope:visionapi.MovementVector)
+ }
+
+ // @@protoc_insertion_point(class_scope:visionapi.MovementVector)
+ private static final de.starwit.visionapi.Common.MovementVector DEFAULT_INSTANCE;
+ static {
+ DEFAULT_INSTANCE = new de.starwit.visionapi.Common.MovementVector();
+ }
+
+ public static de.starwit.visionapi.Common.MovementVector getDefaultInstance() {
+ return DEFAULT_INSTANCE;
+ }
+
+ private static final com.google.protobuf.Parser
+ PARSER = new com.google.protobuf.AbstractParser() {
+ @java.lang.Override
+ public MovementVector parsePartialFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ Builder builder = newBuilder();
+ try {
+ builder.mergeFrom(input, extensionRegistry);
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(builder.buildPartial());
+ } catch (com.google.protobuf.UninitializedMessageException e) {
+ throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+ } catch (java.io.IOException e) {
+ throw new com.google.protobuf.InvalidProtocolBufferException(e)
+ .setUnfinishedMessage(builder.buildPartial());
+ }
+ return builder.buildPartial();
+ }
+ };
+
+ public static com.google.protobuf.Parser parser() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public com.google.protobuf.Parser getParserForType() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public de.starwit.visionapi.Common.MovementVector getDefaultInstanceForType() {
+ return DEFAULT_INSTANCE;
+ }
+
+ }
+
public interface TypeMessageOrBuilder extends
// @@protoc_insertion_point(interface_extends:visionapi.TypeMessage)
com.google.protobuf.MessageOrBuilder {
@@ -1830,6 +2340,11 @@ public de.starwit.visionapi.Common.TypeMessage getDefaultInstanceForType() {
private static final
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_visionapi_GeoCoordinate_fieldAccessorTable;
+ private static final com.google.protobuf.Descriptors.Descriptor
+ internal_static_visionapi_MovementVector_descriptor;
+ private static final
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internal_static_visionapi_MovementVector_fieldAccessorTable;
private static final com.google.protobuf.Descriptors.Descriptor
internal_static_visionapi_TypeMessage_descriptor;
private static final
@@ -1847,12 +2362,13 @@ public de.starwit.visionapi.Common.TypeMessage getDefaultInstanceForType() {
"\n\026visionapi/common.proto\022\tvisionapi\"*\n\tM" +
"odelInfo\022\014\n\004name\030\001 \001(\t\022\017\n\007version\030\002 \001(\t\"" +
"4\n\rGeoCoordinate\022\020\n\010latitude\030\001 \001(\001\022\021\n\tlo" +
- "ngitude\030\002 \001(\001\"4\n\013TypeMessage\022%\n\004type\030\350\007 " +
- "\001(\0162\026.visionapi.MessageType*e\n\013MessageTy" +
- "pe\022\017\n\013UNSPECIFIED\020\000\022\007\n\003SAE\020\001\022\023\n\017DETECTIO" +
- "N_COUNT\020\002\022\014\n\010POSITION\020\003\022\013\n\007ANOMALY\020\004\022\014\n\010" +
- "INCIDENT\020\005B\026\n\024de.starwit.visionapib\006prot" +
- "o3"
+ "ngitude\030\002 \001(\001\"8\n\016MovementVector\022\021\n\tspeed" +
+ "_kmh\030\001 \001(\001\022\023\n\013heading_deg\030\002 \001(\001\"4\n\013TypeM" +
+ "essage\022%\n\004type\030\350\007 \001(\0162\026.visionapi.Messag" +
+ "eType*e\n\013MessageType\022\017\n\013UNSPECIFIED\020\000\022\007\n" +
+ "\003SAE\020\001\022\023\n\017DETECTION_COUNT\020\002\022\014\n\010POSITION\020" +
+ "\003\022\013\n\007ANOMALY\020\004\022\014\n\010INCIDENT\020\005B\026\n\024de.starw" +
+ "it.visionapib\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -1870,8 +2386,14 @@ public de.starwit.visionapi.Common.TypeMessage getDefaultInstanceForType() {
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_visionapi_GeoCoordinate_descriptor,
new java.lang.String[] { "Latitude", "Longitude", });
- internal_static_visionapi_TypeMessage_descriptor =
+ internal_static_visionapi_MovementVector_descriptor =
getDescriptor().getMessageTypes().get(2);
+ internal_static_visionapi_MovementVector_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_visionapi_MovementVector_descriptor,
+ new java.lang.String[] { "SpeedKmh", "HeadingDeg", });
+ internal_static_visionapi_TypeMessage_descriptor =
+ getDescriptor().getMessageTypes().get(3);
internal_static_visionapi_TypeMessage_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_visionapi_TypeMessage_descriptor,
diff --git a/java/visionapi/src/main/java/de/starwit/visionapi/Sae.java b/java/visionapi/src/main/java/de/starwit/visionapi/Sae.java
index 542030c..4a14f28 100644
--- a/java/visionapi/src/main/java/de/starwit/visionapi/Sae.java
+++ b/java/visionapi/src/main/java/de/starwit/visionapi/Sae.java
@@ -1541,6 +1541,21 @@ public interface VideoFrameOrBuilder extends
* .visionapi.GeoCoordinate camera_location = 6;
*/
de.starwit.visionapi.Common.GeoCoordinateOrBuilder getCameraLocationOrBuilder();
+
+ /**
+ * .visionapi.MovementVector movement_vector = 7;
+ * @return Whether the movementVector field is set.
+ */
+ boolean hasMovementVector();
+ /**
+ * .visionapi.MovementVector movement_vector = 7;
+ * @return The movementVector.
+ */
+ de.starwit.visionapi.Common.MovementVector getMovementVector();
+ /**
+ * .visionapi.MovementVector movement_vector = 7;
+ */
+ de.starwit.visionapi.Common.MovementVectorOrBuilder getMovementVectorOrBuilder();
}
/**
* Protobuf type {@code visionapi.VideoFrame}
@@ -1707,6 +1722,32 @@ public de.starwit.visionapi.Common.GeoCoordinateOrBuilder getCameraLocationOrBui
return cameraLocation_ == null ? de.starwit.visionapi.Common.GeoCoordinate.getDefaultInstance() : cameraLocation_;
}
+ public static final int MOVEMENT_VECTOR_FIELD_NUMBER = 7;
+ private de.starwit.visionapi.Common.MovementVector movementVector_;
+ /**
+ * .visionapi.MovementVector movement_vector = 7;
+ * @return Whether the movementVector field is set.
+ */
+ @java.lang.Override
+ public boolean hasMovementVector() {
+ return ((bitField0_ & 0x00000004) != 0);
+ }
+ /**
+ * .visionapi.MovementVector movement_vector = 7;
+ * @return The movementVector.
+ */
+ @java.lang.Override
+ public de.starwit.visionapi.Common.MovementVector getMovementVector() {
+ return movementVector_ == null ? de.starwit.visionapi.Common.MovementVector.getDefaultInstance() : movementVector_;
+ }
+ /**
+ * .visionapi.MovementVector movement_vector = 7;
+ */
+ @java.lang.Override
+ public de.starwit.visionapi.Common.MovementVectorOrBuilder getMovementVectorOrBuilder() {
+ return movementVector_ == null ? de.starwit.visionapi.Common.MovementVector.getDefaultInstance() : movementVector_;
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -1739,6 +1780,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (((bitField0_ & 0x00000002) != 0)) {
output.writeMessage(6, getCameraLocation());
}
+ if (((bitField0_ & 0x00000004) != 0)) {
+ output.writeMessage(7, getMovementVector());
+ }
getUnknownFields().writeTo(output);
}
@@ -1771,6 +1815,10 @@ public int getSerializedSize() {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(6, getCameraLocation());
}
+ if (((bitField0_ & 0x00000004) != 0)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(7, getMovementVector());
+ }
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
return size;
@@ -1804,6 +1852,11 @@ public boolean equals(final java.lang.Object obj) {
if (!getCameraLocation()
.equals(other.getCameraLocation())) return false;
}
+ if (hasMovementVector() != other.hasMovementVector()) return false;
+ if (hasMovementVector()) {
+ if (!getMovementVector()
+ .equals(other.getMovementVector())) return false;
+ }
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
return true;
}
@@ -1832,6 +1885,10 @@ public int hashCode() {
hash = (37 * hash) + CAMERA_LOCATION_FIELD_NUMBER;
hash = (53 * hash) + getCameraLocation().hashCode();
}
+ if (hasMovementVector()) {
+ hash = (37 * hash) + MOVEMENT_VECTOR_FIELD_NUMBER;
+ hash = (53 * hash) + getMovementVector().hashCode();
+ }
hash = (29 * hash) + getUnknownFields().hashCode();
memoizedHashCode = hash;
return hash;
@@ -1964,6 +2021,7 @@ private void maybeForceBuilderInitialization() {
.alwaysUseFieldBuilders) {
internalGetShapeFieldBuilder();
internalGetCameraLocationFieldBuilder();
+ internalGetMovementVectorFieldBuilder();
}
}
@java.lang.Override
@@ -1984,6 +2042,11 @@ public Builder clear() {
cameraLocationBuilder_.dispose();
cameraLocationBuilder_ = null;
}
+ movementVector_ = null;
+ if (movementVectorBuilder_ != null) {
+ movementVectorBuilder_.dispose();
+ movementVectorBuilder_ = null;
+ }
return this;
}
@@ -2042,6 +2105,12 @@ private void buildPartial0(de.starwit.visionapi.Sae.VideoFrame result) {
: cameraLocationBuilder_.build();
to_bitField0_ |= 0x00000002;
}
+ if (((from_bitField0_ & 0x00000040) != 0)) {
+ result.movementVector_ = movementVectorBuilder_ == null
+ ? movementVector_
+ : movementVectorBuilder_.build();
+ to_bitField0_ |= 0x00000004;
+ }
result.bitField0_ |= to_bitField0_;
}
@@ -2077,6 +2146,9 @@ public Builder mergeFrom(de.starwit.visionapi.Sae.VideoFrame other) {
if (other.hasCameraLocation()) {
mergeCameraLocation(other.getCameraLocation());
}
+ if (other.hasMovementVector()) {
+ mergeMovementVector(other.getMovementVector());
+ }
this.mergeUnknownFields(other.getUnknownFields());
onChanged();
return this;
@@ -2137,6 +2209,13 @@ public Builder mergeFrom(
bitField0_ |= 0x00000020;
break;
} // case 50
+ case 58: {
+ input.readMessage(
+ internalGetMovementVectorFieldBuilder().getBuilder(),
+ extensionRegistry);
+ bitField0_ |= 0x00000040;
+ break;
+ } // case 58
default: {
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
done = true; // was an endgroup tag
@@ -2564,6 +2643,127 @@ public de.starwit.visionapi.Common.GeoCoordinateOrBuilder getCameraLocationOrBui
return cameraLocationBuilder_;
}
+ private de.starwit.visionapi.Common.MovementVector movementVector_;
+ private com.google.protobuf.SingleFieldBuilder<
+ de.starwit.visionapi.Common.MovementVector, de.starwit.visionapi.Common.MovementVector.Builder, de.starwit.visionapi.Common.MovementVectorOrBuilder> movementVectorBuilder_;
+ /**
+ * .visionapi.MovementVector movement_vector = 7;
+ * @return Whether the movementVector field is set.
+ */
+ public boolean hasMovementVector() {
+ return ((bitField0_ & 0x00000040) != 0);
+ }
+ /**
+ * .visionapi.MovementVector movement_vector = 7;
+ * @return The movementVector.
+ */
+ public de.starwit.visionapi.Common.MovementVector getMovementVector() {
+ if (movementVectorBuilder_ == null) {
+ return movementVector_ == null ? de.starwit.visionapi.Common.MovementVector.getDefaultInstance() : movementVector_;
+ } else {
+ return movementVectorBuilder_.getMessage();
+ }
+ }
+ /**
+ * .visionapi.MovementVector movement_vector = 7;
+ */
+ public Builder setMovementVector(de.starwit.visionapi.Common.MovementVector value) {
+ if (movementVectorBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ movementVector_ = value;
+ } else {
+ movementVectorBuilder_.setMessage(value);
+ }
+ bitField0_ |= 0x00000040;
+ onChanged();
+ return this;
+ }
+ /**
+ * .visionapi.MovementVector movement_vector = 7;
+ */
+ public Builder setMovementVector(
+ de.starwit.visionapi.Common.MovementVector.Builder builderForValue) {
+ if (movementVectorBuilder_ == null) {
+ movementVector_ = builderForValue.build();
+ } else {
+ movementVectorBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000040;
+ onChanged();
+ return this;
+ }
+ /**
+ * .visionapi.MovementVector movement_vector = 7;
+ */
+ public Builder mergeMovementVector(de.starwit.visionapi.Common.MovementVector value) {
+ if (movementVectorBuilder_ == null) {
+ if (((bitField0_ & 0x00000040) != 0) &&
+ movementVector_ != null &&
+ movementVector_ != de.starwit.visionapi.Common.MovementVector.getDefaultInstance()) {
+ getMovementVectorBuilder().mergeFrom(value);
+ } else {
+ movementVector_ = value;
+ }
+ } else {
+ movementVectorBuilder_.mergeFrom(value);
+ }
+ if (movementVector_ != null) {
+ bitField0_ |= 0x00000040;
+ onChanged();
+ }
+ return this;
+ }
+ /**
+ * .visionapi.MovementVector movement_vector = 7;
+ */
+ public Builder clearMovementVector() {
+ bitField0_ = (bitField0_ & ~0x00000040);
+ movementVector_ = null;
+ if (movementVectorBuilder_ != null) {
+ movementVectorBuilder_.dispose();
+ movementVectorBuilder_ = null;
+ }
+ onChanged();
+ return this;
+ }
+ /**
+ * .visionapi.MovementVector movement_vector = 7;
+ */
+ public de.starwit.visionapi.Common.MovementVector.Builder getMovementVectorBuilder() {
+ bitField0_ |= 0x00000040;
+ onChanged();
+ return internalGetMovementVectorFieldBuilder().getBuilder();
+ }
+ /**
+ * .visionapi.MovementVector movement_vector = 7;
+ */
+ public de.starwit.visionapi.Common.MovementVectorOrBuilder getMovementVectorOrBuilder() {
+ if (movementVectorBuilder_ != null) {
+ return movementVectorBuilder_.getMessageOrBuilder();
+ } else {
+ return movementVector_ == null ?
+ de.starwit.visionapi.Common.MovementVector.getDefaultInstance() : movementVector_;
+ }
+ }
+ /**
+ * .visionapi.MovementVector movement_vector = 7;
+ */
+ private com.google.protobuf.SingleFieldBuilder<
+ de.starwit.visionapi.Common.MovementVector, de.starwit.visionapi.Common.MovementVector.Builder, de.starwit.visionapi.Common.MovementVectorOrBuilder>
+ internalGetMovementVectorFieldBuilder() {
+ if (movementVectorBuilder_ == null) {
+ movementVectorBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ de.starwit.visionapi.Common.MovementVector, de.starwit.visionapi.Common.MovementVector.Builder, de.starwit.visionapi.Common.MovementVectorOrBuilder>(
+ getMovementVector(),
+ getParentForChildren(),
+ isClean());
+ movementVector_ = null;
+ }
+ return movementVectorBuilder_;
+ }
+
// @@protoc_insertion_point(builder_scope:visionapi.VideoFrame)
}
@@ -6064,6 +6264,36 @@ public interface PositionMessageOrBuilder extends
*/
com.google.protobuf.ByteString getSaeUuid();
+ /**
+ * .visionapi.MovementVector movement_vector = 6;
+ * @return Whether the movementVector field is set.
+ */
+ boolean hasMovementVector();
+ /**
+ * .visionapi.MovementVector movement_vector = 6;
+ * @return The movementVector.
+ */
+ de.starwit.visionapi.Common.MovementVector getMovementVector();
+ /**
+ * .visionapi.MovementVector movement_vector = 6;
+ */
+ de.starwit.visionapi.Common.MovementVectorOrBuilder getMovementVectorOrBuilder();
+
+ /**
+ * .visionapi.GeoCoordinate raw_geo_coordinate = 7;
+ * @return Whether the rawGeoCoordinate field is set.
+ */
+ boolean hasRawGeoCoordinate();
+ /**
+ * .visionapi.GeoCoordinate raw_geo_coordinate = 7;
+ * @return The rawGeoCoordinate.
+ */
+ de.starwit.visionapi.Common.GeoCoordinate getRawGeoCoordinate();
+ /**
+ * .visionapi.GeoCoordinate raw_geo_coordinate = 7;
+ */
+ de.starwit.visionapi.Common.GeoCoordinateOrBuilder getRawGeoCoordinateOrBuilder();
+
/**
* .visionapi.MessageType type = 1000;
* @return The enum numeric value on the wire for type.
@@ -6185,6 +6415,58 @@ public com.google.protobuf.ByteString getSaeUuid() {
return saeUuid_;
}
+ public static final int MOVEMENT_VECTOR_FIELD_NUMBER = 6;
+ private de.starwit.visionapi.Common.MovementVector movementVector_;
+ /**
+ * .visionapi.MovementVector movement_vector = 6;
+ * @return Whether the movementVector field is set.
+ */
+ @java.lang.Override
+ public boolean hasMovementVector() {
+ return ((bitField0_ & 0x00000002) != 0);
+ }
+ /**
+ * .visionapi.MovementVector movement_vector = 6;
+ * @return The movementVector.
+ */
+ @java.lang.Override
+ public de.starwit.visionapi.Common.MovementVector getMovementVector() {
+ return movementVector_ == null ? de.starwit.visionapi.Common.MovementVector.getDefaultInstance() : movementVector_;
+ }
+ /**
+ * .visionapi.MovementVector movement_vector = 6;
+ */
+ @java.lang.Override
+ public de.starwit.visionapi.Common.MovementVectorOrBuilder getMovementVectorOrBuilder() {
+ return movementVector_ == null ? de.starwit.visionapi.Common.MovementVector.getDefaultInstance() : movementVector_;
+ }
+
+ public static final int RAW_GEO_COORDINATE_FIELD_NUMBER = 7;
+ private de.starwit.visionapi.Common.GeoCoordinate rawGeoCoordinate_;
+ /**
+ * .visionapi.GeoCoordinate raw_geo_coordinate = 7;
+ * @return Whether the rawGeoCoordinate field is set.
+ */
+ @java.lang.Override
+ public boolean hasRawGeoCoordinate() {
+ return ((bitField0_ & 0x00000004) != 0);
+ }
+ /**
+ * .visionapi.GeoCoordinate raw_geo_coordinate = 7;
+ * @return The rawGeoCoordinate.
+ */
+ @java.lang.Override
+ public de.starwit.visionapi.Common.GeoCoordinate getRawGeoCoordinate() {
+ return rawGeoCoordinate_ == null ? de.starwit.visionapi.Common.GeoCoordinate.getDefaultInstance() : rawGeoCoordinate_;
+ }
+ /**
+ * .visionapi.GeoCoordinate raw_geo_coordinate = 7;
+ */
+ @java.lang.Override
+ public de.starwit.visionapi.Common.GeoCoordinateOrBuilder getRawGeoCoordinateOrBuilder() {
+ return rawGeoCoordinate_ == null ? de.starwit.visionapi.Common.GeoCoordinate.getDefaultInstance() : rawGeoCoordinate_;
+ }
+
public static final int TYPE_FIELD_NUMBER = 1000;
private int type_ = 0;
/**
@@ -6232,6 +6514,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!saeUuid_.isEmpty()) {
output.writeBytes(5, saeUuid_);
}
+ if (((bitField0_ & 0x00000002) != 0)) {
+ output.writeMessage(6, getMovementVector());
+ }
+ if (((bitField0_ & 0x00000004) != 0)) {
+ output.writeMessage(7, getRawGeoCoordinate());
+ }
if (type_ != de.starwit.visionapi.Common.MessageType.UNSPECIFIED.getNumber()) {
output.writeEnum(1000, type_);
}
@@ -6264,6 +6552,14 @@ public int getSerializedSize() {
size += com.google.protobuf.CodedOutputStream
.computeBytesSize(5, saeUuid_);
}
+ if (((bitField0_ & 0x00000002) != 0)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(6, getMovementVector());
+ }
+ if (((bitField0_ & 0x00000004) != 0)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(7, getRawGeoCoordinate());
+ }
if (type_ != de.starwit.visionapi.Common.MessageType.UNSPECIFIED.getNumber()) {
size += com.google.protobuf.CodedOutputStream
.computeEnumSize(1000, type_);
@@ -6297,6 +6593,16 @@ public boolean equals(final java.lang.Object obj) {
!= other.getFix()) return false;
if (!getSaeUuid()
.equals(other.getSaeUuid())) return false;
+ if (hasMovementVector() != other.hasMovementVector()) return false;
+ if (hasMovementVector()) {
+ if (!getMovementVector()
+ .equals(other.getMovementVector())) return false;
+ }
+ if (hasRawGeoCoordinate() != other.hasRawGeoCoordinate()) return false;
+ if (hasRawGeoCoordinate()) {
+ if (!getRawGeoCoordinate()
+ .equals(other.getRawGeoCoordinate())) return false;
+ }
if (type_ != other.type_) return false;
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
return true;
@@ -6324,6 +6630,14 @@ public int hashCode() {
getFix());
hash = (37 * hash) + SAE_UUID_FIELD_NUMBER;
hash = (53 * hash) + getSaeUuid().hashCode();
+ if (hasMovementVector()) {
+ hash = (37 * hash) + MOVEMENT_VECTOR_FIELD_NUMBER;
+ hash = (53 * hash) + getMovementVector().hashCode();
+ }
+ if (hasRawGeoCoordinate()) {
+ hash = (37 * hash) + RAW_GEO_COORDINATE_FIELD_NUMBER;
+ hash = (53 * hash) + getRawGeoCoordinate().hashCode();
+ }
hash = (37 * hash) + TYPE_FIELD_NUMBER;
hash = (53 * hash) + type_;
hash = (29 * hash) + getUnknownFields().hashCode();
@@ -6457,6 +6771,8 @@ private void maybeForceBuilderInitialization() {
if (com.google.protobuf.GeneratedMessage
.alwaysUseFieldBuilders) {
internalGetGeoCoordinateFieldBuilder();
+ internalGetMovementVectorFieldBuilder();
+ internalGetRawGeoCoordinateFieldBuilder();
}
}
@java.lang.Override
@@ -6472,6 +6788,16 @@ public Builder clear() {
hdop_ = 0F;
fix_ = false;
saeUuid_ = com.google.protobuf.ByteString.EMPTY;
+ movementVector_ = null;
+ if (movementVectorBuilder_ != null) {
+ movementVectorBuilder_.dispose();
+ movementVectorBuilder_ = null;
+ }
+ rawGeoCoordinate_ = null;
+ if (rawGeoCoordinateBuilder_ != null) {
+ rawGeoCoordinateBuilder_.dispose();
+ rawGeoCoordinateBuilder_ = null;
+ }
type_ = 0;
return this;
}
@@ -6526,6 +6852,18 @@ private void buildPartial0(de.starwit.visionapi.Sae.PositionMessage result) {
result.saeUuid_ = saeUuid_;
}
if (((from_bitField0_ & 0x00000020) != 0)) {
+ result.movementVector_ = movementVectorBuilder_ == null
+ ? movementVector_
+ : movementVectorBuilder_.build();
+ to_bitField0_ |= 0x00000002;
+ }
+ if (((from_bitField0_ & 0x00000040) != 0)) {
+ result.rawGeoCoordinate_ = rawGeoCoordinateBuilder_ == null
+ ? rawGeoCoordinate_
+ : rawGeoCoordinateBuilder_.build();
+ to_bitField0_ |= 0x00000004;
+ }
+ if (((from_bitField0_ & 0x00000080) != 0)) {
result.type_ = type_;
}
result.bitField0_ |= to_bitField0_;
@@ -6558,6 +6896,12 @@ public Builder mergeFrom(de.starwit.visionapi.Sae.PositionMessage other) {
if (!other.getSaeUuid().isEmpty()) {
setSaeUuid(other.getSaeUuid());
}
+ if (other.hasMovementVector()) {
+ mergeMovementVector(other.getMovementVector());
+ }
+ if (other.hasRawGeoCoordinate()) {
+ mergeRawGeoCoordinate(other.getRawGeoCoordinate());
+ }
if (other.type_ != 0) {
setTypeValue(other.getTypeValue());
}
@@ -6614,9 +6958,23 @@ public Builder mergeFrom(
bitField0_ |= 0x00000010;
break;
} // case 42
+ case 50: {
+ input.readMessage(
+ internalGetMovementVectorFieldBuilder().getBuilder(),
+ extensionRegistry);
+ bitField0_ |= 0x00000020;
+ break;
+ } // case 50
+ case 58: {
+ input.readMessage(
+ internalGetRawGeoCoordinateFieldBuilder().getBuilder(),
+ extensionRegistry);
+ bitField0_ |= 0x00000040;
+ break;
+ } // case 58
case 8000: {
type_ = input.readEnum();
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000080;
break;
} // case 8000
default: {
@@ -6885,6 +7243,248 @@ public Builder clearSaeUuid() {
return this;
}
+ private de.starwit.visionapi.Common.MovementVector movementVector_;
+ private com.google.protobuf.SingleFieldBuilder<
+ de.starwit.visionapi.Common.MovementVector, de.starwit.visionapi.Common.MovementVector.Builder, de.starwit.visionapi.Common.MovementVectorOrBuilder> movementVectorBuilder_;
+ /**
+ * .visionapi.MovementVector movement_vector = 6;
+ * @return Whether the movementVector field is set.
+ */
+ public boolean hasMovementVector() {
+ return ((bitField0_ & 0x00000020) != 0);
+ }
+ /**
+ * .visionapi.MovementVector movement_vector = 6;
+ * @return The movementVector.
+ */
+ public de.starwit.visionapi.Common.MovementVector getMovementVector() {
+ if (movementVectorBuilder_ == null) {
+ return movementVector_ == null ? de.starwit.visionapi.Common.MovementVector.getDefaultInstance() : movementVector_;
+ } else {
+ return movementVectorBuilder_.getMessage();
+ }
+ }
+ /**
+ * .visionapi.MovementVector movement_vector = 6;
+ */
+ public Builder setMovementVector(de.starwit.visionapi.Common.MovementVector value) {
+ if (movementVectorBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ movementVector_ = value;
+ } else {
+ movementVectorBuilder_.setMessage(value);
+ }
+ bitField0_ |= 0x00000020;
+ onChanged();
+ return this;
+ }
+ /**
+ * .visionapi.MovementVector movement_vector = 6;
+ */
+ public Builder setMovementVector(
+ de.starwit.visionapi.Common.MovementVector.Builder builderForValue) {
+ if (movementVectorBuilder_ == null) {
+ movementVector_ = builderForValue.build();
+ } else {
+ movementVectorBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000020;
+ onChanged();
+ return this;
+ }
+ /**
+ * .visionapi.MovementVector movement_vector = 6;
+ */
+ public Builder mergeMovementVector(de.starwit.visionapi.Common.MovementVector value) {
+ if (movementVectorBuilder_ == null) {
+ if (((bitField0_ & 0x00000020) != 0) &&
+ movementVector_ != null &&
+ movementVector_ != de.starwit.visionapi.Common.MovementVector.getDefaultInstance()) {
+ getMovementVectorBuilder().mergeFrom(value);
+ } else {
+ movementVector_ = value;
+ }
+ } else {
+ movementVectorBuilder_.mergeFrom(value);
+ }
+ if (movementVector_ != null) {
+ bitField0_ |= 0x00000020;
+ onChanged();
+ }
+ return this;
+ }
+ /**
+ * .visionapi.MovementVector movement_vector = 6;
+ */
+ public Builder clearMovementVector() {
+ bitField0_ = (bitField0_ & ~0x00000020);
+ movementVector_ = null;
+ if (movementVectorBuilder_ != null) {
+ movementVectorBuilder_.dispose();
+ movementVectorBuilder_ = null;
+ }
+ onChanged();
+ return this;
+ }
+ /**
+ * .visionapi.MovementVector movement_vector = 6;
+ */
+ public de.starwit.visionapi.Common.MovementVector.Builder getMovementVectorBuilder() {
+ bitField0_ |= 0x00000020;
+ onChanged();
+ return internalGetMovementVectorFieldBuilder().getBuilder();
+ }
+ /**
+ * .visionapi.MovementVector movement_vector = 6;
+ */
+ public de.starwit.visionapi.Common.MovementVectorOrBuilder getMovementVectorOrBuilder() {
+ if (movementVectorBuilder_ != null) {
+ return movementVectorBuilder_.getMessageOrBuilder();
+ } else {
+ return movementVector_ == null ?
+ de.starwit.visionapi.Common.MovementVector.getDefaultInstance() : movementVector_;
+ }
+ }
+ /**
+ * .visionapi.MovementVector movement_vector = 6;
+ */
+ private com.google.protobuf.SingleFieldBuilder<
+ de.starwit.visionapi.Common.MovementVector, de.starwit.visionapi.Common.MovementVector.Builder, de.starwit.visionapi.Common.MovementVectorOrBuilder>
+ internalGetMovementVectorFieldBuilder() {
+ if (movementVectorBuilder_ == null) {
+ movementVectorBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ de.starwit.visionapi.Common.MovementVector, de.starwit.visionapi.Common.MovementVector.Builder, de.starwit.visionapi.Common.MovementVectorOrBuilder>(
+ getMovementVector(),
+ getParentForChildren(),
+ isClean());
+ movementVector_ = null;
+ }
+ return movementVectorBuilder_;
+ }
+
+ private de.starwit.visionapi.Common.GeoCoordinate rawGeoCoordinate_;
+ private com.google.protobuf.SingleFieldBuilder<
+ de.starwit.visionapi.Common.GeoCoordinate, de.starwit.visionapi.Common.GeoCoordinate.Builder, de.starwit.visionapi.Common.GeoCoordinateOrBuilder> rawGeoCoordinateBuilder_;
+ /**
+ * .visionapi.GeoCoordinate raw_geo_coordinate = 7;
+ * @return Whether the rawGeoCoordinate field is set.
+ */
+ public boolean hasRawGeoCoordinate() {
+ return ((bitField0_ & 0x00000040) != 0);
+ }
+ /**
+ * .visionapi.GeoCoordinate raw_geo_coordinate = 7;
+ * @return The rawGeoCoordinate.
+ */
+ public de.starwit.visionapi.Common.GeoCoordinate getRawGeoCoordinate() {
+ if (rawGeoCoordinateBuilder_ == null) {
+ return rawGeoCoordinate_ == null ? de.starwit.visionapi.Common.GeoCoordinate.getDefaultInstance() : rawGeoCoordinate_;
+ } else {
+ return rawGeoCoordinateBuilder_.getMessage();
+ }
+ }
+ /**
+ * .visionapi.GeoCoordinate raw_geo_coordinate = 7;
+ */
+ public Builder setRawGeoCoordinate(de.starwit.visionapi.Common.GeoCoordinate value) {
+ if (rawGeoCoordinateBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ rawGeoCoordinate_ = value;
+ } else {
+ rawGeoCoordinateBuilder_.setMessage(value);
+ }
+ bitField0_ |= 0x00000040;
+ onChanged();
+ return this;
+ }
+ /**
+ * .visionapi.GeoCoordinate raw_geo_coordinate = 7;
+ */
+ public Builder setRawGeoCoordinate(
+ de.starwit.visionapi.Common.GeoCoordinate.Builder builderForValue) {
+ if (rawGeoCoordinateBuilder_ == null) {
+ rawGeoCoordinate_ = builderForValue.build();
+ } else {
+ rawGeoCoordinateBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000040;
+ onChanged();
+ return this;
+ }
+ /**
+ * .visionapi.GeoCoordinate raw_geo_coordinate = 7;
+ */
+ public Builder mergeRawGeoCoordinate(de.starwit.visionapi.Common.GeoCoordinate value) {
+ if (rawGeoCoordinateBuilder_ == null) {
+ if (((bitField0_ & 0x00000040) != 0) &&
+ rawGeoCoordinate_ != null &&
+ rawGeoCoordinate_ != de.starwit.visionapi.Common.GeoCoordinate.getDefaultInstance()) {
+ getRawGeoCoordinateBuilder().mergeFrom(value);
+ } else {
+ rawGeoCoordinate_ = value;
+ }
+ } else {
+ rawGeoCoordinateBuilder_.mergeFrom(value);
+ }
+ if (rawGeoCoordinate_ != null) {
+ bitField0_ |= 0x00000040;
+ onChanged();
+ }
+ return this;
+ }
+ /**
+ * .visionapi.GeoCoordinate raw_geo_coordinate = 7;
+ */
+ public Builder clearRawGeoCoordinate() {
+ bitField0_ = (bitField0_ & ~0x00000040);
+ rawGeoCoordinate_ = null;
+ if (rawGeoCoordinateBuilder_ != null) {
+ rawGeoCoordinateBuilder_.dispose();
+ rawGeoCoordinateBuilder_ = null;
+ }
+ onChanged();
+ return this;
+ }
+ /**
+ * .visionapi.GeoCoordinate raw_geo_coordinate = 7;
+ */
+ public de.starwit.visionapi.Common.GeoCoordinate.Builder getRawGeoCoordinateBuilder() {
+ bitField0_ |= 0x00000040;
+ onChanged();
+ return internalGetRawGeoCoordinateFieldBuilder().getBuilder();
+ }
+ /**
+ * .visionapi.GeoCoordinate raw_geo_coordinate = 7;
+ */
+ public de.starwit.visionapi.Common.GeoCoordinateOrBuilder getRawGeoCoordinateOrBuilder() {
+ if (rawGeoCoordinateBuilder_ != null) {
+ return rawGeoCoordinateBuilder_.getMessageOrBuilder();
+ } else {
+ return rawGeoCoordinate_ == null ?
+ de.starwit.visionapi.Common.GeoCoordinate.getDefaultInstance() : rawGeoCoordinate_;
+ }
+ }
+ /**
+ * .visionapi.GeoCoordinate raw_geo_coordinate = 7;
+ */
+ private com.google.protobuf.SingleFieldBuilder<
+ de.starwit.visionapi.Common.GeoCoordinate, de.starwit.visionapi.Common.GeoCoordinate.Builder, de.starwit.visionapi.Common.GeoCoordinateOrBuilder>
+ internalGetRawGeoCoordinateFieldBuilder() {
+ if (rawGeoCoordinateBuilder_ == null) {
+ rawGeoCoordinateBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ de.starwit.visionapi.Common.GeoCoordinate, de.starwit.visionapi.Common.GeoCoordinate.Builder, de.starwit.visionapi.Common.GeoCoordinateOrBuilder>(
+ getRawGeoCoordinate(),
+ getParentForChildren(),
+ isClean());
+ rawGeoCoordinate_ = null;
+ }
+ return rawGeoCoordinateBuilder_;
+ }
+
private int type_ = 0;
/**
* .visionapi.MessageType type = 1000;
@@ -6900,7 +7500,7 @@ public Builder clearSaeUuid() {
*/
public Builder setTypeValue(int value) {
type_ = value;
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000080;
onChanged();
return this;
}
@@ -6920,7 +7520,7 @@ public de.starwit.visionapi.Common.MessageType getType() {
*/
public Builder setType(de.starwit.visionapi.Common.MessageType value) {
if (value == null) { throw new NullPointerException(); }
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000080;
type_ = value.getNumber();
onChanged();
return this;
@@ -6930,7 +7530,7 @@ public Builder setType(de.starwit.visionapi.Common.MessageType value) {
* @return This builder for chaining.
*/
public Builder clearType() {
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000080);
type_ = 0;
onChanged();
return this;
@@ -7047,30 +7647,34 @@ public de.starwit.visionapi.Sae.PositionMessage getDefaultInstanceForType() {
"ons\030\002 \003(\0132\024.visionapi.Detection\022#\n\007metri" +
"cs\030c \001(\0132\022.visionapi.Metrics\0220\n\016model_me" +
"tadata\030d \001(\0132\030.visionapi.ModelMetadata\022%" +
- "\n\004type\030\350\007 \001(\0162\026.visionapi.MessageType\"\272\001" +
+ "\n\004type\030\350\007 \001(\0162\026.visionapi.MessageType\"\356\001" +
"\n\nVideoFrame\022\021\n\tsource_id\030\001 \001(\t\022\030\n\020times" +
"tamp_utc_ms\030\002 \001(\004\022\037\n\005shape\030\003 \001(\0132\020.visio" +
"napi.Shape\022\022\n\nframe_data\030\004 \001(\014\022\027\n\017frame_" +
"data_jpeg\030\005 \001(\014\0221\n\017camera_location\030\006 \001(\013" +
- "2\030.visionapi.GeoCoordinate\"8\n\005Shape\022\016\n\006h" +
- "eight\030\001 \001(\r\022\r\n\005width\030\002 \001(\r\022\020\n\010channels\030\003" +
- " \001(\r\"\244\001\n\tDetection\022,\n\014bounding_box\030\001 \001(\013" +
- "2\026.visionapi.BoundingBox\022\022\n\nconfidence\030\002" +
- " \001(\002\022\020\n\010class_id\030\003 \001(\r\022\021\n\tobject_id\030\004 \001(" +
- "\014\0220\n\016geo_coordinate\030\005 \001(\0132\030.visionapi.Ge" +
- "oCoordinate\"I\n\013BoundingBox\022\r\n\005min_x\030\001 \001(" +
- "\002\022\r\n\005min_y\030\002 \001(\002\022\r\n\005max_x\030\003 \001(\002\022\r\n\005max_y" +
- "\030\004 \001(\002\"R\n\007Metrics\022#\n\033detection_inference" +
- "_time_us\030\001 \001(\r\022\"\n\032tracking_inference_tim" +
- "e_us\030\002 \001(\r\"\201\001\n\rModelMetadata\022=\n\013class_na" +
- "mes\030\001 \003(\0132(.visionapi.ModelMetadata.Clas" +
- "sNamesEntry\0321\n\017ClassNamesEntry\022\013\n\003key\030\001 " +
- "\001(\r\022\r\n\005value\030\002 \001(\t:\0028\001\"\261\001\n\017PositionMessa" +
- "ge\022\030\n\020timestamp_utc_ms\030\001 \001(\004\0220\n\016geo_coor" +
- "dinate\030\002 \001(\0132\030.visionapi.GeoCoordinate\022\014" +
- "\n\004hdop\030\003 \001(\002\022\013\n\003fix\030\004 \001(\010\022\020\n\010sae_uuid\030\005 " +
- "\001(\014\022%\n\004type\030\350\007 \001(\0162\026.visionapi.MessageTy" +
- "peB\026\n\024de.starwit.visionapib\006proto3"
+ "2\030.visionapi.GeoCoordinate\0222\n\017movement_v" +
+ "ector\030\007 \001(\0132\031.visionapi.MovementVector\"8" +
+ "\n\005Shape\022\016\n\006height\030\001 \001(\r\022\r\n\005width\030\002 \001(\r\022\020" +
+ "\n\010channels\030\003 \001(\r\"\244\001\n\tDetection\022,\n\014boundi" +
+ "ng_box\030\001 \001(\0132\026.visionapi.BoundingBox\022\022\n\n" +
+ "confidence\030\002 \001(\002\022\020\n\010class_id\030\003 \001(\r\022\021\n\tob" +
+ "ject_id\030\004 \001(\014\0220\n\016geo_coordinate\030\005 \001(\0132\030." +
+ "visionapi.GeoCoordinate\"I\n\013BoundingBox\022\r" +
+ "\n\005min_x\030\001 \001(\002\022\r\n\005min_y\030\002 \001(\002\022\r\n\005max_x\030\003 " +
+ "\001(\002\022\r\n\005max_y\030\004 \001(\002\"R\n\007Metrics\022#\n\033detecti" +
+ "on_inference_time_us\030\001 \001(\r\022\"\n\032tracking_i" +
+ "nference_time_us\030\002 \001(\r\"\201\001\n\rModelMetadata" +
+ "\022=\n\013class_names\030\001 \003(\0132(.visionapi.ModelM" +
+ "etadata.ClassNamesEntry\0321\n\017ClassNamesEnt" +
+ "ry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\t:\0028\001\"\233\002\n\017P" +
+ "ositionMessage\022\030\n\020timestamp_utc_ms\030\001 \001(\004" +
+ "\0220\n\016geo_coordinate\030\002 \001(\0132\030.visionapi.Geo" +
+ "Coordinate\022\014\n\004hdop\030\003 \001(\002\022\013\n\003fix\030\004 \001(\010\022\020\n" +
+ "\010sae_uuid\030\005 \001(\014\0222\n\017movement_vector\030\006 \001(\013" +
+ "2\031.visionapi.MovementVector\0224\n\022raw_geo_c" +
+ "oordinate\030\007 \001(\0132\030.visionapi.GeoCoordinat" +
+ "e\022%\n\004type\030\350\007 \001(\0162\026.visionapi.MessageType" +
+ "B\026\n\024de.starwit.visionapib\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -7088,7 +7692,7 @@ public de.starwit.visionapi.Sae.PositionMessage getDefaultInstanceForType() {
internal_static_visionapi_VideoFrame_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_visionapi_VideoFrame_descriptor,
- new java.lang.String[] { "SourceId", "TimestampUtcMs", "Shape", "FrameData", "FrameDataJpeg", "CameraLocation", });
+ new java.lang.String[] { "SourceId", "TimestampUtcMs", "Shape", "FrameData", "FrameDataJpeg", "CameraLocation", "MovementVector", });
internal_static_visionapi_Shape_descriptor =
getDescriptor().getMessageTypes().get(2);
internal_static_visionapi_Shape_fieldAccessorTable = new
@@ -7130,7 +7734,7 @@ public de.starwit.visionapi.Sae.PositionMessage getDefaultInstanceForType() {
internal_static_visionapi_PositionMessage_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_visionapi_PositionMessage_descriptor,
- new java.lang.String[] { "TimestampUtcMs", "GeoCoordinate", "Hdop", "Fix", "SaeUuid", "Type", });
+ new java.lang.String[] { "TimestampUtcMs", "GeoCoordinate", "Hdop", "Fix", "SaeUuid", "MovementVector", "RawGeoCoordinate", "Type", });
descriptor.resolveAllFeaturesImmutable();
de.starwit.visionapi.Common.getDescriptor();
}
diff --git a/python/visionapi/pyproject.toml b/python/visionapi/pyproject.toml
index 93a9f27..650fecb 100644
--- a/python/visionapi/pyproject.toml
+++ b/python/visionapi/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "visionapi"
-version = "3.5.3"
+version = "3.6.0"
description = ""
authors = ["flonix8 "]
readme = "README.md"
diff --git a/python/visionapi/visionapi/common_pb2.py b/python/visionapi/visionapi/common_pb2.py
index d6581ae..8edadc2 100644
--- a/python/visionapi/visionapi/common_pb2.py
+++ b/python/visionapi/visionapi/common_pb2.py
@@ -24,7 +24,7 @@
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16visionapi/common.proto\x12\tvisionapi\"*\n\tModelInfo\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\t\"4\n\rGeoCoordinate\x12\x10\n\x08latitude\x18\x01 \x01(\x01\x12\x11\n\tlongitude\x18\x02 \x01(\x01\"4\n\x0bTypeMessage\x12%\n\x04type\x18\xe8\x07 \x01(\x0e\x32\x16.visionapi.MessageType*e\n\x0bMessageType\x12\x0f\n\x0bUNSPECIFIED\x10\x00\x12\x07\n\x03SAE\x10\x01\x12\x13\n\x0f\x44\x45TECTION_COUNT\x10\x02\x12\x0c\n\x08POSITION\x10\x03\x12\x0b\n\x07\x41NOMALY\x10\x04\x12\x0c\n\x08INCIDENT\x10\x05\x42\x16\n\x14\x64\x65.starwit.visionapib\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16visionapi/common.proto\x12\tvisionapi\"*\n\tModelInfo\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\t\"4\n\rGeoCoordinate\x12\x10\n\x08latitude\x18\x01 \x01(\x01\x12\x11\n\tlongitude\x18\x02 \x01(\x01\"8\n\x0eMovementVector\x12\x11\n\tspeed_kmh\x18\x01 \x01(\x01\x12\x13\n\x0bheading_deg\x18\x02 \x01(\x01\"4\n\x0bTypeMessage\x12%\n\x04type\x18\xe8\x07 \x01(\x0e\x32\x16.visionapi.MessageType*e\n\x0bMessageType\x12\x0f\n\x0bUNSPECIFIED\x10\x00\x12\x07\n\x03SAE\x10\x01\x12\x13\n\x0f\x44\x45TECTION_COUNT\x10\x02\x12\x0c\n\x08POSITION\x10\x03\x12\x0b\n\x07\x41NOMALY\x10\x04\x12\x0c\n\x08INCIDENT\x10\x05\x42\x16\n\x14\x64\x65.starwit.visionapib\x06proto3')
_globals = globals()
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -32,12 +32,14 @@
if not _descriptor._USE_C_DESCRIPTORS:
_globals['DESCRIPTOR']._loaded_options = None
_globals['DESCRIPTOR']._serialized_options = b'\n\024de.starwit.visionapi'
- _globals['_MESSAGETYPE']._serialized_start=189
- _globals['_MESSAGETYPE']._serialized_end=290
+ _globals['_MESSAGETYPE']._serialized_start=247
+ _globals['_MESSAGETYPE']._serialized_end=348
_globals['_MODELINFO']._serialized_start=37
_globals['_MODELINFO']._serialized_end=79
_globals['_GEOCOORDINATE']._serialized_start=81
_globals['_GEOCOORDINATE']._serialized_end=133
- _globals['_TYPEMESSAGE']._serialized_start=135
- _globals['_TYPEMESSAGE']._serialized_end=187
+ _globals['_MOVEMENTVECTOR']._serialized_start=135
+ _globals['_MOVEMENTVECTOR']._serialized_end=191
+ _globals['_TYPEMESSAGE']._serialized_start=193
+ _globals['_TYPEMESSAGE']._serialized_end=245
# @@protoc_insertion_point(module_scope)
diff --git a/python/visionapi/visionapi/common_pb2.pyi b/python/visionapi/visionapi/common_pb2.pyi
index bdee06f..d874907 100644
--- a/python/visionapi/visionapi/common_pb2.pyi
+++ b/python/visionapi/visionapi/common_pb2.pyi
@@ -36,6 +36,14 @@ class GeoCoordinate(_message.Message):
longitude: float
def __init__(self, latitude: _Optional[float] = ..., longitude: _Optional[float] = ...) -> None: ...
+class MovementVector(_message.Message):
+ __slots__ = ("speed_kmh", "heading_deg")
+ SPEED_KMH_FIELD_NUMBER: _ClassVar[int]
+ HEADING_DEG_FIELD_NUMBER: _ClassVar[int]
+ speed_kmh: float
+ heading_deg: float
+ def __init__(self, speed_kmh: _Optional[float] = ..., heading_deg: _Optional[float] = ...) -> None: ...
+
class TypeMessage(_message.Message):
__slots__ = ("type",)
TYPE_FIELD_NUMBER: _ClassVar[int]
diff --git a/python/visionapi/visionapi/sae_pb2.py b/python/visionapi/visionapi/sae_pb2.py
index 8e2dbf7..ac82992 100644
--- a/python/visionapi/visionapi/sae_pb2.py
+++ b/python/visionapi/visionapi/sae_pb2.py
@@ -25,7 +25,7 @@
from visionapi import common_pb2 as visionapi_dot_common__pb2
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x13visionapi/sae.proto\x12\tvisionapi\x1a\x16visionapi/common.proto\"\xda\x01\n\nSaeMessage\x12$\n\x05\x66rame\x18\x01 \x01(\x0b\x32\x15.visionapi.VideoFrame\x12(\n\ndetections\x18\x02 \x03(\x0b\x32\x14.visionapi.Detection\x12#\n\x07metrics\x18\x63 \x01(\x0b\x32\x12.visionapi.Metrics\x12\x30\n\x0emodel_metadata\x18\x64 \x01(\x0b\x32\x18.visionapi.ModelMetadata\x12%\n\x04type\x18\xe8\x07 \x01(\x0e\x32\x16.visionapi.MessageType\"\xba\x01\n\nVideoFrame\x12\x11\n\tsource_id\x18\x01 \x01(\t\x12\x18\n\x10timestamp_utc_ms\x18\x02 \x01(\x04\x12\x1f\n\x05shape\x18\x03 \x01(\x0b\x32\x10.visionapi.Shape\x12\x12\n\nframe_data\x18\x04 \x01(\x0c\x12\x17\n\x0f\x66rame_data_jpeg\x18\x05 \x01(\x0c\x12\x31\n\x0f\x63\x61mera_location\x18\x06 \x01(\x0b\x32\x18.visionapi.GeoCoordinate\"8\n\x05Shape\x12\x0e\n\x06height\x18\x01 \x01(\r\x12\r\n\x05width\x18\x02 \x01(\r\x12\x10\n\x08\x63hannels\x18\x03 \x01(\r\"\xa4\x01\n\tDetection\x12,\n\x0c\x62ounding_box\x18\x01 \x01(\x0b\x32\x16.visionapi.BoundingBox\x12\x12\n\nconfidence\x18\x02 \x01(\x02\x12\x10\n\x08\x63lass_id\x18\x03 \x01(\r\x12\x11\n\tobject_id\x18\x04 \x01(\x0c\x12\x30\n\x0egeo_coordinate\x18\x05 \x01(\x0b\x32\x18.visionapi.GeoCoordinate\"I\n\x0b\x42oundingBox\x12\r\n\x05min_x\x18\x01 \x01(\x02\x12\r\n\x05min_y\x18\x02 \x01(\x02\x12\r\n\x05max_x\x18\x03 \x01(\x02\x12\r\n\x05max_y\x18\x04 \x01(\x02\"R\n\x07Metrics\x12#\n\x1b\x64\x65tection_inference_time_us\x18\x01 \x01(\r\x12\"\n\x1atracking_inference_time_us\x18\x02 \x01(\r\"\x81\x01\n\rModelMetadata\x12=\n\x0b\x63lass_names\x18\x01 \x03(\x0b\x32(.visionapi.ModelMetadata.ClassNamesEntry\x1a\x31\n\x0f\x43lassNamesEntry\x12\x0b\n\x03key\x18\x01 \x01(\r\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xb1\x01\n\x0fPositionMessage\x12\x18\n\x10timestamp_utc_ms\x18\x01 \x01(\x04\x12\x30\n\x0egeo_coordinate\x18\x02 \x01(\x0b\x32\x18.visionapi.GeoCoordinate\x12\x0c\n\x04hdop\x18\x03 \x01(\x02\x12\x0b\n\x03\x66ix\x18\x04 \x01(\x08\x12\x10\n\x08sae_uuid\x18\x05 \x01(\x0c\x12%\n\x04type\x18\xe8\x07 \x01(\x0e\x32\x16.visionapi.MessageTypeB\x16\n\x14\x64\x65.starwit.visionapib\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x13visionapi/sae.proto\x12\tvisionapi\x1a\x16visionapi/common.proto\"\xda\x01\n\nSaeMessage\x12$\n\x05\x66rame\x18\x01 \x01(\x0b\x32\x15.visionapi.VideoFrame\x12(\n\ndetections\x18\x02 \x03(\x0b\x32\x14.visionapi.Detection\x12#\n\x07metrics\x18\x63 \x01(\x0b\x32\x12.visionapi.Metrics\x12\x30\n\x0emodel_metadata\x18\x64 \x01(\x0b\x32\x18.visionapi.ModelMetadata\x12%\n\x04type\x18\xe8\x07 \x01(\x0e\x32\x16.visionapi.MessageType\"\xee\x01\n\nVideoFrame\x12\x11\n\tsource_id\x18\x01 \x01(\t\x12\x18\n\x10timestamp_utc_ms\x18\x02 \x01(\x04\x12\x1f\n\x05shape\x18\x03 \x01(\x0b\x32\x10.visionapi.Shape\x12\x12\n\nframe_data\x18\x04 \x01(\x0c\x12\x17\n\x0f\x66rame_data_jpeg\x18\x05 \x01(\x0c\x12\x31\n\x0f\x63\x61mera_location\x18\x06 \x01(\x0b\x32\x18.visionapi.GeoCoordinate\x12\x32\n\x0fmovement_vector\x18\x07 \x01(\x0b\x32\x19.visionapi.MovementVector\"8\n\x05Shape\x12\x0e\n\x06height\x18\x01 \x01(\r\x12\r\n\x05width\x18\x02 \x01(\r\x12\x10\n\x08\x63hannels\x18\x03 \x01(\r\"\xa4\x01\n\tDetection\x12,\n\x0c\x62ounding_box\x18\x01 \x01(\x0b\x32\x16.visionapi.BoundingBox\x12\x12\n\nconfidence\x18\x02 \x01(\x02\x12\x10\n\x08\x63lass_id\x18\x03 \x01(\r\x12\x11\n\tobject_id\x18\x04 \x01(\x0c\x12\x30\n\x0egeo_coordinate\x18\x05 \x01(\x0b\x32\x18.visionapi.GeoCoordinate\"I\n\x0b\x42oundingBox\x12\r\n\x05min_x\x18\x01 \x01(\x02\x12\r\n\x05min_y\x18\x02 \x01(\x02\x12\r\n\x05max_x\x18\x03 \x01(\x02\x12\r\n\x05max_y\x18\x04 \x01(\x02\"R\n\x07Metrics\x12#\n\x1b\x64\x65tection_inference_time_us\x18\x01 \x01(\r\x12\"\n\x1atracking_inference_time_us\x18\x02 \x01(\r\"\x81\x01\n\rModelMetadata\x12=\n\x0b\x63lass_names\x18\x01 \x03(\x0b\x32(.visionapi.ModelMetadata.ClassNamesEntry\x1a\x31\n\x0f\x43lassNamesEntry\x12\x0b\n\x03key\x18\x01 \x01(\r\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\x9b\x02\n\x0fPositionMessage\x12\x18\n\x10timestamp_utc_ms\x18\x01 \x01(\x04\x12\x30\n\x0egeo_coordinate\x18\x02 \x01(\x0b\x32\x18.visionapi.GeoCoordinate\x12\x0c\n\x04hdop\x18\x03 \x01(\x02\x12\x0b\n\x03\x66ix\x18\x04 \x01(\x08\x12\x10\n\x08sae_uuid\x18\x05 \x01(\x0c\x12\x32\n\x0fmovement_vector\x18\x06 \x01(\x0b\x32\x19.visionapi.MovementVector\x12\x34\n\x12raw_geo_coordinate\x18\x07 \x01(\x0b\x32\x18.visionapi.GeoCoordinate\x12%\n\x04type\x18\xe8\x07 \x01(\x0e\x32\x16.visionapi.MessageTypeB\x16\n\x14\x64\x65.starwit.visionapib\x06proto3')
_globals = globals()
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -38,19 +38,19 @@
_globals['_SAEMESSAGE']._serialized_start=59
_globals['_SAEMESSAGE']._serialized_end=277
_globals['_VIDEOFRAME']._serialized_start=280
- _globals['_VIDEOFRAME']._serialized_end=466
- _globals['_SHAPE']._serialized_start=468
- _globals['_SHAPE']._serialized_end=524
- _globals['_DETECTION']._serialized_start=527
- _globals['_DETECTION']._serialized_end=691
- _globals['_BOUNDINGBOX']._serialized_start=693
- _globals['_BOUNDINGBOX']._serialized_end=766
- _globals['_METRICS']._serialized_start=768
- _globals['_METRICS']._serialized_end=850
- _globals['_MODELMETADATA']._serialized_start=853
- _globals['_MODELMETADATA']._serialized_end=982
- _globals['_MODELMETADATA_CLASSNAMESENTRY']._serialized_start=933
- _globals['_MODELMETADATA_CLASSNAMESENTRY']._serialized_end=982
- _globals['_POSITIONMESSAGE']._serialized_start=985
- _globals['_POSITIONMESSAGE']._serialized_end=1162
+ _globals['_VIDEOFRAME']._serialized_end=518
+ _globals['_SHAPE']._serialized_start=520
+ _globals['_SHAPE']._serialized_end=576
+ _globals['_DETECTION']._serialized_start=579
+ _globals['_DETECTION']._serialized_end=743
+ _globals['_BOUNDINGBOX']._serialized_start=745
+ _globals['_BOUNDINGBOX']._serialized_end=818
+ _globals['_METRICS']._serialized_start=820
+ _globals['_METRICS']._serialized_end=902
+ _globals['_MODELMETADATA']._serialized_start=905
+ _globals['_MODELMETADATA']._serialized_end=1034
+ _globals['_MODELMETADATA_CLASSNAMESENTRY']._serialized_start=985
+ _globals['_MODELMETADATA_CLASSNAMESENTRY']._serialized_end=1034
+ _globals['_POSITIONMESSAGE']._serialized_start=1037
+ _globals['_POSITIONMESSAGE']._serialized_end=1320
# @@protoc_insertion_point(module_scope)
diff --git a/python/visionapi/visionapi/sae_pb2.pyi b/python/visionapi/visionapi/sae_pb2.pyi
index 6afb950..24f4191 100644
--- a/python/visionapi/visionapi/sae_pb2.pyi
+++ b/python/visionapi/visionapi/sae_pb2.pyi
@@ -22,20 +22,22 @@ class SaeMessage(_message.Message):
def __init__(self, frame: _Optional[_Union[VideoFrame, _Mapping]] = ..., detections: _Optional[_Iterable[_Union[Detection, _Mapping]]] = ..., metrics: _Optional[_Union[Metrics, _Mapping]] = ..., model_metadata: _Optional[_Union[ModelMetadata, _Mapping]] = ..., type: _Optional[_Union[_common_pb2.MessageType, str]] = ...) -> None: ...
class VideoFrame(_message.Message):
- __slots__ = ("source_id", "timestamp_utc_ms", "shape", "frame_data", "frame_data_jpeg", "camera_location")
+ __slots__ = ("source_id", "timestamp_utc_ms", "shape", "frame_data", "frame_data_jpeg", "camera_location", "movement_vector")
SOURCE_ID_FIELD_NUMBER: _ClassVar[int]
TIMESTAMP_UTC_MS_FIELD_NUMBER: _ClassVar[int]
SHAPE_FIELD_NUMBER: _ClassVar[int]
FRAME_DATA_FIELD_NUMBER: _ClassVar[int]
FRAME_DATA_JPEG_FIELD_NUMBER: _ClassVar[int]
CAMERA_LOCATION_FIELD_NUMBER: _ClassVar[int]
+ MOVEMENT_VECTOR_FIELD_NUMBER: _ClassVar[int]
source_id: str
timestamp_utc_ms: int
shape: Shape
frame_data: bytes
frame_data_jpeg: bytes
camera_location: _common_pb2.GeoCoordinate
- def __init__(self, source_id: _Optional[str] = ..., timestamp_utc_ms: _Optional[int] = ..., shape: _Optional[_Union[Shape, _Mapping]] = ..., frame_data: _Optional[bytes] = ..., frame_data_jpeg: _Optional[bytes] = ..., camera_location: _Optional[_Union[_common_pb2.GeoCoordinate, _Mapping]] = ...) -> None: ...
+ movement_vector: _common_pb2.MovementVector
+ def __init__(self, source_id: _Optional[str] = ..., timestamp_utc_ms: _Optional[int] = ..., shape: _Optional[_Union[Shape, _Mapping]] = ..., frame_data: _Optional[bytes] = ..., frame_data_jpeg: _Optional[bytes] = ..., camera_location: _Optional[_Union[_common_pb2.GeoCoordinate, _Mapping]] = ..., movement_vector: _Optional[_Union[_common_pb2.MovementVector, _Mapping]] = ...) -> None: ...
class Shape(_message.Message):
__slots__ = ("height", "width", "channels")
@@ -95,17 +97,21 @@ class ModelMetadata(_message.Message):
def __init__(self, class_names: _Optional[_Mapping[int, str]] = ...) -> None: ...
class PositionMessage(_message.Message):
- __slots__ = ("timestamp_utc_ms", "geo_coordinate", "hdop", "fix", "sae_uuid", "type")
+ __slots__ = ("timestamp_utc_ms", "geo_coordinate", "hdop", "fix", "sae_uuid", "movement_vector", "raw_geo_coordinate", "type")
TIMESTAMP_UTC_MS_FIELD_NUMBER: _ClassVar[int]
GEO_COORDINATE_FIELD_NUMBER: _ClassVar[int]
HDOP_FIELD_NUMBER: _ClassVar[int]
FIX_FIELD_NUMBER: _ClassVar[int]
SAE_UUID_FIELD_NUMBER: _ClassVar[int]
+ MOVEMENT_VECTOR_FIELD_NUMBER: _ClassVar[int]
+ RAW_GEO_COORDINATE_FIELD_NUMBER: _ClassVar[int]
TYPE_FIELD_NUMBER: _ClassVar[int]
timestamp_utc_ms: int
geo_coordinate: _common_pb2.GeoCoordinate
hdop: float
fix: bool
sae_uuid: bytes
+ movement_vector: _common_pb2.MovementVector
+ raw_geo_coordinate: _common_pb2.GeoCoordinate
type: _common_pb2.MessageType
- def __init__(self, timestamp_utc_ms: _Optional[int] = ..., geo_coordinate: _Optional[_Union[_common_pb2.GeoCoordinate, _Mapping]] = ..., hdop: _Optional[float] = ..., fix: bool = ..., sae_uuid: _Optional[bytes] = ..., type: _Optional[_Union[_common_pb2.MessageType, str]] = ...) -> None: ...
+ def __init__(self, timestamp_utc_ms: _Optional[int] = ..., geo_coordinate: _Optional[_Union[_common_pb2.GeoCoordinate, _Mapping]] = ..., hdop: _Optional[float] = ..., fix: bool = ..., sae_uuid: _Optional[bytes] = ..., movement_vector: _Optional[_Union[_common_pb2.MovementVector, _Mapping]] = ..., raw_geo_coordinate: _Optional[_Union[_common_pb2.GeoCoordinate, _Mapping]] = ..., type: _Optional[_Union[_common_pb2.MessageType, str]] = ...) -> None: ...
diff --git a/visionapi/common.proto b/visionapi/common.proto
index ed826c1..4d21ea7 100644
--- a/visionapi/common.proto
+++ b/visionapi/common.proto
@@ -14,6 +14,11 @@ message GeoCoordinate {
double longitude = 2;
}
+message MovementVector {
+ double speed_kmh = 1;
+ double heading_deg = 2;
+}
+
// Dummy message used solely for deserializing the 'type' field, cleaning up parser code.
message TypeMessage {
MessageType type = 1000;
diff --git a/visionapi/sae.proto b/visionapi/sae.proto
index aa9d15d..5741c6b 100644
--- a/visionapi/sae.proto
+++ b/visionapi/sae.proto
@@ -21,6 +21,7 @@ message VideoFrame {
bytes frame_data = 4;
bytes frame_data_jpeg = 5;
GeoCoordinate camera_location = 6;
+ MovementVector movement_vector = 7;
}
message Shape {
@@ -59,5 +60,7 @@ message PositionMessage {
float hdop = 3;
bool fix = 4;
bytes sae_uuid = 5;
+ MovementVector movement_vector = 6;
+ GeoCoordinate raw_geo_coordinate = 7;
MessageType type = 1000;
}
\ No newline at end of file