|
|
|
@ -2103,7 +2103,7 @@ MainMap_QM.prototype = { |
|
|
|
TweenMax.killAll(true); |
|
|
|
Map_QM.util.pathStateObj.isPathState = false; |
|
|
|
Map_QM.controls.maxDistance = Map_QM.util.options.maxDis; |
|
|
|
Map_QM.controls.minAzimuthAngle = -Infinity; |
|
|
|
Map_QM.controls.minAzimuthAngle = -Infinity; |
|
|
|
Map_QM.controls.maxAzimuthAngle = Infinity; |
|
|
|
clearTimeout(Map_QM.util.timeObj.collTime); |
|
|
|
Map_QM.controls.enabled = true; |
|
|
|
@ -4143,7 +4143,7 @@ MainMap_QM.prototype = { |
|
|
|
if (item.hasOwnProperty("wayShop") && item.wayShop) { |
|
|
|
for (let i = 0; i < item.wayShop.length; i++) { |
|
|
|
let enTlite = item.wayShop[i].shop.shopNameEn == "" ? item.wayShop[i].shop.shopName : item.wayShop[i].shop.shopNameEn; |
|
|
|
Map_QM.util.pathStateObj.forShopArr.wayList.push({ isAddPrefix: false, shopName: "经过 " + item.wayShop[i].shop.shopName || item.wayShop[i].shop.name, shopNameEn: "PASS " + enTlite, logoPath: item.wayShop[i].shop.logoPath, code: item.wayShop[i].shop.code, shopNum: iot ? item.wayShop[i].shop.houseNumber : item.wayShop[i].shop.houseNum }); |
|
|
|
Map_QM.util.pathStateObj.forShopArr.wayList.push({ isAddPrefix: false, shopName: "经过 " + item.wayShop[i].shop.shopName || item.wayShop[i].shop.name, shopNameEn: "PASS " + enTlite, logoPath: item.wayShop[i].shop.logoPath || item.wayShop[i].shop.logoUrl, code: item.wayShop[i].shop.code, shopNum: iot ? item.wayShop[i].shop.houseNumber : item.wayShop[i].shop.houseNum }); |
|
|
|
} |
|
|
|
} |
|
|
|
if (item.hasOwnProperty("Facilities") && item.Facilities) { //设施
|
|
|
|
@ -5342,10 +5342,10 @@ FloorMap_QM.prototype = { |
|
|
|
show = shopData[h].shopName || shopData[h].name; |
|
|
|
showLeb = houseNum; |
|
|
|
showE = shopData[h].shopNameEn || shopData[h].nameEn; |
|
|
|
logo = shopData[h].logoPath; |
|
|
|
logo = shopData[h].logoPath || shopData[h].logoUrl; |
|
|
|
mapShow = shopData[h].mapShow ?? false; |
|
|
|
if (shopData[h].navRecommend) { |
|
|
|
navRecommend = shopData[h].navRecommend; |
|
|
|
if (shopData[h].navRecommend || shopData[h].isPass) { |
|
|
|
navRecommend = shopData[h].navRecommend || shopData[h].isPass; |
|
|
|
} else { |
|
|
|
navRecommend = false; |
|
|
|
} |
|
|
|
|
