Merge branch 'master' of http://192.168.0.115:3000/4dkankan/laser_v1

17.82bbf60e16d46d39aea0.js

@@ -1070,7 +1070,7 @@
                             l.ɵɵadvance(1),
                             l.ɵɵproperty("ngIf", i.isArea(o.measurement)),
                             l.ɵɵadvance(1),
-                            l.ɵɵproperty("ngIf", o.location),
+                            // l.ɵɵproperty("ngIf", o.location),
                             l.ɵɵadvance(4),
                             l.ɵɵproperty("href", o.url.value, l.ɵɵsanitizeUrl),
                             l.ɵɵadvance(1),

IndoorViewerAPI.js

@@ -136740,7 +136740,10 @@ and limitations under the License.
             n += (Math.ceil((t.getTextWidth(o) + 15) / this.FRAME_DIM_W) - 1) * this.MTEXT_TEXT_SIZE,
             t.setFontSize(this.ICON_TEXT_SIZE),
             t.setTextColor(this.ICON_TEXT_COLOR),
-            this.setFontFromUiLanguage(t),
+            this.setFontFromUiLanguage(t);
+            e.location.building = null;
+            e.location.floor = null;
+            e.location.room = null;
             i && (e.location.building && (t.addImage(this.buildingIcon, "PNG", this.BUILDING_ICON_H_OFFSET, n, this.ICON_DIM_WH, this.ICON_DIM_WH),
             t.text(e.location.building, this.BUILDING_TEXT_H_OFFSET, n + this.ICON_TEXT_V_OFFSET)),
             e.location.floor && (t.addImage(this.floorIcon, "PNG", this.FLOOR_ICON_H_OFFSET, n, this.ICON_DIM_WH, this.ICON_DIM_WH),