CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-28 10:51:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:systemed/iD

Browse Source
This commit is contained in:
Saman Bemel-Benrud
2013-01-28 12:15:52 -05:00
parent c1d397386b 1d4c04c334
commit 1972616b11
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/renderer/map.js
+2 -2
View File
@@ -33,7 +33,7 @@ iD.Map = function() {
.attr('id', 'tile-g');
var supersurface = selection.append('div')
.style('position', 'absolute')
.style('position', 'absolute');
surface = supersurface.append('svg')
.on('mousedown.zoom', function() {
@@ -112,7 +112,7 @@ iD.Map = function() {
.call(areas, graph, all, filter)
.call(multipolygons, graph, all, filter)
.call(midpoints, graph, all, filter)
.call(labels, graph, all, filter);
.call(labels, graph, all, filter, dimensions);
}
dispatch.drawn(map);
}
js/id/svg/labels.js
+12 -10
View File
@@ -25,9 +25,8 @@ iD.svg.Labels = function(projection) {
[-15, 0, 'end']
];
var lineOffsets = [
50, 40, 60, 30, 70
];
var lineOffsets = [50, 45, 55, 40, 60, 35, 65, 30, 70, 25,
75, 20, 80, 15, 95, 10, 90, 5, 95];
function get(array, prop) {
return function(d, i) { return array[i][prop]; };
@@ -184,7 +183,7 @@ iD.svg.Labels = function(projection) {
}
return function drawLabels(surface, graph, entities, filter) {
return function drawLabels(surface, graph, entities, filter, dimensions) {
var rtree = new RTree();
var hidePoints = !d3.select('.node.point').node();
@@ -256,18 +255,18 @@ iD.svg.Labels = function(projection) {
if (tryInsert(rect)) return p;
}
function getLineLabel(entity, width, height) {
var nodes = _.pluck(graph.childNodes(entity), 'loc').map(projection),
length = iD.geo.pathLength(nodes);
if (length < width + 20) return;
// 50, 40, 60, 30, 70
for (var i = 0; i < 5; i ++) {
for (var i = 0; i < lineOffsets.length; i ++) {
var offset = lineOffsets[i],
middle = offset / 100 * length;
if (middle <= width / 2) return;
var start = middle - width/2,
sub = subpath(nodes, start, start + width),
middle = offset / 100 * length,
start = middle - width/2;
if (start < 0 || start + width > length) continue;
var sub = subpath(nodes, start, start + width),
rev = reverse(sub),
rect = new RTree.Rectangle(
Math.min(sub[0][0], sub[sub.length - 1][0]) - 10,
@@ -304,6 +303,9 @@ iD.svg.Labels = function(projection) {
}
function tryInsert(rect) {
// Check that label is visible
if (rect.x1 < 0 || rect.y1 < 0 || rect.x2 > dimensions[0] ||
rect.y2 > dimensions[1]) return false;
var v = rtree.search(rect, true).length === 0;
if (v) rtree.insert(rect);
return v;