add journey and route type taxi

tsinghua-fib-lab · Dec 3, 2024 · c3d4c1d · c3d4c1d
1 parent c86ac7b
commit c3d4c1d
Show file tree

Hide file tree

Showing 50 changed files with 385 additions and 294 deletions.
diff --git a/city/person/v2/motion.proto b/city/person/v2/motion.proto
@@ -34,6 +34,9 @@ enum Status {
   // 操控轨道交通
   // operating rail transit
   STATUS_RAIL_TRANSIT = 8;
+  // 等待出租车
+  // wait for taxi
+  STATUS_WAIT_TAXI = 9;
 }
 
 // Person（人）的运动状态

diff --git a/city/routing/v2/routing.proto b/city/routing/v2/routing.proto
@@ -23,6 +23,9 @@ enum RouteType {
   // 地铁+公交，包含两者的换乘
   // both bus and subway are available, including multimodal transfers
   ROUTE_TYPE_BUS_SUBWAY = 5;
+  // 出租车
+  // by taxi
+  ROUTE_TYPE_TAXI = 6;
 }
 
 // 移动方式
@@ -48,6 +51,9 @@ enum JourneyType {
   // 公交
   // taking bus
   JOURNEY_TYPE_BY_BUS = 3;
+  // 出租车
+  // taking taxi
+  JOURNEY_TYPE_BY_TAXI = 4;
 }
 
 // 驾车出行方式的路径规划结果
@@ -120,10 +126,10 @@ message BusJourneyBody {
 }
 
 // 路径规划结果的一部分，含且仅含采用一种交通出行方式的完整出行序列
-// Part of the routing results, including a complete travel sequence using exactly one travelling mode
+// Part of the routing results, including a complete travel sequence using exactly one traveling mode
 message Journey {
   // 出行方式
-  // journey travelling mode
+  // journey traveling mode
   JourneyType type = 1;
 
   // 出行方式的具体信息

diff --git a/cpp/city/person/v2/motion.pb.cc b/cpp/city/person/v2/motion.pb.cc
diff --git a/cpp/city/person/v2/motion.pb.h b/cpp/city/person/v2/motion.pb.h
diff --git a/cpp/city/routing/v2/routing.pb.cc b/cpp/city/routing/v2/routing.pb.cc
diff --git a/cpp/city/routing/v2/routing.pb.h b/cpp/city/routing/v2/routing.pb.h
diff --git a/doc/index.html b/doc/index.html
@@ -10558,6 +10558,13 @@ <h3 id="city.person.v2.Status">Status</h3>
 operating rail transit</p></td>
               </tr>
 
+              <tr>
+                <td>STATUS_WAIT_TAXI</td>
+                <td>9</td>
+                <td><p>等待出租车
+wait for taxi</p></td>
+              </tr>
+
           </tbody>
         </table>
 
@@ -11874,7 +11881,7 @@ <h3 id="city.routing.v2.DrivingJourneyBody">DrivingJourneyBody</h3>
 
 
         <h3 id="city.routing.v2.Journey">Journey</h3>
-        <p>路径规划结果的一部分，含且仅含采用一种交通出行方式的完整出行序列</p><p>Part of the routing results, including a complete travel sequence using exactly one travelling mode</p>
+        <p>路径规划结果的一部分，含且仅含采用一种交通出行方式的完整出行序列</p><p>Part of the routing results, including a complete travel sequence using exactly one traveling mode</p>
 
 
           <table class="field-table">
@@ -11888,7 +11895,7 @@ <h3 id="city.routing.v2.Journey">Journey</h3>
                   <td><a href="#city.routing.v2.JourneyType">JourneyType</a></td>
                   <td></td>
                   <td><p>出行方式
-journey travelling mode </p></td>
+journey traveling mode </p></td>
                 </tr>
 
                 <tr>
@@ -12120,6 +12127,13 @@ <h3 id="city.routing.v2.JourneyType">JourneyType</h3>
 taking bus</p></td>
               </tr>
 
+              <tr>
+                <td>JOURNEY_TYPE_BY_TAXI</td>
+                <td>4</td>
+                <td><p>出租车
+taking taxi</p></td>
+              </tr>
+
           </tbody>
         </table>
 
@@ -12205,6 +12219,13 @@ <h3 id="city.routing.v2.RouteType">RouteType</h3>
 both bus and subway are available, including multimodal transfers</p></td>
               </tr>
 
+              <tr>
+                <td>ROUTE_TYPE_TAXI</td>
+                <td>6</td>
+                <td><p>出租车
+by taxi</p></td>
+              </tr>
+
           </tbody>
         </table>
 

diff --git a/es/city/person/v2/motion_pb.d.ts b/es/city/person/v2/motion_pb.d.ts
@@ -85,6 +85,14 @@ export declare enum Status {
    * @generated from enum value: STATUS_RAIL_TRANSIT = 8;
    */
   RAIL_TRANSIT = 8,
+
+  /**
+   * 等待出租车
+   * wait for taxi
+   *
+   * @generated from enum value: STATUS_WAIT_TAXI = 9;
+   */
+  WAIT_TAXI = 9,
 }
 
 /**

diff --git a/es/city/person/v2/motion_pb.js b/es/city/person/v2/motion_pb.js
@@ -24,6 +24,7 @@ export const Status = /*@__PURE__*/ proto3.makeEnum(
     {no: 6, name: "STATUS_WAIT_ROUTE", localName: "WAIT_ROUTE"},
     {no: 7, name: "STATUS_WAIT_BUS", localName: "WAIT_BUS"},
     {no: 8, name: "STATUS_RAIL_TRANSIT", localName: "RAIL_TRANSIT"},
+    {no: 9, name: "STATUS_WAIT_TAXI", localName: "WAIT_TAXI"},
   ],
 );
 

