|
@@ -52896,6 +52896,7 @@ and limitations under the License.
|
|
|
'api/license',
|
|
|
'api/user',
|
|
|
'api/users',
|
|
|
+ 'api/route',
|
|
|
//'status/health',
|
|
|
//'api/configs',
|
|
|
'api/poi_type_groups',
|
|
@@ -76228,7 +76229,7 @@ and limitations under the License.
|
|
|
}
|
|
|
,
|
|
|
t.convertPoiEntityToUrlReference = function(t) {
|
|
|
- return t.isLocationAsPoi ? t.globalLocation.toArray().toString() : t.id.toString()
|
|
|
+ return t.isLocationAsPoi ? t.globalLocation.toArray().toString() : t.id.toString();
|
|
|
}
|
|
|
,
|
|
|
t.prototype.generatePointCloudViewUrl = function() {
|
|
@@ -93641,7 +93642,8 @@ and limitations under the License.
|
|
|
var t = this;
|
|
|
this.clearSearchResults(),
|
|
|
this.PoiService.routeStart && this.PoiService.routeEnd && (this.UrlService.addRouteParameters(this.PoiService.routeStart, this.PoiService.routeEnd),
|
|
|
- this.RouteService.findRoute(this.PoiService.routeStart.globalLocation, this.PoiService.routeEnd.globalLocation).then((function(e) {
|
|
|
+ //this.RouteService.findRoute(this.PoiService.routeStart.globalLocation, this.PoiService.routeEnd.globalLocation).then((function(e) {
|
|
|
+ this.RouteService.findRoute(this.PoiService.routeStart.location, this.PoiService.routeEnd.location).then((function(e) {
|
|
|
t.PoiService.wasRouteFound = e.instructions.length > 0,
|
|
|
t.PoiService.poisChanged.emit(),
|
|
|
s.isMobileBrowser() && r.blurActiveElement()
|
|
@@ -100980,7 +100982,16 @@ and limitations under the License.
|
|
|
return t instanceof u.TiledMapOpenStreetMap
|
|
|
}
|
|
|
));
|
|
|
- "osm" === t.factory.ConfigService.getString(f.Configs.CORE_MAP_BASEMAP) ? e || t.addMap(new u.TiledMapOpenStreetMap(t.factory.TransformService,t.factory.ConfigService.getString(f.Configs.CORE_MAP_TILE_URL),t.factory.ConfigService.getInteger(f.Configs.CORE_MAP_TILE_MAX_ZOOM, 25),t,t.tileColor,t.factory.ConfigService.getString(f.Configs.CORE_MAP_ATTRIBUTION))) : t.removeMap(e)
|
|
|
+
|
|
|
+ if("osm" === t.factory.ConfigService.getString(f.Configs.CORE_MAP_BASEMAP)){
|
|
|
+ if(!e){
|
|
|
+ t.addMap(new u.TiledMapOpenStreetMap(t.factory.TransformService,t.factory.ConfigService.getString(f.Configs.CORE_MAP_TILE_URL),t.factory.ConfigService.getInteger(f.Configs.CORE_MAP_TILE_MAX_ZOOM, 25),t,t.tileColor,t.factory.ConfigService.getString(f.Configs.CORE_MAP_ATTRIBUTION)));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ t.removeMap(e);
|
|
|
+ }
|
|
|
+ //"osm" === t.factory.ConfigService.getString(f.Configs.CORE_MAP_BASEMAP) ? e || t.addMap(new u.TiledMapOpenStreetMap(t.factory.TransformService,t.factory.ConfigService.getString(f.Configs.CORE_MAP_TILE_URL),t.factory.ConfigService.getInteger(f.Configs.CORE_MAP_TILE_MAX_ZOOM, 25),t,t.tileColor,t.factory.ConfigService.getString(f.Configs.CORE_MAP_ATTRIBUTION))) : t.removeMap(e)
|
|
|
}
|
|
|
)).catch(m.handleWarning)
|
|
|
}
|