diff options
author | Diva Canto | 2011-06-12 15:37:42 -0700 |
---|---|---|
committer | Diva Canto | 2011-06-12 15:37:42 -0700 |
commit | fd57c91b4a10cf7ee1e94dc8fe4e81eb0d5bae3d (patch) | |
tree | 55907fbcea5962638275453301482190c4b989b0 /OpenSim/Server/Handlers | |
parent | A few more cleanups on the way to close http://opensimulator.org/mantis/view.... (diff) | |
download | opensim-SC-fd57c91b4a10cf7ee1e94dc8fe4e81eb0d5bae3d.zip opensim-SC-fd57c91b4a10cf7ee1e94dc8fe4e81eb0d5bae3d.tar.gz opensim-SC-fd57c91b4a10cf7ee1e94dc8fe4e81eb0d5bae3d.tar.bz2 opensim-SC-fd57c91b4a10cf7ee1e94dc8fe4e81eb0d5bae3d.tar.xz |
First pass at making the V2 map work. Standalones only for now. There are some issues with the zoom level -- TBD.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/Map/MapAddServerConnector.cs | 61 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Map/MapGetServerConnector.cs | 105 |
2 files changed, 166 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs new file mode 100644 index 0000000..a953cd7 --- /dev/null +++ b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs | |||
@@ -0,0 +1,61 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.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 OpenSimulator 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 | |||
28 | using System; | ||
29 | using Nini.Config; | ||
30 | using OpenSim.Server.Base; | ||
31 | using OpenSim.Services.Interfaces; | ||
32 | using OpenSim.Framework.Servers.HttpServer; | ||
33 | using OpenSim.Server.Handlers.Base; | ||
34 | |||
35 | namespace OpenSim.Server.Handlers.MapImage | ||
36 | { | ||
37 | public class MapAddServiceConnector : ServiceConnector | ||
38 | { | ||
39 | private IMapImageService m_MapService; | ||
40 | private string m_ConfigName = "MapImageService"; | ||
41 | |||
42 | public MapAddServiceConnector(IConfigSource config, IHttpServer server, string configName) : | ||
43 | base(config, server, configName) | ||
44 | { | ||
45 | IConfig serverConfig = config.Configs[m_ConfigName]; | ||
46 | if (serverConfig == null) | ||
47 | throw new Exception(String.Format("No section {0} in config file", m_ConfigName)); | ||
48 | |||
49 | string gridService = serverConfig.GetString("LocalServiceModule", | ||
50 | String.Empty); | ||
51 | |||
52 | if (gridService == String.Empty) | ||
53 | throw new Exception("No LocalServiceModule in config file"); | ||
54 | |||
55 | Object[] args = new Object[] { config }; | ||
56 | m_MapService = ServerUtils.LoadPlugin<IMapImageService>(gridService, args); | ||
57 | |||
58 | //server.AddStreamHandler(new PresenceServerPostHandler(m_PresenceService)); | ||
59 | } | ||
60 | } | ||
61 | } | ||
diff --git a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs new file mode 100644 index 0000000..9448af7 --- /dev/null +++ b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs | |||
@@ -0,0 +1,105 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.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 OpenSimulator 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 | |||
28 | using System; | ||
29 | using System.IO; | ||
30 | using System.Net; | ||
31 | using System.Reflection; | ||
32 | |||
33 | using Nini.Config; | ||
34 | using log4net; | ||
35 | |||
36 | using OpenSim.Server.Base; | ||
37 | using OpenSim.Services.Interfaces; | ||
38 | using OpenSim.Framework.Servers.HttpServer; | ||
39 | using OpenSim.Server.Handlers.Base; | ||
40 | |||
41 | namespace OpenSim.Server.Handlers.MapImage | ||
42 | { | ||
43 | public class MapGetServiceConnector : ServiceConnector | ||
44 | { | ||
45 | private IMapImageService m_MapService; | ||
46 | private string m_ConfigName = "MapImageService"; | ||
47 | |||
48 | public MapGetServiceConnector(IConfigSource config, IHttpServer server, string configName) : | ||
49 | base(config, server, configName) | ||
50 | { | ||
51 | IConfig serverConfig = config.Configs[m_ConfigName]; | ||
52 | if (serverConfig == null) | ||
53 | throw new Exception(String.Format("No section {0} in config file", m_ConfigName)); | ||
54 | |||
55 | string gridService = serverConfig.GetString("LocalServiceModule", | ||
56 | String.Empty); | ||
57 | |||
58 | if (gridService == String.Empty) | ||
59 | throw new Exception("No LocalServiceModule in config file"); | ||
60 | |||
61 | Object[] args = new Object[] { config }; | ||
62 | m_MapService = ServerUtils.LoadPlugin<IMapImageService>(gridService, args); | ||
63 | |||
64 | server.AddStreamHandler(new MapServerGetHandler(m_MapService)); | ||
65 | } | ||
66 | } | ||
67 | |||
68 | class MapServerGetHandler : BaseStreamHandler | ||
69 | { | ||
70 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
71 | private IMapImageService m_MapService; | ||
72 | |||
73 | public MapServerGetHandler(IMapImageService service) : | ||
74 | base("GET", "/map") | ||
75 | { | ||
76 | m_MapService = service; | ||
77 | } | ||
78 | |||
79 | public override byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) | ||
80 | { | ||
81 | m_log.DebugFormat("[MAP SERVICE IMAGE HANDLER]: retrieving {0}", path); | ||
82 | byte[] result = new byte[0]; | ||
83 | |||
84 | string format = string.Empty; | ||
85 | result = m_MapService.GetMapTile(path.Trim('/'), out format); | ||
86 | |||
87 | if (result.Length > 0) | ||
88 | { | ||
89 | httpResponse.StatusCode = (int)HttpStatusCode.OK; | ||
90 | if (format.Equals("png")) | ||
91 | httpResponse.ContentType = "image/png"; | ||
92 | else if (format.Equals("jpg") || format.Equals("jpeg")) | ||
93 | httpResponse.ContentType = "image/jpeg"; | ||
94 | } | ||
95 | else | ||
96 | { | ||
97 | httpResponse.StatusCode = (int)HttpStatusCode.NotFound; | ||
98 | httpResponse.ContentType = "text/plain"; | ||
99 | } | ||
100 | |||
101 | return result; | ||
102 | } | ||
103 | |||
104 | } | ||
105 | } | ||