Skip to content

Commit 08f2597

Browse files
authored
Mapsforge themes: ignore no-op instructions (#1205)
1 parent e9e5f38 commit 08f2597

File tree

1 file changed

+64
-1
lines changed

1 file changed

+64
-1
lines changed

vtm/src/org/oscim/theme/XmlThemeBuilder.java

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,36 @@ else if ("repeat-start".equals(name))
625625
else if ("repeat-gap".equals(name))
626626
b.repeatGap = Float.parseFloat(value) * mScale;
627627

628+
else if ("align-center".equals(name))
629+
; // no-op
630+
631+
else if ("curve".equals(name))
632+
; // no-op
633+
634+
else if ("display".equals(name))
635+
; // no-op
636+
637+
else if ("dy".equals(name))
638+
; // no-op
639+
640+
else if ("position".equals(name))
641+
; // no-op
642+
643+
else if ("priority".equals(name))
644+
; // no-op
645+
646+
else if ("repeat".equals(name))
647+
; // no-op
648+
649+
else if ("rotate".equals(name))
650+
; // no-op
651+
652+
else if ("scale".equals(name))
653+
; // no-op
654+
655+
else if ("stroke-linejoin".equals(name))
656+
; // no-op
657+
628658
else
629659
logUnknownAttribute(elementName, name, value, i);
630660
}
@@ -968,6 +998,9 @@ else if ("map-background".equals(name)) {
968998
else if ("base-text-scale".equals(name) || "base-text-size".equals(name))
969999
baseTextScale = Float.parseFloat(value);
9701000

1001+
else if ("map-background-outside".equals(name))
1002+
; // no-op
1003+
9711004
else
9721005
logUnknownAttribute(elementName, name, value, i);
9731006

@@ -1109,7 +1142,31 @@ else if ("position".equals(name)) {
11091142
b.dy = -Float.parseFloat(value) * mScale * CanvasAdapter.symbolScale;
11101143
}
11111144

1112-
} else
1145+
} else if ("display".equals(name))
1146+
; // no-op
1147+
1148+
else if ("repeat".equals(name))
1149+
; // no-op
1150+
1151+
else if ("repeat-gap".equals(name))
1152+
; // no-op
1153+
1154+
else if ("repeat-start".equals(name))
1155+
; // no-op
1156+
1157+
else if ("symbol-id".equals(name))
1158+
; // no-op
1159+
1160+
else if ("text-orientation".equals(name))
1161+
; // no-op
1162+
1163+
else if ("text-transform".equals(name))
1164+
; // no-op
1165+
1166+
else if ("text-wrap-width".equals(name))
1167+
; // no-op
1168+
1169+
else
11131170
logUnknownAttribute(elementName, name, value, i);
11141171
}
11151172

@@ -1252,6 +1309,12 @@ else if ("repeat-gap".equals(name))
12521309
else if ("rotate".equals(name))
12531310
b.rotate(Boolean.parseBoolean(value));
12541311

1312+
else if ("display".equals(name))
1313+
; // no-op
1314+
1315+
else if ("priority".equals(name))
1316+
; // no-op
1317+
12551318
else
12561319
logUnknownAttribute(elementName, name, value, i);
12571320
}

0 commit comments

Comments
 (0)