tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/new_networkmap' of https://github.com/pandorafms/pandorafms into feature/new_networkmap 

Conflicts:
	pandora_console/include/javascript/map/MapController.js
This commit is contained in:
mdtrooper 2016-03-22 09:51:24 +01:00
parent 6e0ddb5b18 2e26ac4bfc
commit d017ace822
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pandora_console/include/javascript/map/MapController.js
View File

@ -16,7 +16,6 @@
/*-------------------Constants-------------------*/ /*-------------------Constants-------------------*/
/*-----------------------------------------------*/ /*-----------------------------------------------*/
var MAX_ZOOM_LEVEL = 50; var MAX_ZOOM_LEVEL = 50;
var RELATION_MINIMAP = 4;
/*-----------------------------------------------*/ /*-----------------------------------------------*/
/*------------------Constructor------------------*/ /*------------------Constructor------------------*/
@ -506,12 +505,27 @@ MapController.prototype.paint_minimap = function() {
var screen_size = d3.select(self._target).node().getBoundingClientRect(); var screen_size = d3.select(self._target).node().getBoundingClientRect();
var map_size = d3.select(self._target + " .viewport").node().getBBox(); var map_size = d3.select(self._target + " .viewport").node().getBBox();
var relation_minimap = [];
<<<<<<< HEAD
var real_width = map_size.width + map_size.x; var real_width = map_size.width + map_size.x;
var real_height = map_size.height + map_size.y; var real_height = map_size.height + map_size.y;
var minimap_map_width = (map_size.width + map_size.x) / RELATION_MINIMAP; var minimap_map_width = (map_size.width + map_size.x) / RELATION_MINIMAP;
var minimap_map_height = (map_size.height + map_size.y) / RELATION_MINIMAP; var minimap_map_height = (map_size.height + map_size.y) / RELATION_MINIMAP;
=======
if (map_size.width > map_size.height) {
relation_minimap['width'] = 6;
relation_minimap['height'] = 8;
}
else {
relation_minimap['width'] = 8;
relation_minimap['height'] = 6;
}
var minimap_map_width = (map_size.width + map_size.x) / relation_minimap['width'];
var minimap_map_height = (map_size.height + map_size.y) / relation_minimap['height'];
>>>>>>> 2e26ac4bfce15be192aa2a654e22e65b66c56cac
var minimap = d3.select(self._target + " .minimap"); var minimap = d3.select(self._target + " .minimap");
var svg = d3.select(self._target + " svg"); var svg = d3.select(self._target + " svg");
@ -541,8 +555,8 @@ MapController.prototype.paint_minimap = function() {
.attr("style", "fill: #ffffff; stroke: #000000; stroke-width: 1;"); .attr("style", "fill: #ffffff; stroke: #000000; stroke-width: 1;");
transform = d3.transform(); transform = d3.transform();
transform.scale[0] = 1 / RELATION_MINIMAP; transform.scale[0] = 1 / relation_minimap['width'];
transform.scale[1] = 1 / RELATION_MINIMAP; transform.scale[1] = 1 / relation_minimap['height'];
var minimap_layer = minimap var minimap_layer = minimap
.append("g") .append("g")