@vtx/ol-map 2.0.0-beta.10 → 2.0.0-beta.11
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.
- package/lib/_util/search.js +8 -1
- package/lib/_util/search.js.map +1 -1
- package/package.json +5 -4
package/lib/_util/search.js
CHANGED
|
@@ -7,6 +7,7 @@ exports.regeoSearch = exports.poiSearch = exports.geoSearch = void 0;
|
|
|
7
7
|
var _axios = _interopRequireDefault(require("axios"));
|
|
8
8
|
var _mapTool = _interopRequireDefault(require("./mapTool"));
|
|
9
9
|
var _getSystemInfo = _interopRequireDefault(require("./getSystemInfo"));
|
|
10
|
+
var _projection = require("./projection");
|
|
10
11
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
11
12
|
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
12
13
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
@@ -31,7 +32,13 @@ var regeoSearch = exports.regeoSearch = function regeoSearch(_ref) {
|
|
|
31
32
|
// ...val,
|
|
32
33
|
// };
|
|
33
34
|
|
|
34
|
-
var
|
|
35
|
+
var coordType = (0, _projection.getApiCoordType)(projection);
|
|
36
|
+
var epsg;
|
|
37
|
+
if (coordType === 'wgs84') {
|
|
38
|
+
epsg = coordType;
|
|
39
|
+
} else {
|
|
40
|
+
epsg = 'epsg' + projection.split(':')[1];
|
|
41
|
+
}
|
|
35
42
|
var url = "/cloudLbs/vortexapi/rest/lbs/geoconvert/v2?location=".concat(location[0], ",").concat(location[1], "&coordtype=").concat(epsg, "&batch=false");
|
|
36
43
|
return _axios["default"].get(url).then(function (res) {
|
|
37
44
|
return res.data;
|
package/lib/_util/search.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.js","names":["_axios","_interopRequireDefault","require","_mapTool","_getSystemInfo","e","__esModule","_typeof","o","Symbol","iterator","constructor","prototype","ownKeys","r","t","Object","keys","getOwnPropertySymbols","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","toPrimitive","call","TypeError","String","Number","GD_KEY","CITY","getSystemInfo","regeoSearch","exports","_ref","location","projection","epsg","split","url","concat","axios","get","then","res","data","responseData","result","geometryInfo","type","lngLats","join","
|
|
1
|
+
{"version":3,"file":"search.js","names":["_axios","_interopRequireDefault","require","_mapTool","_getSystemInfo","_projection","e","__esModule","_typeof","o","Symbol","iterator","constructor","prototype","ownKeys","r","t","Object","keys","getOwnPropertySymbols","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","toPrimitive","call","TypeError","String","Number","GD_KEY","CITY","getSystemInfo","regeoSearch","exports","_ref","location","projection","coordType","getApiCoordType","epsg","split","url","concat","axios","get","then","res","data","responseData","result","geometryInfo","type","lngLats","join","geoSearch","address","params","key","city","status","poiSearch","val","keywords","coordTypeOutput","list","map","item","lngDone","latDone","name","id","label","index"],"sources":["_util/search.js"],"sourcesContent":["import axios from 'axios';\nimport mapTool from './mapTool';\nimport getSystemInfo from './getSystemInfo';\nimport { getApiCoordType } from './projection';\n\n// const GD_KEY = '09a28c40f2d58e1f414e292ae61bc992'; // 莆田事件工单暂用key--解决使用过多地图获取地址失败\nconst GD_KEY = '2dd5476719ea3378dc06ef93b3d4aba7';\n\nconst CITY = getSystemInfo('rootDivisionName') || '中国';\n\n// 根据经纬度查询\nexport const regeoSearch = ({ location, projection }) => {\n // let lngLats = mapTool.wgs84togcj02(location[0], location[1]);\n\n // const params = {\n // key: GD_KEY,\n // location: lngLats.join(','),\n // type: 'geocode',\n // ...val,\n // };\n\n let coordType = getApiCoordType(projection);\n\n let epsg;\n if (coordType === 'wgs84') {\n epsg = coordType;\n } else {\n epsg = 'epsg' + projection.split(':')[1];\n }\n\n let url = `/cloudLbs/vortexapi/rest/lbs/geoconvert/v2?location=${location[0]},${location[1]}&coordtype=${epsg}&batch=false`;\n\n return axios\n .get(url)\n .then(res => res.data)\n .then(data => {\n const { data: responseData } = data;\n let result = {};\n if (data?.result == 0 && responseData) {\n result = {\n ...responseData,\n geometryInfo: {\n type: 'point',\n lngLats: location.join(','),\n coordType: epsg,\n },\n };\n }\n\n return result;\n });\n};\n\n// 根据地址查询\nexport const geoSearch = address => {\n const params = {\n key: GD_KEY,\n address,\n city: CITY,\n };\n\n return axios\n .get('https://restapi.amap.com/v3/geocode/geo', {\n params,\n })\n .then(res => res.data)\n .then(data => {\n let result = {};\n if (data.status === '0' && data.result) {\n result = data.result;\n }\n\n return result;\n });\n};\n\n// 根据poi 兴趣点查询\nexport const poiSearch = val => {\n const params = {\n // key: GD_KEY,\n // region: CITY,\n keywords: '',\n coordTypeOutput: 'wgs84',\n // page_size: 25,\n ...val,\n };\n\n return axios\n .get('/cloudLbs/vortexapi/rest/lbs/poi', {\n params,\n })\n .then(res => res.data)\n .then(res => {\n let list = [];\n let { data, result } = res;\n if (result === 0 && data?.length) {\n data.map(item => {\n let { lngDone, latDone, name, id } = item;\n if (location) {\n list.push({\n ...item,\n label: name,\n value: id,\n index: list.length + 1,\n geometryInfo: {\n type: 'point',\n lngLats: `${lngDone}, ${latDone}`,\n coordType: params.coordTypeOutput || 'wgs84',\n },\n });\n // console.log('listlistlist', list);\n }\n });\n }\n // console.log('poiSearch list', list);\n return list;\n })\n .catch(() => []);\n};\n"],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vtx/ol-map",
|
|
3
|
-
"version": "2.0.0-beta.
|
|
3
|
+
"version": "2.0.0-beta.11",
|
|
4
4
|
"description": "React components for Vortex",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react",
|
|
@@ -69,7 +69,9 @@
|
|
|
69
69
|
"antd": "^6.0.1",
|
|
70
70
|
"axios": "^0.21.1",
|
|
71
71
|
"lodash-es": "^4.17.21",
|
|
72
|
-
"classnames": "^2.2.6"
|
|
72
|
+
"classnames": "^2.2.6",
|
|
73
|
+
"echarts": "^5.5.1",
|
|
74
|
+
"echarts-for-react": "^3.0.2"
|
|
73
75
|
},
|
|
74
76
|
"devDependencies": {
|
|
75
77
|
"@babel/cli": "^7.6.4",
|
|
@@ -99,7 +101,6 @@
|
|
|
99
101
|
"gulp-less": "5.0.0",
|
|
100
102
|
"gulp-sourcemaps": "^2.6.5",
|
|
101
103
|
"husky": "^4.0.7",
|
|
102
|
-
"jquery": "^3.6.0",
|
|
103
104
|
"less": "^3.10.3",
|
|
104
105
|
"less-plugin-autoprefix": "^2.0.0",
|
|
105
106
|
"less-plugin-npm-import": "^2.1.0",
|
|
@@ -124,7 +125,7 @@
|
|
|
124
125
|
"ahooks": "^3.1.5",
|
|
125
126
|
"antd": "^6.0.1",
|
|
126
127
|
"axios": "^0.21.1",
|
|
127
|
-
"lodash": "^4.17.21",
|
|
128
|
+
"lodash-es": "^4.17.21",
|
|
128
129
|
"classnames": "^2.2.6"
|
|
129
130
|
}
|
|
130
131
|
}
|