@heycar/heycars-map 2.4.6 → 2.5.0

package/dist/v3/types/interface.d.ts

@@ -33,7 +33,7 @@ export interface CoordinateZone extends Omit<Zone, "path"> {
 }
 export interface RecommendZonePlaces {
     adsorption?: boolean;
-    force?: boolean;
+    type?: RecommendType;
     available?: boolean;
     zone?: Zone;
     places?: Place[];
@@ -43,14 +43,16 @@ export interface CoordinateRecommendZonePlaces extends Omit<RecommendZonePlaces,
     places?: CoordinatePlace[];
 }
 export interface ValueOfOnChangeRecommendPlace {
+    type: RecommendType;
     place: Place;
     inputPlace: Place;
-    isInZone: boolean;
+    zone?: Zone;
     isSameZone: boolean;
 }
-export interface CoordinateValueOfOnChangeRecommendPlace extends Omit<ValueOfOnChangeRecommendPlace, "place" | "inputPlace"> {
+export interface CoordinateValueOfOnChangeRecommendPlace extends Omit<ValueOfOnChangeRecommendPlace, "place" | "inputPlace" | "zone"> {
     place: CoordinatePlace;
     inputPlace: CoordinatePlace;
+    zone?: CoordinateZone;
 }
 export interface GeoPosition {
     position: Point;
@@ -86,6 +88,7 @@ export interface TrackPoint {
 export interface CoordinateTrackPoint extends TrackPoint {
     type: CoordinateType;
 }
+export type RecommendType = "Restricted" | "Forbidden" | "Recommend";
 export type DriverStatus = "dispatching" | "book-dispatching" | "dispatched" | "driverStartService" | "book-driverStartService" | "book-dispatched" | "driverArrived" | "inService" | "canceled" | "endService" | "completed" | "canceling" | "banlanceRefund" | "waitBanlanceRefund" | "rechargePayed" | "waitRechargePay" | "payed" | "waitpay" | "refund" | "confirmed" | "assign" | "orderReassigned";
 export declare enum CenterPlaceStatus {
     GEO_LOADING = "GEO_LOADING",

package/dist/v3/utils/log.js

@@ -1,6 +1,6 @@
 const availableLogKeys = /* @__PURE__ */ new Set();
 const pkgName = "@heycar/heycars-map";
-const pkgVersion = "2.4.6";
+const pkgVersion = "2.5.0";
 const isEnableLog = (name) => {
   const searchParam = new URLSearchParams(location.search);
   return searchParam.has(`log-${name}`);

package/dist/v3/utils/transform.js

@@ -74,7 +74,7 @@ const isGeoPositionEqual = (p1, p2) => {
   return p1.coords.longitude === p2.coords.longitude && p1.coords.latitude === p2.coords.latitude;
 };
 const isZoneEqual = (z1, z2) => {
-  return z1.path.every((point, idx) => isPointEqual(point, z2 == null ? void 0 : z2.path[idx]));
+  return z1.name === (z2 == null ? void 0 : z2.name) && z1.path.every((point, idx) => isPointEqual(point, z2 == null ? void 0 : z2.path[idx]));
 };
 const amapPlaceName2DisplayName = (name, options) => {
   const { isChina } = options;

package/dist/v3/utils/typeChecking.d.ts

@@ -1,5 +1,7 @@
-import type { CoordinatePlace, CoordinatePoint, CoordinateRecommendZonePlaces, CoordinateTrackPoint, CoordinateType, CoordinateZone } from "../types/interface";
+import type { CoordinatePlace, CoordinatePoint, CoordinateRecommendZonePlaces, CoordinateTrackPoint, CoordinateType, CoordinateZone, RecommendType } from "../types/interface";
 export declare function isCoordinateType(type: unknown): type is CoordinateType;
+export declare function isRecommendType(type: unknown): type is RecommendType;
+export declare function toRecommendType(type: unknown): RecommendType;
 interface MaybeCoordinatePlace {
     displayName?: string;
     name: string;
@@ -20,9 +22,10 @@ interface MaybeCoordinateZone {
     path: MaybeCoordinatePoint[];
 }
 export declare const toCoordinateZoneType: (value?: MaybeCoordinateZone) => CoordinateZone;
+export declare const assertNoConflictTypeAndZone: (type: unknown, zone: unknown) => void;
 interface MaybeCoordinateRecomendZonePlaces {
     adsorption?: boolean;
-    force?: boolean;
+    type?: string;
     available?: boolean;
     zone?: MaybeCoordinateZone;
     places?: MaybeCoordinatePlace[];

package/dist/v3/utils/typeChecking.js

@@ -11,6 +11,16 @@ const createTypeError = (typeName, value, detail) => {
 function isCoordinateType(type) {
   return type === "wgs84" || type === "gcj02" || type === "bd09";
 }
+function isRecommendType(type) {
+  return type === "Recommend" || type === "Restricted" || type === "Forbidden";
+}
+function toRecommendType(type) {
+  if (type === void 0)
+    return "Recommend";
+  if (isRecommendType(type))
+    return type;
+  throw createTypeError("RecommendType", type);
+}
 const toCoordinatePlaceType = (value) => {
   var _a;
   try {
@@ -48,16 +58,31 @@ const toCoordinateZoneType = (value) => {
     const { name = "", path } = value;
     if (!Array.isArray(path))
       throw Error();
-    return { name, path: path.map(toCoordinatePointType) };
+    return { ...value, name, path: path.map(toCoordinatePointType) };
   } catch (err) {
     throw createTypeError("CoordinateZone", value, err == null ? void 0 : err.message);
   }
 };
+const assertNoConflictTypeAndZone = (type, zone) => {
+  if (!!zone && type !== "Restricted" && type !== "Forbidden") {
+    throw Error(
+      `MyTypeError: zone exist, so expected type: Restricted | Forbidden, but received: ${JSON.stringify(
+        type
+      )}`
+    );
+  }
+  if (!zone && (type === "Restricted" || type === "Forbidden")) {
+    throw Error(
+      `MyTypeError: zone not exist, so expected type: Recommend | undefined, but received: ${type}`
+    );
+  }
+};
 const toCoordinateRecommendZonePlacesType = (value) => {
   try {
-    const { force, available, zone, places, adsorption } = value;
+    const { type, available, zone, places, adsorption } = value;
+    assertNoConflictTypeAndZone(type, zone);
     return {
-      force: !!force,
+      type: toRecommendType(type),
       available: !!available,
       zone: zone === void 0 ? void 0 : toCoordinateZoneType(zone),
       places: places === void 0 ? void 0 : places.map(toCoordinatePlaceType),
@@ -81,11 +106,14 @@ const toCoordinateTrackPoint = (value) => {
   return { lng, lat, type, angle, speed, timestamp };
 };
 export {
+  assertNoConflictTypeAndZone,
   isCoordinatePoint,
   isCoordinateType,
+  isRecommendType,
   toCoordinatePlaceType,
   toCoordinatePointType,
   toCoordinateRecommendZonePlacesType,
   toCoordinateTrackPoint,
-  toCoordinateZoneType
+  toCoordinateZoneType,
+  toRecommendType
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heycar/heycars-map",
-  "version": "2.4.6",
+  "version": "2.5.0",
   "type": "module",
   "bin": {
     "checkVersion": "./bin/checkVersion.js",