OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change the map tile system to be multi-grid hosting compatible

avinationmerge
Melanie Thielker 2014-08-23 17:27:01 +02:00
parent f06f13b59d
commit cbd7c7b9ec
7 changed files with 49 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
View File

@ -227,7 +227,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
} }
string reason = string.Empty; string reason = string.Empty;
if (!m_MapService.AddMapTile((int)scene.RegionInfo.RegionLocX, (int)scene.RegionInfo.RegionLocY, jpgData, out reason)) if (!m_MapService.AddMapTile((int)scene.RegionInfo.RegionLocX, (int)scene.RegionInfo.RegionLocY, jpgData, scene.RegionInfo.ScopeID, out reason))
{ {
m_log.DebugFormat("[MAP IMAGE SERVICE MODULE]: Unable to upload tile image for {0} at {1}-{2}: {3}", m_log.DebugFormat("[MAP IMAGE SERVICE MODULE]: Unable to upload tile image for {0} at {1}-{2}: {3}",
scene.RegionInfo.RegionName, scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY, reason); scene.RegionInfo.RegionName, scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY, reason);

5
OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
View File

@ -117,8 +117,11 @@ namespace OpenSim.Server.Handlers.MapImage
return FailureResult("Bad request."); return FailureResult("Bad request.");
} }
int x = 0, y = 0; int x = 0, y = 0;
UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
Int32.TryParse(request["X"].ToString(), out x); Int32.TryParse(request["X"].ToString(), out x);
Int32.TryParse(request["Y"].ToString(), out y); Int32.TryParse(request["Y"].ToString(), out y);
if (request.ContainsKey("SCOPE"))
UUID.TryParse(request["SCOPE"].ToString(), out scopeID);
m_log.DebugFormat("[MAP ADD SERVER CONNECTOR]: Received map data for region at {0}-{1}", x, y); m_log.DebugFormat("[MAP ADD SERVER CONNECTOR]: Received map data for region at {0}-{1}", x, y);
@ -151,7 +154,7 @@ namespace OpenSim.Server.Handlers.MapImage
byte[] data = Convert.FromBase64String(request["DATA"].ToString()); byte[] data = Convert.FromBase64String(request["DATA"].ToString());
string reason = string.Empty; string reason = string.Empty;
bool result = m_MapService.AddMapTile(x, y, data, out reason); bool result = m_MapService.AddMapTile(x, y, data, scopeID, out reason);
if (result) if (result)
return SuccessResult(); return SuccessResult();

12
OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
View File

