Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-28 21:25:46 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #329 from mikeprimm/master

Browse Source 
Add updated regions support for current Residence (2.3.x)
This commit is contained in:
mikeprimm 2011-07-26 21:08:52 -07:00
commit 8bac8b0d23
2 changed files with 67 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/resources/configuration.txt
View File

@ -79,6 +79,24 @@ components:
# visibleregions:
# - homebase
# - miningsite
#- class: org.dynmap.regions.RegionsComponent
# type: regions
# name: Residence
# useworldpath: false
# filename: res.yml
# basenode: Residences
# use3dregions: false
# infowindow: '<div class="infowindow"><span style="font-size:120%;">%regionname%</span><br /> Owner <span style="font-weight:bold;">%playerowners%</span><br />Flags<br /><span style="font-weight:bold;">%flags%</span></div>'
# regionstyle:
# strokeColor: "#FF0000"
# strokeOpacity: 0.8
# strokeWeight: 3
# fillColor: "#FF0000"
# fillOpacity: 0.35
# # Optional setting to limit which regions to show, by name - if commented out, all regions are shown
# visibleregions:
# - homebase
# - miningsite
#- class: org.dynmap.TestComponent
# stuff: "This is some configuration-value"

103
web/js/regions_Residence.js
View File

@ -1,122 +1,115 @@
regionConstructors['polygon'] = function(map, name, region)
regionConstructors['polygon'] = function(map, resname, region)
{
if(regionCfg.regiontype == 'worldguard')
{
region.x1 = region.min.x;
region.y1 = region.min.y;
region.z1 = region.min.z;
region.x2 = region.max.x;
region.y2 = region.max.y;
region.z2 = region.max.z;
}
$.each(region.Areas, function(aname, area) {
var name = resname + '_' + aname;
if(regionCfg.use3dregions)
{
regionPolygons[name+'_bottom'] = new google.maps.Polygon($.extend(regionCfg.regionstyle, {
paths: [
map.getProjection().fromWorldToLatLng(region.x1,region.y1,region.z1),
map.getProjection().fromWorldToLatLng(region.x2,region.y1,region.z1),
map.getProjection().fromWorldToLatLng(region.x2,region.y1,region.z2),
map.getProjection().fromWorldToLatLng(region.x1,region.y1,region.z2)
map.getProjection().fromWorldToLatLng(area.X1,area.Y1,area.Z1),
map.getProjection().fromWorldToLatLng(area.X2,area.Y1,area.Z1),
map.getProjection().fromWorldToLatLng(area.X2,area.Y1,area.Z2),
map.getProjection().fromWorldToLatLng(area.X1,area.Y1,area.Z2)
],
map: map
}));
google.maps.event.addListener(regionPolygons[name+'_bottom'] , 'click', function(event) {
regionInfo(event, name, region);
regionInfo(event, resname, region);
});
regionPolygons[name+'_top'] = new google.maps.Polygon($.extend(regionCfg.regionstyle, {
paths: [
map.getProjection().fromWorldToLatLng(region.x1,region.y2,region.z1),
map.getProjection().fromWorldToLatLng(region.x2,region.y2,region.z1),
map.getProjection().fromWorldToLatLng(region.x2,region.y2,region.z2),
map.getProjection().fromWorldToLatLng(region.x1,region.y2,region.z2)
map.getProjection().fromWorldToLatLng(area.X1,area.Y2,area.Z1),
map.getProjection().fromWorldToLatLng(area.X2,area.Y2,area.Z1),
map.getProjection().fromWorldToLatLng(area.X2,area.Y2,area.Z2),
map.getProjection().fromWorldToLatLng(area.X1,area.Y2,area.Z2)
],
map: map
}));
google.maps.event.addListener(regionPolygons[name+'_top'] , 'click', function(event) {
regionInfo(event, name, region);
regionInfo(event, resname, region);
});
regionPolygons[name+'_east'] = new google.maps.Polygon($.extend(regionCfg.regionstyle, {
paths: [
map.getProjection().fromWorldToLatLng(region.x1,region.y1,region.z1),
map.getProjection().fromWorldToLatLng(region.x1,region.y2,region.z1),
map.getProjection().fromWorldToLatLng(region.x2,region.y2,region.z1),
map.getProjection().fromWorldToLatLng(region.x2,region.y1,region.z1)
map.getProjection().fromWorldToLatLng(area.X1,area.Y1,area.Z1),
map.getProjection().fromWorldToLatLng(area.X1,area.Y2,area.Z1),
map.getProjection().fromWorldToLatLng(area.X2,area.Y2,area.Z1),
map.getProjection().fromWorldToLatLng(area.X2,area.Y1,area.Z1)
],
map: map
}));
google.maps.event.addListener(regionPolygons[name+'_east'] , 'click', function(event) {
regionInfo(event, name, region);
regionInfo(event, resname, region);
});
regionPolygons[name+'_south'] = new google.maps.Polygon($.extend(regionCfg.regionstyle, {
paths: [
map.getProjection().fromWorldToLatLng(region.x2,region.y1,region.z1),
map.getProjection().fromWorldToLatLng(region.x2,region.y2,region.z1),
map.getProjection().fromWorldToLatLng(region.x2,region.y2,region.z2),
map.getProjection().fromWorldToLatLng(region.x2,region.y1,region.z2)
map.getProjection().fromWorldToLatLng(area.X2,area.Y1,area.Z1),
map.getProjection().fromWorldToLatLng(area.X2,area.Y2,area.Z1),
map.getProjection().fromWorldToLatLng(area.X2,area.Y2,area.Z2),
map.getProjection().fromWorldToLatLng(area.X2,area.Y1,area.Z2)
],
map: map
}));
google.maps.event.addListener(regionPolygons[name+'_south'] , 'click', function(event) {
regionInfo(event, name, region);
regionInfo(event, resname, region);
});
regionPolygons[name+'_west'] = new google.maps.Polygon($.extend(regionCfg.regionstyle, {
paths: [
map.getProjection().fromWorldToLatLng(region.x1,region.y1,region.z2),
map.getProjection().fromWorldToLatLng(region.x1,region.y2,region.z2),
map.getProjection().fromWorldToLatLng(region.x2,region.y2,region.z2),
map.getProjection().fromWorldToLatLng(region.x2,region.y1,region.z2)
map.getProjection().fromWorldToLatLng(area.X1,area.Y1,area.Z2),
map.getProjection().fromWorldToLatLng(area.X1,area.Y2,area.Z2),
map.getProjection().fromWorldToLatLng(area.X2,area.Y2,area.Z2),
map.getProjection().fromWorldToLatLng(area.X2,area.Y1,area.Z2)
],
map: map
}));
google.maps.event.addListener(regionPolygons[name+'_west'] , 'click', function(event) {
regionInfo(event, name, region);
regionInfo(event, resname, region);
});
regionPolygons[name+'_north'] = new google.maps.Polygon($.extend(regionCfg.regionstyle, {
paths: [
map.getProjection().fromWorldToLatLng(region.x1,region.y1,region.z1),
map.getProjection().fromWorldToLatLng(region.x1,region.y2,region.z1),
map.getProjection().fromWorldToLatLng(region.x1,region.y2,region.z2),
map.getProjection().fromWorldToLatLng(region.x1,region.y1,region.z2)
map.getProjection().fromWorldToLatLng(area.X1,area.Y1,area.Z1),
map.getProjection().fromWorldToLatLng(area.X1,area.Y2,area.Z1),
map.getProjection().fromWorldToLatLng(area.X1,area.Y2,area.Z2),
map.getProjection().fromWorldToLatLng(area.X1,area.Y1,area.Z2)
],
map: map
}));
google.maps.event.addListener(regionPolygons[name+'_west'] , 'click', function(event) {
regionInfo(event, name, region);
regionInfo(event, resname, region);
});
}
else
{
middleY = region.y2;
middleY = area.Y2;
regionPolygons[name+'_bottom'] = new google.maps.Polygon($.extend(regionCfg.regionstyle, {
paths: [
map.getProjection().fromWorldToLatLng(region.x1,middleY,region.z1),
map.getProjection().fromWorldToLatLng(region.x2,middleY,region.z1),
map.getProjection().fromWorldToLatLng(region.x2,middleY,region.z2),
map.getProjection().fromWorldToLatLng(region.x1,middleY,region.z2)
map.getProjection().fromWorldToLatLng(area.X1,middleY,area.Z1),
map.getProjection().fromWorldToLatLng(area.X2,middleY,area.Z1),
map.getProjection().fromWorldToLatLng(area.X2,middleY,area.Z2),
map.getProjection().fromWorldToLatLng(area.X1,middleY,area.Z2)
],
map: map
}));
google.maps.event.addListener(regionPolygons[name+'_bottom'] , 'click', function(event) {
regionInfo(event, name, region);
regionInfo(event, resname, region);
});
}
});
}
regionConstructors['info'] = function(event, name, region)
{
if(regionCfg.regiontype == 'residence')
var flags = "";
$.each(region.Permissions.AreaFlags, function(flag, status)
{
$.each(region.areaflags, function(flag, status)
{
flags += flag+': '+status+'<br />';
});
var replace = ['%regionname%','%playerowners%','%flags%','%groupowners%', '%playermembers%', '%groupmembers%','%parent%', '%priority%'];
var by = [name,region.Permissions.Owner, flags, '', '', '', '', ''];
});
var replace = ['%regionname%','%owners%'];
var by = [name,region.permissions.owner];
}
var contentString = arrayReplace(replace, by, regionCfg.infowindow)
regionInfoWindow.setContent(contentString);
@ -133,11 +126,11 @@ regionConstructors['update'] = function(map)
region.setMap(null);
});
regionPolygons = {};
$.getJSON("standalone/res.json", function(data)
$.getJSON("standalone/res_" + map + ".json", function(data)
{
$.each(data, function(name, residence)
{
if(map == residence.world)
if(map == residence.Permissions.World)
makeRegionPolygonCube(dynmap.map, name, residence);
});
});