@heycar/heycars-map 0.9.3 → 0.9.4

package/dist/index.cjs

@@ -9,7 +9,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const Vue = require("vue");
 const style = "";
 const name = "@heycar/heycars-map";
-const version = "0.9.3";
+const version = "0.9.4";
 const type = "module";
 const scripts = {
   dev: "vite -c vite.config.dev.ts",
@@ -1110,14 +1110,6 @@ function assertAngle(angle) {
     return;
   throw new Error(`Assertion Error: expect type number | undefined, actual is ${angle}`);
 }
-function assertZone(zone) {
-  try {
-    if (Array.isArray(zone == null ? void 0 : zone.path) && zone.path.every(assertPoint))
-      return;
-  } catch (err) {
-    throw new Error(`Assertion Error: expect type Zone, actual is ${JSON.stringify(zone)}`);
-  }
-}
 const isLatLngLiteral = (value) => {
   return value != null && typeof value === "object" && Number.isFinite(value.lat) && Number.isFinite(value.lng);
 };
@@ -1163,9 +1155,9 @@ const pausableSleep = (milliSeconds) => {
   };
   return { sleepPromise: sleepDefered, pause, restart };
 };
-const MAX_ANIMATION_DISTANCE_VW = 100;
-const MIN_ANIMATION_DURATION = 400;
-const ANIMATION_DURATION_FOR_100VW = 800;
+const MAX_ANIMATION_DISTANCE_VW = 300;
+const MIN_ANIMATION_DURATION = 300;
+const ANIMATION_DURATION_FOR_100VW = 200;
 const ANIMATION_DURATION_PER_ZOOM = 400;
 const BEIJIN_POINT = [116.2317, 39.5427];
 const ZINDEX_BUBBLE_LAYER = 50;
