@heycar/heycars-map 2.15.0-domestic4 → 2.16.0-downgrade1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (92) hide show
  1. package/README.md +16 -50
  2. package/dist/v2/App.js +2 -2
  3. package/dist/v2/Demo/DemoBusinessRecomendPlace.js +1 -2
  4. package/dist/v2/Demo/DemoBusinessTaxiEnd.d.ts +1 -2
  5. package/dist/v2/Demo/DemoBusinessTaxiEnd.js +2 -9
  6. package/dist/v2/Demo/DemoBusinessTaxiService.d.ts +1 -4
  7. package/dist/v2/Demo/DemoBusinessTaxiService.js +1 -19
  8. package/dist/v2/api/googleRoutes.js +2 -0
  9. package/dist/v2/business-components/BusinessRecomendPlaceMap/BusinessRecomendPlaceMap.d.ts +2 -2
  10. package/dist/v2/business-components/BusinessRecomendPlaceMap/BusinessRecomendPlaceMap.js +2 -3
  11. package/dist/v2/business-components/BusinessRecomendPlaceMap/index.js +2 -2
  12. package/dist/v2/business-components/BusinessRecomendPlaceMap/useCacheCenterPlace.d.ts +2 -1
  13. package/dist/v2/business-components/BusinessRecomendPlaceMap/useCacheCenterPlace.js +14 -6
  14. package/dist/v2/business-components/BusinessReselectPlaceMap/BusinessReselectPlaceMap.js +6 -2
  15. package/dist/v2/business-components/BusinessTaxiEndMap/BusinessTaxiEndMap.d.ts +3 -4
  16. package/dist/v2/business-components/BusinessTaxiEndMap/BusinessTaxiEndMap.js +2 -6
  17. package/dist/v2/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceMap.d.ts +1 -4
  18. package/dist/v2/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceMap.js +7 -45
  19. package/dist/v2/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceSection.d.ts +1 -6
  20. package/dist/v2/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceSection.js +16 -80
  21. package/dist/v2/chunks/{BusinessRecomendPlaceMap.eebd0822.js → BusinessRecomendPlaceMap.ed4b75d5.js} +30 -11
  22. package/dist/{v3/chunks/Loading.4b53c31f.js → v2/chunks/Loading.70dfc720.js} +30 -34
  23. package/dist/v2/components/Loading/Loading.js +1 -1
  24. package/dist/v2/components/Loading/index.js +1 -1
  25. package/dist/v2/components/MapProvider/MapProvider.d.ts +1 -3
  26. package/dist/v2/components/MapProvider/MapProvider.js +13 -25
  27. package/dist/v2/hooks/useMapCoordinatify.d.ts +1 -2
  28. package/dist/v2/hooks/useMapCoordinatify.js +1 -6
  29. package/dist/v2/hooks/useMapFitView.js +3 -0
  30. package/dist/v2/hooks/useMapFitZoom.d.ts +6 -0
  31. package/dist/v2/hooks/useMapFitZoom.js +22 -2
  32. package/dist/v2/hooks/useMapLoader.js +3 -3
  33. package/dist/v2/hooks-business/useBusinessRecomendPlaceMap.js +1 -1
  34. package/dist/v2/index.js +1 -1
  35. package/dist/v2/types/interface.d.ts +0 -12
  36. package/dist/v2/utils/geometryPolygon.d.ts +0 -9
  37. package/dist/v2/utils/geometryPolygon.js +0 -19
  38. package/dist/v2/utils/log.js +1 -1
  39. package/dist/v2/utils/platform.d.ts +1 -3
  40. package/dist/v2/utils/platform.js +2 -8
  41. package/dist/v2/utils/typeChecking.d.ts +1 -7
  42. package/dist/v2/utils/typeChecking.js +0 -18
  43. package/dist/v3/App.js +2 -2
  44. package/dist/v3/Demo/DemoBusinessRecomendPlace.js +1 -2
  45. package/dist/v3/Demo/DemoBusinessTaxiEnd.d.ts +1 -2
  46. package/dist/v3/Demo/DemoBusinessTaxiEnd.js +2 -9
  47. package/dist/v3/Demo/DemoBusinessTaxiService.d.ts +1 -4
  48. package/dist/v3/Demo/DemoBusinessTaxiService.js +1 -19
  49. package/dist/v3/api/googleRoutes.js +2 -0
  50. package/dist/v3/business-components/BusinessRecomendPlaceMap/BusinessRecomendPlaceMap.d.ts +2 -2
  51. package/dist/v3/business-components/BusinessRecomendPlaceMap/BusinessRecomendPlaceMap.js +2 -3
  52. package/dist/v3/business-components/BusinessRecomendPlaceMap/index.js +2 -2
  53. package/dist/v3/business-components/BusinessRecomendPlaceMap/useCacheCenterPlace.d.ts +2 -1
  54. package/dist/v3/business-components/BusinessRecomendPlaceMap/useCacheCenterPlace.js +14 -6
  55. package/dist/v3/business-components/BusinessReselectPlaceMap/BusinessReselectPlaceMap.js +6 -2
  56. package/dist/v3/business-components/BusinessTaxiEndMap/BusinessTaxiEndMap.d.ts +3 -4
  57. package/dist/v3/business-components/BusinessTaxiEndMap/BusinessTaxiEndMap.js +2 -6
  58. package/dist/v3/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceMap.d.ts +1 -4
  59. package/dist/v3/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceMap.js +7 -45
  60. package/dist/v3/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceSection.d.ts +1 -6
  61. package/dist/v3/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceSection.js +16 -62
  62. package/dist/v3/chunks/{BusinessRecomendPlaceMap.71c439c6.js → BusinessRecomendPlaceMap.4ec9353a.js} +30 -9
  63. package/dist/{v2/chunks/Loading.8aa3aad3.js → v3/chunks/Loading.4c949ec9.js} +27 -47
  64. package/dist/v3/components/Loading/Loading.js +1 -1
  65. package/dist/v3/components/Loading/index.js +1 -1
  66. package/dist/v3/components/MapProvider/MapProvider.d.ts +1 -3
  67. package/dist/v3/components/MapProvider/MapProvider.js +14 -26
  68. package/dist/v3/hooks/useMapCoordinatify.d.ts +1 -2
  69. package/dist/v3/hooks/useMapCoordinatify.js +1 -6
  70. package/dist/v3/hooks/useMapFitView.js +3 -0
  71. package/dist/v3/hooks/useMapFitZoom.d.ts +6 -0
  72. package/dist/v3/hooks/useMapFitZoom.js +22 -2
  73. package/dist/v3/hooks/useMapLoader.js +3 -3
  74. package/dist/v3/hooks-business/useBusinessRecomendPlaceMap.js +1 -1
  75. package/dist/v3/index.js +1 -1
  76. package/dist/v3/types/interface.d.ts +0 -12
  77. package/dist/v3/utils/geometryPolygon.d.ts +0 -9
  78. package/dist/v3/utils/geometryPolygon.js +0 -19
  79. package/dist/v3/utils/log.js +1 -1
  80. package/dist/v3/utils/platform.d.ts +1 -3
  81. package/dist/v3/utils/platform.js +2 -8
  82. package/dist/v3/utils/typeChecking.d.ts +1 -7
  83. package/dist/v3/utils/typeChecking.js +0 -18
  84. package/package.json +1 -1
  85. package/dist/v2/Demo/demo.data.mock.d.ts +0 -4
  86. package/dist/v2/Demo/demo.data.mock.js +0 -1194
  87. package/dist/v2/business-components/TaxiCar/RandomCars.d.ts +0 -6
  88. package/dist/v2/business-components/TaxiCar/RandomCars.js +0 -47
  89. package/dist/v3/Demo/demo.data.mock.d.ts +0 -4
  90. package/dist/v3/Demo/demo.data.mock.js +0 -1194
  91. package/dist/v3/business-components/TaxiCar/RandomCars.d.ts +0 -8
  92. package/dist/v3/business-components/TaxiCar/RandomCars.js +0 -45
