Commit 0c63d2ac authored by 任国军's avatar 任国军

fix area distance sort

parent d503f0e2
Pipeline #15255 passed with stage
in 38 seconds
...@@ -56,10 +56,8 @@ class InstitutionService extends Service { ...@@ -56,10 +56,8 @@ class InstitutionService extends Service {
// const area_lbs = await this.computeDistance(institution_area_list, { lat, lng });// 计算距离信息 // const area_lbs = await this.computeDistance(institution_area_list, { lat, lng });// 计算距离信息
const area_distance_list = await this.calcDistance(institution_area_list, { lat, lng }, page, distance); const area_distance_list = await this.calcDistance(institution_area_list, { lat, lng }, page, distance);
const area_distance = area_distance_list.rows; const area_distance = area_distance_list.rows;
console.log(area_distance); console.log(area_distance_list);
console.log(distance);
const institution_areas = await this.computeDistance(area_distance, { lat, lng }); const institution_areas = await this.computeDistance(area_distance, { lat, lng });
console.log(institution_areas.length);
for (const i in institution_areas) { for (const i in institution_areas) {
area_distance[i].distance = Number(institution_areas[i].distance) === 0 ? 999999999.0 : parseFloat(institution_areas[i].distance); area_distance[i].distance = Number(institution_areas[i].distance) === 0 ? 999999999.0 : parseFloat(institution_areas[i].distance);
area_distance[i].duration = institution_areas[i].duration; area_distance[i].duration = institution_areas[i].duration;
...@@ -425,7 +423,7 @@ class InstitutionService extends Service { ...@@ -425,7 +423,7 @@ class InstitutionService extends Service {
ctx.failed(error); ctx.failed(error);
}); });
const ret = []; let ret = [];
for (const i in result) { for (const i in result) {
const tmp = lbs_array[i]; const tmp = lbs_array[i];
tmp.distance = result[i]; tmp.distance = result[i];
...@@ -438,6 +436,8 @@ class InstitutionService extends Service { ...@@ -438,6 +436,8 @@ class InstitutionService extends Service {
return a.distance - b.distance; return a.distance - b.distance;
}; };
ret = R.sort(sort)(ret);
const institutions = []; const institutions = [];
for (const v of ret) { for (const v of ret) {
if (!institutions[v.id] && !ctx.isEmpty(v)) { if (!institutions[v.id] && !ctx.isEmpty(v)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment