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

Add rendering parser state

Browse source
This commit is contained in:
Victor Shcherb 2014-08-21 22:19:31 +02:00
parent 15141fa496
commit 20677dd757
1 changed files with 41 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
OsmAnd-java/src/net/osmand/render/RenderingRulesStorage.java
View file

@ -2,6 +2,7 @@ package net.osmand.render;
import gnu.trove.map.hash.TIntObjectHashMap; import gnu.trove.map.hash.TIntObjectHashMap;
import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.PrintStream; import java.io.PrintStream;
@ -440,6 +441,10 @@ public class RenderingRulesStorage {
public static void main(String[] args) throws XmlPullParserException, IOException { public static void main(String[] args) throws XmlPullParserException, IOException {
InputStream is = RenderingRulesStorage.class.getResourceAsStream("default.render.xml");
if(args != null && args.length > 0) {
is = new FileInputStream(args[0]);
}
RenderingRulesStorage storage = new RenderingRulesStorage("test", null); RenderingRulesStorage storage = new RenderingRulesStorage("test", null);
final RenderingRulesStorageResolver resolver = new RenderingRulesStorageResolver() { final RenderingRulesStorageResolver resolver = new RenderingRulesStorageResolver() {
@Override @Override
@ -449,25 +454,43 @@ public class RenderingRulesStorage {
return depends; return depends;
} }
}; };
storage.parseRulesFromXmlInputStream(RenderingRulesStorage.class.getResourceAsStream("default.render.xml"), resolver); storage.parseRulesFromXmlInputStream(is, resolver);
storage.printDebug(TEXT_RULES, System.out);
// long tm = System.nanoTime();
// int count = 100000;
// for (int i = 0; i < count; i++) {
RenderingRuleSearchRequest searchRequest = new RenderingRuleSearchRequest(storage);
searchRequest.setStringFilter(storage.PROPS.R_TAG, "landuse");
searchRequest.setStringFilter(storage.PROPS.R_VALUE, "wood");
searchRequest.setIntFilter(storage.PROPS.R_LAYER, 1);
searchRequest.setIntFilter(storage.PROPS.R_MINZOOM, 15);
searchRequest.setIntFilter(storage.PROPS.R_MAXZOOM, 15);
// searchRequest.setBooleanFilter(storage.PROPS.R_NIGHT_MODE, true);
// searchRequest.setBooleanFilter(storage.PROPS.get("hmRendered"), true);
boolean res = searchRequest.search(POLYGON_RULES); printAllRules(storage);
System.out.println("Result " + res); // testSearch(storage);
printResult(searchRequest, System.out); }
// }
// System.out.println((System.nanoTime()- tm)/ (1e6f * count) ); protected static void testSearch(RenderingRulesStorage storage) {
// long tm = System.nanoTime();
// int count = 100000;
// for (int i = 0; i < count; i++) {
RenderingRuleSearchRequest searchRequest = new RenderingRuleSearchRequest(storage);
searchRequest.setStringFilter(storage.PROPS.R_TAG, "landuse");
searchRequest.setStringFilter(storage.PROPS.R_VALUE, "wood");
searchRequest.setIntFilter(storage.PROPS.R_LAYER, 1);
searchRequest.setIntFilter(storage.PROPS.R_MINZOOM, 15);
searchRequest.setIntFilter(storage.PROPS.R_MAXZOOM, 15);
// searchRequest.setBooleanFilter(storage.PROPS.R_NIGHT_MODE, true);
// searchRequest.setBooleanFilter(storage.PROPS.get("hmRendered"), true);
boolean res = searchRequest.search(POLYGON_RULES);
System.out.println("Result " + res);
printResult(searchRequest, System.out);
// }
// System.out.println((System.nanoTime()- tm)/ (1e6f * count) );
}
protected static void printAllRules(RenderingRulesStorage storage) {
System.out.println("\n\n--------- POINTS ----- ");
storage.printDebug(POINT_RULES, System.out);
System.out.println("\n\n--------- POLYGON ----- ");
storage.printDebug(POLYGON_RULES, System.out);
System.out.println("\n\n--------- LINES ----- ");
storage.printDebug(LINE_RULES, System.out);
System.out.println("\n\n--------- ORDER ----- ");
storage.printDebug(ORDER_RULES, System.out);
System.out.println("\n\n--------- TEXT ----- ");
storage.printDebug(TEXT_RULES, System.out);
} }
private static void printResult(RenderingRuleSearchRequest searchRequest, PrintStream out) { private static void printResult(RenderingRuleSearchRequest searchRequest, PrintStream out) {