diff --git a/js/kundenkarte.js b/js/kundenkarte.js index 68f752b..10203f1 100755 --- a/js/kundenkarte.js +++ b/js/kundenkarte.js @@ -7869,10 +7869,10 @@ var pos = self.getTerminalPosition(eq, termId, terms); if (!pos) return; var labelText = conn.output_label || ''; - if (conn.output_location) labelText += ' · ' + conn.output_location; + var locationText = conn.output_location || ''; var cableText = ((conn.medium_type || '') + ' ' + (conn.medium_spec || '')).trim(); - var maxLen = Math.max(labelText.length, cableText.length); - var lineLen = Math.min(120, Math.max(50, maxLen * 6 + 20)); + var maxLen = Math.max(labelText.length, locationText.length, cableText.length); + var lineLen = Math.min(150, Math.max(50, maxLen * 6 + 20)); var goUp = pos.isTop; self._outputAreas.push({ x: pos.x - 25, @@ -7937,12 +7937,12 @@ } } - // Calculate line length based on label text + // Calculate line length based on label text (label and location are separate lines) var labelText = conn.output_label || ''; - if (conn.output_location) labelText += ' · ' + conn.output_location; + var locationText = conn.output_location || ''; var cableText = (conn.medium_type || '') + ' ' + (conn.medium_spec || ''); - var maxTextLen = Math.max(labelText.length, cableText.trim().length); - var lineLength = Math.min(120, Math.max(50, maxTextLen * 6 + 20)); + var maxTextLen = Math.max(labelText.length, locationText.length, cableText.trim().length); + var lineLength = Math.min(150, Math.max(50, maxTextLen * 6 + 20)); // Direction: top terminal = UP, bottom terminal = DOWN var goingUp = sourcePos.isTop; @@ -7988,15 +7988,19 @@ // Labels - vertical text on both sides var labelY = (startY + endY) / 2; - // Left side: Bezeichnung (output_label) + Räumlichkeit + // Left side: Bezeichnung (output_label) + Räumlichkeit (separate line) if (conn.output_label) { htmlFront += ''; htmlFront += self.escapeHtml(conn.output_label); - if (conn.output_location) { - htmlFront += ' · ' + self.escapeHtml(conn.output_location) + ''; - } + htmlFront += ''; + } + if (conn.output_location) { + htmlFront += ''; + htmlFront += self.escapeHtml(conn.output_location); htmlFront += ''; } @@ -11406,10 +11410,10 @@ } var labelText = conn.output_label || ''; - if (conn.output_location) labelText += ' · ' + conn.output_location; + var locationText = conn.output_location || ''; var cableText = (conn.medium_type || '') + ' ' + (conn.medium_spec || ''); - var maxTextLen = Math.max(labelText.length, cableText.trim().length); - var lineLength = Math.min(120, Math.max(50, maxTextLen * 6 + 20)); + var maxTextLen = Math.max(labelText.length, locationText.length, cableText.trim().length); + var lineLength = Math.min(150, Math.max(50, maxTextLen * 6 + 20)); var goingUp = sourcePos.isTop; var endY = goingUp ? (sourcePos.y - lineLength) : (sourcePos.y + lineLength); pathData = 'M ' + lineX + ' ' + sourcePos.y + ' L ' + lineX + ' ' + endY;