@@ -1269,14 +1261,24 @@ const distanceVw2animationDuration = (distance) => {
 const deltaZoom2animationDuration = (deltaZoom) => {
   return Math.max(MIN_ANIMATION_DURATION * 4, Math.abs(deltaZoom) * ANIMATION_DURATION_PER_ZOOM);
 };
+const throwTypeError = (typeName, value, detail) => {
+  if (detail)
+    new Error(
+      `MyTypeError: expect type: ${typeName}, but received: ${JSON.stringify(
+        value
+      )}
+ Type Error Details: ${detail}`
+    );
+  throw new Error(`MyTypeError: expect type: ${typeName}, but received: ${JSON.stringify(value)}`);
+};
 const toPlaceType = (maybePlace) => {
   var _a;
   const lng = Number(maybePlace.lng);
   if (isNaN(lng))
-    throw new Error("MyError: expect lng to be number");
+    throwTypeError("Place", maybePlace, "lng is not number");
   const lat = Number(maybePlace.lat);
   if (isNaN(lat))
-    throw new Error("MyError: expect lat to be number");
+    throwTypeError("Place", maybePlace, "lat is not number");
   return {
     lng,
     lat,
@@ -1284,6 +1286,37 @@ const toPlaceType = (maybePlace) => {
     displayName: (_a = maybePlace.displayName) != null ? _a : maybePlace.name
   };
 };
+const toPointType = (maybePoint) => {
+  const lng = Number(maybePoint == null ? void 0 : maybePoint[0]);
+  const lat = Number(maybePoint == null ? void 0 : maybePoint[1]);
+  if (isNaN(lat) || isNaN(lng))
+    throwTypeError("Point", maybePoint);
+  return [lng, lat];
+};
+const toZoneType = (maybeZone) => {
+  try {
+    if (!maybeZone)
+      throwTypeError("Zone", maybeZone);
+    const { name: name2 = "", path } = maybeZone;
+    if (!Array.isArray(path))
+      throwTypeError("Zone", maybeZone);
+    return { name: name2, path: path.map(toPointType) };
+  } catch (err) {
+    return throwTypeError("Zone", maybeZone, err == null ? void 0 : err.message);
+  }
+};
+const toRecommendZonePlacesType = (maybeRecomendZonePlaces) => {
+  try {
+    const { available, zone, places } = maybeRecomendZonePlaces;
+    return {
+      available: !!available,
+      zone: zone === void 0 ? zone : toZoneType(zone),
+      places: places === void 0 ? places : places.map(toPlaceType)
+    };
+  } catch (err) {
+    return throwTypeError("RecommendZonePlaces", maybeRecomendZonePlaces, err == null ? void 0 : err.message);
+  }
+};
 const wxGetLocationSuccessResponse2GeolocationPosition = (res) => {
   const { longitude, latitude, accuracy } = res;
   const speed = Number(res.speed);
@@ -5853,12 +5886,12 @@ const useMapRecomendPlace = (props) => {
   });
   const findAttachedPlace = async (place) => {
     var _a;
+    const inputRecommendZonePlaces = (_a = await getRecomendPlace({ ...place }, context2)) != null ? _a : {};
     const {
-      places: inputPlaceCandidates,
+      places: placeCandidates,
       zone,
       available = false
-    } = (_a = await getRecomendPlace({ ...place }, context2)) != null ? _a : {};
-    const placeCandidates = inputPlaceCandidates == null ? void 0 : inputPlaceCandidates.map(toPlaceType);
+    } = toRecommendZonePlacesType(inputRecommendZonePlaces);
     if (!available || !placeCandidates) {
       return { place: { ...place }, zone, candidates: [], available };
     }
@@ -5919,13 +5952,13 @@ const useMapRecomendPlace = (props) => {
   };
   const updatePlaceCandidates = async (place) => {
     var _a;
+    const inputRecommendZonePlaces = (_a = await getRecomendPlace({ ...place }, context2)) != null ? _a : {};
     const {
-      places: inputPlaceCandidates,
+      places: placeCandidates,
       zone,
-      available
-    } = (_a = await getRecomendPlace({ ...place }, context2)) != null ? _a : {};
+      available = false
+    } = toRecommendZonePlacesType(inputRecommendZonePlaces);
     const isSameZone = !!zone && isZoneEqual(zone, zoneRef.value);
-    const placeCandidates = inputPlaceCandidates == null ? void 0 : inputPlaceCandidates.map(toPlaceType);
     availableRef.value = !!available;
     zoneRef.value = zone;
     placeCandidatesRef.value = placeCandidates != null ? placeCandidates : [];
@@ -6729,16 +6762,17 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     Object.assign(centerPlace, place);
     updateRecommendPlace(place);
   };
-  const setCenterPlaceByUserSpecifiedInZone = ({
-    place: input,
-    recommends
+  const setCenterPlaceByUserSpecifiedInZone = async ({
+    place: inputPlace,
+    recommends: inputRecommends
   }) => {
-    const place = toPlaceType(input);
-    assertZone(recommends.zone);
+    const place = toPlaceType(inputPlace);
+    const recommends = toRecommendZonePlacesType(inputRecommends);
+    const isSameZone = recommends.zone && isZoneEqual(recommends.zone, zoneRef.value);
+    if (!isSameZone)
+      setZoom(ZONE_ZOOM);
     Object.assign(centerPlace, place);
     setPlaceCandidatesAndZone(recommends);
-    if (!isZoneEqual(recommends.zone, zoneRef.value))
-      setZoom(ZONE_ZOOM);
     emit("changePlace", {
       ...place
     });
@@ -6849,7 +6883,6 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
       isInZone,
       isSameZone
     }) => {
-      debugger;
       centerSource.source = "recomend";
       if (isPlaceEqual(place, centerPlace))
         panTo(place2point(place));
@@ -6974,15 +7007,16 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
     Object.assign(centerPlace, place);
     updateRecommendPlace(place);
   };
-  const setCenterPlaceByUserSpecifiedInZone = ({
-    place: input,
-    recommends
+  const setCenterPlaceByUserSpecifiedInZone = async ({
+    place: inputPlace,
+    recommends: inputRecommends
   }) => {
-    const place = toPlaceType(input);
-    assertZone(recommends.zone);
-    Object.assign(centerPlace, place);
-    if (!isZoneEqual(recommends.zone, zoneRef.value))
+    const place = toPlaceType(inputPlace);
+    const recommends = toRecommendZonePlacesType(inputRecommends);
+    const isSameZone = recommends.zone && isZoneEqual(recommends.zone, zoneRef.value);
+    if (!isSameZone)
       setZoom(ZONE_ZOOM);
+    Object.assign(centerPlace, place);
     setPlaceCandidatesAndZone(recommends);
     emit("changePlace", {
       ...place
@@ -6991,10 +7025,7 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
   const panToCenterByPlace = async (place) => {
     centerSource.source = "api";
     await panTo(place2point(place));
-    centerPlace.lng = place.lng;
-    centerPlace.lat = place.lat;
-    centerPlace.name = place.name;
-    centerPlace.displayName = place.displayName;
+    Object.assign(centerPlace, place);
     emit("changePlace", {
       ...place
     });

package/dist/index.js

@@ -7,7 +7,7 @@ var __publicField = (obj, key, value) => {
 import Vue, { defineComponent, h, computed, inject, provide, watch, onMounted, onUnmounted, watchPostEffect, shallowRef, ref, watchEffect, reactive, toRefs, toRef } from "vue";
 const style = "";
 const name = "@heycar/heycars-map";
-const version = "0.9.3";
+const version = "0.9.4";
 const type = "module";
 const scripts = {
   dev: "vite -c vite.config.dev.ts",
@@ -1108,14 +1108,6 @@ function assertAngle(angle) {
     return;
   throw new Error(`Assertion Error: expect type number | undefined, actual is ${angle}`);
 }
-function assertZone(zone) {
-  try {
-    if (Array.isArray(zone == null ? void 0 : zone.path) && zone.path.every(assertPoint))
-      return;
-  } catch (err) {
-    throw new Error(`Assertion Error: expect type Zone, actual is ${JSON.stringify(zone)}`);
-  }
-}
 const isLatLngLiteral = (value) => {
   return value != null && typeof value === "object" && Number.isFinite(value.lat) && Number.isFinite(value.lng);
 };
@@ -1161,9 +1153,9 @@ const pausableSleep = (milliSeconds) => {
   };
   return { sleepPromise: sleepDefered, pause, restart };
 };
-const MAX_ANIMATION_DISTANCE_VW = 100;
-const MIN_ANIMATION_DURATION = 400;
-const ANIMATION_DURATION_FOR_100VW = 800;
+const MAX_ANIMATION_DISTANCE_VW = 300;
+const MIN_ANIMATION_DURATION = 300;
+const ANIMATION_DURATION_FOR_100VW = 200;
 const ANIMATION_DURATION_PER_ZOOM = 400;
 const BEIJIN_POINT = [116.2317, 39.5427];
 const ZINDEX_BUBBLE_LAYER = 50;
@@ -1267,14 +1259,24 @@ const distanceVw2animationDuration = (distance) => {
 const deltaZoom2animationDuration = (deltaZoom) => {
   return Math.max(MIN_ANIMATION_DURATION * 4, Math.abs(deltaZoom) * ANIMATION_DURATION_PER_ZOOM);
 };
+const throwTypeError = (typeName, value, detail) => {
+  if (detail)
+    new Error(
+      `MyTypeError: expect type: ${typeName}, but received: ${JSON.stringify(
+        value
+      )}
+ Type Error Details: ${detail}`
+    );
+  throw new Error(`MyTypeError: expect type: ${typeName}, but received: ${JSON.stringify(value)}`);
+};
 const toPlaceType = (maybePlace) => {
   var _a;
   const lng = Number(maybePlace.lng);
   if (isNaN(lng))
-    throw new Error("MyError: expect lng to be number");
+    throwTypeError("Place", maybePlace, "lng is not number");
   const lat = Number(maybePlace.lat);
   if (isNaN(lat))
-    throw new Error("MyError: expect lat to be number");
+    throwTypeError("Place", maybePlace, "lat is not number");
   return {
     lng,
     lat,
@@ -1282,6 +1284,37 @@ const toPlaceType = (maybePlace) => {
     displayName: (_a = maybePlace.displayName) != null ? _a : maybePlace.name
   };
 };
+const toPointType = (maybePoint) => {
+  const lng = Number(maybePoint == null ? void 0 : maybePoint[0]);
+  const lat = Number(maybePoint == null ? void 0 : maybePoint[1]);
+  if (isNaN(lat) || isNaN(lng))
+    throwTypeError("Point", maybePoint);
+  return [lng, lat];
+};
+const toZoneType = (maybeZone) => {
+  try {
+    if (!maybeZone)
+      throwTypeError("Zone", maybeZone);
+    const { name: name2 = "", path } = maybeZone;
+    if (!Array.isArray(path))
+      throwTypeError("Zone", maybeZone);
+    return { name: name2, path: path.map(toPointType) };
+  } catch (err) {
+    return throwTypeError("Zone", maybeZone, err == null ? void 0 : err.message);
+  }
+};
+const toRecommendZonePlacesType = (maybeRecomendZonePlaces) => {
+  try {
+    const { available, zone, places } = maybeRecomendZonePlaces;
+    return {
+      available: !!available,
+      zone: zone === void 0 ? zone : toZoneType(zone),
+      places: places === void 0 ? places : places.map(toPlaceType)
+    };
+  } catch (err) {
+    return throwTypeError("RecommendZonePlaces", maybeRecomendZonePlaces, err == null ? void 0 : err.message);
+  }
+};
 const wxGetLocationSuccessResponse2GeolocationPosition = (res) => {
   const { longitude, latitude, accuracy } = res;
   const speed = Number(res.speed);
@@ -5851,12 +5884,12 @@ const useMapRecomendPlace = (props) => {
   });
   const findAttachedPlace = async (place) => {
     var _a;
+    const inputRecommendZonePlaces = (_a = await getRecomendPlace({ ...place }, context2)) != null ? _a : {};
     const {
-      places: inputPlaceCandidates,
+      places: placeCandidates,
       zone,
       available = false
-    } = (_a = await getRecomendPlace({ ...place }, context2)) != null ? _a : {};
-    const placeCandidates = inputPlaceCandidates == null ? void 0 : inputPlaceCandidates.map(toPlaceType);
+    } = toRecommendZonePlacesType(inputRecommendZonePlaces);
     if (!available || !placeCandidates) {
       return { place: { ...place }, zone, candidates: [], available };
     }
@@ -5917,13 +5950,13 @@ const useMapRecomendPlace = (props) => {
   };
   const updatePlaceCandidates = async (place) => {
     var _a;
+    const inputRecommendZonePlaces = (_a = await getRecomendPlace({ ...place }, context2)) != null ? _a : {};
     const {
-      places: inputPlaceCandidates,
+      places: placeCandidates,
       zone,
-      available
-    } = (_a = await getRecomendPlace({ ...place }, context2)) != null ? _a : {};
+      available = false
+    } = toRecommendZonePlacesType(inputRecommendZonePlaces);
     const isSameZone = !!zone && isZoneEqual(zone, zoneRef.value);
-    const placeCandidates = inputPlaceCandidates == null ? void 0 : inputPlaceCandidates.map(toPlaceType);
     availableRef.value = !!available;
     zoneRef.value = zone;
     placeCandidatesRef.value = placeCandidates != null ? placeCandidates : [];
@@ -6727,16 +6760,17 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     Object.assign(centerPlace, place);
     updateRecommendPlace(place);
   };
-  const setCenterPlaceByUserSpecifiedInZone = ({
-    place: input,
-    recommends
+  const setCenterPlaceByUserSpecifiedInZone = async ({
+    place: inputPlace,
+    recommends: inputRecommends
   }) => {
-    const place = toPlaceType(input);
-    assertZone(recommends.zone);
+    const place = toPlaceType(inputPlace);
+    const recommends = toRecommendZonePlacesType(inputRecommends);
+    const isSameZone = recommends.zone && isZoneEqual(recommends.zone, zoneRef.value);
+    if (!isSameZone)
+      setZoom(ZONE_ZOOM);
     Object.assign(centerPlace, place);
     setPlaceCandidatesAndZone(recommends);
-    if (!isZoneEqual(recommends.zone, zoneRef.value))
-      setZoom(ZONE_ZOOM);
     emit("changePlace", {
       ...place
     });
@@ -6847,7 +6881,6 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
       isInZone,
       isSameZone
     }) => {
-      debugger;
       centerSource.source = "recomend";
       if (isPlaceEqual(place, centerPlace))
         panTo(place2point(place));
@@ -6972,15 +7005,16 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
     Object.assign(centerPlace, place);
     updateRecommendPlace(place);
   };
-  const setCenterPlaceByUserSpecifiedInZone = ({
-    place: input,
-    recommends
+  const setCenterPlaceByUserSpecifiedInZone = async ({
+    place: inputPlace,
+    recommends: inputRecommends
   }) => {
-    const place = toPlaceType(input);
-    assertZone(recommends.zone);
-    Object.assign(centerPlace, place);
-    if (!isZoneEqual(recommends.zone, zoneRef.value))
+    const place = toPlaceType(inputPlace);
+    const recommends = toRecommendZonePlacesType(inputRecommends);
+    const isSameZone = recommends.zone && isZoneEqual(recommends.zone, zoneRef.value);
+    if (!isSameZone)
       setZoom(ZONE_ZOOM);
+    Object.assign(centerPlace, place);
     setPlaceCandidatesAndZone(recommends);
     emit("changePlace", {
       ...place
@@ -6989,10 +7023,7 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
   const panToCenterByPlace = async (place) => {
     centerSource.source = "api";
     await panTo(place2point(place));
-    centerPlace.lng = place.lng;
-    centerPlace.lat = place.lat;
-    centerPlace.name = place.name;
-    centerPlace.displayName = place.displayName;
+    Object.assign(centerPlace, place);
     emit("changePlace", {
       ...place
     });

package/dist/src/api/contants.d.ts

@@ -1,7 +1,7 @@
 import type { Point } from "../types/interface";
-export declare const MAX_ANIMATION_DISTANCE_VW = 100;
-export declare const MIN_ANIMATION_DURATION = 400;
-export declare const ANIMATION_DURATION_FOR_100VW = 800;
+export declare const MAX_ANIMATION_DISTANCE_VW = 300;
+export declare const MIN_ANIMATION_DURATION = 300;
+export declare const ANIMATION_DURATION_FOR_100VW = 200;
 export declare const ANIMATION_DURATION_PER_ZOOM = 400;
 export declare const BEIJIN_POINT: Point;
 export declare const ZINDEX_BUBBLE_LAYER = 50;

package/dist/src/utils/transform.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="google.maps" />
-import type { Place, Point, Zone } from "../types/interface";
+import type { Place, Point, RecommendZonePlaces, Zone } from "../types/interface";
 import type { WxGetLocationSuccessResponse } from "../types/wx";
 export declare const vec2lnglat: ([lng, lat]: [number, number]) => google.maps.LatLngLiteral;
 export interface AsteriskItem {
@@ -26,11 +26,25 @@ interface AmapPlaceName2DisplayNameOptions extends AMap.AddressComponent {
 export declare const amapPlaceName2DisplayName: (name: string, options: AmapPlaceName2DisplayNameOptions) => string;
 export declare const distanceVw2animationDuration: (distance: number) => number;
 export declare const deltaZoom2animationDuration: (deltaZoom: number) => number;
-export declare const toPlaceType: (maybePlace: {
+interface MaybePlace {
     displayName?: string;
     name: string;
     lng: string | number;
     lat: string | number;
-}) => Place;
+}
+export declare const toPlaceType: (maybePlace: MaybePlace) => Place;
+type MaybePoint = [string | number, string | number];
+export declare const toPointType: (maybePoint: MaybePoint) => Point;
+interface MaybeZone {
+    name?: string;
+    path: MaybePoint[];
+}
+export declare const toZoneType: (maybeZone: MaybeZone) => Zone;
+interface MaybeRecomendZonePlaces {
+    available?: boolean;
+    zone?: MaybeZone;
+    places?: MaybePlace[];
+}
+export declare const toRecommendZonePlacesType: (maybeRecomendZonePlaces: MaybeRecomendZonePlaces) => RecommendZonePlaces;
 export declare const wxGetLocationSuccessResponse2GeolocationPosition: (res: WxGetLocationSuccessResponse) => GeolocationPosition;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heycar/heycars-map",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "type": "module",
   "scripts": {
     "dev": "vite -c vite.config.dev.ts",