From a0bc9aaf968a81eba1321008be66d62c702e8fc3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 24 七月 2026 15:50:03 +0800
Subject: [PATCH] 更新
---
XWProject/Tools/YYLocationManager/GoogleMapAPI.swift | 128 +++++++++++++++++++++---------------------
1 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/XWProject/Tools/YYLocationManager/GoogleMapAPI.swift b/XWProject/Tools/YYLocationManager/GoogleMapAPI.swift
index b73a8c0..3c06181 100644
--- a/XWProject/Tools/YYLocationManager/GoogleMapAPI.swift
+++ b/XWProject/Tools/YYLocationManager/GoogleMapAPI.swift
@@ -141,69 +141,69 @@
var task: Task {
- switch self {
- case .geocode(let location):
- let params = APIParamsAppender()
- .append(key: "latlng", value: String(format: "%lf,%lf", location.latitude,location.longitude))
- .append(key: "result_type", value: "premise|street_address|neighborhood|route|administrative_area_level_2")
- return .requestParameters(parameters: params.googleMapDone(), encoding: URLEncoding.queryString)
-
- case .nearbySearch(let location, let radius, let type, let keyword):
- let params = APIParamsAppender()
- .append(key: "location", value: String(format: "%lf,%lf", location.latitude,location.longitude))
- .append(key: "radius", value: radius)
- .append(key: "type", value: type)
- .append(key: "keyword", value: keyword)
- return .requestParameters(parameters: params.googleMapDone(canHasLang: false), encoding: URLEncoding.queryString)
-
-
- case .textSearch(let query, let location, let radius, let region):
- let params = APIParamsAppender()
- .append(key: "query", value: query)
-// .append(key: "language", value: AppSettings.shared.language.code)
- .append(key: "location", value: "\(location!.latitude),\(location!.longitude)")
-// .append(key: "region", value: region)
- .append(key: "radius", value: 25000)
- switch AppSettings.shared.language{
- case .Chinese:
- params.append(key: "language", value: "cn")
- case .English:
- params.append(key: "language", value: "en")
- case .French:
- params.append(key: "language", value: "fr")
- }
- return .requestParameters(parameters: params.googleMapDone(canHasLang: false), encoding: URLEncoding.queryString)
-
- case .directions(let origin, let destination):
- let params = APIParamsAppender()
- .append(key: "origin", value: origin.toFormat())
- .append(key: "destination", value: destination.toFormat())
- .append(key: "alternatives", value: false) //可供选择方案：会增加请求时间
- .append(key: "avoid", value: "indoor")
- .append(key: "mode", value: "driving")
-
- // .append(key: "optimize", value: true)
- // .append(key: "waypoint_order", value:"[3,2,0,1]")
- return .requestParameters(parameters: params.googleMapDone(canHasLang: false), encoding: URLEncoding.queryString)
-
- case .findplaceFromtext(let text):
- let params = APIParamsAppender()
- .append(key: "fields", value: "formatted_address,name,rating,opening_hours,geometry")
- .append(key: "input", value: text)
- .append(key: "inputtype", value: "textquery")
- return .requestParameters(parameters: params.googleMapDone(canHasLang: false), encoding: URLEncoding.queryString)
- case .placeAutoComplete(let query, let code):
- let params = APIParamsAppender()
- .append(key: "input", value: query)
- .append(key: "components", value: "country:\(code)")
-// .append(key: "locationbias", value: String(format: "circle:%ld@%lf,%lf", circle,lat,lon))
- return .requestParameters(parameters: params.googleMapDone(canHasLang: true), encoding: URLEncoding.queryString)
-
- case .placeDetails(placeId: let placeId):
- let params = APIParamsAppender()
- .append(key: "place_id", value: placeId)
- .append(key: "fields", value: "name,geometry")
- return .requestParameters(parameters: params.googleMapDone(canHasLang: true), encoding: URLEncoding.queryString)
- }
+ switch self {
+ case .geocode(let location):
+ let params = APIParamsAppender()
+ .append(key: "latlng", value: String(format: "%lf,%lf", location.latitude,location.longitude))
+ .append(key: "result_type", value: "premise|street_address|neighborhood|route|administrative_area_level_2")
+ return .requestParameters(parameters: params.googleMapDone(), encoding: URLEncoding.queryString)
+
+ case .nearbySearch(let location, let radius, let type, let keyword):
+ let params = APIParamsAppender()
+ .append(key: "location", value: String(format: "%lf,%lf", location.latitude,location.longitude))
+ .append(key: "radius", value: radius)
+ .append(key: "type", value: type)
+ .append(key: "keyword", value: keyword)
+ return .requestParameters(parameters: params.googleMapDone(canHasLang: false), encoding: URLEncoding.queryString)
+
+
+ case .textSearch(let query, let location, let radius, let region):
+ let params = APIParamsAppender()
+ .append(key: "query", value: query)
+ // .append(key: "language", value: AppSettings.shared.language.code)
+ .append(key: "location", value: "\(location!.latitude),\(location!.longitude)")
+ // .append(key: "region", value: region)
+ .append(key: "radius", value: 25000)
+ switch AppSettings.shared.language{
+ case .Chinese:
+ params.append(key: "language", value: "cn")
+ case .English:
+ params.append(key: "language", value: "en")
+ case .French:
+ params.append(key: "language", value: "fr")
+ }
+ return .requestParameters(parameters: params.googleMapDone(canHasLang: false), encoding: URLEncoding.queryString)
+
+ case .directions(let origin, let destination):
+ let params = APIParamsAppender()
+ .append(key: "origin", value: origin.toFormat())
+ .append(key: "destination", value: destination.toFormat())
+ .append(key: "alternatives", value: false) //可供选择方案：会增加请求时间
+ .append(key: "avoid", value: "indoor")
+ .append(key: "mode", value: "driving")
+
+ // .append(key: "optimize", value: true)
+ // .append(key: "waypoint_order", value:"[3,2,0,1]")
+ return .requestParameters(parameters: params.googleMapDone(canHasLang: false), encoding: URLEncoding.queryString)
+
+ case .findplaceFromtext(let text):
+ let params = APIParamsAppender()
+ .append(key: "fields", value: "formatted_address,name,rating,opening_hours,geometry")
+ .append(key: "input", value: text)
+ .append(key: "inputtype", value: "textquery")
+ return .requestParameters(parameters: params.googleMapDone(canHasLang: false), encoding: URLEncoding.queryString)
+ case .placeAutoComplete(let query, let code):
+ let params = APIParamsAppender()
+ .append(key: "input", value: query)
+ .append(key: "components", value: "country:\(code)")
+ // .append(key: "locationbias", value: String(format: "circle:%ld@%lf,%lf", circle,lat,lon))
+ return .requestParameters(parameters: params.googleMapDone(canHasLang: true), encoding: URLEncoding.queryString)
+
+ case .placeDetails(placeId: let placeId):
+ let params = APIParamsAppender()
+ .append(key: "place_id", value: placeId)
+ .append(key: "fields", value: "name,geometry")
+ return .requestParameters(parameters: params.googleMapDone(canHasLang: true), encoding: URLEncoding.queryString)
+ }
}
}
--
Gitblit v1.7.1