@ -38,6 +38,7 @@ using OpenSim.Server.Base;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Server.Handlers.Base; using OpenSim.Server.Handlers.Base;
using OpenMetaverse;
namespace OpenSim.Server.Handlers.MapImage namespace OpenSim.Server.Handlers.MapImage
{ {
@ -93,7 +94,16 @@ namespace OpenSim.Server.Handlers.MapImage
byte[] result = new byte[0]; byte[] result = new byte[0];
string format = string.Empty; string format = string.Empty;
result = m_MapService.GetMapTile(path.Trim('/'), out format);
UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
string[] bits = path.Trim('/').Split(new char[] {'/'});
if (bits.Length > 1)
{
scopeID = new UUID(bits[0]);
path = bits[1];
}
result = m_MapService.GetMapTile(path.Trim('/'), scopeID, out format);
if (result.Length > 0) if (result.Length > 0)
{ {
httpResponse.StatusCode = (int)HttpStatusCode.OK; httpResponse.StatusCode = (int)HttpStatusCode.OK;

5
OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs
View File

@ -119,6 +119,9 @@ namespace OpenSim.Server.Handlers.MapImage
int x = 0, y = 0; int x = 0, y = 0;
Int32.TryParse(request["X"].ToString(), out x); Int32.TryParse(request["X"].ToString(), out x);
Int32.TryParse(request["Y"].ToString(), out y); Int32.TryParse(request["Y"].ToString(), out y);
UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
if (request.ContainsKey("SCOPE"))
UUID.TryParse(request["SCOPE"].ToString(), out scopeID);
m_log.DebugFormat("[MAP REMOVE SERVER CONNECTOR]: Received position data for region at {0}-{1}", x, y); m_log.DebugFormat("[MAP REMOVE SERVER CONNECTOR]: Received position data for region at {0}-{1}", x, y);
@ -144,7 +147,7 @@ namespace OpenSim.Server.Handlers.MapImage
} }
string reason = string.Empty; string reason = string.Empty;
bool result = m_MapService.RemoveMapTile(x, y, out reason); bool result = m_MapService.RemoveMapTile(x, y, scopeID, out reason);
if (result) if (result)
return SuccessResult(); return SuccessResult();

8
OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
View File

@ -86,13 +86,14 @@ namespace OpenSim.Services.Connectors
m_ServerURI = serviceURI.TrimEnd('/'); m_ServerURI = serviceURI.TrimEnd('/');
} }
public bool RemoveMapTile(int x, int y, out string reason) public bool RemoveMapTile(int x, int y, UUID scopeID, out string reason)
{ {
reason = string.Empty; reason = string.Empty;
int tickstart = Util.EnvironmentTickCount(); int tickstart = Util.EnvironmentTickCount();
Dictionary<string, object> sendData = new Dictionary<string, object>(); Dictionary<string, object> sendData = new Dictionary<string, object>();
sendData["X"] = x.ToString(); sendData["X"] = x.ToString();
sendData["Y"] = y.ToString(); sendData["Y"] = y.ToString();
sendData["SCOPE"] = scopeID.ToString();
string reqString = ServerUtils.BuildQueryString(sendData); string reqString = ServerUtils.BuildQueryString(sendData);
string uri = m_ServerURI + "/removemap"; string uri = m_ServerURI + "/removemap";
@ -146,13 +147,14 @@ namespace OpenSim.Services.Connectors
return false; return false;
} }
public bool AddMapTile(int x, int y, byte[] jpgData, out string reason) public bool AddMapTile(int x, int y, byte[] jpgData, UUID scopeID, out string reason)
{ {
reason = string.Empty; reason = string.Empty;
int tickstart = Util.EnvironmentTickCount(); int tickstart = Util.EnvironmentTickCount();
Dictionary<string, object> sendData = new Dictionary<string, object>(); Dictionary<string, object> sendData = new Dictionary<string, object>();
sendData["X"] = x.ToString(); sendData["X"] = x.ToString();
sendData["Y"] = y.ToString(); sendData["Y"] = y.ToString();
sendData["SCOPE"] = scopeID.ToString();
sendData["TYPE"] = "image/jpeg"; sendData["TYPE"] = "image/jpeg";
sendData["DATA"] = Convert.ToBase64String(jpgData); sendData["DATA"] = Convert.ToBase64String(jpgData);
@ -212,7 +214,7 @@ namespace OpenSim.Services.Connectors
} }
public byte[] GetMapTile(string fileName, out string format) public byte[] GetMapTile(string fileName, UUID scopeID, out string format)
{ {
format = string.Empty; format = string.Empty;
new Exception("GetMapTile method not Implemented"); new Exception("GetMapTile method not Implemented");

6
OpenSim/Services/Interfaces/IMapImageService.cs
View File

@ -34,8 +34,8 @@ namespace OpenSim.Services.Interfaces
public interface IMapImageService public interface IMapImageService
{ {
//List<MapBlockData> GetMapBlocks(UUID scopeID, int minX, int minY, int maxX, int maxY); //List<MapBlockData> GetMapBlocks(UUID scopeID, int minX, int minY, int maxX, int maxY);
bool AddMapTile(int x, int y, byte[] imageData, out string reason); bool AddMapTile(int x, int y, byte[] imageData, UUID scopeID, out string reason);
bool RemoveMapTile(int x, int y, out string reason); bool RemoveMapTile(int x, int y, UUID scopeID, out string reason);
byte[] GetMapTile(string fileName, out string format); byte[] GetMapTile(string fileName, UUID scopeID, out string format);
} }
} }

39
OpenSim/Services/MapImageService/MapImageService.cs
View File

