From 5f37f2f0deb05c56ee03481a9097c964aed827a5 Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Mon, 8 Apr 2013 18:48:58 +0200 Subject: [PATCH] fix mapsforge data source --- src/org/oscim/database/mapfile/MapDatabase.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/org/oscim/database/mapfile/MapDatabase.java b/src/org/oscim/database/mapfile/MapDatabase.java index 60f1cfb0..5c68517b 100644 --- a/src/org/oscim/database/mapfile/MapDatabase.java +++ b/src/org/oscim/database/mapfile/MapDatabase.java @@ -23,6 +23,7 @@ import org.oscim.core.Tag; import org.oscim.core.Tile; import org.oscim.database.IMapDatabase; import org.oscim.database.IMapDatabaseCallback; +import org.oscim.database.IMapDatabaseCallback.WayData; import org.oscim.database.MapOptions; import org.oscim.database.OpenResult; import org.oscim.database.QueryResult; @@ -198,10 +199,10 @@ public class MapDatabase implements IMapDatabase { private int[] mIntBuffer; private final GeometryBuffer mGeom = new GeometryBuffer(1 << 14, 1 << 8); + private final WayData mWay = new WayData(); private int minLat, minLon; private Tile mTile; - private static boolean sMapExperimental; /* @@ -979,7 +980,12 @@ public class MapDatabase implements IMapDatabase { && mGeom.points[1] == mGeom.points[l - 1]; projectToTile(mGeom.points, mGeom.index); - /// FIXME mapDatabaseCallback.renderWay(layer, curTags, mGeom, closed, 0); + mWay.geom = mGeom; + mWay.layer = layer; + mWay.closed = closed; + mWay.tags = curTags; + + mapDatabaseCallback.renderWay(mWay); } }