|
@@ -52908,11 +52908,13 @@ and limitations under the License.
|
|
|
|
|
|
for(let i=0;i<matchingUrls.length;++i){
|
|
for(let i=0;i<matchingUrls.length;++i){
|
|
if(o.url.indexOf(matchingUrls[i])>-1){
|
|
if(o.url.indexOf(matchingUrls[i])>-1){
|
|
- o.url = '../../indoor/'+sceneNum+'/'+o.url;
|
|
|
|
|
|
+ //o.url = '../../indoor/'+sceneNum+'/'+o.url;
|
|
|
|
+ o.url = '/indoor/'+sceneNum+'/'+o.url;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
console.log('url:'+o.url);
|
|
console.log('url:'+o.url);
|
|
|
|
+ //o.url = window.location.origin+o.url;
|
|
//if(o.url.indexOf('api/site_model/closest')>-1||o.url.indexOf('api/images/')>-1||o.url.indexOf('api/site_model/within')>-1||o.url.indexOf('api/site_model/within_polygon')>-1||o.url.indexOf('api/search/site_model')>-1||o.url.indexOf('api/search/poi')>-1){
|
|
//if(o.url.indexOf('api/site_model/closest')>-1||o.url.indexOf('api/images/')>-1||o.url.indexOf('api/site_model/within')>-1||o.url.indexOf('api/site_model/within_polygon')>-1||o.url.indexOf('api/search/site_model')>-1||o.url.indexOf('api/search/poi')>-1){
|
|
// o.url = '../../indoor/'+sceneNum+'/'+o.url;
|
|
// o.url = '../../indoor/'+sceneNum+'/'+o.url;
|
|
//}
|
|
//}
|
|
@@ -152990,17 +152992,24 @@ and limitations under the License.
|
|
else {
|
|
else {
|
|
var y = e(o, a)
|
|
var y = e(o, a)
|
|
, b = !1;
|
|
, b = !1;
|
|
- console.log('url2:'+a);
|
|
|
|
- if(a.indexOf('/api/pois/filter')>-1||a.indexOf('/api/poses')>-1||a.indexOf('/api/images')>-1){
|
|
|
|
|
|
+ console.log('url2:'+a);
|
|
|
|
+ if(a.indexOf('/api')>-1||a.indexOf('/api/pois/filter')>-1||a.indexOf('/api/poses')>-1||a.indexOf('/api/images')>-1){
|
|
//o = 'GET';
|
|
//o = 'GET';
|
|
- a = '../../indoor/'+sceneNum+a.substring(a.indexOf('/api/'));
|
|
|
|
|
|
+ //a = '../../indoor/'+sceneNum+a.substring(a.indexOf('/api/'));
|
|
|
|
+ a = 'indoor/'+sceneNum+a.substring(a.indexOf('/api/'));
|
|
|
|
+ a = window.location.origin+a.replace(ossPrefixDep,"");
|
|
}
|
|
}
|
|
else if(a.indexOf('/poi/icon')>-1||a.indexOf('/poi/image')>-1){
|
|
else if(a.indexOf('/poi/icon')>-1||a.indexOf('/poi/image')>-1){
|
|
- a = '../../indoor/'+sceneNum+a.substring(a.indexOf('/poi/'));
|
|
|
|
|
|
+ //a = '../../indoor/'+sceneNum+a.substring(a.indexOf('/poi/'));
|
|
|
|
+ a = 'indoor/'+sceneNum+a.substring(a.indexOf('/poi/'));
|
|
|
|
+ a = window.location.origin+a.replace(ossPrefixDep,"");
|
|
}
|
|
}
|
|
else if(a.indexOf('/api/tiled_maps')>-1||a.indexOf('/api/site_model')>-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/tiled_maps')>-1||a.indexOf('/api/site_model')>-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){
|
|
- a = '../../indoor/'+sceneNum+a.substring(a.indexOf('/api/'));
|
|
|
|
- }
|
|
|
|
|
|
+ //a = '../../indoor/'+sceneNum+a.substring(a.indexOf('/api/'));
|
|
|
|
+ a = 'indoor/'+sceneNum+a.substring(a.indexOf('/api/'));
|
|
|
|
+ a = window.location.origin+a.replace(ossPrefixDep,"");
|
|
|
|
+ }
|
|
|
|
+
|
|
y.open(o, a, !0),
|
|
y.open(o, a, !0),
|
|
M(l, (function(t, e) {
|
|
M(l, (function(t, e) {
|
|
F(t) && y.setRequestHeader(e, t)
|
|
F(t) && y.setRequestHeader(e, t)
|