From cdc2e7308f48dddd7c52d6fbbf4f525a43331cde Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Wed, 30 Jan 2013 03:53:57 +0100
Subject: [PATCH] cleanups
---
src/org/oscim/generator/JobQueue.java | 5 ++---
src/org/oscim/theme/renderinstruction/Text.java | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/org/oscim/generator/JobQueue.java b/src/org/oscim/generator/JobQueue.java
index 8e065675..e5d24c2d 100644
--- a/src/org/oscim/generator/JobQueue.java
+++ b/src/org/oscim/generator/JobQueue.java
@@ -1,4 +1,5 @@
/*
+ * Copyright 2010, 2011, 2012 mapsforge.org
* Copyright 2012, 2013 OpenScienceMap
*
* This program is free software: you can redistribute it and/or modify it under the
@@ -27,7 +28,7 @@ public class JobQueue {
/**
* @param tiles
- * the job to be added to this queue.
+ * the jobs to be added to this queue.
*/
public synchronized void setJobs(JobTile[] tiles) {
for (JobTile t : tiles)
@@ -70,13 +71,11 @@ public class JobQueue {
return null;
if (mCurrentJob == 0) {
- //Arrays.sort(mJobs);
int len = mJobs.length;
if (len > 1)
TileDistanceSort.sort(mJobs, 0, len);
}
- //return mPriorityQueue.poll();
JobTile t = mJobs[mCurrentJob];
mJobs[mCurrentJob] = null;
diff --git a/src/org/oscim/theme/renderinstruction/Text.java b/src/org/oscim/theme/renderinstruction/Text.java
index 6553883f..2d6434e2 100644
--- a/src/org/oscim/theme/renderinstruction/Text.java
+++ b/src/org/oscim/theme/renderinstruction/Text.java
@@ -27,7 +27,6 @@ import android.graphics.Paint.Align;
import android.graphics.Paint.FontMetrics;
import android.graphics.Paint.Style;
import android.graphics.Typeface;
-import android.util.FloatMath;
/**
* Represents a text along a polyline on the map.
@@ -163,8 +162,8 @@ public final class Text extends RenderInstruction {
this.fontSize = fontSize;
FontMetrics fm = paint.getFontMetrics();
- fontHeight = FloatMath.ceil(Math.abs(fm.bottom) + Math.abs(fm.top));
- fontDescent = FloatMath.ceil(Math.abs(fm.descent));
+ fontHeight = (float) Math.ceil(Math.abs(fm.bottom) + Math.abs(fm.top));
+ fontDescent = (float) Math.ceil(Math.abs(fm.descent));
}
@Override