@heycar/heycars-map 0.5.0 → 0.5.1

package/dist/hooks/useMapPlace.d.ts

@@ -7,6 +7,7 @@ export interface UseMapPlaceOnChangeCityProps {
 }
 export interface UseMapPlaceProps {
     pointRef: Ref<Point>;
+    emptyPlaceName: string;
     onChange?: (value: Place) => any;
     onChangeCity?: (value: UseMapPlaceOnChangeCityProps) => any;
 }

package/dist/hooks/useMapRecomendPlace.d.ts

@@ -4,6 +4,7 @@ import { UseMapPlaceProps } from "./useMapPlace";
 export interface UseMapRecomendPlaceProps<C = Record<string, any>> {
     pointRef: Ref<Point>;
     context?: C;
+    emptyPlaceName: string;
     getLimit: (context?: C) => number;
     getRecomendPlace: (place: Place, context?: C) => Promise<Place[] | undefined>;
     onChangeCity?: UseMapPlaceProps["onChangeCity"];

package/dist/index.cjs

@@ -3086,6 +3086,7 @@ const useAmapDrag = (props) => {
     var _a;
     isDragging.value = false;
     const { lng, lat } = target.getCenter();
+    spaceLog("dragEnd", "[lng, lat] = ", [lng, lat]);
     centerRef.value = [lng, lat];
     (_a = pipeAsync(onChange)) == null ? void 0 : _a([lng, lat]);
   };
@@ -3135,7 +3136,7 @@ const useUpdate = () => {
   return { idx, update };
 };
 const useAmapPlace = (props) => {
-  const { onChange, onChangeCity } = props;
+  const { onChange, onChangeCity, emptyPlaceName } = props;
   const defaultPoint = [...props.pointRef.value];
   const pointRef = Vue.ref(defaultPoint);
   const { readyPromise } = useMapSupplier();
@@ -3175,9 +3176,11 @@ const useAmapPlace = (props) => {
       geocoder.getAddress(new AMap.LngLat(lng, lat), (status, result) => {
         switch (status) {
           case "complete": {
-            const { formattedAddress: name, addressComponent } = result.regeocode;
+            const { formattedAddress, addressComponent } = result.regeocode;
             const cityName = addressComponent.city ? addressComponent.city : addressComponent.province;
             const cityParentName = addressComponent.province;
+            const name = formattedAddress ? formattedAddress : emptyPlaceName;
+            console.log("geocoder.getAddress status, name, lng, lat = ", status, name, lng, lat);
             place.name = name;
             place.lng = lng;
             place.lat = lat;
@@ -3186,9 +3189,10 @@ const useAmapPlace = (props) => {
             return;
           }
           case "no_data":
-            place.name = "";
+            place.name = emptyPlaceName;
             place.lng = lng;
             place.lat = lat;
+            console.log("geocoder.getAddress status, name, lng, lat = ", status, "", lng, lat);
             onChange == null ? void 0 : onChange({ lng, lat, name: "" });
             return;
           case "error":
@@ -3200,7 +3204,7 @@ const useAmapPlace = (props) => {
   return { place, updatePlace, setPlace, updateCity };
 };
 const useGmapPlace = (props) => {
-  const { onChange, onChangeCity } = props;
+  const { onChange, onChangeCity, emptyPlaceName } = props;
   const defaultPoint = [...props.pointRef.value];
   const pointRef = Vue.ref(defaultPoint);
   const { readyPromise } = useMapSupplier();
@@ -3235,7 +3239,7 @@ const useGmapPlace = (props) => {
       const geocoder = new google.maps.Geocoder();
       const [lng, lat] = pointRef.value;
       const { results } = await geocoder.geocode({ language: LANGUAGE, location: { lng, lat } });
-      const name = results[0].formatted_address;
+      const name = results[0].formatted_address ? results[0].formatted_address : emptyPlaceName;
       const cityName = geocoderResult2cityName(results[0]);
       const cityParentName = results.slice(-2)[0].address_components[0].long_name;
       const countryName = results.slice(-1)[0].address_components[0].long_name;
@@ -3277,12 +3281,22 @@ const findGmapNearestPlace = (place, candidates) => {
   return { shortestPlace, shortestDistance };
 };
 const useAmapRecomendPlace = (props) => {
-  const { pointRef, getRecomendPlace, getLimit, context: context2, onChange, onChangePlace, onChangeCity } = props;
+  const {
+    pointRef,
+    getRecomendPlace,
+    getLimit,
+    context: context2,
+    emptyPlaceName,
+    onChange,
+    onChangePlace,
+    onChangeCity
+  } = props;
   const availableRef = Vue.ref(true);
   const placeCandidatesRef = Vue.ref([]);
   const { idx: recomendPlaceKey, update: updateRecomandPlace } = useUpdate();
   const { readyPromise } = useMapSupplier();
   const { place, updatePlace, setPlace, updateCity } = useAmapPlace({
+    emptyPlaceName,
     pointRef,
     onChange: onChangePlace,
     onChangeCity
@@ -3333,12 +3347,22 @@ const useAmapRecomendPlace = (props) => {
   };
 };
 const useGmapRecomendPlace = (props) => {
-  const { pointRef, getRecomendPlace, getLimit, context: context2, onChange, onChangePlace, onChangeCity } = props;
+  const {
+    pointRef,
+    getRecomendPlace,
+    getLimit,
+    context: context2,
+    emptyPlaceName,
+    onChange,
+    onChangePlace,
+    onChangeCity
+  } = props;
   const availableRef = Vue.ref(true);
   const placeCandidatesRef = Vue.ref([]);
   const { idx: recomendPlaceKey, update: updateRecomandPlace } = useUpdate();
   const { readyPromise } = useMapSupplier();
   const { place, updatePlace, setPlace, updateCity } = useGmapPlace({
+    emptyPlaceName,
     pointRef,
     onChange: onChangePlace,
     onChangeCity
@@ -3805,7 +3829,8 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
   const pipedGetRecomendPlace = pipeOnlyLastEffect(getRecomendPlace);
   const {
     mapRef,
-    setMap
+    setMap,
+    panTo
   } = useHeycarMap();
   const {
     readyPromise
@@ -3916,6 +3941,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     isElectedRef
   } = useMapRecomendPlace({
     pointRef: centerPoint,
+    emptyPlaceName: DEFAULT_PLACE_NAME,
     context: centerSource,
     getRecomendPlace: pipedGetRecomendPlace,
     getLimit: (context2) => {
@@ -3943,6 +3969,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
       Object.assign(centerPlace, {
         ...place
       });
+      panTo(place2point(place));
       emit("changeRecomandPlace", place);
       if (isFirstWorkflowRecomendLoadingRef.value)
         await pipeDefer(setZoom)(READY_ZOOM);
@@ -3961,13 +3988,12 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     mapContext.onChangeRecomendPlaces([...placeCandidates.value]);
   });
   return () => {
-    var _a2;
     const {
       geoLoadingTitle,
       recomendDescription,
       unavailableTitle
     } = props;
-    const title = geoLoading.value ? geoLoadingTitle : !availableRef.value ? unavailableTitle : (_a2 = centerPlace.name) != null ? _a2 : DEFAULT_PLACE_NAME;
+    const title = geoLoading.value ? geoLoadingTitle : !availableRef.value ? unavailableTitle : centerPlace.name;
     const description = !availableRef.value ? void 0 : isElectedRef.value ? recomendDescription : void 0;
     return Vue.h(HeycarMap, {
       "attrs": {
@@ -4864,7 +4890,7 @@ const BusinessTaxiEndMap = defineSetup(function BusinessTaxiEndMap2(props) {
   } = useMapFitView({
     mapRef,
     autoFitTimeout: 5e3,
-    padding: [25, 20, 15, 15]
+    padding: [19, 36, 19, 26]
   });
   const deferedSetFitView = pipeDefer(registerFitVeiw.setFitView);
   return () => {
@@ -5247,7 +5273,7 @@ const useBusinessTaxiServiceMap = () => {
   const { registerFitVeiw, setFitView } = useMapFitView({
     mapRef,
     autoFitTimeout: 5e3,
-    padding: [19, 26, 19, 26]
+    padding: [19, 36, 19, 26]
   });
   return { setMap, registerFitVeiw, setFitView };
 };

package/dist/index.js

@@ -3084,6 +3084,7 @@ const useAmapDrag = (props) => {
     var _a;
     isDragging.value = false;
     const { lng, lat } = target.getCenter();
+    spaceLog("dragEnd", "[lng, lat] = ", [lng, lat]);
     centerRef.value = [lng, lat];
     (_a = pipeAsync(onChange)) == null ? void 0 : _a([lng, lat]);
   };
@@ -3133,7 +3134,7 @@ const useUpdate = () => {
   return { idx, update };
 };
 const useAmapPlace = (props) => {
-  const { onChange, onChangeCity } = props;
+  const { onChange, onChangeCity, emptyPlaceName } = props;
   const defaultPoint = [...props.pointRef.value];
   const pointRef = ref(defaultPoint);
   const { readyPromise } = useMapSupplier();
@@ -3173,9 +3174,11 @@ const useAmapPlace = (props) => {
       geocoder.getAddress(new AMap.LngLat(lng, lat), (status, result) => {
         switch (status) {
           case "complete": {
-            const { formattedAddress: name, addressComponent } = result.regeocode;
+            const { formattedAddress, addressComponent } = result.regeocode;
             const cityName = addressComponent.city ? addressComponent.city : addressComponent.province;
             const cityParentName = addressComponent.province;
+            const name = formattedAddress ? formattedAddress : emptyPlaceName;
+            console.log("geocoder.getAddress status, name, lng, lat = ", status, name, lng, lat);
             place.name = name;
             place.lng = lng;
             place.lat = lat;
@@ -3184,9 +3187,10 @@ const useAmapPlace = (props) => {
             return;
           }
           case "no_data":
-            place.name = "";
+            place.name = emptyPlaceName;
             place.lng = lng;
             place.lat = lat;
+            console.log("geocoder.getAddress status, name, lng, lat = ", status, "", lng, lat);
             onChange == null ? void 0 : onChange({ lng, lat, name: "" });
             return;
           case "error":
@@ -3198,7 +3202,7 @@ const useAmapPlace = (props) => {
   return { place, updatePlace, setPlace, updateCity };
 };
 const useGmapPlace = (props) => {
-  const { onChange, onChangeCity } = props;
+  const { onChange, onChangeCity, emptyPlaceName } = props;
   const defaultPoint = [...props.pointRef.value];
   const pointRef = ref(defaultPoint);
   const { readyPromise } = useMapSupplier();
@@ -3233,7 +3237,7 @@ const useGmapPlace = (props) => {
       const geocoder = new google.maps.Geocoder();
       const [lng, lat] = pointRef.value;
       const { results } = await geocoder.geocode({ language: LANGUAGE, location: { lng, lat } });
-      const name = results[0].formatted_address;
+      const name = results[0].formatted_address ? results[0].formatted_address : emptyPlaceName;
       const cityName = geocoderResult2cityName(results[0]);
       const cityParentName = results.slice(-2)[0].address_components[0].long_name;
       const countryName = results.slice(-1)[0].address_components[0].long_name;
@@ -3275,12 +3279,22 @@ const findGmapNearestPlace = (place, candidates) => {
   return { shortestPlace, shortestDistance };
 };
 const useAmapRecomendPlace = (props) => {
-  const { pointRef, getRecomendPlace, getLimit, context: context2, onChange, onChangePlace, onChangeCity } = props;
+  const {
+    pointRef,
+    getRecomendPlace,
+    getLimit,
+    context: context2,
+    emptyPlaceName,
+    onChange,
+    onChangePlace,
+    onChangeCity
+  } = props;
   const availableRef = ref(true);
   const placeCandidatesRef = ref([]);
   const { idx: recomendPlaceKey, update: updateRecomandPlace } = useUpdate();
   const { readyPromise } = useMapSupplier();
   const { place, updatePlace, setPlace, updateCity } = useAmapPlace({
+    emptyPlaceName,
     pointRef,
     onChange: onChangePlace,
     onChangeCity
@@ -3331,12 +3345,22 @@ const useAmapRecomendPlace = (props) => {
   };
 };
 const useGmapRecomendPlace = (props) => {
-  const { pointRef, getRecomendPlace, getLimit, context: context2, onChange, onChangePlace, onChangeCity } = props;
+  const {
+    pointRef,
+    getRecomendPlace,
+    getLimit,
+    context: context2,
+    emptyPlaceName,
+    onChange,
+    onChangePlace,
+    onChangeCity
+  } = props;
   const availableRef = ref(true);
   const placeCandidatesRef = ref([]);
   const { idx: recomendPlaceKey, update: updateRecomandPlace } = useUpdate();
   const { readyPromise } = useMapSupplier();
   const { place, updatePlace, setPlace, updateCity } = useGmapPlace({
+    emptyPlaceName,
     pointRef,
     onChange: onChangePlace,
     onChangeCity
@@ -3803,7 +3827,8 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
   const pipedGetRecomendPlace = pipeOnlyLastEffect(getRecomendPlace);
   const {
     mapRef,
-    setMap
+    setMap,
+    panTo
   } = useHeycarMap();
   const {
     readyPromise
@@ -3914,6 +3939,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     isElectedRef
   } = useMapRecomendPlace({
     pointRef: centerPoint,
+    emptyPlaceName: DEFAULT_PLACE_NAME,
     context: centerSource,
     getRecomendPlace: pipedGetRecomendPlace,
     getLimit: (context2) => {
@@ -3941,6 +3967,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
       Object.assign(centerPlace, {
         ...place
       });
+      panTo(place2point(place));
       emit("changeRecomandPlace", place);
       if (isFirstWorkflowRecomendLoadingRef.value)
         await pipeDefer(setZoom)(READY_ZOOM);
@@ -3959,13 +3986,12 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     mapContext.onChangeRecomendPlaces([...placeCandidates.value]);
   });
   return () => {
-    var _a2;
     const {
       geoLoadingTitle,
       recomendDescription,
       unavailableTitle
     } = props;
-    const title = geoLoading.value ? geoLoadingTitle : !availableRef.value ? unavailableTitle : (_a2 = centerPlace.name) != null ? _a2 : DEFAULT_PLACE_NAME;
+    const title = geoLoading.value ? geoLoadingTitle : !availableRef.value ? unavailableTitle : centerPlace.name;
     const description = !availableRef.value ? void 0 : isElectedRef.value ? recomendDescription : void 0;
     return h(HeycarMap, {
       "attrs": {
@@ -4862,7 +4888,7 @@ const BusinessTaxiEndMap = defineSetup(function BusinessTaxiEndMap2(props) {
   } = useMapFitView({
     mapRef,
     autoFitTimeout: 5e3,
-    padding: [25, 20, 15, 15]
+    padding: [19, 36, 19, 26]
   });
   const deferedSetFitView = pipeDefer(registerFitVeiw.setFitView);
   return () => {
@@ -5245,7 +5271,7 @@ const useBusinessTaxiServiceMap = () => {
   const { registerFitVeiw, setFitView } = useMapFitView({
     mapRef,
     autoFitTimeout: 5e3,
-    padding: [19, 26, 19, 26]
+    padding: [19, 36, 19, 26]
   });
   return { setMap, registerFitVeiw, setFitView };
 };

package/dist/style.css

@@ -140,7 +140,7 @@
   font-family: PingFangSC-Medium, PingFang SC;
   font-weight: 500;
   color: #1E1E1E;
-  line-height: 3.9vw;
+  line-height: 4vw;
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
   overflow: hidden;

package/package.json

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

package/todo.md

@@ -3,39 +3,26 @@ https://dawchihliou.github.io/articles/building-custom-google-maps-marker-react-
 2. Google 地址名称太长
 3. 高德地图加载期间出现大量的请求
 4. 做完其他事情进入首页，变成了获取定位失败，但其实 gps 是 ok 的，因为刷新页面是有点位的
+5. map 的两个 slot loading 和 error slot 没有生效
+6. 企业微信如果关闭定位，会不停的跳 geoError 事件
 
-特殊
+缩放问题
 
-- 5173
-- 5244 新开一个窗口，打开网址
-
-caught (in promise) Error: Invalid Object: LngLat(NaN, NaN)
+- 4867
+- 4920
 
 章新华
 
 - 5238
 
-郝瑞
-
-- 5033 是否可以关闭
-- 5177 不太明白
-- 5168 需要在 获取推荐点的接口调用那里增加 地图供应商参数
-
 不明白的
 
-- 4843
-- 4986
-- 5024
 - 5294
 
 需要复现
 
-- 4769
-- 4867
 - 5044
 - 5113
-- 5173
-- 5303 需要 nearAddress 发送的经纬度
 - 5291
 - 5257 我的 safari 没有问题
 
@@ -81,3 +68,14 @@ caught (in promise) Error: Invalid Object: LngLat(NaN, NaN)
 - 5198
 - 5173
 - 5168
+
+  0.5.1
+
+- 5303
+- 5329
+- 4769
+- 5044 （跟章新华说下）
+- 5314
+- 5347
+- 5348
+- 5057