labeling testing

This commit is contained in:
Hannes Janetzek
2013-02-18 09:48:32 +01:00
parent d25d967332
commit 34bffcc15f
16 changed files with 628 additions and 348 deletions

View File

@@ -167,7 +167,8 @@ public final class Text extends RenderInstruction {
FontMetrics fm = paint.getFontMetrics();
fontHeight = (float) Math.ceil(Math.abs(fm.bottom) + Math.abs(fm.top));
fontDescent = (float) Math.ceil(Math.abs(fm.descent));
//fontDescent = (float) Math.ceil(Math.abs(fm.descent));
fontDescent = Math.abs(fm.bottom);
}
@Override

View File

@@ -991,14 +991,22 @@
<!-- place -->
<rule e="node" k="place" v="*">
<rule e="node" k="*" v="suburb|town|village">
<caption k="name" font-size="17" fill="#2020bb"
<rule e="node" k="*" v="suburb" zoom-max="14">
<caption k="name" font-size="17" fill="#bb2020"
stroke="#ffffff" stroke-width="2.0" />
</rule>
<rule e="node" k="*" v="village" zoom-max="14">
<caption k="name" font-size="17" fill="#2020cc"
stroke="#ffffff" stroke-width="2.0" />
</rule>
<rule e="node" k="*" v="island" zoom-min="10">
<caption k="name" font-style="bold" font-size="20" fill="#000000"
stroke="#ffffff" stroke-width="2.0" />
</rule>
<rule e="node" k="*" v="town">
<caption k="name" font-size="19" fill="#000000"
stroke="#ffffff" stroke-width="2.0" />
</rule>
<rule e="node" k="*" v="city">
<caption k="name" font-size="20" fill="#000000"
stroke="#ffffff" stroke-width="2.0" />