summaryrefslogtreecommitdiff
path: root/navit
diff options
context:
space:
mode:
authormdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220>2014-12-27 22:48:37 +0000
committermdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220>2014-12-27 22:48:37 +0000
commitc678668bd06ebada81c8060eb8faf610e81f73d7 (patch)
tree4f6259b9a0b05309e1a35baf3cc3327e8d3a3b32 /navit
parent52548d00b481a2671fad6d09c426a8187c218ee4 (diff)
downloadnavit-svn-c678668bd06ebada81c8060eb8faf610e81f73d7.tar.gz
Add:port_android:Produce icons for x-xx-xxxhdpi resolutions, scale map icons, reduce map detalization for higher dpis. Related to #1181.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5987 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit')
-rw-r--r--navit/xslt/android.xslt20
1 files changed, 16 insertions, 4 deletions
diff --git a/navit/xslt/android.xslt b/navit/xslt/android.xslt
index 6588421b..ab0d114b 100644
--- a/navit/xslt/android.xslt
+++ b/navit/xslt/android.xslt
@@ -76,10 +76,14 @@
<xsl:if test="@radius">
<xsl:attribute name="radius"><xsl:value-of select="round(number(@radius)*number($OSD_SIZE))"/></xsl:attribute>
</xsl:if>
- <xsl:if test="@w">
+ <xsl:if test="name()='icon'">
+ <xsl:attribute name="w"><xsl:value-of select="round(24.0*number($OSD_SIZE))"/></xsl:attribute>
+ <xsl:attribute name="h"><xsl:value-of select="round(24.0*number($OSD_SIZE))"/></xsl:attribute>
+ </xsl:if>
+ <xsl:if test="@w and not(name()='icon')">
<xsl:attribute name="w"><xsl:value-of select="round(number(@w)*number($OSD_SIZE))"/></xsl:attribute>
</xsl:if>
- <xsl:if test="@h">
+ <xsl:if test="@h and not(name()='icon')">
<xsl:attribute name="h"><xsl:value-of select="round(number(@h)*number($OSD_SIZE))"/></xsl:attribute>
</xsl:if>
<xsl:apply-templates/>
@@ -91,10 +95,18 @@
</xsl:if>
</xsl:copy>
</xsl:template>
- <xsl:template match="/config/navit/layout[@name='Car-Android']">
+ <xsl:template match="/config/navit/layout">
<xsl:copy>
<xsl:copy-of select="@*"/>
- <xsl:attribute name="active">1</xsl:attribute>
+ <xsl:if test="@name='Car-Android'">
+ <xsl:attribute name="active">1</xsl:attribute>
+ </xsl:if>
+ <xsl:if test="number($OSD_SIZE)>3">
+ <xsl:attribute name="order_delta">-2</xsl:attribute>
+ </xsl:if>
+ <xsl:if test="number($OSD_SIZE)>1.4 and 3>=number($OSD_SIZE)">
+ <xsl:attribute name="order_delta">-1</xsl:attribute>
+ </xsl:if>
<xsl:apply-templates/>
</xsl:copy>
</xsl:template>