Skip to content

Commit 8f005f0

Browse files
committed
measure text height in tooltip
1 parent a6d3cf3 commit 8f005f0

File tree

16 files changed

+459
-247
lines changed

16 files changed

+459
-247
lines changed

.idea/workspace.xml

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/.idea/modules.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/.idea/workspace.xml

Lines changed: 171 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/src/com/mapbox/mapboxsdk/MapView.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ public class MapView extends org.osmdroid.views.MapView{
1818
private MapController controller;
1919
private ItemizedIconOverlay<OverlayItem> defaultMarkerOverlay;
2020
private ArrayList<OverlayItem> defaultMarkerList = new ArrayList<OverlayItem>();
21+
2122
private Context context;
2223
private boolean firstMarker = true;
2324

@@ -40,8 +41,7 @@ public MapView(Context context, String URL){
4041
*/
4142

4243
public Marker addMarker(double lat, double lon, String title, String text){
43-
Marker marker = new Marker(title, text, new GeoPoint(lat, lon));
44-
marker.fromMaki("restaurant");
44+
Marker marker = new Marker(this, title, text, new GeoPoint(lat, lon));
4545
if(firstMarker){
4646
defaultMarkerList.add(marker);
4747
setDefaultItemizedOverlay();

src/src/com/mapbox/mapboxsdk/Marker.java

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.mapbox.mapboxsdk;
22

3+
import android.content.Context;
34
import android.graphics.Bitmap;
45
import android.graphics.BitmapFactory;
56
import android.graphics.drawable.BitmapDrawable;
@@ -13,23 +14,29 @@
1314
import java.net.URL;
1415

1516
public class Marker extends OverlayItem{
16-
public Marker(String aTitle, String aSnippet, GeoPoint aGeoPoint) {
17-
super(aTitle, aSnippet, aGeoPoint);
18-
//Drawable markerDrawable = ;
19-
//this.setMarker(markerDrawable);
20-
}
17+
private Context context;
18+
2119

22-
public Marker(String aUid, String aTitle, String aDescription, GeoPoint aGeoPoint) {
23-
super(aUid, aTitle, aDescription, aGeoPoint);
20+
public Marker(String aTitle, String aDescription, GeoPoint aGeoPoint) {
21+
super(aTitle, aDescription, aGeoPoint);
22+
fromMaki("markerstroked");
23+
}
24+
public Marker(MapView mv, String aTitle, String aDescription, GeoPoint aGeoPoint) {
25+
super(aTitle, aDescription, aGeoPoint);
26+
context = mv.getContext();
27+
fromMaki("markerstroked");
2428
}
2529

2630
public void fromMaki(String makiString){
27-
String urlString = "https://raw.github.com/mapbox/maki/gh-pages/renders/"+makiString+"[email protected]";
28-
this.setMarker(new BitmapDrawable());
29-
new BitmapLoader().execute(urlString);
30-
31+
String urlString = makiString+"182x";
32+
System.out.println(urlString);
33+
int id = context.getResources().getIdentifier(urlString, "drawable", context.getPackageName());
34+
System.out.println(""+id);
35+
this.setMarker(context.getResources().getDrawable(id));
36+
//this.setMarker(context.getResources().getDrawable(R.drawable.library182x));
3137
}
3238

39+
3340
class BitmapLoader extends AsyncTask<String, Void,Bitmap> {
3441

3542
@Override

src/src/com/mapbox/mapboxsdk/Tooltip.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
package com.mapbox.mapboxsdk;
22

33
import android.content.Context;
4-
import android.graphics.Canvas;
5-
import android.graphics.Color;
6-
import android.graphics.Paint;
7-
import android.graphics.Point;
4+
import android.graphics.*;
85
import org.osmdroid.ResourceProxy;
96
import org.osmdroid.util.GeoPoint;
107
import org.osmdroid.views.overlay.Overlay;
@@ -28,7 +25,10 @@ private Tooltip(ResourceProxy pResourceProxy) {
2825

2926
@Override
3027
protected void draw(Canvas canvas, org.osmdroid.views.MapView mapView, boolean shadow) {
31-
System.out.println("this is being called");
28+
Rect bounds = new Rect();
29+
String text = "Helloooo this is a tooltip!";
30+
paint.getTextBounds(text, 0, text.length()-1, bounds);
31+
int innerBoxHeight = bounds.height();
3232
GeoPoint markerCoords = item.getPoint();
3333
MapView.Projection projection = mapView.getProjection();
3434
Point point = new Point();
@@ -42,6 +42,6 @@ protected void draw(Canvas canvas, org.osmdroid.views.MapView mapView, boolean s
4242
paint.setColor(Color.rgb(50, 50, 50));
4343
paint.setTextAlign(Paint.Align.CENTER);
4444
paint.setTextSize(40f);
45-
canvas.drawText("Helloooo this is a tooltip!", point.x, point.y-140, paint);
45+
canvas.drawText(text, point.x, point.y-140, paint);
4646
}
4747
}

test/.idea/.name

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/.idea/misc.xml

Lines changed: 165 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/.idea/modules.xml

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)