@@ -5,9 +5,7 @@ import { type GmapLoaderProps, type UseMapLoaderProps } from "../../hooks/useMap
5
5
  import { type MapSupplierPayolad } from "../../hooks/useMapSupplier";
6
6
  import type { AmapMap } from "../../types/interface";
7
7
  import { type AmapProps } from "../Amap";
8
- export type MapProviderProps = UseMapLoaderProps & Pick<MapSupplierPayolad, "gmapId" | "gmapRasterId" | "gaodeDirectionDrivingProxyUrl" | "gaodeDirectionWalkingProxyUrl" | "googleDirectionsProxyUrl" | "googleRoutesProxyUrl" | "googleSnapRoadProxyUrl" | "themeVariables" | "renderLoadFailedTitle" | "renderLoadFailedDescription"> & {
9
- forceBrowserPlatformH5?: boolean;
10
- };
8
+ export type MapProviderProps = UseMapLoaderProps & Pick<MapSupplierPayolad, "gmapId" | "gmapRasterId" | "gaodeDirectionDrivingProxyUrl" | "gaodeDirectionWalkingProxyUrl" | "googleDirectionsProxyUrl" | "googleRoutesProxyUrl" | "googleSnapRoadProxyUrl" | "themeVariables" | "renderLoadFailedTitle" | "renderLoadFailedDescription">;
11
9
  export declare const MapProvider: import("vue-demi").DefineComponent<import("vue3").ComponentObjectPropsOptions<MapProviderProps>, 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<MapProviderProps, Required<MapProviderProps>>, "success" | "fail" | "downloadOptimizeEnd", MapProviderProps>;
