Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Initial implementation

Browse source
This commit is contained in:
Victor Shcherb 2011-10-21 14:02:46 +02:00
parent e71a0738c2
commit c05f95cf24
6 changed files with 235 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

232
OsmAnd/jni/osmand/rendering.c
View file

@ -7,20 +7,232 @@
#include <stdlib.h>
JNIEXPORT jstring JNICALL Java_net_osmand_plus_render_NativeOsmandLibrary_generateRendering( JNIEnv* env,
jobject obj, jobject renderingContext, jobjectArray binaryMapDataObjects, jobject bmp,
jboolean useEnglishNames, jobject renderingRuleSearchRequest) {
JNIEnv* env;
jclass MultiPolygonClass;
jclass MapRenderingTypesClass;
jmethodID MapRenderingTypes_getMainObjectType;
jmethodID MapRenderingTypes_getObjectSubType;
typedef struct RenderingContext {
// TODO check interrupted
jobject originalRC;
jfieldID interrupted;
// public boolean interrupted = false;
// boolean highResMode = false;
// float mapTextSize = 1;
// List<TextDrawInfo> textToDraw = new ArrayList<TextDrawInfo>();
// List<IconDrawInfo> iconsToDraw = new ArrayList<IconDrawInfo>();
float leftX;
float topY;
int width;
int height;
int zoom;
float rotate;
float tileDivisor;
// debug purpose
int pointCount ;
int pointInsideCount;
int visible;
int allObjects;
// use to calculate points
float calcX;
float calcY;
float cosRotateTileSize;
float sinRotateTileSize;
int shadowRenderingMode;
// not expect any shadow
int shadowLevelMin;
int shadowLevelMax;
} RenderingContext;
jmethodID getMid(jobject obj, char* methodName, char* sig )
{
jclass cls = (*env)->GetObjectClass(env, obj);
return (*env)->GetMethodID(env, cls, methodName, sig);
}
jfieldID getFid(jobject obj, char* fieldName, char* sig )
{
jclass cls = (*env)->GetObjectClass(env, obj);
return (*env)->GetFieldID(env, cls, fieldName, sig);
}
void calcPoint(jobject mapObject, jint ind, RenderingContext* rc)
{
rc -> pointCount ++;
float tx = (*env)->CallFloatMethod(env, mapObject, getMid(mapObject, "getPoint31XTile", "(I)[F" ),
ind ) / (rc -> tileDivisor);
float ty = (*env)->CallFloatMethod(env, mapObject, getMid(mapObject, "getPoint31YTile", "(I)[F" ),
ind ) / (rc -> tileDivisor);
float dTileX = tx - rc -> leftX;
float dTileY = ty - rc -> topY;
rc -> calcX = rc -> cosRotateTileSize * dTileX - rc -> sinRotateTileSize * dTileY;
rc -> calcY = rc -> sinRotateTileSize * dTileX + rc ->cosRotateTileSize * dTileY;
if(rc -> calcX >= 0 && rc -> calcX < rc -> width &&
rc -> calcY >= 0 && rc -> calcY < rc ->height){
rc -> pointInsideCount++;
}
}
void drawObject(RenderingContext* rc, jobject binaryMapDataObject, jobject cv,
jobject renderingRuleSearchRequest, int l) {
rc -> allObjects++;
if ((*env)->IsInstanceOf(env, binaryMapDataObject, MultiPolygonClass)) {
//if(!drawOnlyShadow){
// drawMultiPolygon(obj, render, canvas, rc);
//}
return;
}
jintArray types = (*env)->CallObjectMethod(env, binaryMapDataObject,
getMid(binaryMapDataObject, "getTypes", "()[I" ) );
jint mainType;
(*env)->GetIntArrayRegion(env, types, l, 1, &mainType);
int t = mainType & 3;
(*env)->DeleteLocalRef(env, types);
jint type = (*env)->CallStaticIntMethod(env, MapRenderingTypesClass, MapRenderingTypes_getMainObjectType, mainType);
jint subtype = (*env)->CallStaticIntMethod(env, MapRenderingTypesClass, MapRenderingTypes_getObjectSubType, mainType);
// TODO
//TagValuePair pair = obj.getMapIndex().decodeType(type, subtype);
if( t == 1) {
// point
} else if(t == 2) {
// polyline
} else if(t == 3) {
// polygon
}
/*
TagValuePair pair = obj.getMapIndex().decodeType(type, subtype);
if (t == MapRenderingTypes.POINT_TYPE && !drawOnlyShadow) {
drawPoint(obj, render, canvas, rc, pair, renderText);
} else if (t == MapRenderingTypes.POLYLINE_TYPE) {
int layer = MapRenderingTypes.getNegativeWayLayer(mainType);
drawPolyline(obj, render, canvas, rc, pair, layer, drawOnlyShadow);
} else if (t == MapRenderingTypes.POLYGON_TYPE && !drawOnlyShadow) {
drawPolygon(obj, render, canvas, rc, pair);
} else {
if (t == MapRenderingTypes.MULTY_POLYGON_TYPE && !(obj instanceof MultyPolygon)) {
// log this situation
return;
}
}
} */
}
void copyRenderingContext(jobject orc, RenderingContext* rc)
{
rc->leftX = (*env)->GetFloatField(env, orc, getFid( orc, "leftX", "F" ) );
rc->topY = (*env)->GetFloatField(env, orc, getFid( orc, "topY", "F" ) );
rc->width = (*env)->GetIntField(env, orc, getFid( orc, "width", "I" ) );
rc->height = (*env)->GetIntField(env, orc, getFid( orc, "height", "I" ) );
__android_log_print(ANDROID_LOG_INFO, "net.osmand", "Rendering cpp");
// malloc room for the resulting string
// szResult = malloc(sizeof(szFormat) + 20);
rc->zoom = (*env)->GetIntField(env, orc, getFid( orc, "zoom", "I" ) );
rc->rotate = (*env)->GetFloatField(env, orc, getFid( orc, "rotate", "F" ) );
rc->tileDivisor = (*env)->GetFloatField(env, orc, getFid( orc, "tileDivisor", "F" ) );
rc->pointCount = (*env)->GetIntField(env, orc, getFid( orc, "pointCount", "I" ) );
rc->pointInsideCount = (*env)->GetIntField(env, orc, getFid( orc, "pointInsideCount", "I" ) );
rc->visible = (*env)->GetIntField(env, orc, getFid( orc, "visible", "I" ) );
rc->allObjects = (*env)->GetIntField(env, orc, getFid( orc, "allObjects", "I" ) );
rc->shadowRenderingMode = (*env)->GetIntField(env, orc, getFid( orc, "shadowRenderingMode", "I" ) );
rc->shadowLevelMin = (*env)->GetIntField(env, orc, getFid( orc, "shadowLevelMin", "I" ) );
rc->shadowLevelMax = (*env)->GetIntField(env, orc, getFid( orc, "shadowLevelMax", "I" ) );
rc->interrupted = getFid( orc, "interrupted", "B" );
rc->originalRC = orc;
}
void mergeRenderingContext(jobject orc, RenderingContext* rc)
{
(*env)->SetIntField(env, orc, getFid(orc, "pointCount", "I" ) , rc->pointCount);
(*env)->SetIntField(env, orc, getFid(orc, "pointInsideCount", "I" ) , rc->pointInsideCount);
(*env)->SetIntField(env, orc, getFid(orc, "visible", "I" ) , rc->visible);
(*env)->SetIntField(env, orc, getFid(orc, "allObjects", "I" ) , rc->allObjects);
}
void initLibrary()
{
MultiPolygonClass = (*env)->FindClass(env, "net/osmand/osm/MultyPolygon");
MapRenderingTypesClass = (*env)->FindClass(env, "net/osmand/osm/MapRenderingTypes");
MapRenderingTypes_getMainObjectType = (*env)->GetStaticMethodID(env, MapRenderingTypesClass,"getMainObjectType","(I)I");
MapRenderingTypes_getObjectSubType = (*env)->GetStaticMethodID(env, MapRenderingTypesClass, "getObjectSubType","(I)I");
}
JNIEXPORT jstring JNICALL Java_net_osmand_plus_render_NativeOsmandLibrary_generateRendering( JNIEnv* ienv,
jobject obj, jobject renderingContext, jobjectArray binaryMapDataObjects, jobject cv,
jboolean useEnglishNames, jobject renderingRuleSearchRequest) {
int i = 0;
if(!env) {
env = ienv;
initLibrary();
}
env = ienv;
const size_t size = (*env)->GetArrayLength(env,binaryMapDataObjects);
char szResult[1024];
RenderingContext rc;
// copyRenderingContext(renderingContext, &rc);
// szResult = malloc(sizeof(szFormat) + 20);
__android_log_print(ANDROID_LOG_INFO, "net.osmand", "Rendering cpp");
for(; i < size; i++)
{
jobject binaryMapDataObject = (jobject) (*env)->GetObjectArrayElement(env, binaryMapDataObjects, i);
drawObject(&rc, binaryMapDataObject, cv, renderingRuleSearchRequest, 0);
(*env)->DeleteLocalRef(env, binaryMapDataObject);
}
sprintf(szResult, "Hello android %d", size);
// get an object string
jstring result = (*env)->NewStringUTF(env, "Hello android");
jstring result = (*env)->NewStringUTF(env, szResult);
// cleanup
// free(szResult);
// free(szResult);
// mergeRenderingContext(renderingContext, &rc);
return result;
}

BIN
OsmAnd/libs/armeabi/libosmand.so
View file

Binary file not shown.

BIN
OsmAnd/obj/local/armeabi/libosmand.so
View file

Binary file not shown.

BIN
OsmAnd/obj/local/armeabi/objs-debug/osmand/rendering.o
View file

Binary file not shown.

3
OsmAnd/src/net/osmand/plus/render/NativeOsmandLibrary.java
View file

@ -6,6 +6,7 @@ import net.osmand.binary.BinaryMapDataObject;
import net.osmand.plus.render.OsmandRenderer.RenderingContext;
import net.osmand.render.RenderingRuleSearchRequest;
import android.graphics.Bitmap;
import android.graphics.Canvas;
public class NativeOsmandLibrary {
@ -13,7 +14,7 @@ public class NativeOsmandLibrary {
System.loadLibrary("osmand");
}
public static native String generateRendering(RenderingContext rc, List<BinaryMapDataObject> objects, Bitmap bmp,
public static native String generateRendering(RenderingContext rc, BinaryMapDataObject[] objects, Canvas cv,
boolean useEnglishNames, RenderingRuleSearchRequest render);
}

20
OsmAnd/src/net/osmand/plus/render/OsmandRenderer.java
View file

@ -227,15 +227,16 @@ public class OsmandRenderer {
// put in order map
if (objects != null && !objects.isEmpty() && rc.width > 0 && rc.height > 0) {
// init rendering context
rc.tileDivisor = (int) (1 << (31 - rc.zoom));
rc.cosRotateTileSize = FloatMath.cos((float) Math.toRadians(rc.rotate)) * TILE_SIZE;
rc.sinRotateTileSize = FloatMath.sin((float) Math.toRadians(rc.rotate)) * TILE_SIZE;
if (!nativeRendering) {
TIntObjectHashMap<TIntArrayList> orderMap = sortObjectsByProperOrder(rc, objects, render);
int objCount = 0;
// init rendering context
rc.tileDivisor = (int) (1 << (31 - rc.zoom));
rc.cosRotateTileSize = FloatMath.cos((float) Math.toRadians(rc.rotate)) * TILE_SIZE;
rc.sinRotateTileSize = FloatMath.sin((float) Math.toRadians(rc.rotate)) * TILE_SIZE;
int[] keys = orderMap.keys();
Arrays.sort(keys);
@ -298,11 +299,12 @@ public class OsmandRenderer {
log.info(rc.renderingDebugInfo);
} else {
long time = System.currentTimeMillis() - now;
String res = NativeOsmandLibrary.generateRendering(rc, objects, bmp, useEnglishNames, render);
rc.renderingDebugInfo = String.format("Rendering done in %s (%s text) ms\n"
+ "(%s points, %s points inside, %s objects visile from %s)\n" + res,//$NON-NLS-1$
time, 0, rc.pointCount, rc.pointInsideCount, rc.visible, rc.allObjects);
long time = System.currentTimeMillis() - now;
BinaryMapDataObject[] array = objects.toArray(new BinaryMapDataObject[objects.size()]);
String res = NativeOsmandLibrary.generateRendering(rc, array, cv, useEnglishNames, render);
rc.renderingDebugInfo = String.format("Rendering done in %s (%s text) ms\n"
+ "(%s points, %s points inside, %s objects visile from %s)\n" + res,//$NON-NLS-1$
time, 0, rc.pointCount, rc.pointInsideCount, rc.visible, rc.allObjects);
}
}