feat: [google-maps-fleetengine] add ability to specify trip attributes to Trip and deprecate Trip.remaining_waypoints_version (googleapis#14070)

- [ ] Regenerate this pull request now.

PiperOrigin-RevId: 781185838

Source-Link:
googleapis/googleapis@302273a

Source-Link:
https://github.com/googleapis/googleapis-gen/commit/dd3d22b67c589f8f6042f30a885a57728a2ed4fa
Copy-Tag:
eyJwIjoicGFja2FnZXMvZ29vZ2xlLW1hcHMtZmxlZXRlbmdpbmUvLk93bEJvdC55YW1sIiwiaCI6ImRkM2QyMmI2N2M1ODlmOGY2MDQyZjMwYTg4NWE1NzcyOGEyZWQ0ZmEifQ==

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

Author: gcf-owl-bot[bot]

packages/google-maps-fleetengine/google/maps/fleetengine/__init__.py

@@ -34,6 +34,7 @@
     PolylineFormatType,
     TerminalLocation,
     TerminalPointId,
+    TripAttribute,
     TripType,
     TripWaypoint,
     VehicleAttribute,
@@ -96,6 +97,7 @@
     "VehicleServiceAsyncClient",
     "TerminalLocation",
     "TerminalPointId",
+    "TripAttribute",
     "TripWaypoint",
     "VehicleAttribute",
     "VehicleLocation",

packages/google-maps-fleetengine/google/maps/fleetengine/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "0.2.10"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}

packages/google-maps-fleetengine/google/maps/fleetengine_v1/__init__.py

@@ -26,6 +26,7 @@
     PolylineFormatType,
     TerminalLocation,
     TerminalPointId,
+    TripAttribute,
     TripType,
     TripWaypoint,
     VehicleAttribute,
@@ -112,6 +113,7 @@
     "TerminalPointId",
     "TrafficPolylineData",
     "Trip",
+    "TripAttribute",
     "TripServiceClient",
     "TripStatus",
     "TripType",

packages/google-maps-fleetengine/google/maps/fleetengine_v1/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "0.2.10"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}

packages/google-maps-fleetengine/google/maps/fleetengine_v1/types/__init__.py

@@ -19,6 +19,7 @@
     PolylineFormatType,
     TerminalLocation,
     TerminalPointId,
+    TripAttribute,
     TripType,
     TripWaypoint,
     VehicleAttribute,
@@ -68,6 +69,7 @@
 __all__ = (
     "TerminalLocation",
     "TerminalPointId",
+    "TripAttribute",
     "TripWaypoint",
     "VehicleAttribute",
     "VehicleLocation",

packages/google-maps-fleetengine/google/maps/fleetengine_v1/types/fleetengine.py

@@ -38,6 +38,7 @@
         "TripWaypoint",
         "VehicleAttribute",
         "VehicleLocation",
+        "TripAttribute",
     },
 )
 
@@ -467,6 +468,17 @@ class VehicleLocation(proto.Message):
             Source of the raw location. Defaults to ``GPS``.
         raw_location_accuracy (google.protobuf.wrappers_pb2.DoubleValue):
             Accuracy of ``raw_location`` as a radius, in meters.
+        flp_location (google.type.latlng_pb2.LatLng):
+            The location from Android's Fused Location
+            Provider.
+        flp_update_time (google.protobuf.timestamp_pb2.Timestamp):
+            Update timestamp of ``flp_location``.
+        flp_latlng_accuracy_meters (google.protobuf.wrappers_pb2.DoubleValue):
+            Accuracy of ``flp_location`` in meters as a radius.
+        flp_heading_degrees (google.protobuf.wrappers_pb2.Int32Value):
+            Direction the vehicle is moving in degrees, as determined by
+            the Fused Location Provider. 0 represents North. The valid
+            range is [0,360).
         supplemental_location (google.type.latlng_pb2.LatLng):
             Supplemental location provided by the
             integrating app.
@@ -598,6 +610,26 @@ class VehicleLocation(proto.Message):
         number=25,
         message=wrappers_pb2.DoubleValue,
     )
+    flp_location: latlng_pb2.LatLng = proto.Field(
+        proto.MESSAGE,
+        number=29,
+        message=latlng_pb2.LatLng,
+    )
+    flp_update_time: timestamp_pb2.Timestamp = proto.Field(
+        proto.MESSAGE,
+        number=30,
+        message=timestamp_pb2.Timestamp,
+    )
+    flp_latlng_accuracy_meters: wrappers_pb2.DoubleValue = proto.Field(
+        proto.MESSAGE,
+        number=31,
+        message=wrappers_pb2.DoubleValue,
+    )
+    flp_heading_degrees: wrappers_pb2.Int32Value = proto.Field(
+        proto.MESSAGE,
+        number=32,
+        message=wrappers_pb2.Int32Value,
+    )
     supplemental_location: latlng_pb2.LatLng = proto.Field(
         proto.MESSAGE,
         number=18,
@@ -624,4 +656,54 @@ class VehicleLocation(proto.Message):
     )
 
 