diff --git a/es/city/routing/v2/routing_pb.d.ts b/es/city/routing/v2/routing_pb.d.ts
@@ -60,6 +60,14 @@ export declare enum RouteType {
    * @generated from enum value: ROUTE_TYPE_BUS_SUBWAY = 5;
    */
   BUS_SUBWAY = 5,
+
+  /**
+   * 出租车
+   * by taxi
+   *
+   * @generated from enum value: ROUTE_TYPE_TAXI = 6;
+   */
+  TAXI = 6,
 }
 
 /**
@@ -108,6 +116,14 @@ export declare enum JourneyType {
    * @generated from enum value: JOURNEY_TYPE_BY_BUS = 3;
    */
   BY_BUS = 3,
+
+  /**
+   * 出租车
+   * taking taxi
+   *
+   * @generated from enum value: JOURNEY_TYPE_BY_TAXI = 4;
+   */
+  BY_TAXI = 4,
 }
 
 /**
@@ -335,14 +351,14 @@ export declare class BusJourneyBody extends Message<BusJourneyBody> {
 
 /**
  * 路径规划结果的一部分，含且仅含采用一种交通出行方式的完整出行序列
- * Part of the routing results, including a complete travel sequence using exactly one travelling mode
+ * Part of the routing results, including a complete travel sequence using exactly one traveling mode
  *
  * @generated from message city.routing.v2.Journey
  */
 export declare class Journey extends Message<Journey> {
   /**
    * 出行方式
-   * journey travelling mode
+   * journey traveling mode
    *
    * @generated from field: city.routing.v2.JourneyType type = 1;
    */

diff --git a/es/city/routing/v2/routing_pb.js b/es/city/routing/v2/routing_pb.js
@@ -20,6 +20,7 @@ export const RouteType = /*@__PURE__*/ proto3.makeEnum(
     {no: 3, name: "ROUTE_TYPE_BUS", localName: "BUS"},
     {no: 4, name: "ROUTE_TYPE_SUBWAY", localName: "SUBWAY"},
     {no: 5, name: "ROUTE_TYPE_BUS_SUBWAY", localName: "BUS_SUBWAY"},
+    {no: 6, name: "ROUTE_TYPE_TAXI", localName: "TAXI"},
   ],
 );
 
@@ -44,6 +45,7 @@ export const JourneyType = /*@__PURE__*/ proto3.makeEnum(
     {no: 1, name: "JOURNEY_TYPE_DRIVING", localName: "DRIVING"},
     {no: 2, name: "JOURNEY_TYPE_WALKING", localName: "WALKING"},
     {no: 3, name: "JOURNEY_TYPE_BY_BUS", localName: "BY_BUS"},
+    {no: 4, name: "JOURNEY_TYPE_BY_TAXI", localName: "BY_TAXI"},
   ],
 );
 
@@ -137,7 +139,7 @@ export const BusJourneyBody = /*@__PURE__*/ proto3.makeMessageType(
 
 /**
  * 路径规划结果的一部分，含且仅含采用一种交通出行方式的完整出行序列
- * Part of the routing results, including a complete travel sequence using exactly one travelling mode
+ * Part of the routing results, including a complete travel sequence using exactly one traveling mode
  *
  * @generated from message city.routing.v2.Journey
  */