|
@@ -101871,17 +101871,23 @@ and limitations under the License.
|
|
|
}
|
|
|
,
|
|
|
e.prototype.displayPois = function(t, e, n) {
|
|
|
- t = c.clone(t),
|
|
|
- this.addAdditionalPoisToDisplay(t),
|
|
|
+ t = c.clone(t);
|
|
|
+ this.addAdditionalPoisToDisplay(t);
|
|
|
this.sortPoisToDisplay(t);
|
|
|
var i = this.filterPoisToDisplay(t, this.factory.PoiService.highlightedPois, n, e);
|
|
|
this.clear();
|
|
|
for (var r = 0, o = i; r < o.length; r++) {
|
|
|
var a = o[r];
|
|
|
- this.isPoiToBeHighLighted(this.factory.PoiService.highlightedPois, a) ? this.displayHighlightedPoi(a) : this.displayPoi(a)
|
|
|
+ if(this.isPoiToBeHighLighted(this.factory.PoiService.highlightedPois, a)){
|
|
|
+ this.displayHighlightedPoi(a);
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ this.displayPoi(a);
|
|
|
+ }
|
|
|
+ //this.isPoiToBeHighLighted(this.factory.PoiService.highlightedPois, a) ? this.displayHighlightedPoi(a) : this.displayPoi(a)
|
|
|
}
|
|
|
- this.params.poiVisibilityCheck && this.hideObscuredPois(this.factory.PoiService.highlightedPois),
|
|
|
- this.view.invalidateScene()
|
|
|
+ this.params.poiVisibilityCheck && this.hideObscuredPois(this.factory.PoiService.highlightedPois);
|
|
|
+ this.view.invalidateScene();
|
|
|
}
|
|
|
,
|
|
|
e.prototype.sortPoisToDisplay = function(t) {
|
|
@@ -101894,16 +101900,16 @@ and limitations under the License.
|
|
|
,
|
|
|
e.prototype.displayPoi = function(t) {
|
|
|
var e = this.getPoiTextSprite(t);
|
|
|
- e.spriteObject.visible = !1,
|
|
|
- this.params.poiVisibilityCheck || (e.spriteObject.visible = !0),
|
|
|
- this.planeSprites.push(e),
|
|
|
- this.poiSprites.add(e.spriteObject)
|
|
|
+ e.spriteObject.visible = !1;
|
|
|
+ this.params.poiVisibilityCheck || (e.spriteObject.visible = !0);
|
|
|
+ this.planeSprites.push(e);
|
|
|
+ this.poiSprites.add(e.spriteObject);
|
|
|
}
|
|
|
,
|
|
|
e.prototype.displayHighlightedPoi = function(t) {
|
|
|
var e = this.getPoiHighlightSprite(t);
|
|
|
- this.planeSprites.push(e),
|
|
|
- this.poiHighlightSprites.add(e.spriteObject)
|
|
|
+ this.planeSprites.push(e);
|
|
|
+ this.poiHighlightSprites.add(e.spriteObject);
|
|
|
}
|
|
|
,
|
|
|
e.prototype.isPoiToBeHighLighted = function(t, e) {
|
|
@@ -152890,16 +152896,17 @@ and limitations under the License.
|
|
|
else {
|
|
|
var y = e(o, a)
|
|
|
, b = !1;
|
|
|
+ console.log('url2:'+a);
|
|
|
if(a.indexOf('/api/pois/filter')>-1){
|
|
|
- o = 'GET'
|
|
|
+ //o = 'GET';
|
|
|
+ a = '../../indoor/'+sceneNum+a.substring(a.indexOf('/api/'));
|
|
|
}
|
|
|
else if(a.indexOf('/poi/icon')>-1){
|
|
|
a = '../../indoor/'+sceneNum+a.substring(a.indexOf('/poi/'));
|
|
|
}
|
|
|
- else if(a.indexOf('/api/site_model/within_polygon')>-1||a.indexOf('/api/poi_types')>-1||a.indexOf('/api/poi_type_groups')>-1||a.indexOf('/api/auth/token')>-1){
|
|
|
+ else if(a.indexOf('/api/site_model/within_polygon')>-1||a.indexOf('/api/pois')>-1||a.indexOf('/api/poi_types')>-1||a.indexOf('/api/poi_type_groups')>-1||a.indexOf('/api/auth/token')>-1){
|
|
|
a = '../../indoor/'+sceneNum+a.substring(a.indexOf('/api/'));
|
|
|
}
|
|
|
- console.log('url2:'+a);
|
|
|
y.open(o, a, !0),
|
|
|
M(l, (function(t, e) {
|
|
|
F(t) && y.setRequestHeader(e, t)
|