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

sequence parsing finishing

Browse source
This commit is contained in:
MadWasp79 2020-08-03 12:21:23 +03:00
parent 0a0709441c
commit 03ed195fcb
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -40,6 +40,10 @@ public class RenderingRulesStorage {
private final static int SHIFT_TAG_VAL = 16; private final static int SHIFT_TAG_VAL = 16;
private final static String SEQ_ATTR_KEY = "seq";
private final static String SEQ_PLACEHOLDER = "#SEQ";
// C++ // C++
List<String> dictionary = new ArrayList<String>(); List<String> dictionary = new ArrayList<String>();
Map<String, Integer> dictionaryMap = new LinkedHashMap<String, Integer>(); Map<String, Integer> dictionaryMap = new LinkedHashMap<String, Integer>();
@ -191,8 +195,19 @@ public class RenderingRulesStorage {
List<XmlTreeSequence> children = new ArrayList<RenderingRulesStorage.XmlTreeSequence>(); List<XmlTreeSequence> children = new ArrayList<RenderingRulesStorage.XmlTreeSequence>();
private void process(RenderingRulesHandler handler, int el) throws XmlPullParserException, IOException { private void process(RenderingRulesHandler handler, int el) throws XmlPullParserException, IOException {
// TODO create new attrsMap and replace #SEQ -> el Map<String, String> seqAttrsMap = new HashMap<String, String>(attrsMap);
handler.startElement(attrsMap, name); if (attrsMap.containsKey(SEQ_ATTR_KEY)) {
attrsMap.remove(SEQ_ATTR_KEY);
}
for (Entry<String, String> attr: attrsMap.entrySet()) {
if (attr.getValue().contains(SEQ_PLACEHOLDER)) {
seqAttrsMap.put(attr.getKey(), attr.getValue().replace(SEQ_PLACEHOLDER, el+""));
} else {
seqAttrsMap.put(attr.getKey(), attr.getValue());
}
}
handler.startElement(seqAttrsMap, name);
for(XmlTreeSequence s : children) { for(XmlTreeSequence s : children) {
s.process(handler, el); s.process(handler, el);
} }
@ -223,13 +238,13 @@ public class RenderingRulesStorage {
attrsMap.clear(); attrsMap.clear();
parseAttributes(parser, attrsMap); parseAttributes(parser, attrsMap);
String name = parser.getName(); String name = parser.getName();
if (!Algorithms.isEmpty(parser.getAttributeValue("", "seq")) || currentSeqElement != null) { if (!Algorithms.isEmpty(parser.getAttributeValue("", SEQ_ATTR_KEY)) || currentSeqElement != null) {
XmlTreeSequence seq = new XmlTreeSequence(); XmlTreeSequence seq = new XmlTreeSequence();
seq.name = name; seq.name = name;
seq.attrsMap = attrsMap; seq.attrsMap = new HashMap<String, String>(attrsMap);
seq.parent = currentSeqElement; seq.parent = currentSeqElement;
if (currentSeqElement == null) { if (currentSeqElement == null) {
seq.seqOrder = parser.getAttributeValue("", "seq"); seq.seqOrder = parser.getAttributeValue("", SEQ_ATTR_KEY);
} else { } else {
currentSeqElement.children.add(seq); currentSeqElement.children.add(seq);
seq.seqOrder = currentSeqElement.seqOrder; seq.seqOrder = currentSeqElement.seqOrder;
@ -246,7 +261,8 @@ public class RenderingRulesStorage {
currentSeqElement = currentSeqElement.parent; currentSeqElement = currentSeqElement.parent;
if (currentSeqElement == null) { if (currentSeqElement == null) {
// Here we process sequence element // Here we process sequence element
for(int i = 1; i < 5; i++) { int seqEnd = Integer.parseInt(process.seqOrder.substring(process.seqOrder.indexOf(':') + 1, process.seqOrder.length()));
for(int i = 1; i < seqEnd; i++) {
process.process(this, i); process.process(this, i);
} }
} }