@heycar/heycars-map 0.9.5 → 0.9.7

package/README.md

@@ -22,6 +22,19 @@ npm install @heycar/heycars-map --save
 import "@heycar/heycars-map/dist/style.css";
 ```
 
+### 自定义字体
+
+目前地图提供了 3 个字体 css variables 用于外部制定特殊字体
+
+```css
+/* 使用特殊字体 HarmonyOS_Sans_SC_Regular */
+body {
+  --HEYCAR_MAP_CSS_VAR_FONT_REGULAR: HarmonyOS_Sans_SC_Regular, "PingFangSC-Regular", "PingFang SC";
+  --HEYCAR_MAP_CSS_VAR_FONT_MEDIUM: HarmonyOS_Sans_SC_Medium, "PingFangSC-Medium", "PingFang SC";
+  --HEYCAR_MAP_CSS_VAR_FONT_SEMI_BOLD: HarmonyOS_Sans_SC_Bold, "PingFangSC-Semibold", "PingFang SC";
+}
+```
+
 ### 使用
 
 常用数据结构
@@ -202,7 +215,7 @@ export default defineComponent({
             " 最终的地址是: ",
             place,
             " 是否在绿区内: ",
-            isInZone
+            isInZone,
           );
         }}
         onClickLocator={() =>
@@ -313,7 +326,7 @@ export default defineComponent({
             " 最终的地址是: ",
             place,
             " 是否在绿区内: ",
-            isInZone
+            isInZone,
           );
         }}
         onGeoError={() => {

package/dist/index.cjs

@@ -7,9 +7,9 @@ var __publicField = (obj, key, value) => {
 };
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const Vue = require("vue");
-const style = "";
+const style_css_ts_vanilla = "";
 const name = "@heycar/heycars-map";
-const version = "0.9.5";
+const version = "0.9.7";
 const type = "module";
 const scripts = {
   dev: "vite -c vite.config.dev.ts",
@@ -1529,12 +1529,12 @@ const GmapAdvancedMarkerView = defineSetup(function GmapAdvancedMarkerView2(prop
   return () => null;
 });
 const createDom = (tag, props, innerHtml) => {
-  const { class: className, style: style2, ...restProps } = props != null ? props : {};
+  const { class: className, style, ...restProps } = props != null ? props : {};
   const elm = document.createElement(tag);
   if (className)
     elm.className = className;
-  if (style2)
-    elm.style.cssText = style2;
+  if (style)
+    elm.style.cssText = style;
   Object.assign(elm, restProps);
   if (innerHtml)
     elm.innerHTML = innerHtml;
@@ -6247,12 +6247,12 @@ const APassengerCircle = defineSetup(function APassengerCircle2(props) {
       angle
     } = props;
     const src = size === "large" ? angle === void 0 ? imgPassengerCircle : imgPassengerCircleArrow : angle === void 0 ? imgPassengerSmall : imgPassengerSmallArrow;
-    const style2 = angle === void 0 ? "" : `transform: rotate(var(${angle}))`;
+    const style = angle === void 0 ? "" : `transform: rotate(var(${angle}))`;
     const type2 = size === "large" ? angle === void 0 ? "large" : "largeArrow" : angle === void 0 ? "small" : "smallArrow";
     return `
         <img class="APassengerCircle ${passengerCircle({
       type: type2
