Quellcode durchsuchen

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

jinx vor 4 Jahren
Ursprung
Commit
eb443f4aea

+ 2 - 2
IndoorViewerAPI.js

@@ -152986,10 +152986,10 @@ and limitations under the License.
 									//o = 'GET';
 									a = '../../indoor/'+sceneNum+a.substring(a.indexOf('/api/'));
 								} 
-								else if(a.indexOf('/poi/icon')>-1){
+								else if(a.indexOf('/poi/icon')>-1||a.indexOf('/poi/image')>-1){
 									a = '../../indoor/'+sceneNum+a.substring(a.indexOf('/poi/'));
 								}
-                                else if(a.indexOf('/poi/image')>-1||a.indexOf('/api/jobs')>-1||a.indexOf('/api/site_model/validate')>-1||a.indexOf('/api/pointcloud/crop')>-1||a.indexOf('/api/newmeasurements')>-1||a.indexOf('/api/datasets')>-1||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){
+                                else if(a.indexOf('/api/jobs')>-1||a.indexOf('/api/site_model/validate')>-1||a.indexOf('/api/pointcloud/crop')>-1||a.indexOf('/api/newmeasurements')>-1||a.indexOf('/api/datasets')>-1||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/'));
                                 }
                                 y.open(o, a, !0),

BIN
img/poi_navvis/access_elevator.png


BIN
img/poi_navvis/access_entrance_exit.png


BIN
img/poi_navvis/access_parking.png


BIN
img/poi_navvis/access_steps.png


BIN
img/poi_navvis/facility_mngmt_maintenance.png


BIN
img/poi_navvis/generic_poi.png


BIN
img/poi_navvis/office_meeting_room.png


BIN
img/poi_navvis/office_office.png


BIN
img/poi_navvis/publictransport_bus.png


BIN
img/poi_navvis/publictransport_taxi.png


BIN
img/poi_navvis/publictransport_train.png


BIN
img/poi_navvis/safety_fire.png


BIN
img/poi_navvis/safety_health.png


BIN
img/poi_navvis/sanitary_babycare.png


BIN
img/poi_navvis/sanitary_toiletdisabled.png


BIN
img/poi_navvis/sanitary_toiletmen.png


BIN
img/poi_navvis/sanitary_toiletwomen.png


BIN
img/poi_navvis/services_food.png


BIN
img/poi_navvis/services_information.png


BIN
img/poi_navvis/services_shops.png


BIN
img/poi_navvis/vr_audio.png


BIN
img/poi_navvis/vr_video.png