diff --git a/DataExtractionOSM/src/net/osmand/data/preparation/IndexCreator.java b/DataExtractionOSM/src/net/osmand/data/preparation/IndexCreator.java index e6c006a604..b3c139d3b0 100644 --- a/DataExtractionOSM/src/net/osmand/data/preparation/IndexCreator.java +++ b/DataExtractionOSM/src/net/osmand/data/preparation/IndexCreator.java @@ -2525,7 +2525,7 @@ public class IndexCreator { // creator.generateIndexes(new File("e:/Information/OSM maps/belarus osm/minsk.osm"), new ConsoleProgressImplementation(3), null); creator.setNodesDBFile(new File("e:/Information/OSM maps/osmand/belarus_nodes.tmp.odb")); - creator.generateIndexes(new File("e:/Information/OSM maps/belarus osm/belarus.osm.bz2"), new ConsoleProgressImplementation(3), null); + creator.generateIndexes(new File("e:/Information/OSM maps/belarus osm/belarus.osm.pbf"), new ConsoleProgressImplementation(3), null); // creator.setNodesDBFile(new File("e:/Information/OSM maps/osmand/ams.tmp.odb")); // creator.generateIndexes(new File("e:/Information/OSM maps/osm_map/ams_part_map.osm"), new ConsoleProgressImplementation(3), null); diff --git a/DataExtractionOSM/src/net/osmand/render/OsmandRenderingRulesParser.java b/DataExtractionOSM/src/net/osmand/render/OsmandRenderingRulesParser.java index 4fef069b49..4d500ee1ca 100644 --- a/DataExtractionOSM/src/net/osmand/render/OsmandRenderingRulesParser.java +++ b/DataExtractionOSM/src/net/osmand/render/OsmandRenderingRulesParser.java @@ -88,7 +88,7 @@ public class OsmandRenderingRulesParser { */ public void visitRule(int state, FilterState filter); - public void rendering(String name, String depends); + public void rendering(String name, String depends, int defaultColor); } @@ -143,7 +143,12 @@ public class OsmandRenderingRulesParser { FilterState st = parseFilterAttributes(attributes); ((SwitchState)stack.peek()).filters.add(st); } else if("renderer".equals(name)){ //$NON-NLS-1$ - visitor.rendering(attributes.getValue("name"), attributes.getValue("depends")); //$NON-NLS-1$ //$NON-NLS-2$ + String dc = attributes.getValue("defaultColor"); + int defaultColor = 0; + if(dc != null && dc.length() > 0){ + defaultColor = parseColor(dc); + } + visitor.rendering(attributes.getValue("name"), attributes.getValue("depends"), defaultColor); //$NON-NLS-1$ //$NON-NLS-2$ } else { log.warn("Unknown tag" + name); //$NON-NLS-1$ } @@ -427,7 +432,7 @@ public class OsmandRenderingRulesParser { new RenderingRuleVisitor() { @Override - public void rendering(String name, String depends) { + public void rendering(String name, String depends, int defColor) { System.out.println("Renderer " + name); //$NON-NLS-1$ } diff --git a/DataExtractionOSM/src/net/osmand/render/default-night.render.xml b/DataExtractionOSM/src/net/osmand/render/default-night.render.xml new file mode 100644 index 0000000000..49367233f0 --- /dev/null +++ b/DataExtractionOSM/src/net/osmand/render/default-night.render.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/DataExtractionOSM/src/net/osmand/render/default.render.xml b/DataExtractionOSM/src/net/osmand/render/default.render.xml index 5eab5c914d..92558c3ad1 100644 --- a/DataExtractionOSM/src/net/osmand/render/default.render.xml +++ b/DataExtractionOSM/src/net/osmand/render/default.render.xml @@ -1,4 +1,4 @@ - +