-    })}" style="${style2}" src="${src}">
+    })}" style="${style}" src="${src}">
       `;
   });
   return () => {
@@ -6274,14 +6274,14 @@ const GPassengerCircle = defineSetup(function GPassengerCircle2(props) {
       angle
     } = props;
     const src = size === "large" ? angle === void 0 ? imgPassengerCircle : imgPassengerCircleArrow : angle === void 0 ? imgPassengerSmall : imgPassengerSmallArrow;
-    const style2 = angle === void 0 ? "" : `transform: rotate(var(${angle}))`;
+    const style = angle === void 0 ? "" : `transform: rotate(var(${angle}))`;
     const type2 = size === "large" ? angle === void 0 ? "large" : "largeArrow" : angle === void 0 ? "small" : "smallArrow";
     return createDom("img", {
       class: `GPassengerCircle ${passengerCircle({
         type: type2
       })}`,
       src,
-      style: style2
+      style
     });
   });
   return () => Vue.h(GmapAdvancedMarkerView, {
@@ -6346,10 +6346,15 @@ const usePointsLabelDirection = (props) => {
   const labeledPlacesRef = Vue.ref([]);
   const isContainBasePlaceRef = Vue.ref(false);
   watchEffectForDeepOption(
-    () => [[...props.places], { ...props.basePlace }, zoomRef.value],
-    ([places, basePlace]) => {
+    () => [[...props.places], { ...props.basePlace }, props.skip, zoomRef.value],
+    ([places, basePlace, skip]) => {
       const placesExcludeBase = places.filter((place) => !isPlaceEqual(place, basePlace));
       isContainBasePlaceRef.value = placesExcludeBase.length < places.length;
+      if (skip) {
+        labeledPlacesRef.value = placesExcludeBase;
+        directionsRef.value = Array(placesExcludeBase.length).fill("right");
+        return;
+      }
       const sortedPlaces = placesExcludeBase.sort(
         ({ lat: lat1 }, { lat: lat2 }) => lat1 < lat2 ? 1 : lat1 > lat2 ? -1 : 0
       );
@@ -6677,7 +6682,8 @@ const PickupPoints = defineSetup(function PickupPoints2(props, {
     basePlace: Vue.toRef(props, "basePlace"),
     places: Vue.toRef(props, "places"),
     heightLimit: 9,
-    widthLimit: 34
+    widthLimit: 34,
+    skip: Vue.toRef(props, "noLabel")
   }));
   return () => {
     const {
@@ -6768,6 +6774,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
   }) => {
     const place = toPlaceType(inputPlace);
     const recommends = toRecommendZonePlacesType(inputRecommends);
+    spaceLog("setCenterPlaceByUserSpecifiedInZone", "place, recommends.places = ", JSON.stringify(place), JSON.stringify(recommends.places));
     const isSameZone = recommends.zone && isZoneEqual(recommends.zone, zoneRef.value);
     if (!isSameZone)
       setZoom(ZONE_ZOOM);
@@ -6938,6 +6945,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
       "attrs": {
         "basePlace": centerPlace,
         "places": placeCandidates.value,
+        "noLabel": !!zoneRef.value,
         "zoomIconMin": zoneRef.value ? RECOMMEND_PLACE_ZONE_ICON_MIN : RECOMMEND_PLACE_ICON_ZOOM_MIN,
         "zoomTextMin": zoneRef.value ? RECOMMEND_PLACE_ZONE_TEXT_MIN : RECOMMEND_PLACE_TEXT_ZOOM_MIN
       },
@@ -7013,6 +7021,7 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
   }) => {
     const place = toPlaceType(inputPlace);
     const recommends = toRecommendZonePlacesType(inputRecommends);
+    spaceLog("setCenterPlaceByUserSpecifiedInZone", "place, recommends.places = ", JSON.stringify(place), JSON.stringify(recommends.places));
     const isSameZone = recommends.zone && isZoneEqual(recommends.zone, zoneRef.value);
     if (!isSameZone)
       setZoom(ZONE_ZOOM);
@@ -7122,6 +7131,8 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
   });
   watchPostEffectOnce(async () => {
     const value = await updatePlaceCandidates(defaultPlace);
+    if (value.isInZone)
+      setZoom(ZONE_ZOOM);
     emit("changeRecomandPlace", value);
   });
   Vue.watchEffect(() => {
@@ -7162,6 +7173,7 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
       "attrs": {
         "basePlace": centerPlace,
         "places": placeCandidates.value,
+        "noLabel": !!zoneRef.value,
         "zoomIconMin": zoneRef.value ? RECOMMEND_PLACE_ZONE_ICON_MIN : RECOMMEND_PLACE_ICON_ZOOM_MIN,
         "zoomTextMin": zoneRef.value ? RECOMMEND_PLACE_ZONE_TEXT_MIN : RECOMMEND_PLACE_TEXT_ZOOM_MIN
       },

package/dist/index.js

@@ -5,9 +5,9 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 import Vue, { defineComponent, h, computed, inject, provide, watch, onMounted, onUnmounted, watchPostEffect, shallowRef, ref, watchEffect, reactive, toRefs, toRef } from "vue";
-const style = "";
+const style_css_ts_vanilla = "";
 const name = "@heycar/heycars-map";
-const version = "0.9.5";
+const version = "0.9.7";
 const type = "module";
 const scripts = {
   dev: "vite -c vite.config.dev.ts",
@@ -1527,12 +1527,12 @@ const GmapAdvancedMarkerView = defineSetup(function GmapAdvancedMarkerView2(prop
   return () => null;
 });
 const createDom = (tag, props, innerHtml) => {
-  const { class: className, style: style2, ...restProps } = props != null ? props : {};
+  const { class: className, style, ...restProps } = props != null ? props : {};
   const elm = document.createElement(tag);
   if (className)
     elm.className = className;
-  if (style2)
-    elm.style.cssText = style2;
+  if (style)
+    elm.style.cssText = style;
   Object.assign(elm, restProps);
   if (innerHtml)
     elm.innerHTML = innerHtml;
@@ -6245,12 +6245,12 @@ const APassengerCircle = defineSetup(function APassengerCircle2(props) {
       angle
     } = props;
     const src = size === "large" ? angle === void 0 ? imgPassengerCircle : imgPassengerCircleArrow : angle === void 0 ? imgPassengerSmall : imgPassengerSmallArrow;
-    const style2 = angle === void 0 ? "" : `transform: rotate(var(${angle}))`;
+    const style = angle === void 0 ? "" : `transform: rotate(var(${angle}))`;
     const type2 = size === "large" ? angle === void 0 ? "large" : "largeArrow" : angle === void 0 ? "small" : "smallArrow";
     return `
         <img class="APassengerCircle ${passengerCircle({
       type: type2