@ -94,10 +94,10 @@ namespace OpenSim.Services.MapImageService
#region IMapImageService #region IMapImageService
public bool AddMapTile(int x, int y, byte[] imageData, out string reason) public bool AddMapTile(int x, int y, byte[] imageData, UUID scopeID, out string reason)
{ {
reason = string.Empty; reason = string.Empty;
string fileName = GetFileName(1, x, y); string fileName = GetFileName(1, x, y, scopeID);
lock (m_Sync) lock (m_Sync)
{ {
@ -114,13 +114,13 @@ namespace OpenSim.Services.MapImageService
} }
} }
return UpdateMultiResolutionFiles(x, y, out reason); return UpdateMultiResolutionFiles(x, y, scopeID, out reason);
} }
public bool RemoveMapTile(int x, int y, out string reason) public bool RemoveMapTile(int x, int y, UUID scopeID, out string reason)
{ {
reason = String.Empty; reason = String.Empty;
string fileName = GetFileName(1, x, y); string fileName = GetFileName(1, x, y, scopeID);
lock (m_Sync) lock (m_Sync)
{ {
@ -136,10 +136,10 @@ namespace OpenSim.Services.MapImageService
} }
} }
return UpdateMultiResolutionFiles(x, y, out reason); return UpdateMultiResolutionFiles(x, y, scopeID, out reason);
} }
private bool UpdateMultiResolutionFiles(int x, int y, out string reason) private bool UpdateMultiResolutionFiles(int x, int y, UUID scopeID, out string reason)
{ {
reason = String.Empty; reason = String.Empty;
lock (m_Sync) lock (m_Sync)
@ -153,7 +153,7 @@ namespace OpenSim.Services.MapImageService
int x1 = x - (x % width); int x1 = x - (x % width);
int y1 = y - (y % width); int y1 = y - (y % width);
if (!CreateTile(zoomLevel, x1, y1)) if (!CreateTile(zoomLevel, x1, y1, scopeID))
{ {
m_log.WarnFormat("[MAP IMAGE SERVICE]: Unable to create tile for {0},{1} at zoom level {1}", x, y, zoomLevel); m_log.WarnFormat("[MAP IMAGE SERVICE]: Unable to create tile for {0},{1} at zoom level {1}", x, y, zoomLevel);
reason = string.Format("Map tile at zoom level {0} failed", zoomLevel); reason = string.Format("Map tile at zoom level {0} failed", zoomLevel);
@ -165,12 +165,13 @@ namespace OpenSim.Services.MapImageService
return true; return true;
} }
public byte[] GetMapTile(string fileName, out string format) public byte[] GetMapTile(string fileName, UUID scopeID, out string format)
{ {
// m_log.DebugFormat("[MAP IMAGE SERVICE]: Getting map tile {0}", fileName); // m_log.DebugFormat("[MAP IMAGE SERVICE]: Getting map tile {0}", fileName);
format = ".jpg"; format = ".jpg";
string fullName = Path.Combine(m_TilesStoragePath, fileName); string fullName = Path.Combine(m_TilesStoragePath, scopeID.ToString());
fullName = Path.Combine(fullName, fileName);
if (File.Exists(fullName)) if (File.Exists(fullName))
{ {
format = Path.GetExtension(fileName).ToLower(); format = Path.GetExtension(fileName).ToLower();
@ -191,10 +192,12 @@ namespace OpenSim.Services.MapImageService
#endregion #endregion
private string GetFileName(uint zoomLevel, int x, int y) private string GetFileName(uint zoomLevel, int x, int y, UUID scopeID)
{ {
string extension = "jpg"; string extension = "jpg";
return Path.Combine(m_TilesStoragePath, string.Format("map-{0}-{1}-{2}-objects.{3}", zoomLevel, x, y, extension)); string path = Path.Combine(m_TilesStoragePath, scopeID.ToString());
Directory.CreateDirectory(path);
return Path.Combine(path, string.Format("map-{0}-{1}-{2}-objects.{3}", zoomLevel, x, y, extension));
} }
private Bitmap GetInputTileImage(string fileName) private Bitmap GetInputTileImage(string fileName)
@ -235,7 +238,7 @@ namespace OpenSim.Services.MapImageService
return null; return null;
} }
private bool CreateTile(uint zoomLevel, int x, int y) private bool CreateTile(uint zoomLevel, int x, int y, UUID scopeID)
{ {
// m_log.DebugFormat("[MAP IMAGE SERVICE]: Create tile for {0} {1}, zoom {2}", x, y, zoomLevel); // m_log.DebugFormat("[MAP IMAGE SERVICE]: Create tile for {0} {1}, zoom {2}", x, y, zoomLevel);
int prevWidth = (int)Math.Pow(2, (double)zoomLevel - 2); int prevWidth = (int)Math.Pow(2, (double)zoomLevel - 2);
@ -250,13 +253,13 @@ namespace OpenSim.Services.MapImageService
int yOut = y - (y % thisWidth); int yOut = y - (y % thisWidth);
// Try to open the four input tiles from the previous zoom level // Try to open the four input tiles from the previous zoom level
Bitmap inputBL = GetInputTileImage(GetFileName(zoomLevel - 1, xIn, yIn)); Bitmap inputBL = GetInputTileImage(GetFileName(zoomLevel - 1, xIn, yIn, scopeID));
Bitmap inputBR = GetInputTileImage(GetFileName(zoomLevel - 1, xIn + prevWidth, yIn)); Bitmap inputBR = GetInputTileImage(GetFileName(zoomLevel - 1, xIn + prevWidth, yIn, scopeID));
Bitmap inputTL = GetInputTileImage(GetFileName(zoomLevel - 1, xIn, yIn + prevWidth)); Bitmap inputTL = GetInputTileImage(GetFileName(zoomLevel - 1, xIn, yIn + prevWidth, scopeID));
Bitmap inputTR = GetInputTileImage(GetFileName(zoomLevel - 1, xIn + prevWidth, yIn + prevWidth)); Bitmap inputTR = GetInputTileImage(GetFileName(zoomLevel - 1, xIn + prevWidth, yIn + prevWidth, scopeID));
// Open the output tile (current zoom level) // Open the output tile (current zoom level)
string outputFile = GetFileName(zoomLevel, xOut, yOut); string outputFile = GetFileName(zoomLevel, xOut, yOut, scopeID);
Bitmap output = GetOutputTileImage(outputFile); Bitmap output = GetOutputTileImage(outputFile);
if (output == null) if (output == null)
return false; return false;