Added worldguard support for Leaflet.

web/js/dynmaputils.js

@@ -182,3 +182,27 @@ function Location(world, x, y, z) {
 	this.y = y;
 	this.z = z;
 }
+
+function namedReplace(str, obj)
+{
+	var startIndex = 0;
+	var result = '';
+	while(true) {
+		var variableBegin = str.indexOf('{', startIndex);
+		var variableEnd = str.indexOf('}', variableBegin+1);
+		if (variableBegin < 0 || variableEnd < 0) {
+			result += str.substr(startIndex);
+			break;
+		}
+		if (variableBegin < variableEnd) {
+			var variableName = str.substring(variableBegin+1, variableEnd-1);
+			result += str.substring(startIndex, variableBegin-1);
+			result += obj[variableName];
+		} else /* found '{}' */ {
+			result += str.substring(startIndex, variableBegin-1);
+			result += '';
+		}
+		startIndex = variableEnd+1;
+	}
+	return result;
+}

web/js/map.js

@@ -19,63 +19,6 @@ componentconstructors['testcomponent'] = function(dynmap, configuration) {
 	$(dynmap).bind('playerupdated', function() { console.log('playerupdated'); });
 };
 
-function loadjs(url, completed) {
-	var script = document.createElement('script');
-	script.setAttribute('src', url);
-	script.setAttribute('type', 'text/javascript');
-	var isloaded = false;
-	script.onload = function() {
-		if (isloaded) { return; }
-		isloaded = true;
-		completed();
-	};
-	
-	// Hack for IE, don't know whether this still applies to IE9.
-	script.onreadystatechange = function() {
-		script.onload();
-	};
-	(document.head || document.getElementsByTagName('head')[0]).appendChild(script);
-}
-
-function splitArgs(s) {
-	var r = s.split(' ');
-	delete arguments[0];
-	var obj = {};
-	var index = 0;
-	$.each(arguments, function(argumentIndex, argument) {
-		if (!argumentIndex) { return; }
-		var value = r[argumentIndex-1];
-		obj[argument] = value;
-	});
-	return obj;
-}
-
-function swtch(value, options, defaultOption) {
-	return (options[value] || defaultOption || function(){})(value);
-}
-(function( $ ){
-	$.fn.scrollHeight = function(height) {
-		return this[0].scrollHeight;
-	};
-})($);
-
-function DynMapType() { }
-DynMapType.prototype = {
-	onTileUpdated: function(tile, tileName) {
-		var src = this.dynmap.getTileUrl(tileName);
-		tile.attr('src', src);
-		tile.show();
-	},
-	updateTileSize: function(zoom) {}
-};
-
-function Location(world, x, y, z) {
-	this.world = world;
-	this.x = x;
-	this.y = y;
-	this.z = z;
-}
-
 function DynMap(options) {
 	var me = this;
 	me.options = options;

web/js/regions.js

@@ -1,36 +1,33 @@
-// Author: nidefawl. contact me at bukkit.org or irc.esper.net #nide
-
-var regionCfg;
-var regionPolygons = {} ;
-var regionInfoWindow = new google.maps.InfoWindow();
 var regionConstructors = {};
-function makeRegionPolygonCube(map, name, region)
+
-{
+componentconstructors['regions'] = function(dynmap, configuration) {
-	new regionConstructors['polygon'](map, name, region);
-}
-function regionInfo(event, name, region)
-{
-	new regionConstructors['info'](event, name, region);
-}
-componentconstructors['regions'] = function(dynmap, configuration)
-{
 	regionCfg = configuration;
-
+	var regionType = regionCfg.name;
-	loadjs('js/regions_' + regionCfg.name + '.js', function()
+	loadjs('js/regions_' + regionType + '.js', function() {
-	{
+		var regionsLayer = undefined;
-		var world_info = dynmap.map.mapTypeId.split('.');
+		function undraw() {
-		new regionConstructors['update'](world_info[0]);
+			if (regionsLayer) {
-		
+				dynmap.map.removeLayer(regionsLayer);
-		$(dynmap).bind('mapchanged', function() {
+				regionsLayer = undefined;
-			var world_info = dynmap.map.mapTypeId.split('.');
+			}
-			new regionConstructors['update'](world_info[0]); 
+		}
-		});
+		function redraw() {
+			undraw();
+			var worldName = dynmap.world && dynmap.world.name;
+			if (worldName) {
+				regionConstructors[regionType](dynmap, worldName, function(regionLayers) {
+					var newRegionsLayer = new L.LayerGroup();
+					$.each(regionLayers, function(name, layer) {
+						console.log(name, layer);
+						newRegionsLayer.addLayer(layer);
+					});
+					regionsLayer = newRegionsLayer;
+					dynmap.map.addLayer(newRegionsLayer);
+				});
+			}
+		}
+		$(dynmap).bind('mapchanged', redraw);
+		$(dynmap).bind('mapchanging', undraw);
+		redraw();
 	});
-}
+}
-
-function arrayReplace(replace, by, str)
-{
-	for (var i=0; i<replace.length; i++)
-		str = str.replace(replace[i], by[i]);
-	return str;
-} 

web/js/regions_WorldGuard.js

@@ -1,219 +1,110 @@
-regionConstructors['polygon'] = function(map, name, region)
+Array.max = function( array ){
+    return Math.max.apply( Math, array );
+};
+Array.min = function( array ){
+    return Math.min.apply( Math, array );
+};
+
+function createPolygonSurfaces(latlng, maxx, minx, maxy, miny, maxz, minz) {
+	return [
+		new L.Polygon([
+			latlng(minx,miny,minz),
+			latlng(maxx,miny,minz),
+			latlng(maxx,miny,maxz),
+			latlng(minx,miny,maxz)
+			], {}),
+		new L.Polygon([
+			latlng(minx,maxy,minz),
+			latlng(maxx,maxy,minz),
+			latlng(maxx,maxy,maxz),
+			latlng(minx,maxy,maxz)
+			], {}),
+		new L.Polygon([
+			latlng(minx,miny,minz),
+			latlng(minx,maxy,minz),
+			latlng(maxx,maxy,minz),
+			latlng(maxx,miny,minz)
+			], {}),
+		new L.Polygon([
+			latlng(maxx,miny,minz),
+			latlng(maxx,maxy,minz),
+			latlng(maxx,maxy,maxz),
+			latlng(maxx,miny,maxz)
+			], {}),
+		new L.Polygon([
+			latlng(minx,miny,maxz),
+			latlng(minx,maxy,maxz),
+			latlng(maxx,maxy,maxz),
+			latlng(maxx,miny,maxz)
+			], {}),
+		new L.Polygon([
+			latlng(minx,miny,minz),
+			latlng(minx,maxy,minz),
+			latlng(minx,maxy,maxz),
+			latlng(minx,miny,maxz)
+			], {})
+		];
+}
+
+function createPolygonsFromWorldGuardRegion(latlng, name, region)
 {
-    if(region.points) {
+	if(region.points) {
-    	var i;
+		var i;
-		if(regionCfg.use3dregions) {
+		var xs = region.points.map(function(p) { return p.x; });
-			var toppts = [];
+		var zs = region.points.map(function(p) { return p.z; });
-			var botpts = [];
+		return createPolygonSurfaces(latlng, Array.max(xs), Array.min(xs), region['max-y'], region['min-y'], Array.max(zs), Array.min(zs));
-    		for(i = 0; i < region.points.length; i++) {
+	}
-    			toppts.push(map.getProjection().fromWorldToLatLng(region.points[i].x,
-    				region['max-y'], region.points[i].z));
-    			botpts.push(map.getProjection().fromWorldToLatLng(region.points[i].x,
-    				region['min-y'], region.points[i].z));    				
-    		}
-    		for(i = 0; i < region.points.length; i++) {
-				regionPolygons[name+'_side'+i] = new google.maps.Polygon($.extend(regionCfg.regionstyle, {
-					paths: [
-						toppts[i], botpts[i], botpts[(i+1)%region.points.length], toppts[(i+1)%region.points.length]
-					], map: map }));
-				google.maps.event.addListener(regionPolygons[name+'_side'+i] , 'click', function(event) {
-					regionInfo(event, name, region);
-				});
-			}
-			regionPolygons[name+'_bottom'] = new google.maps.Polygon($.extend(regionCfg.regionstyle, {
-				paths: botpts, map: map }));
-			google.maps.event.addListener(regionPolygons[name+'_bottom'] , 'click', function(event) {
-				regionInfo(event, name, region);
-			});
-			regionPolygons[name+'_top'] = new google.maps.Polygon($.extend(regionCfg.regionstyle, {
-				paths: toppts, map: map }));
-			google.maps.event.addListener(regionPolygons[name+'_top'] , 'click', function(event) {
-				regionInfo(event, name, region);
-			});
-    	}
-    	else {
- 	   		var pts = [];
-    		var yy = (region['min-y']+region['max-y'])/2;
-    		for(i = 0; i < region.points.length; i++) {
-    			pts.push(map.getProjection().fromWorldToLatLng(region.points[i].x,
-    				yy, region.points[i].z));
-    		}
-			regionPolygons[name+'_bottom'] = new google.maps.Polygon($.extend(regionCfg.regionstyle, {
-				paths: pts, map: map }));
-			google.maps.event.addListener(regionPolygons[name+'_bottom'] , 'click', function(event) {
-				regionInfo(event, name, region);
-			});
-		}
-		return;
-    }
 	if(!region.min || !region.max)
-		return;
+		return [];
-    if(region.max.y <= region.min.y)
+	if(region.max.y <= region.min.y)
-        region.min.y = region.max.y - 1;
+		region.min.y = region.max.y - 1;
-	if(regionCfg.use3dregions)
+	return createPolygonSurfaces(latlng, region.max.x, region.min.x, region.max.y, region.min.y, region.max.z, region.min.z);
-	{
-		regionPolygons[name+'_bottom'] = new google.maps.Polygon($.extend(regionCfg.regionstyle, {
-			paths: [
-			map.getProjection().fromWorldToLatLng(region.min.x,region.min.y,region.min.z),
-			map.getProjection().fromWorldToLatLng(region.max.x,region.min.y,region.min.z),
-			map.getProjection().fromWorldToLatLng(region.max.x,region.min.y,region.max.z),
-			map.getProjection().fromWorldToLatLng(region.min.x,region.min.y,region.max.z)
-			],
-			map: map
-			}));
-		regionPolygons[name+'_top'] = new google.maps.Polygon($.extend(regionCfg.regionstyle, {
-			paths: [
-			map.getProjection().fromWorldToLatLng(region.min.x,region.max.y,region.min.z),
-			map.getProjection().fromWorldToLatLng(region.max.x,region.max.y,region.min.z),
-			map.getProjection().fromWorldToLatLng(region.max.x,region.max.y,region.max.z),
-			map.getProjection().fromWorldToLatLng(region.min.x,region.max.y,region.max.z)
-			],
-			map: map
-			}));
-		regionPolygons[name+'_east'] = new google.maps.Polygon($.extend(regionCfg.regionstyle, {
-			paths: [
-			map.getProjection().fromWorldToLatLng(region.min.x,region.min.y,region.min.z),
-			map.getProjection().fromWorldToLatLng(region.min.x,region.max.y,region.min.z),
-			map.getProjection().fromWorldToLatLng(region.max.x,region.max.y,region.min.z),
-			map.getProjection().fromWorldToLatLng(region.max.x,region.min.y,region.min.z)
-			],
-			map: map
-			}));
-		regionPolygons[name+'_south'] = new google.maps.Polygon($.extend(regionCfg.regionstyle, {
-			paths: [
-			map.getProjection().fromWorldToLatLng(region.max.x,region.min.y,region.min.z),
-			map.getProjection().fromWorldToLatLng(region.max.x,region.max.y,region.min.z),
-			map.getProjection().fromWorldToLatLng(region.max.x,region.max.y,region.max.z),
-			map.getProjection().fromWorldToLatLng(region.max.x,region.min.y,region.max.z)
-			],
-			map: map
-			}));
-		regionPolygons[name+'_west'] = new google.maps.Polygon($.extend(regionCfg.regionstyle, {
-			paths: [
-			map.getProjection().fromWorldToLatLng(region.min.x,region.min.y,region.max.z),
-			map.getProjection().fromWorldToLatLng(region.min.x,region.max.y,region.max.z),
-			map.getProjection().fromWorldToLatLng(region.max.x,region.max.y,region.max.z),
-			map.getProjection().fromWorldToLatLng(region.max.x,region.min.y,region.max.z)
-			],
-			map: map
-			}));
-		regionPolygons[name+'_north'] = new google.maps.Polygon($.extend(regionCfg.regionstyle, {
-			paths: [
-			map.getProjection().fromWorldToLatLng(region.min.x,region.min.y,region.min.z),
-			map.getProjection().fromWorldToLatLng(region.min.x,region.max.y,region.min.z),
-			map.getProjection().fromWorldToLatLng(region.min.x,region.max.y,region.max.z),
-			map.getProjection().fromWorldToLatLng(region.min.x,region.min.y,region.max.z)
-			],
-			map: map
-			}));
-		google.maps.event.addListener(regionPolygons[name+'_bottom'] , 'click', function(event) {
-			regionInfo(event, name, region);
-		});
-		google.maps.event.addListener(regionPolygons[name+'_top'] , 'click', function(event) {
-			regionInfo(event, name, region);
-		});
-		google.maps.event.addListener(regionPolygons[name+'_east'] , 'click', function(event) {
-			regionInfo(event, name, region);
-		});
-		google.maps.event.addListener(regionPolygons[name+'_south'] , 'click', function(event) {
-			regionInfo(event, name, region);
-		});
-		google.maps.event.addListener(regionPolygons[name+'_west'] , 'click', function(event) {
-			regionInfo(event, name, region);
-		});
-		google.maps.event.addListener(regionPolygons[name+'_north'] , 'click', function(event) {
-			regionInfo(event, name, region);
-		});
-	}
-	else
-	{
-		regionPolygons[name+'_bottom'] = new google.maps.Polygon($.extend(regionCfg.regionstyle, {
-			paths: [
-			map.getProjection().fromWorldToLatLng(region.min.x,region.max.y,region.min.z),
-			map.getProjection().fromWorldToLatLng(region.max.x,region.max.y,region.min.z),
-			map.getProjection().fromWorldToLatLng(region.max.x,region.max.y,region.max.z),
-			map.getProjection().fromWorldToLatLng(region.min.x,region.max.y,region.max.z)
-			],
-			map: map
-			}));
-		
-		google.maps.event.addListener(regionPolygons[name+'_bottom'] , 'click', function(event) {
-			regionInfo(event, name, region);
-		});
-	}
-}
-regionConstructors['info'] = function(event, name, region)
-{
-	var owners = {'players':'', 'groups':''};
-	$.each(region.owners, function(type, names)
-	{
-		$.each(names, function(index, name)
-		{
-			if(type == 'players')
-				owners['players'] += name+' ';
-			else if(type == 'groups')
-				owners['groups'] += name+' ';
-		});
-	});
-	var members = {'players':'', 'groups':''};
-	$.each(region.members, function(type, names)
-	{
-		$.each(names, function(index, name)
-		{
-			if(type == 'players')
-				members['players'] += name+' ';
-			else if(type == 'groups')
-				members['groups'] += name+' ';
-		});
-	});
-	var flags = '';
-	$.each(region.flags, function(name, value)
-	{
-		flags += name+': '+value+'<br />';
-	});
-	
-	name = '<span class="regionname">'+name+'</span>';
-	owners['players'] = '<span class="playerowners">'+owners['players']+'</span>';
-	owners['groups'] = '<span class="groupowners">'+owners['groups']+'</span>';
-	members['players'] = '<span class="playermembers">'+members['players']+'</span>';
-	members['groups'] = '<span class="groupmembers">'+members['groups']+'</span>';
-	var region_parent = (region.parent) ? '<span class="regionparent">'+region.parent+'</span>' : '';
-	flags = '<span class="regionflags">'+flags+'</span>';
-	var region_priority = '<span class="regionpriority">'+region.priority+'</span>';
-	
-	var replace = ['%regionname%','%playerowners%','%groupowners%','%playermembers%','%groupmembers%','%parent%','%flags%','%priority%'];
-	var by = [name,owners['players'],owners['groups'],members['players'], members['groups'],region_parent,flags,region_priority];
-	
-	var contentString = arrayReplace(replace, by, regionCfg.infowindow)
-
-	regionInfoWindow.setContent(contentString);
-	regionInfoWindow.setPosition(event.latLng);
-
-	regionInfoWindow.open(dynmap.map);
 }
 
-regionConstructors['update'] = function(map)
+function createPopupContent(name, region) {
-{
+	
-	if(regionInfoWindow)
+	return $('<div/>')
-		regionInfoWindow.close();
+		.append($('<span/>').addClass('regionname').text(name))
-	$.each(regionPolygons, function(index, region)
+		.append(region.owners.players && $('<span/>').addClass('playerowners').text(region.owners.players.concat()))
-	{
+		.append(region.owners.groups && $('<span/>').addClass('groupowners').text(region.owners.groups.concat()))
-		region.setMap(null);
+		.append(region.members.players && $('<span/>').addClass('playermembers').text(region.members.players.concat()))
-	});
+		.append(region.members.groups && $('<span/>').addClass('groupmembers').text(region.members.groups.concat()))
-	regionPolygons = {};
+		.append(region.parent && $('<span/>').addClass('regionparent').text(region.parent))
+		.append(region.flags && function() {
+			var regionflags = $('<span/>').addClass('regionflags');
+			$.each(region.flags, function(name, value) {
+				regionflags.append($('<span/>').addClass('regionflag').text(name + ': ' + value));
+			});
+			return regionflags;
+		}())
+		.append($('<span/>').addClass('regionpriority').text(region.priority))
+		[0];
+};
+
+regionConstructors['WorldGuard'] = function(dynmap, worldName, result) {
+	var latlng = function(x, y, z) {
+		var l;
+		if (typeof x === 'Object' && !y && !z) {
+			l = x;
+		} else {
+			l = new Location(undefined, x,y,z);
+		}
+		return dynmap.getProjection().fromLocationToLatLng(l);
+	};
 	
 	regionFile = regionCfg.filename.substr(0, regionCfg.filename.lastIndexOf('.'));
-	regionFile += '_'+map+'.json';
+	regionFile += '_'+worldName+'.json';
-
+	$.getJSON('standalone/'+regionFile, function(data) {
-	$.getJSON('standalone/'+regionFile, function(data)
+		var regionLayers = {};
-	{
+		$.each(data, function(name, region) {
-		var regionnames = '';
+			var polygons = createPolygonsFromWorldGuardRegion(latlng, name, region);
-		var count = 0;
+			var regionLayer = new L.FeatureGroup(polygons);
-		$.each(data, function(name, residence)
+			
-		{
+			regionLayer.bindPopup(createPopupContent(name, region));
-			count += 1;
+			
-			regionnames += ", "+name;
+			regionLayers[name] = regionLayer;
-			makeRegionPolygonCube(dynmap.map, name, residence);
 		});
+		result(regionLayers);
+		
 	});
-}
+};