12
10
  export interface HeycarMapProps extends Pick<GmapLoaderProps, "fallback" | "loading">, Pick<AmapProps, "center" | "zoom"> {
13
11
  mapRef?: SetMap<AmapMap> | SetMap<google.maps.Map>;
@@ -1,13 +1,13 @@
1
1
  import "../../css/MapProvider-156bfd53.css";
2
2
  import { h } from "vue";
3
3
  import { reactive, toRefs } from "vue-demi";
4
- import { L as LoadFailed, a as Loading, i as imgGrid } from "../../chunks/Loading.8aa3aad3.js";
4
+ import { L as LoadFailed, a as Loading, i as imgGrid } from "../../chunks/Loading.70dfc720.js";
5
5
  import { useMapLoader, Status } from "../../hooks/useMapLoader.js";
6
6
  import { provideMapSupplier, useMapSupplier } from "../../hooks/useMapSupplier.js";
7
7
  import { defineLagecySetup } from "../../types/helper.js";
8
8
  import "../../utils/alipayPolyfill.js";
9
9
  import { loadTraditionalChineseConvertOnce } from "../../utils/cn2tw.js";
10
- import { detectWebGL, WEBGL_STATUS, injectForcedBrowserPlatform, BRWOSER_PLATFORM, detectBrowserPlatform, OS_PLATFORM, detectOSPlatform } from "../../utils/platform.js";
10
+ import { detectWebGL, WEBGL_STATUS, detectBrowserPlatform, OS_PLATFORM, BRWOSER_PLATFORM, detectOSPlatform } from "../../utils/platform.js";
11
11
  import { vec2lnglat } from "../../utils/transform.js";
12
12
  import { Amap } from "../Amap/Amap.js";
13
13
  import { Gmap } from "../Gmap/Gmap.js";
@@ -45,13 +45,12 @@ const MapProvider = defineLagecySetup("MapProvider", function(props, {
45
45
  return Reflect.get(target, name, receiver);
46
46
  }
47
47
  });
48
- injectForcedBrowserPlatform(props.forceBrowserPlatformH5 ? BRWOSER_PLATFORM.H5 : void 0);
49
48
  provideMapSupplier(context);
50
49
  return () => {
51
50
  var _a;
52
51
  return h("div", [(_a = slots.default) == null ? void 0 : _a.call(slots)]);
53
52
  };
54
- }).props(["amapKey", "amapSecret", "amapServiceHost", "gmapId", "gmapRasterId", "gmapKey", "supplier", "language", "gaodeDirectionDrivingProxyUrl", "gaodeDirectionWalkingProxyUrl", "googleDirectionsProxyUrl", "googleRoutesProxyUrl", "googleSnapRoadProxyUrl", "themeVariables", "renderLoadFailedTitle", "renderLoadFailedDescription", "forceBrowserPlatformH5"]);
53
+ }).props(["amapKey", "amapSecret", "amapServiceHost", "gmapId", "gmapRasterId", "gmapKey", "supplier", "language", "gaodeDirectionDrivingProxyUrl", "gaodeDirectionWalkingProxyUrl", "googleDirectionsProxyUrl", "googleRoutesProxyUrl", "googleSnapRoadProxyUrl", "themeVariables", "renderLoadFailedTitle", "renderLoadFailedDescription"]);
55
54
  const HeycarMap = defineLagecySetup("HeycarMap", function(props, {
56
55
  slots,
57
56
  emit,
@@ -81,7 +80,7 @@ const HeycarMap = defineLagecySetup("HeycarMap", function(props, {
81
80
  });
82
81
  loadTraditionalChineseConvertOnce(payload.language === "zh-TW");
83
82
  return () => {
84
- var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
83
+ var _a, _b, _c, _d, _e, _f, _g, _h;
85
84
  const {
86
85
  supplier,
87
86
  gmapId,
@@ -100,30 +99,19 @@ const HeycarMap = defineLagecySetup("HeycarMap", function(props, {
100
99
  const node = (_a = slots.fallback) == null ? void 0 : _a.call(slots);
101
100
  const title = (_b = payload.renderLoadFailedTitle) == null ? void 0 : _b.call(payload, status);
102
101
  const description = (_c = payload.renderLoadFailedDescription) == null ? void 0 : _c.call(payload, status);
103
- return node ? h("div", {
104
- "class": (_d = attrs.class) != null ? _d : "",
105
- "style": attrs.style
106
- }, [node]) : h(LoadFailed, {
107
- "class": (_e = attrs.class) != null ? _e : "",
102
+ return node ? h("div", [node]) : h(LoadFailed, {
108
103
  "attrs": {
109
104
  "title": title,
110
105
  "description": description
111
- },
112
- "style": attrs.style
106
+ }
113
107
  });
114
108
  }
115
109
  if (status === Status.LOADING || status === Status.SUCCESS && pingStatus === "pending") {
116
- const node = (_f = slots.loading) == null ? void 0 : _f.call(slots);
117
- return node ? h("div", {
118
- "class": (_g = attrs.class) != null ? _g : "",
119
- "style": attrs.style
120
- }, [node]) : h(Loading, {
121
- "class": (_h = attrs.class) != null ? _h : "",
122
- "style": attrs.style
123
- });
110
+ const node = (_d = slots.loading) == null ? void 0 : _d.call(slots);
111
+ return node ? h("div", [node]) : h(Loading);
124
112
  }
125
- const children = (_i = slots.default) == null ? void 0 : _i.call(slots);
126
- const outArea = (_j = slots.outerArea) == null ? void 0 : _j.call(slots);
113
+ const children = (_e = slots.default) == null ? void 0 : _e.call(slots);
114
+ const outArea = (_f = slots.outerArea) == null ? void 0 : _f.call(slots);
127
115
  switch (supplier) {
128
116
  case "gmap": {
129
117
  const renderingType = compatibleGmapRenderingType({
@@ -131,7 +119,7 @@ const HeycarMap = defineLagecySetup("HeycarMap", function(props, {
131
119
  touchZoomCenter
132
120
  });
133
121
  return h("div", {
134
- "class": `${heycarMap} ${(_k = attrs.class) != null ? _k : ""}`,
122
+ "class": `${heycarMap} ${(_g = attrs.class) != null ? _g : ""}`,
135
123
  "attrs": {
136
124
  "lang": language
137
125
  },
@@ -157,7 +145,7 @@ const HeycarMap = defineLagecySetup("HeycarMap", function(props, {
157
145
  "dragEnd": gmapHandleDargEnd,
158
146
  "resize": handleResize
159
147
  }
160
- }, [h("div", [children])]), h("img", {
148
+ }, [children]), h("img", {
161
149
  "class": heycarGmapBackgroundDefaultLoadingImage,
162
150
  "attrs": {
163
151
  "src": imgGrid
@@ -166,7 +154,7 @@ const HeycarMap = defineLagecySetup("HeycarMap", function(props, {
166
154
  }
167
155
  default:
168
156
  return h("div", {
169
- "class": `${heycarMap} ${(_l = attrs.class) != null ? _l : ""}`,
157
+ "class": `${heycarMap} ${(_h = attrs.class) != null ? _h : ""}`,
170
158
  "attrs": {
171
159
  "lang": language
172
160
  },
@@ -1,4 +1,4 @@
1
- import { type CoordinateExternalRoute, type CoordinateGeoPosition, type CoordinatePlace, type CoordinatePoint, type CoordinateRecommendZonePlaces, type CoordinateTrackPoint, type CoordinateValueOfOnChangeRecommendPlace, type CoordinateZone, type ExternalRoute, type GeoPosition, type Place, type Point, type RecommendZonePlaces, type TrackPoint, type ValueOfOnChangeRecommendPlace, type Zone } from "../types/interface";
1
+ import { type CoordinateGeoPosition, type CoordinatePlace, type CoordinatePoint, type CoordinateRecommendZonePlaces, type CoordinateTrackPoint, type CoordinateValueOfOnChangeRecommendPlace, type CoordinateZone, type GeoPosition, type Place, type Point, type RecommendZonePlaces, type TrackPoint, type ValueOfOnChangeRecommendPlace, type Zone } from "../types/interface";
2
2
  export declare function useMapCoordinatify(): {
3
3
  coordinatifyPoint: (value: Point) => CoordinatePoint;
4
4
  unCoordinatifyPoint: (value: CoordinatePoint) => Point;
@@ -12,5 +12,4 @@ export declare function useMapCoordinatify(): {
12
12
  unCoordinatifyValueOfOnChangeRecommendPlace: (value: CoordinateValueOfOnChangeRecommendPlace) => ValueOfOnChangeRecommendPlace;
13
13
  coordinatifyGeoPosition: (value: GeoPosition) => CoordinateGeoPosition;
14
14
  unCoordinatifyTrackPoint: (value: CoordinateTrackPoint) => TrackPoint;
15
- unCoordinatifyExternalRoute: (value: CoordinateExternalRoute) => ExternalRoute;
16
15
  };
@@ -74,10 +74,6 @@ function useMapCoordinatify() {
74
74
  const [lng, lat] = unCoordinatifyPoint(value);
75
75
  return { ...others, lng, lat };
76
76
  };
77
- const unCoordinatifyExternalRoute = (value) => {
78
- const { path, duration, distance } = value;
79
- return { path: path.map(unCoordinatifyPoint), duration, distance };
80
- };
81
77
  const coordinatifyGeoPosition = (value) => {
82
78
  return {
83
79
  ...value,
@@ -96,8 +92,7 @@ function useMapCoordinatify() {
96
92
  coordinatifyValueOfOnChangeRecommendPlace,
97
93
  unCoordinatifyValueOfOnChangeRecommendPlace,
98
94
  coordinatifyGeoPosition,
99
- unCoordinatifyTrackPoint,
100
- unCoordinatifyExternalRoute
95
+ unCoordinatifyTrackPoint
101
96
  };
102
97
  }
103
98
  export {
@@ -75,6 +75,9 @@ class SimpleGmapOverLayerGroup extends Set {
75
75
  }
76
76
  function gmapFitBoundNoAnimate(map, bound, padding) {
77
77
  const projection = map.getProjection();
78
+ if (!projection) {
79
+ debugger;
80
+ }
78
81
  if (!projection || bound.isEmpty())
79
82
  return;
80
83
  const { top = 0, right = 0, bottom = 0, left = 0 } = padding;
@@ -1,9 +1,15 @@
1
1
  /// <reference types="google.maps" />
2
2
  import type { AmapMap, MapShallowRef, Point } from "../types/interface";
3
+ interface CertainZoomArea {
4
+ zoom: number;
5
+ points: Point[];
6
+ }
3
7
  export interface UseMapFitZoomProps<M = AmapMap | google.maps.Map> {
4
8
  mapRef: MapShallowRef<M>;
5
9
  padding?: [number, number, number, number];
10
+ certainZoomAreas?: CertainZoomArea[];
6
11
  }
7
12
  export declare const useMapFitZoom: (props: UseMapFitZoomProps) => {
8
13
  setFitZoom: (points?: Point[], base?: Point, immediate?: boolean) => void;
9
14
  };
15
+ export {};
@@ -1,3 +1,4 @@
1
+ import { pointInPolygon } from "../utils/geometryPolygon.js";
1
2
  import { vec2lnglat, deltaZoom2animationDuration } from "../utils/transform.js";
2
3
  import { useMapSupplier } from "./useMapSupplier.js";
3
4
  const points2bound = (points) => {
@@ -7,8 +8,17 @@ const points2bound = (points) => {
7
8
  const latList = points.map((p) => p[1]);
8
9
  return [Math.min(...latList), Math.max(...lngList), Math.max(...latList), Math.min(...lngList)];
9
10
  };
11
+ const matchCertainZoomArea = (point, certainZoomAreas) => {
12
+ if (!point || !certainZoomAreas)
13
+ return void 0;
14
+ for (const area of certainZoomAreas) {
15
+ if (pointInPolygon(point, area.points) >= 0)
16
+ return area.zoom;
17
+ }
18
+ return void 0;
19
+ };
10
20
  const useAmapFitZoom = (props) => {
11
- const { mapRef, padding = [0, 0, 0, 0] } = props;
21
+ const { mapRef, padding = [0, 0, 0, 0], certainZoomAreas } = props;
12
22
  const setZoom = (v, immediate = false) => {
13
23
  var _a, _b, _c, _d;
14
24
  if (immediate)
@@ -21,6 +31,11 @@ const useAmapFitZoom = (props) => {
21
31
  const map = mapRef.value;
22
32
  if (!points || !(map == null ? void 0 : map.amap))
23
33
  return;
34
+ const matchedCertainZoom = matchCertainZoomArea(points[0], certainZoomAreas);
35
+ if (matchedCertainZoom) {
36
+ setZoom(matchedCertainZoom, immediate);
37
+ return;
38
+ }
24
39
  const bound = points2bound(points.map((p) => {
25
40
  var _a;
26
41
  return (_a = map.lngLatToPixel(p, 0)) == null ? void 0 : _a.toArray();
@@ -49,7 +64,7 @@ const useAmapFitZoom = (props) => {
49
64
  return { setFitZoom };
50
65
  };
51
66
  const useGmapFitZoom = (props) => {
52
- const { mapRef, padding = [0, 0, 0, 0] } = props;
67
+ const { mapRef, padding = [0, 0, 0, 0], certainZoomAreas } = props;
53
68
  const setZoom = (v, immediate = false) => {
54
69
  var _a, _b;
55
70
  if (immediate)
@@ -63,6 +78,11 @@ const useGmapFitZoom = (props) => {
63
78
  const projection = map.getProjection();
64
79
  if (!projection)
65
80
  return;
81
+ const matchedCertainZoom = matchCertainZoomArea(points[0], certainZoomAreas);
82
+ if (matchedCertainZoom) {
83
+ setZoom(matchedCertainZoom, immediate);
84
+ return;
85
+ }
66
86
  const bound = points2bound(
67
87
  points.map((p) => {
68
88
  const { x, y } = projection.fromLatLngToPoint(vec2lnglat(p));
@@ -549,7 +549,7 @@ var dist = {
549
549
  });
550
550
  })(dist);
551
551
  const MIN_MAP_RELOAD_INTERVAL = 5e3;
552
- const MIN_GMAP_LOAD_RESET_THRESHOLD = 1e3;
552
+ const MIN_MAP_LOAD_RESET_THRESHOLD = 1e3;
553
553
  const DEFAULT_AMAP_PLUGINS = [
554
554
  "AMap.Geocoder",
555
555
  "AMap.Driving",
@@ -608,7 +608,7 @@ const useAmapLoader = (props) => {
608
608
  if (statusRef.value === "SUCCESS")
609
609
  return Promise.resolve();
610
610
  defineSecurityOnce();
611
- distExports.reset();
611
+ throttledExecute(() => distExports.reset());
612
612
  statusRef.value = "LOADING";
613
613
  setTimeout(preloadAmapStyleOnce);
614
614
  const startTime = Date.now();
@@ -651,7 +651,7 @@ const useAmapLoader = (props) => {
651
651
  watchPostEffectForDeepOption(() => [optionsRef.value, disableRef == null ? void 0 : disableRef.value], keepRetry);
652
652
  return { statusRef, pingStatusRef, readyPromise };
653
653
  };
654
- const throttledExecute = throttle((fn) => fn(), MIN_GMAP_LOAD_RESET_THRESHOLD, {
654
+ const throttledExecute = throttle((fn) => fn(), MIN_MAP_LOAD_RESET_THRESHOLD, {
655
655
  trailing: false
656
656
  });
657
657
  const useGmapLoader = (props) => {
@@ -1,5 +1,5 @@
1
1
  import { reactive, ref, readonly } from "vue-demi";
2
- import { E as EMPTY_PLACE } from "../chunks/BusinessRecomendPlaceMap.eebd0822.js";
2
+ import { E as EMPTY_PLACE } from "../chunks/BusinessRecomendPlaceMap.ed4b75d5.js";
3
3
  import { CenterPlaceStatus } from "../types/interface.js";
4
4
  import { proxyFunctionalProperty, assertAssingedBeforeUsed } from "../utils/helper.js";
5
5
  const useBusinessRecomendPlaceMap = () => {
package/dist/v2/index.js CHANGED
@@ -2,7 +2,7 @@ import "./utils/alipayPolyfill.js";
2
2
  import { isCoordinatePointEqual } from "./api/geometry.js";
3
3
  import { AbsoluteAddressBox } from "./business-components/AbsoluteAddressBox/AbsoluteAddressBox.js";
4
4
  import { BusinessQuotingMap } from "./business-components/BusinessQuotingMap/BusinessQuotingMap.js";
5
- import { B } from "./chunks/BusinessRecomendPlaceMap.eebd0822.js";
5
+ import { B } from "./chunks/BusinessRecomendPlaceMap.ed4b75d5.js";
6
6
  import { BusinessReselectPlaceMap } from "./business-components/BusinessReselectPlaceMap/BusinessReselectPlaceMap.js";
7
7
  import { BusinessTaxiEndMap } from "./business-components/BusinessTaxiEndMap/BusinessTaxiEndMap.js";
8
8
  import { BusinessTaxiServiceMap } from "./business-components/BusinessTaxiServiceMap/BusinessTaxiServiceMap.js";
@@ -80,11 +80,6 @@ export interface Route {
80
80
  steps: RouteStep[];
81
81
  trafficJams?: TrafficJams;
82
82
  }
83
- export interface ExternalRoute {
84
- path: Point[];
85
- duration: number;
86
- distance: number;
87
- }
88
83
  export interface TrackPoint {
89
84
  lng: number;
90
85
  lat: number;
@@ -95,13 +90,6 @@ export interface TrackPoint {
95
90
  export interface CoordinateTrackPoint extends TrackPoint {
96
91
  type: CoordinateType;
97
92
  }
98
- export interface CoordinateExternalRoute extends Omit<ExternalRoute, "path"> {
99
- path: CoordinatePoint[];
100
- }
101
- export type GetDriverRouteOrTrackOutput = {
102
- routes?: CoordinateExternalRoute;
103
- tracks?: CoordinateTrackPoint[];
104
- };
105
93
  export type RecommendType = "Restricted" | "Forbidden" | "Recommend";
106
94
  export type DriverStatus = "dispatching" | "book-dispatching" | "dispatched" | "driverStartService" | "driverStartRelayService" | "book-driverStartService" | "book-dispatched" | "driverArrived" | "inService" | "canceled" | "endService" | "completed" | "canceling" | "banlanceRefund" | "waitBanlanceRefund" | "rechargePayed" | "waitRechargePay" | "payed" | "waitpay" | "refund" | "confirmed" | "assign" | "orderReassigned";
107
95
  export declare enum CenterPlaceStatus {
@@ -9,12 +9,3 @@ export declare const distanceBetweenTwoPoints: (from: Point, to: Point) => numbe
9
9
  * 计算折线(按顺序连接各点)总长度。
10
10
  */
11
11
  export declare const computeLineLength: (line: Point[]) => number;
12
- /**
13
- * 计算从起点指向终点的初始方位角(heading)。
14
- * 说明:
15
- * - 基于球面大圆航线计算(WGS84 半径近似),与常见地图 SDK 的 heading 含义一致
16
- * - 返回范围为 [-180, 180](度):0 表示正北,正值为东偏北,负值为西偏南
17
- * - 起终点经纬完全相同返回 0
18
- * @returns 初始方位角(度)
19
- */
20
- export declare const computeLineAngle: (from: Point, to: Point) => number;
@@ -47,26 +47,7 @@ const computeLineLength = (line) => {
47
47
  }
48
48
  return totalLength;
49
49
  };
50
- const computeLineAngle = (from, to) => {
51
- const [lng1, lat1] = from;
52
- const [lng2, lat2] = to;
53
- if (lng1 === lng2 && lat1 === lat2)
54
- return 0;
55
- const toRad = (deg) => deg * Math.PI / 180;
56
- const toDeg = (rad) => rad * 180 / Math.PI;
57
- const phi1 = toRad(lat1);
58
- const phi2 = toRad(lat2);
59
- const lambda1 = toRad(lng1);
60
- const lambda2 = toRad(lng2);
61
- const deltaLambda = lambda2 - lambda1;
62
- const y = Math.sin(deltaLambda) * Math.cos(phi2);
63
- const x = Math.cos(phi1) * Math.sin(phi2) - Math.sin(phi1) * Math.cos(phi2) * Math.cos(deltaLambda);
64
- let heading = toDeg(Math.atan2(y, x));
65
- heading = (heading + 540) % 360 - 180;
66
- return heading;
67
- };
68
50
  export {
69
- computeLineAngle,
70
51
  computeLineLength,
71
52
  distanceBetweenTwoPoints,
72
53
  pointInPolygon
@@ -1,6 +1,6 @@
1
1
  const availableLogKeys = /* @__PURE__ */ new Set();
2
2
  const pkgName = "@heycar/heycars-map";
3
- const pkgVersion = "2.15.0-domestic4";
3
+ const pkgVersion = "2.16.0-downgrade1";
4
4
  const spaceLogSessionKey = "wiajlf;jwiatitruiq3jrlw";
5
5
  const enableSessionLogKey = (key) => {
6
6
  const sessionParam = new URLSearchParams(sessionStorage.getItem(spaceLogSessionKey) || void 0);
@@ -4,8 +4,7 @@ export declare enum BRWOSER_PLATFORM {
4
4
  ALIPAY = "ALIPAY",
5
5
  ALIPAY_MINIPROGRAM = "ALIPAY_MINIPROGRAM",
6
6
  H5 = "H5",
7
- NODE_JS = "NODE_JS",
8
- ENTERPRISE_WECHAT = "ENTERPRISE_WECHAT"
7
+ NODE_JS = "NODE_JS"
9
8
  }
10
9
  export declare enum OS_PLATFORM {
11
10
  IOS = "IOS",
@@ -22,7 +21,6 @@ export declare enum ALIPAY_WALLET {
22
21
  TMN = "TMN"
23
22
  }
24
23
  export declare const detectAlipayWallet: () => ALIPAY_WALLET | undefined;
25
- export declare const injectForcedBrowserPlatform: (platform: BRWOSER_PLATFORM | undefined) => BRWOSER_PLATFORM | undefined;
26
24
  export declare const detectBrowserPlatform: () => BRWOSER_PLATFORM;
27
25
  export declare const detectOSPlatform: () => OS_PLATFORM;
28
26
  /**
@@ -5,7 +5,6 @@ var BRWOSER_PLATFORM = /* @__PURE__ */ ((BRWOSER_PLATFORM2) => {
5
5
  BRWOSER_PLATFORM2["ALIPAY_MINIPROGRAM"] = "ALIPAY_MINIPROGRAM";
6
6
  BRWOSER_PLATFORM2["H5"] = "H5";
7
7
  BRWOSER_PLATFORM2["NODE_JS"] = "NODE_JS";
8
- BRWOSER_PLATFORM2["ENTERPRISE_WECHAT"] = "ENTERPRISE_WECHAT";
9
8
  return BRWOSER_PLATFORM2;
10
9
  })(BRWOSER_PLATFORM || {});
11
10
  var OS_PLATFORM = /* @__PURE__ */ ((OS_PLATFORM2) => {
@@ -35,16 +34,12 @@ const detectAlipayWallet = () => {
35
34
  return "TMN";
36
35
  return void 0;
37
36
  };
38
- let forcedBrowserPlatform = void 0;
39
- const injectForcedBrowserPlatform = (platform) => forcedBrowserPlatform = platform;
40
37
  const detectBrowserPlatform = () => {
41
38
  if (typeof navigator === "undefined")
42
39
  return "NODE_JS";
43
- if (forcedBrowserPlatform)
44
- return forcedBrowserPlatform;
45
40
  const useragent = navigator.userAgent.toLowerCase();
46
41
  if (useragent.includes("micromessenger")) {
47
- return useragent.includes("miniprogram") ? "WECHAT_MINIPROGRAM" : useragent.includes("wxwork") ? "ENTERPRISE_WECHAT" : "WECHAT";
42
+ return useragent.includes("miniprogram") ? "WECHAT_MINIPROGRAM" : "WECHAT";
48
43
  }
49
44
  if (useragent.includes("alipay") || detectAlipayWallet()) {
50
45
  return useragent.includes("miniprogram") ? "ALIPAY_MINIPROGRAM" : "ALIPAY";
@@ -97,6 +92,5 @@ export {
97
92
  detectBrowserPlatform,
98
93
  detectOSPlatform,
99
94
  detectTouchDevice,
100
- detectWebGL,
101
- injectForcedBrowserPlatform
95
+ detectWebGL
102
96
  };
@@ -1,4 +1,4 @@
1
- import type { CoordinateExternalRoute, CoordinatePlace, CoordinatePoint, CoordinateRecommendZonePlaces, CoordinateTrackPoint, CoordinateType, CoordinateZone, ProxyServiceError, RecommendType } from "../types/interface";
1
+ import type { CoordinatePlace, CoordinatePoint, CoordinateRecommendZonePlaces, CoordinateTrackPoint, CoordinateType, CoordinateZone, ProxyServiceError, RecommendType } from "../types/interface";
2
2
  export declare const createTypeError: (typeName: string, value: unknown, detail?: string) => Error;
3
3
  export declare function isCoordinateType(type: unknown): type is CoordinateType;
4
4
  export declare function isRecommendType(type: unknown): type is RecommendType;
@@ -41,12 +41,6 @@ interface MaybeCoordinateTrackPoint {
41
41
  timestamp?: number | string;
42
42
  }
43
43
  export declare const toCoordinateTrackPoint: (value?: MaybeCoordinateTrackPoint) => CoordinateTrackPoint;
44
- interface MaybeCoordinateExternalRoute {
45
- path?: MaybeCoordinatePoint[];
46
- duration?: number | string | null;
47
- distance?: number | string | null;
48
- }
49
- export declare const toCoordinateExternalRoute: (maybeCoordinateExternalRoute?: MaybeCoordinateExternalRoute) => CoordinateExternalRoute;
50
44
  export declare function isProxyServiceError(error: unknown): error is ProxyServiceError;
51
45
  export declare function toGeolocationPositionError(error: unknown, prefix?: string): GeolocationPositionError;
52
46
  /**
@@ -107,23 +107,6 @@ const toCoordinateTrackPoint = (value) => {
107
107
  }
108
108
  return { lng, lat, type, angle, speed, timestamp };
109
109
  };
110
- const toCoordinateExternalRoute = (maybeCoordinateExternalRoute) => {
111
- var _a;
112
- try {
113
- if (!maybeCoordinateExternalRoute)
114
- throw Error();
115
- const duration = Number(maybeCoordinateExternalRoute.duration);
116
- const distance = Number(maybeCoordinateExternalRoute.distance);
117
- if (isNaN(duration) || isNaN(distance))
118
- throw Error();
119
- if (!Array.isArray(maybeCoordinateExternalRoute.path))
120
- throw Error();
121
- const path = (_a = maybeCoordinateExternalRoute.path) == null ? void 0 : _a.map(toCoordinatePointType);
122
- return { path, duration, distance };
123
- } catch (err) {
124
- throw createTypeError("CoordinateExternalRoute", maybeCoordinateExternalRoute, err == null ? void 0 : err.message);
125
- }
126
- };
127
110
  function isProxyServiceError(error) {
128
111
  return !!error && typeof error === "object" && "msg" in error && "code" in error;
129
112
  }
@@ -189,7 +172,6 @@ export {
189
172
  isCoordinateType,
190
173
  isProxyServiceError,
191
174
  isRecommendType,
192
- toCoordinateExternalRoute,
193
175
  toCoordinatePlaceType,
194
176
  toCoordinatePointType,
195
177
  toCoordinateRecommendZonePlacesType,
package/dist/v3/App.js CHANGED
@@ -8,7 +8,7 @@ const amapApiKey = "fcb7b14c930354a248e21f4031dfa179";
8
8
  const amapApiSecret = "11ad0e3d585b80d18b1ada5b0d947c4a";
9
9
  const App = /* @__PURE__ */ defineComponent({
10
10
  setup() {
11
- const supplierRef = ref("amap");
11
+ const supplierRef = ref("gmap");
12
12
  window.supplierRef = supplierRef;
13
13
  return () => createVNode(MapProvider, {
14
14
  "amapKey": amapApiKey,
@@ -18,7 +18,7 @@ const App = /* @__PURE__ */ defineComponent({
18
18
  "language": "en",
19
19
  "supplier": supplierRef.value,
20
20
  "googleSnapRoadProxyUrl": "/overseas/maps/snapToRoads",
21
- "googleRoutesProxyUrl": "/overseas/maps/routes/directions",
21
+ "googleRoutesProxyUrl": "/overseas/maps/routes/directions/v2",
22
22
  "themeVariables": {
23
23
  // 默认主题
24
24
  // TRAFFIC_UNKNOWN_BACKGROUND_COLOR: "#00C875",
@@ -1,5 +1,5 @@
1
1
  import { createVNode } from "vue";
2
- import { B as BusinessRecomendPlaceMap } from "../chunks/BusinessRecomendPlaceMap.71c439c6.js";
2
+ import { B as BusinessRecomendPlaceMap } from "../chunks/BusinessRecomendPlaceMap.4ec9353a.js";
3
3
  import { useBusinessRecomendPlaceMap } from "../hooks-business/useBusinessRecomendPlaceMap.js";
4
4
  import { defineSetup } from "../types/helper.js";
5
5
  import { d as demo } from "../chunks/Demo.css.e921a2f6.js";
@@ -123,7 +123,6 @@ const DemoBusinessRecomendPlace = defineSetup("DemoBusinessRecomendPlace", funct
123
123
  name: "default place name",
124
124
  displayName: "default place displayName"
125
125
  },
126
- "enableNearbyCars": true,
127
126
  "getAvailable": () => Promise.resolve(true),
128
127
  "getRecomendPlace": getRecomendPlace,
129
128
  "renderPlacePhoto": (place) => {
@@ -1,7 +1,6 @@
1
- import { type CoordinatePlace, type CoordinatePoint } from "../types/interface";
1
+ import { type CoordinatePlace } from "../types/interface";
2
2
  export declare const DemoBusinessTaxiEnd: import("vue-demi").DefineComponent<{}, {}, {
3
3
  from: CoordinatePlace;
4
4
  to: CoordinatePlace;
5
- path: CoordinatePoint[];
6
5
  contentHeight: number;
7
6
  }, {}, {}, import("vue-demi").ComponentOptionsMixin, import("vue-demi").ComponentOptionsMixin, {}, string, import("vue-demi").PublicProps, Readonly<import("vue-demi").ExtractPropTypes<{}>>, {}, {}>;
@@ -2,7 +2,6 @@ import { createVNode, createTextVNode } from "vue";
2
2
  import { defineComponent } from "vue-demi";
3
3
  import { BusinessTaxiEndMap } from "../business-components/BusinessTaxiEndMap/BusinessTaxiEndMap.js";
4
4
  import { l as layout, a as adjustedDemo } from "../chunks/Demo.css.e921a2f6.js";
5
- import { mockPath } from "./demo.data.mock.js";
6
5
  const DemoBusinessTaxiEnd = /* @__PURE__ */ defineComponent({
7
6
  name: "DemoBusinessTaxiEnd",
8
7
  data() {
@@ -21,7 +20,6 @@ const DemoBusinessTaxiEnd = /* @__PURE__ */ defineComponent({
21
20
  displayName: "",
22
21
  type: "wgs84"
23
22
  },
24
- path: [],
25
23
  contentHeight: 200
26
24
  };
27
25
  },
@@ -45,24 +43,19 @@ const DemoBusinessTaxiEnd = /* @__PURE__ */ defineComponent({
45
43
  setTimeout(() => {
46
44
  this.contentHeight = 600;
47
45
  }, 2500);
48
- setTimeout(() => {
49
- this.path = [...mockPath];
50
- }, 3500);
51
46
  },
52
47
  render() {
53
48
  const {
54
49
  from,
55
50
  to,
56
- contentHeight,
57
- path
51
+ contentHeight
58
52
  } = this;
59
53
  return createVNode("div", {
60
54
  "class": layout
61
55
  }, [createVNode("div", null, [JSON.stringify(from), createTextVNode(" | "), JSON.stringify(to)]), createVNode(BusinessTaxiEndMap, {
62
56
  "class": adjustedDemo,
63
57
  "from": from,
64
- "to": to,
65
- "path": path
58
+ "to": to
66
59
  }, null), createVNode("div", {
67
60
  "style": {
68
61
  height: `${contentHeight}px`
@@ -1,4 +1,4 @@
1
- import { type CoordinatePlace, type CoordinatePoint, type CoordinateTrackPoint, type DriverStatus, type GetDriverRouteOrTrackOutput } from "../types/interface";
1
+ import { type CoordinatePlace, type CoordinateTrackPoint, type DriverStatus } from "../types/interface";
2
2
  export declare const DemoBusinessTaxiService: import("vue-demi").DefineComponent<{}, {
3
3
  mapContext: import("../hooks-business/useBusinessTaxiServiceMap").BusinessTaxiServiceContext;
4
4
  }, {
@@ -7,9 +7,6 @@ export declare const DemoBusinessTaxiService: import("vue-demi").DefineComponent
7
7
  relayTo: Partial<CoordinatePlace>;
8
8
  status: DriverStatus;
9
9
  contentHeight: number;
10
- confirmedPath: CoordinatePoint[];
11
- endServicePath: CoordinatePoint[];
12
10
  }, {}, {
13
11
  getDriverPositionTrack(): Promise<CoordinateTrackPoint[]>;
14
- getDriverRouteOrTrack(): Promise<GetDriverRouteOrTrackOutput>;
15
12
  }, import("vue-demi").ComponentOptionsMixin, import("vue-demi").ComponentOptionsMixin, {}, string, import("vue-demi").PublicProps, Readonly<import("vue-demi").ExtractPropTypes<{}>>, {}, {}>;
@@ -4,9 +4,7 @@ import { BusinessTaxiServiceMap } from "../business-components/BusinessTaxiServi
4
4
  import { useBusinessTaxiServiceMap } from "../hooks-business/useBusinessTaxiServiceMap.js";
5
5
  import { isCoordinatePoint } from "../utils/typeChecking.js";
6
6
  import { l as layout, a as adjustedDemo } from "../chunks/Demo.css.e921a2f6.js";
7
- import { mockConfirmedPath, mockExternalRoute } from "./demo.data.mock.js";
8
7
  const allDriverStatus = ["dispatching", "book-dispatching", "dispatched", "driverStartRelayService", "driverStartService", "book-driverStartService", "book-dispatched", "driverArrived", "inService", "canceled", "endService", "completed", "canceling", "banlanceRefund", "waitBanlanceRefund", "rechargePayed", "waitRechargePay", "payed", "waitpay", "refund", "confirmed", "assign"];
9
- const mockDriverRoute = mockExternalRoute;
10
8
  const mockDriverTrackPoints = [{
11
9
  lng: 121.4036983,
12
10
  lat: 31.216324,
@@ -42,9 +40,7 @@ const DemoBusinessTaxiService = /* @__PURE__ */ defineComponent({
42
40
  to: {},
43
41
  relayTo: {},
44
42
  status: "driverStartRelayService",
45
- contentHeight: 200,
46
- confirmedPath: [],
47
- endServicePath: []
43
+ contentHeight: 200
48
44
  };
49
45
  },
50
46
  created() {
@@ -89,24 +85,10 @@ const DemoBusinessTaxiService = /* @__PURE__ */ defineComponent({
89
85
  type
90
86
  });
91
87
  };
92
- window.updateDriverRoute = () => {
93
- mockDriverRoute.path = mockDriverRoute.path.slice(5);
94
- };
95
- window.updateConfirmedPath = () => {
96
- this.confirmedPath = [...mockConfirmedPath];
97
- };
98
- window.updateEndServicePath = () => {
99
- this.endServicePath = [...mockConfirmedPath];
100
- };
101
88
  },
102
89
  methods: {
103
90
  getDriverPositionTrack() {
104
91
  return Promise.resolve(mockDriverTrackPoints);
105
- },
106
- getDriverRouteOrTrack() {
107
- return Promise.resolve({
108
- routes: mockDriverRoute
109
- });
110
92
  }
111
93
  },
112
94
  render() {
@@ -1,5 +1,6 @@
1
1
  import { googleEncodedPolyline2googleLatLng } from "../utils/transform.js";
2
2
  import { isProxyServiceError, createTypeError } from "../utils/typeChecking.js";
3
+ const DEFAULT_GOOGLE_ROUTES_FIELDS = ["routes.polyline", "routes.legs"];
3
4
  const ALL_ROUTES_STATUS = [
4
5
  "OK",
5
6
  "CANCELLED",
@@ -104,6 +105,7 @@ async function apiGoogleRoutes(props) {
104
105
  const { protocol, host } = location;
105
106
  const baseUrl = proxyUrl.startsWith(protocol) ? void 0 : `${protocol}//${host}`;
106
107
  const url = new URL(proxyUrl, baseUrl);
108
+ url.searchParams.set("fields", DEFAULT_GOOGLE_ROUTES_FIELDS.join(","));
107
109
  const response = await fetch(url, {
108
110
  method: "POST",
109
111
  headers: { "Content-Type": "application/json" },