-    })}" style="${style2}" src="${src}">
+    })}" style="${style}" src="${src}">
       `;
   });
   return () => {
@@ -6272,14 +6272,14 @@ const GPassengerCircle = defineSetup(function GPassengerCircle2(props) {
       angle
     } = props;
     const src = size === "large" ? angle === void 0 ? imgPassengerCircle : imgPassengerCircleArrow : angle === void 0 ? imgPassengerSmall : imgPassengerSmallArrow;
-    const style2 = angle === void 0 ? "" : `transform: rotate(var(${angle}))`;
+    const style = angle === void 0 ? "" : `transform: rotate(var(${angle}))`;
     const type2 = size === "large" ? angle === void 0 ? "large" : "largeArrow" : angle === void 0 ? "small" : "smallArrow";
     return createDom("img", {
       class: `GPassengerCircle ${passengerCircle({
         type: type2
       })}`,
       src,
-      style: style2
+      style
     });
   });
   return () => h(GmapAdvancedMarkerView, {
@@ -6344,10 +6344,15 @@ const usePointsLabelDirection = (props) => {
   const labeledPlacesRef = ref([]);
   const isContainBasePlaceRef = ref(false);
   watchEffectForDeepOption(
-    () => [[...props.places], { ...props.basePlace }, zoomRef.value],
-    ([places, basePlace]) => {
+    () => [[...props.places], { ...props.basePlace }, props.skip, zoomRef.value],
+    ([places, basePlace, skip]) => {
       const placesExcludeBase = places.filter((place) => !isPlaceEqual(place, basePlace));
       isContainBasePlaceRef.value = placesExcludeBase.length < places.length;
+      if (skip) {
+        labeledPlacesRef.value = placesExcludeBase;
+        directionsRef.value = Array(placesExcludeBase.length).fill("right");
+        return;
+      }
       const sortedPlaces = placesExcludeBase.sort(
         ({ lat: lat1 }, { lat: lat2 }) => lat1 < lat2 ? 1 : lat1 > lat2 ? -1 : 0
       );
@@ -6675,7 +6680,8 @@ const PickupPoints = defineSetup(function PickupPoints2(props, {
     basePlace: toRef(props, "basePlace"),
     places: toRef(props, "places"),
     heightLimit: 9,
-    widthLimit: 34
+    widthLimit: 34,
+    skip: toRef(props, "noLabel")
   }));
   return () => {
     const {
@@ -6766,6 +6772,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
   }) => {
     const place = toPlaceType(inputPlace);
     const recommends = toRecommendZonePlacesType(inputRecommends);
+    spaceLog("setCenterPlaceByUserSpecifiedInZone", "place, recommends.places = ", JSON.stringify(place), JSON.stringify(recommends.places));
     const isSameZone = recommends.zone && isZoneEqual(recommends.zone, zoneRef.value);
     if (!isSameZone)
       setZoom(ZONE_ZOOM);
@@ -6936,6 +6943,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
       "attrs": {
         "basePlace": centerPlace,
         "places": placeCandidates.value,
+        "noLabel": !!zoneRef.value,
         "zoomIconMin": zoneRef.value ? RECOMMEND_PLACE_ZONE_ICON_MIN : RECOMMEND_PLACE_ICON_ZOOM_MIN,
         "zoomTextMin": zoneRef.value ? RECOMMEND_PLACE_ZONE_TEXT_MIN : RECOMMEND_PLACE_TEXT_ZOOM_MIN
       },
@@ -7011,6 +7019,7 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
   }) => {
     const place = toPlaceType(inputPlace);
     const recommends = toRecommendZonePlacesType(inputRecommends);
+    spaceLog("setCenterPlaceByUserSpecifiedInZone", "place, recommends.places = ", JSON.stringify(place), JSON.stringify(recommends.places));
     const isSameZone = recommends.zone && isZoneEqual(recommends.zone, zoneRef.value);
     if (!isSameZone)
       setZoom(ZONE_ZOOM);
@@ -7120,6 +7129,8 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
   });
   watchPostEffectOnce(async () => {
     const value = await updatePlaceCandidates(defaultPlace);
+    if (value.isInZone)
+      setZoom(ZONE_ZOOM);
     emit("changeRecomandPlace", value);
   });
   watchEffect(() => {
@@ -7160,6 +7171,7 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
       "attrs": {
         "basePlace": centerPlace,
         "places": placeCandidates.value,
+        "noLabel": !!zoneRef.value,
         "zoomIconMin": zoneRef.value ? RECOMMEND_PLACE_ZONE_ICON_MIN : RECOMMEND_PLACE_ICON_ZOOM_MIN,
         "zoomTextMin": zoneRef.value ? RECOMMEND_PLACE_ZONE_TEXT_MIN : RECOMMEND_PLACE_TEXT_ZOOM_MIN
       },

package/dist/src/business-components/PickupPoints/PickupPoints.d.ts

@@ -4,6 +4,7 @@ export interface PickupPointsProps {
     basePlace: Place;
     zoomTextMin: number;
     zoomIconMin: number;
+    noLabel: boolean;
     onClick?: (value: Place) => any;
 }
 export declare const PickupPoints: import("vue-demi").DefineComponent<import("vue/types/v3-component-props").ComponentObjectPropsOptions<PickupPointsProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<PickupPointsProps, Required<PickupPointsProps>>, "click", PickupPointsProps, {}>;

package/dist/src/hooks/usePlacesLabelDirection.d.ts

@@ -5,6 +5,7 @@ export interface UsePointsLabelDirectionProps {
     places: Place[];
     widthLimit: number;
     heightLimit: number;
+    skip: boolean;
 }
 export declare const usePointsLabelDirection: (props: UsePointsLabelDirectionProps) => {
     directionsRef: import("vue-demi").Ref<LabelDirection[]>;

package/dist/src/style.css.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/var.css.d.ts

@@ -0,0 +1,5 @@
+export declare const fontVars: {
+    regular: `var(--${string})` | `var(--${string}, ${string})` | `var(--${string}, ${number})`;
+    medium: `var(--${string})` | `var(--${string}, ${string})` | `var(--${string}, ${number})`;
+    semiBold: `var(--${string})` | `var(--${string}, ${string})` | `var(--${string}, ${number})`;
+};

package/dist/style.css

@@ -1,4 +1,8 @@
-.n8tgem0 {
+:root {
+  --HEYCAR_MAP_CSS_VAR_FONT_REGULAR: PingFangSC-Regular, PingFang SC;
+  --HEYCAR_MAP_CSS_VAR_FONT_MEDIUM: PingFangSC-Medium, PingFang SC;
+  --HEYCAR_MAP_CSS_VAR_FONT_SEMI_BOLD: PingFangSC-Semibold, PingFang SC;
+}.n8tgem0 {
   pointer-events: none;
   position: absolute;
   bottom: 50%;
@@ -28,7 +32,7 @@
 .n8tgem5 {
   display: -webkit-box;
   font-size: 3.47vw;
-  font-family: PingFangSC-Semibold, PingFang SC;
+  font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_SEMI_BOLD);
   font-weight: 600;
   color: #FFFFFF;
   line-height: 4.8vw;
@@ -39,7 +43,7 @@
 .n8tgem6 {
   margin-top: 0.53vw;
   font-size: 2.93vw;
-  font-family: PingFangSC-Regular, PingFang SC;
+  font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_REGULAR);
   font-weight: 400;
   color: #FFFFFF;
   line-height: 4.27vw;
@@ -82,7 +86,7 @@
 }
 ._15rq2xn2 {
   font-size: 3.47vw;
-  font-family: PingFangSC-Semibold, PingFang SC;
+  font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_SEMI_BOLD);
   font-weight: 600;
   color: #FFFFFF;
   line-height: 4.8vw;
@@ -90,7 +94,7 @@
 }
 ._15rq2xn3 {
   font-size: 2.93vw;
-  font-family: PingFangSC-Regular, PingFang SC;
+  font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_REGULAR);
   font-weight: 400;
   color: #EAFAF8;
   line-height: 4.27vw;
@@ -172,7 +176,7 @@ a[title*="Google"]>div>img[alt="Google"], .gmnoprint {
   max-width: 41.33vw;
   width: max-content;
   font-size: 3.2vw;
-  font-family: PingFangSC-Medium, PingFang SC;
+  font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_MEDIUM);
   font-weight: 500;
   color: #1E1E1E;
   line-height: 4vw;
@@ -183,7 +187,7 @@ a[title*="Google"]>div>img[alt="Google"], .gmnoprint {
 ._4a4ovk4 {
   padding-top: 0.6vw;
   font-size: 2.4vw;
-  font-family: PingFangSC-Regular, PingFang SC;
+  font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_REGULAR);
   font-weight: 400;
   color: #7E7E7E;
   line-height: 3.47vw;
@@ -191,7 +195,7 @@ a[title*="Google"]>div>img[alt="Google"], .gmnoprint {
 }
 ._4a4ovk5 {
   color: #4471FF;
-  font-family: PingFangSC-Medium, PingFang SC;
+  font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_MEDIUM);
   font-weight: 500;
 }
 ._4a4ovk6 {
@@ -275,7 +279,7 @@ a[title*="Google"]>div>img[alt="Google"], .gmnoprint {
 .fhyw8c {
   display: -webkit-box;
   font-size: 3.2vw;
-  font-family: PingFangSC-Semibold, PingFang SC;
+  font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_SEMI_BOLD);
   font-weight: 600;
   color: #243E66;
   line-height: 4.53vw;
@@ -301,7 +305,7 @@ a[title*="Google"]>div>img[alt="Google"], .gmnoprint {
 }
 ._65j3sr4 {
   font-size: 3.2vw;
-  font-family: PingFangSC-Medium, PingFang SC;
+  font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_MEDIUM);
   font-weight: 500;
   color: #1E1E1E;
   line-height: 3.8vw;

package/package.json

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