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

Not tested : native rendering

Browse source
This commit is contained in:
Victor Shcherb 2012-05-08 00:50:47 +02:00
parent a6ac11cbdb
commit 58314c350d
8 changed files with 133 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
DataExtractionOSM/src/net/osmand/render/RenderingRulesStorage.java
View file

@ -440,8 +440,7 @@ public class RenderingRulesStorage {
return depends;
}
};
storage.parseRulesFromXmlInputStream(RenderingRulesStorage.class.getResourceAsStream("test_depends.render.xml"),
resolver);
storage.parseRulesFromXmlInputStream(RenderingRulesStorage.class.getResourceAsStream("test_depends.render.xml"), resolver);
storage.printDebug(TEXT_RULES, System.out);
// long tm = System.nanoTime();
// int count = 100000;

6
Osmand-kernel/osmand/src/binaryRead.cpp
View file

@ -702,7 +702,7 @@ void searchMapData(CodedInputStream* input, MapRoot* root, MapIndex* ind, Search
ResultPublisher* searchObjectsForRendering(SearchQuery* q, RenderingRuleSearchRequest* req,
ResultPublisher* searchObjectsForRendering(SearchQuery* q,
bool skipDuplicates, std::string msgNothingFound) {
map<std::string, BinaryMapFile*>::iterator i = openFiles.begin();
HMAP::hash_set<long long> ids;
@ -720,8 +720,8 @@ ResultPublisher* searchObjectsForRendering(SearchQuery* q, RenderingRuleSearchRe
input.SetCloseOnDelete(false);
CodedInputStream cis(&input);
cis.SetTotalBytesLimit(INT_MAX, INT_MAX >> 2);
if (req != NULL) {
req->clearState();
if (q->req != NULL) {
q->req->clearState();
}
q->publisher->result.clear();
for (std::vector<MapIndex>::iterator mapIndex = file->mapIndexes.begin(); mapIndex != file->mapIndexes.end();

3
Osmand-kernel/osmand/src/binaryRead.h
View file

@ -195,8 +195,7 @@ struct SearchQuery {
};
ResultPublisher* searchObjectsForRendering(SearchQuery* q, RenderingRuleSearchRequest* req,
bool skipDuplicates, std::string msgNothingFound);
ResultPublisher* searchObjectsForRendering(SearchQuery* q, bool skipDuplicates, std::string msgNothingFound);
BinaryMapFile* initBinaryMapFile(std::string inputName);

12
Osmand-kernel/osmand/src/common.cpp
View file

@ -160,15 +160,17 @@ double checkLatitude(double latitude) {
int get31TileNumberX(double longitude){
longitude = checkLongitude(longitude);
long l = 1l << 31;
long long int l = 1;
l <<= 31;
return (int)((longitude + 180)/360 * l);
}
int get31TileNumberY( double latitude){
int get31TileNumberY(double latitude) {
latitude = checkLatitude(latitude);
double eval = log(tan(toRadians(latitude)) + 1/cos(toRadians(latitude)) );
long l = 1l << 31;
if(eval > M_PI){
double eval = log(tan(toRadians(latitude)) + 1 / cos(toRadians(latitude)));
long long int l = 1;
l <<= 31;
if (eval > M_PI) {
eval = M_PI;
}
return (int) ((1 - eval / M_PI) / 2 * l);

2
Osmand-kernel/osmand/src/java_wrap.cpp
View file

@ -94,7 +94,7 @@ extern "C" JNIEXPORT jint JNICALL Java_net_osmand_plus_render_NativeOsmandLibrar
SearchQuery q(sleft, sright, stop, sbottom, req, j);
q.zoom = zoom;
ResultPublisher* res = searchObjectsForRendering(&q, req, skipDuplicates, getString(ienv, msgNothingFound));
ResultPublisher* res = searchObjectsForRendering(&q, skipDuplicates, getString(ienv, msgNothingFound));
delete req;
return (jint) res;
}

134
Osmand-kernel/osmand/src/osmand_main.cpp
View file

@ -23,39 +23,45 @@ void printUsage(std::string info) {
class RenderingInfo {
public:
float left, right, top, bottom;
double lattop, latbottom, lonleft, lonright;
int left, right, top, bottom;
double lattop, lonleft;
int tileWX, tileHY;
std::string tileFileName;
int zoom;
int width ;
int height;
RenderingInfo(int argc, char **params) {
double l1, l2;
char s[40];
int z, z1, z2 ;
lattop = 85;
latbottom = -85;
tileHY = 2;
lonleft = -180;
lonright = 180;
width = 500;
height = 500;
tileWX = 2;
zoom = 15;
for (int i = 1; i != argc; ++i) {
if (strcmp(params[i], "-renderingOutputFile=") == 0) {
tileFileName = (char*) (params[i] + strlen("-renderingOutputFile="));
} else {
int z = 0;
if (sscanf(params[i], "-zoom=%d", &z) != EOF) {
} else if (sscanf(params[i], "-renderingOutputFile=%s", &s)) {
tileFileName = s;
} else if (sscanf(params[i], "-zoom=%d", &z)) {
zoom = z;
} else if (sscanf(params[i], "-bbox=%le,%le,%le,%le", &lonleft, &lattop, &lonright, &latbottom) != EOF) {
}
} else if (sscanf(params[i], "-lbox=%lg,%lg", &l1, &l2)) {
lonleft = l1;
lattop = l2;
} else if (sscanf(params[i], "-lt=%d,%d", &z1, &z2)) {
tileWX = z1;
tileWX = z2;
}
}
left = getTileNumberX(zoom, lonleft);
top = getTileNumberY(zoom, lattop);
right= getTileNumberX(zoom, lonright);
bottom= getTileNumberY(zoom, latbottom);
width = (right-left)*TILE_SIZE;
height = (bottom-top)*TILE_SIZE;
left = get31TileNumberX(lonleft);
top = get31TileNumberY(lattop);
right = left + tileWX * (1 << (31 - zoom));
bottom = top + tileHY * (1 << (31 - zoom));
width = tileWX * TILE_SIZE;
height = tileHY * TILE_SIZE;
}
};
@ -164,78 +170,86 @@ void printFileInformation(const char* fileName, VerboseInfo* verbose) {
}
}
SkColor defaultMapColor = SK_ColorLTGRAY;
void runSimpleRendering(const char* fileName, RenderingInfo* info) {
initBinaryMapFile(fileName);
if(info->width > 10000 || info->height > 10000) {
void runSimpleRendering(string fileName, string renderingFileName, RenderingInfo* info) {
SkColor defaultMapColor = SK_ColorLTGRAY;
BinaryMapFile* mf = initBinaryMapFile(fileName.c_str());
osmand_log_print(LOG_INFO, "Init %d (success) binary map file %s.", mf->version, fileName.c_str());
if (info->width > 10000 || info->height > 10000) {
osmand_log_print(LOG_ERROR, "We don't rendering images more than 10000x10000");
return;
}
// TODO not implemented (read storage from file)
RenderingRulesStorage* st = NULL; //createRenderingRulesStorage(env, storage);
RenderingRuleSearchRequest* req = new RenderingRuleSearchRequest(st);
// TODO init rule search request
// initRenderingRuleSearchRequest(env, res, renderingRuleSearchRequest);
SearchQuery q(floor(info->left), floor(info->right), ceil(info->top), ceil(info->bottom), req, new ResultPublisher());
osmand_log_print(LOG_INFO, "Rendering info bounds(%d, %d, %d, %d) zoom(%d), width/height(%d/%d) tilewidth/tileheight(%d/%d) fileName(%s)",
info->left, info->top, info->right, info->bottom, info->zoom, info->width, info->height, info->tileWX, info->tileHY, info->tileFileName.c_str());
RenderingRulesStorage* st = new RenderingRulesStorage(renderingFileName.c_str());
st->parseRulesFromXmlInputStream(renderingFileName.c_str(), NULL);
RenderingRuleSearchRequest* searchRequest = new RenderingRuleSearchRequest(st);
SearchQuery q(floor(info->left), floor(info->right), ceil(info->top), ceil(info->bottom), searchRequest,
new ResultPublisher());
q.zoom = info->zoom;
ResultPublisher* res = searchObjectsForRendering(&q, req, true, "Nothing found");
ResultPublisher* res = searchObjectsForRendering(&q, true, "Nothing found");
osmand_log_print(LOG_INFO, "Found %d objects", res->result.size());
SkBitmap* bitmap = new SkBitmap();
bitmap->setConfig(SkBitmap::kRGB_565_Config, info->width, info->height);
// size_t bitmapDataSize = bitmap->getSize();
// void* bitmapData bitmapData = malloc(bitmapDataSize);
// bitmap->setPixels(bitmapData);
osmand_log_print(LOG_INFO, "Initializing rendering");
size_t bitmapDataSize = bitmap->getSize();
void* bitmapData = malloc(bitmapDataSize);
bitmap->setPixels(bitmapData);
osmand_log_print(LOG_INFO, "Initializing rendering style and rendering context");
ElapsedTimer initObjects;
initObjects.start();
RenderingContext rc;
searchRequest->clearState();
searchRequest->setIntFilter(st->PROPS.R_MINZOOM, info->zoom);
if (searchRequest->searchRenderingAttribute(A_DEFAULT_COLOR)) {
defaultMapColor = searchRequest->getIntPropertyValue(searchRequest->props()->R_ATTR_COLOR_VALUE);
}
searchRequest->clearState();
searchRequest->setIntFilter(st->PROPS.R_MINZOOM, info->zoom);
if (searchRequest->searchRenderingAttribute(A_SHADOW_RENDERING)) {
rc.setShadowRenderingMode(searchRequest->getIntPropertyValue(searchRequest->props()->R_ATTR_INT_VALUE));
//rc.setShadowRenderingColor(searchRequest->getIntPropertyValue(searchRequest->props()->R_SHADOW_COLOR));
}
rc.setLocation(info->left, info->top);
rc.setDimension(info->width, info->height);
rc.setZoom(info->zoom);
rc.setRotate(0);
rc.setDensityScale(1);
rc.setShadowRenderingMode(2);
osmand_log_print(LOG_INFO, "Rendering image");
initObjects.pause();
SkCanvas* canvas = new SkCanvas(*bitmap);
canvas->drawColor(defaultMapColor);
doRendering(res->result, canvas, req, &rc);
doRendering(res->result, canvas, searchRequest, &rc);
osmand_log_print(LOG_INFO, "End Rendering image");
osmand_log_print(LOG_INFO, "Native ok (init %d, rendering %d) ", initObjects.getElapsedTime(),
rc.nativeOperations.getElapsedTime());
if(!SkImageEncoder::EncodeFile(info->tileFileName.c_str(), *bitmap, SkImageEncoder::kPNG_Type, 0)) {
for(int i=100; i<200; i++) {
printf("\n");
for(int j=100; j<200; j++) {
printf("%s ", colorToString(bitmap->getColor(i,j)).c_str());
}
}
if (!SkImageEncoder::EncodeFile(info->tileFileName.c_str(), *bitmap, SkImageEncoder::kPNG_Type, 100)) {
osmand_log_print(LOG_ERROR, "FAIL to save tile to %s", info->tileFileName.c_str());
} else {
osmand_log_print(LOG_INFO, "Tile successfully saved to %s", info->tileFileName.c_str());
}
delete canvas;
delete bitmap;
free(bitmapData);
return;
}
class BasePathRenderingRulesStorageResolver : public RenderingRulesStorageResolver {
public:
string path;
BasePathRenderingRulesStorageResolver(string path) : path(path) {
}
virtual RenderingRulesStorage* resolve(string name, RenderingRulesStorageResolver* ref) {
string file = path;
file += name;
file+=".render.xml";
RenderingRulesStorage* st = new RenderingRulesStorage(file.c_str());
st->parseRulesFromXmlInputStream(file.c_str(), this);
return st;
}
virtual ~BasePathRenderingRulesStorageResolver() {}
};
void testRenderingRuleStorage(const char* basePath, const char* name) {
string filePath = string(basePath) + string(name);
RenderingRulesStorage* st = new RenderingRulesStorage(filePath.c_str());
@ -256,12 +270,21 @@ void testRenderingRuleStorage(const char* basePath, const char* name) {
searchRequest->printDebugResult();
}
int main(int argc, char **argv) {
if (argc <= 1) {
// 1. Test Rendering rule storage
// testRenderingRuleStorage("/home/victor/projects/OsmAnd/git/DataExtractionOSM/src/net/osmand/render/",
// "test_depends.render.xml"
// "default.render.xml"
// );
// 2. Test simple rendering
char** tst = new char*[5] {"", "-renderingOutputFile=/home/victor/1.png","-zoom=11", "-lt=3,3", "-lbox=-80,22"};
RenderingInfo* info = new RenderingInfo(5, tst);
runSimpleRendering(string("/home/victor/projects/OsmAnd/data/osm-gen/Cuba2.obf"),
string("/home/victor/projects/OsmAnd/git/DataExtractionOSM/src/net/osmand/render/default.render.xml"), info);
printf("\n\n");
printUsage("");
return 1;
}
@ -279,8 +302,9 @@ int main(int argc, char **argv) {
if (argc < 2) {
printUsage("Missing file parameter");
} else {
RenderingInfo* info = new RenderingInfo(argc, argv);
runSimpleRendering(argv[argc -1], info);
osmand_log_print(LOG_ERROR, "FIXME functionality");
// RenderingInfo* info = new RenderingInfo(argc, argv);
// runSimpleRendering(argv[argc -1], info);
}
} else {
printUsage("Unknown command");

13
Osmand-kernel/osmand/src/renderRules.cpp
View file

@ -54,7 +54,6 @@ RenderingRule::RenderingRule(map<string, string>& attrs, RenderingRulesStorage*
for (; it != attrs.end(); it++) {
RenderingRuleProperty* property = storage->PROPS.getProperty(it->first.c_str());
if (property == NULL) {
printf("Property %s was not found in registry", it->first.c_str());
osmand_log_print(LOG_ERROR, "Property %s was not found in registry", it->first.c_str());
return ;
}
@ -307,6 +306,8 @@ class RenderingRulesHandler {
t->storage->dictionary = t->dependsStorage->dictionary;
t->storage->dictionaryMap = t->dependsStorage->dictionaryMap;
t->storage->PROPS.merge(t->dependsStorage->PROPS);
} else if (depends.size() > 0) {
osmand_log_print(LOG_ERROR, "!Dependent rendering style was not resolved : %s", depends.c_str());
}
//renderingName = attrsMap["name"];
} else {
@ -522,6 +523,16 @@ bool RenderingRuleSearchRequest::searchRule(int state) {
return search(state, true);
}
bool RenderingRuleSearchRequest::searchRenderingAttribute(string attribute) {
searchResult = false;
RenderingRule* rule = storage->getRenderingAttributeRule(attribute);
if (rule == NULL) {
return false;
}
searchResult = visitRule(rule, true);
return searchResult;
}
bool RenderingRuleSearchRequest::search(int state, bool loadOutput) {
searchResult = false;
int tagKey = values[PROPS->R_TAG->id];

24
Osmand-kernel/osmand/src/renderRules.h
View file

@ -340,6 +340,8 @@ private:
}
};
static string A_DEFAULT_COLOR="defaultColor";
static string A_SHADOW_RENDERING="shadowRendering";
class RenderingRulesStorage
{
@ -405,6 +407,10 @@ public:
void parseRulesFromXmlInputStream(const char* filename, RenderingRulesStorageResolver* resolver);
RenderingRule* getRenderingAttributeRule(string attribute) {
return renderingAttributes[attribute];
}
inline string getStringValue(int i) {
return dictionary[i];
}
@ -489,9 +495,27 @@ public:
bool isSpecified(RenderingRuleProperty* p);
bool searchRenderingAttribute(string attribute);
};
class BasePathRenderingRulesStorageResolver : public RenderingRulesStorageResolver {
public:
string path;
BasePathRenderingRulesStorageResolver(string path) : path(path) {
}
virtual RenderingRulesStorage* resolve(string name, RenderingRulesStorageResolver* ref) {
string file = path;
file += name;
file+=".render.xml";
RenderingRulesStorage* st = new RenderingRulesStorage(file.c_str());
st->parseRulesFromXmlInputStream(file.c_str(), this);
return st;
}
virtual ~BasePathRenderingRulesStorageResolver() {}
};
#endif