xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

XmlThemeBuilder: fix texture loaded from style patterns (#729)

Browse Source
This commit is contained in:
Murray Hughes
2019-06-22 14:06:03 -06:00
committed by Emux
parent c526599e20
commit 368cf1ff4a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vtm/src/org/oscim/theme/XmlThemeBuilder.java
View File

@@ -6,6 +6,7 @@
* Copyright 2016 Andrey Novikov * Copyright 2016 Andrey Novikov
* Copyright 2018-2019 Gustl22 * Copyright 2018-2019 Gustl22
* Copyright 2018 Izumi Kawashima * Copyright 2018 Izumi Kawashima
* Copyright 2019 Murray Hughes
* *
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
* *
@@ -651,6 +652,7 @@ public class XmlThemeBuilder extends DefaultHandler {
b.stippleWidth = 1; b.stippleWidth = 1;
b.stippleColor = b.fillColor; b.stippleColor = b.fillColor;
} else { } else {
if (src != null)
b.texture = Utils.loadTexture(mTheme.getRelativePathPrefix(), src, b.symbolWidth, b.symbolHeight, b.symbolPercent); b.texture = Utils.loadTexture(mTheme.getRelativePathPrefix(), src, b.symbolWidth, b.symbolHeight, b.symbolPercent);
if (hasSymbol) { if (hasSymbol) {
@@ -764,6 +766,7 @@ public class XmlThemeBuilder extends DefaultHandler {
logUnknownAttribute(elementName, name, value, i); logUnknownAttribute(elementName, name, value, i);
} }
if (src != null)
b.texture = Utils.loadTexture(mTheme.getRelativePathPrefix(), src, b.symbolWidth, b.symbolHeight, b.symbolPercent); b.texture = Utils.loadTexture(mTheme.getRelativePathPrefix(), src, b.symbolWidth, b.symbolHeight, b.symbolPercent);
return b.build(); return b.build();