Skip to content

Commit 7b44352

Browse files
committed
Correct SLMapApi (Web World Map handler)
* Slmapapi - correct initial setup for MapService URL details required for the webpage world map (now working correctly)
1 parent 1474902 commit 7b44352

1 file changed

Lines changed: 35 additions & 9 deletions

File tree

WhiteCore/Modules/Web/html/slmapapi.cs

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
1-
using WhiteCore.Framework;
2-
using WhiteCore.Framework.Servers.HttpServer;
1+
/*
2+
* Copyright (c) Contributors, http://whitecore-sim.org/, http://aurora-sim.org/
3+
* See CONTRIBUTORS.TXT for a full list of copyright holders.
4+
*
5+
* Redistribution and use in source and binary forms, with or without
6+
* modification, are permitted provided that the following conditions are met:
7+
* * Redistributions of source code must retain the above copyright
8+
* notice, this list of conditions and the following disclaimer.
9+
* * Redistributions in binary form must reproduce the above copyright
10+
* notice, this list of conditions and the following disclaimer in the
11+
* documentation and/or other materials provided with the distribution.
12+
* * Neither the name of the Aurora-Sim Project nor the
13+
* names of its contributors may be used to endorse or promote products
14+
* derived from this software without specific prior written permission.
15+
*
16+
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17+
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18+
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19+
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20+
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21+
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22+
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23+
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24+
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25+
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26+
*/
27+
328
using System.Collections.Generic;
429
using WhiteCore.Framework.Servers.HttpServer.Implementation;
530
using WhiteCore.Framework.Services;
@@ -35,14 +60,15 @@ public Dictionary<string, object> Fill(WebInterface webInterface, string filenam
3560
{
3661
response = null;
3762
var vars = new Dictionary<string, object>();
63+
var mapService = webInterface.Registry.RequestModuleInterface<IMapService>();
64+
if (mapService != null)
65+
{
66+
string mapUrl = mapService.MapServiceURL;
67+
string mapAPIUrl = mapService.MapServiceAPIURL;
3868

39-
IGridServerInfoService infoService = webInterface.Registry.RequestModuleInterface<IGridServerInfoService>();
40-
41-
string mapService = infoService.GetGridURI("MapService");
42-
string mapAPIService = infoService.GetGridURI("MapAPIService");
43-
44-
vars.Add("WorldMapServiceURL", mapService.Remove(mapService.Length - 1));
45-
vars.Add("WorldMapAPIServiceURL", mapAPIService.Remove(mapAPIService.Length - 1));
69+
vars.Add ("WorldMapServiceURL", mapUrl.Remove (mapUrl.Length - 1));
70+
vars.Add ("WorldMapAPIServiceURL", mapAPIUrl.Remove (mapAPIUrl.Length - 1));
71+
}
4672

4773
return vars;
4874
}

0 commit comments

Comments
 (0)