|
@@ -47,25 +47,22 @@ def ip2bdgps(ip):
|
|
|
y = data['content']['point']['y']
|
|
|
return (x, y, data['status'], data)
|
|
|
|
|
|
-
|
|
|
+
|
|
|
def ip2gdgps(ip):
|
|
|
- url = 'http://iploc.market.alicloudapi.com/v3/ip?ip=' + ip
|
|
|
- headers = {"Authorization":"APPCODE <<<IP定位APPCODE>>>" ,"Content-Type":"application/json; charset=utf-8" }
|
|
|
+ url = 'http://ips.market.alicloudapi.com/iplocaltion?ip=' + ip
|
|
|
+ headers = {"Authorization":"APPCODE <<<IP定位APPCODE>>>" ,"Content-Type":"application/json; charset=utf-8" }
|
|
|
try:
|
|
|
r = requests.get(url=url , headers=headers)
|
|
|
data = r.json()
|
|
|
except :
|
|
|
return
|
|
|
|
|
|
- if data['status'] != '1':
|
|
|
- return (116.39564504, 39.92998578 , data['status'])
|
|
|
- elif data['rectangle']:
|
|
|
- rectangle = data['rectangle']
|
|
|
- arry = rectangle.replace(';', ',').split(',')
|
|
|
- x = (float(arry[0]) + float(arry[2])) / 2.0
|
|
|
- y = (float(arry[1]) + float(arry[3])) / 2.0
|
|
|
- return (x, y, data['status'], data)
|
|
|
- return (116.39564504, 39.92998578 , data['status'])
|
|
|
+ if data['code'] != 100:
|
|
|
+ return (116.39564504, 39.92998578 , data['code'])
|
|
|
+ elif data['message'] == "success":
|
|
|
+ x = data['result']['lng']
|
|
|
+ y = data['result']['lat']
|
|
|
+ return (x, y, data['code'], data)
|
|
|
|
|
|
@app.route("/")
|
|
|
def hello():
|