+class TripAttribute(proto.Message):
+    r"""Describes a trip attribute as a key-value pair. The
+    "key:value" string length cannot exceed 256 characters.
+
+    This message has `oneof`_ fields (mutually exclusive fields).
+    For each oneof, at most one member field can be set at the same time.
+    Setting any member of the oneof automatically clears all other
+    members.
+
+    .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
+
+    Attributes:
+        key (str):
+            The attribute's key. Keys may not contain the
+            colon character (:).
+        string_value (str):
+            String typed attribute value.
+
+            This field is a member of `oneof`_ ``trip_attribute_value``.
+        bool_value (bool):
+            Boolean typed attribute value.
+
+            This field is a member of `oneof`_ ``trip_attribute_value``.
+        number_value (float):
+            Double typed attribute value.
+
+            This field is a member of `oneof`_ ``trip_attribute_value``.
+    """
+
+    key: str = proto.Field(
+        proto.STRING,
+        number=1,
+    )
+    string_value: str = proto.Field(
+        proto.STRING,
+        number=2,
+        oneof="trip_attribute_value",
+    )
+    bool_value: bool = proto.Field(
+        proto.BOOL,
+        number=3,
+        oneof="trip_attribute_value",
+    )
+    number_value: float = proto.Field(
+        proto.DOUBLE,
+        number=4,
+        oneof="trip_attribute_value",
+    )
+
+
 __all__ = tuple(sorted(__protobuf__.manifest))

packages/google-maps-fleetengine/google/maps/fleetengine_v1/types/traffic.py

@@ -54,11 +54,11 @@ class Speed(proto.Enum):
             SPEED_UNSPECIFIED (0):
                 Default value. This value is unused.
             NORMAL (1):
-                Normal speed, no slowdown is detected.
+                Normal speed, no traffic delays.
             SLOW (2):
-                Slowdown detected, but no traffic jam formed.
+                Slowdown detected, medium amount of traffic.
             TRAFFIC_JAM (3):
-                Traffic jam detected.
+                Traffic delays.
         """
         SPEED_UNSPECIFIED = 0
         NORMAL = 1

packages/google-maps-fleetengine/google/maps/fleetengine_v1/types/trip_api.py

@@ -144,11 +144,12 @@ class GetTripRequest(proto.Message):
             the route field is not set in the response. If a minimum is
             unspecified, the route data are always retrieved.
         remaining_waypoints_version (google.protobuf.timestamp_pb2.Timestamp):
-            Indicates the minimum timestamp (exclusive) for which
-            ``Trip.remaining_waypoints`` are retrieved. If they are
-            unchanged since this timestamp, the ``remaining_waypoints``
-            are not set in the response. If this field is unspecified,
-            ``remaining_waypoints`` is always retrieved.
+            Deprecated: ``Trip.remaining_waypoints`` are always
+            retrieved. Use ``remaining_waypoints_route_version`` to
+            control when
+            ``Trip.remaining_waypoints.traffic_to_waypoint`` and
+            ``Trip.remaining_waypoints.path_to_waypoint`` data are
+            retrieved.
         route_format_type (google.maps.fleetengine_v1.types.PolylineFormatType):
             The returned current route format, ``LAT_LNG_LIST_TYPE`` (in
             ``Trip.route``), or ``ENCODED_POLYLINE_TYPE`` (in

packages/google-maps-fleetengine/google/maps/fleetengine_v1/types/trips.py

@@ -292,6 +292,9 @@ class Trip(proto.Message):
         view (google.maps.fleetengine_v1.types.TripView):
             The subset of Trip fields that are populated
             and how they should be interpreted.
+        attributes (MutableSequence[google.maps.fleetengine_v1.types.TripAttribute]):
+            A list of custom Trip attributes. Each
+            attribute must have a unique key.
     """
 
     name: str = proto.Field(
@@ -461,6 +464,11 @@ class Trip(proto.Message):
         number=31,
         enum="TripView",
     )
+    attributes: MutableSequence[fleetengine.TripAttribute] = proto.RepeatedField(
+        proto.MESSAGE,
+        number=35,
+        message=fleetengine.TripAttribute,
+    )
 
 
 class StopLocation(proto.Message):

packages/google-maps-fleetengine/samples/generated_samples/snippet_metadata_maps.fleetengine.v1.json

@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-maps-fleetengine",
-    "version": "0.2.10"
+    "version": "0.1.0"
   },
   "snippets": [
     {