Merge "Issue #2576 Increased the font size of EMER." into development

Former-commit-id: c3a2d640bf [formerly 7045c11eee] [formerly ee18295efe] [formerly ee18295efe [formerly cc53373478]] [formerly c3a2d640bf [formerly 7045c11eee] [formerly ee18295efe] [formerly ee18295efe [formerly cc53373478]] [formerly c29836abd7 [formerly ee18295efe [formerly cc53373478] [formerly c29836abd7 [formerly 947196e8ac4bb82536102bb56413d94589569599]]]]]
Former-commit-id: c29836abd7
Former-commit-id: fd5d9da0d4 [formerly f2a827f884] [formerly cb3d6e2de3] [formerly 7807ca76a75a26eaaaf4ee9e7063177f164b6884 [formerly 14135ca8d7f458242a1ad82bca5ddb70fc04057c] [formerly cb3d6e2de3 [formerly bad9e2ab44]]]
Former-commit-id: 39e4d3b028d321ede5d382c596e2d01d5fff6b8e [formerly 197acb24ea07e1c4a72c16927485bb24f7b34c1c] [formerly 92fb530969 [formerly b58a9fbed7]]
Former-commit-id: 92fb530969
Former-commit-id: af6baf91c7
This commit is contained in:
Nate Jensen 2013-12-03 17:44:55 -06:00 committed by Gerrit Code Review
commit 5001c711ab

View file

@ -80,6 +80,7 @@ import com.vividsolutions.jts.geom.prep.PreparedGeometryFactory;
* Check if geometry is null when inspecting.
* Jul 22, 2013 2176 jsanchez Updated the wire frame and text for EMERGENCY warnings.
* Sep 4, 2013 2176 jsanchez Made the polygon line width thicker and made regular text not bold.
* Dec 3, 2013 2576 jsanchez Increased the font size of EMER.
* </pre>
*
* @author jsanchez
@ -404,7 +405,7 @@ public abstract class AbstractWWAResource extends
.getDefaultFont().getFontName(), 11,
new IFont.Style[0]);
emergencyFont = target.getDefaultFont().deriveWithSize(
11);
14);
}
// DR14992: reverse the textToPrint array to plot the
// strings in correct order
@ -427,12 +428,14 @@ public abstract class AbstractWWAResource extends
// Draws the string again to have it appear bolder
if (EmergencyType.isEmergency(record.getRawmessage())) {
// moves over text to add EMER in a different font
textToPrintReversed[2] = String.format("%1$-21" + "s",
textToPrintReversed[2] = String.format("%1$-23" + "s",
textToPrintReversed[2]);
params.setText(textToPrintReversed, color);
DrawableString emergencyString = new DrawableString(
params);
emergencyString.setCoordinates(d[0],
d[1] + (paintProps.getZoomLevel()) * 90);
emergencyString.font = emergencyFont;
emergencyString.setText(new String[] { "", "",
" " + EmergencyType.EMER, "" }, color);