diff --git a/data/resources-hdpi/basic.skn b/data/resources-hdpi/basic.skn index 94f545c23b..b5911d0605 100644 --- a/data/resources-hdpi/basic.skn +++ b/data/resources-hdpi/basic.skn @@ -1,524 +1,524 @@ - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/data/resources-hdpi/symbols.png b/data/resources-hdpi/symbols.png index dbd811e831..6dccfd34f5 100644 Binary files a/data/resources-hdpi/symbols.png and b/data/resources-hdpi/symbols.png differ diff --git a/data/resources-hdpi/symbols.sdf b/data/resources-hdpi/symbols.sdf index d42d41450d..70fb2f55a1 100644 --- a/data/resources-hdpi/symbols.sdf +++ b/data/resources-hdpi/symbols.sdf @@ -1,178 +1,178 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-ldpi/basic.skn b/data/resources-ldpi/basic.skn index bb625feb6b..1c4b6c5402 100644 --- a/data/resources-ldpi/basic.skn +++ b/data/resources-ldpi/basic.skn @@ -2,523 +2,523 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/data/resources-ldpi/symbols.png b/data/resources-ldpi/symbols.png index 43168d45ed..336fc85eec 100644 Binary files a/data/resources-ldpi/symbols.png and b/data/resources-ldpi/symbols.png differ diff --git a/data/resources-ldpi/symbols.sdf b/data/resources-ldpi/symbols.sdf index e49f0027f4..c37002136f 100644 --- a/data/resources-ldpi/symbols.sdf +++ b/data/resources-ldpi/symbols.sdf @@ -1,178 +1,178 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi/basic.skn b/data/resources-mdpi/basic.skn index 7efec6daaa..5024aa4222 100644 --- a/data/resources-mdpi/basic.skn +++ b/data/resources-mdpi/basic.skn @@ -1,524 +1,524 @@ - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/data/resources-mdpi/symbols.png b/data/resources-mdpi/symbols.png index 840bd24789..19c4cfcbe5 100644 Binary files a/data/resources-mdpi/symbols.png and b/data/resources-mdpi/symbols.png differ diff --git a/data/resources-mdpi/symbols.sdf b/data/resources-mdpi/symbols.sdf index c405b34994..bebd4c20d3 100644 --- a/data/resources-mdpi/symbols.sdf +++ b/data/resources-mdpi/symbols.sdf @@ -1,178 +1,178 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi/basic.skn b/data/resources-xhdpi/basic.skn index a5b3bf6a57..b1ec0716f6 100644 --- a/data/resources-xhdpi/basic.skn +++ b/data/resources-xhdpi/basic.skn @@ -1,524 +1,524 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/data/resources-xhdpi/symbols.png b/data/resources-xhdpi/symbols.png index bc7e3108c3..eb43216f6d 100644 Binary files a/data/resources-xhdpi/symbols.png and b/data/resources-xhdpi/symbols.png differ diff --git a/data/resources-xhdpi/symbols.sdf b/data/resources-xhdpi/symbols.sdf index d5264e21c5..0114557407 100644 --- a/data/resources-xhdpi/symbols.sdf +++ b/data/resources-xhdpi/symbols.sdf @@ -1,178 +1,178 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi/basic.skn b/data/resources-xxhdpi/basic.skn index 10722ae671..aef04f6997 100644 --- a/data/resources-xxhdpi/basic.skn +++ b/data/resources-xxhdpi/basic.skn @@ -1,524 +1,524 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/data/resources-xxhdpi/symbols.png b/data/resources-xxhdpi/symbols.png index 5e029c1d3f..f755ea4d59 100644 Binary files a/data/resources-xxhdpi/symbols.png and b/data/resources-xxhdpi/symbols.png differ diff --git a/data/resources-xxhdpi/symbols.sdf b/data/resources-xxhdpi/symbols.sdf index 7707b5ad4d..8661d2972e 100644 --- a/data/resources-xxhdpi/symbols.sdf +++ b/data/resources-xxhdpi/symbols.sdf @@ -1,178 +1,178 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-yota/basic.skn b/data/resources-yota/basic.skn index 83755651cb..ba24965e83 100644 --- a/data/resources-yota/basic.skn +++ b/data/resources-yota/basic.skn @@ -1,524 +1,524 @@ - + - + - + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + diff --git a/data/resources-yota/symbols.png b/data/resources-yota/symbols.png index a069093a9f..24c3db191f 100644 Binary files a/data/resources-yota/symbols.png and b/data/resources-yota/symbols.png differ diff --git a/data/resources-yota/symbols.sdf b/data/resources-yota/symbols.sdf index 892627d73d..5f3a74f115 100644 --- a/data/resources-yota/symbols.sdf +++ b/data/resources-yota/symbols.sdf @@ -1,178 +1,178 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/styles/hdpi/route_from.png b/data/styles/hdpi/route_from.png index 8fae0c04b1..25e073dbc8 100644 Binary files a/data/styles/hdpi/route_from.png and b/data/styles/hdpi/route_from.png differ diff --git a/data/styles/hdpi/route_to.png b/data/styles/hdpi/route_to.png index 5b36305a08..f0aa612528 100644 Binary files a/data/styles/hdpi/route_to.png and b/data/styles/hdpi/route_to.png differ diff --git a/data/styles/ldpi/route_from.png b/data/styles/ldpi/route_from.png index 3596951faa..eb75544b10 100644 Binary files a/data/styles/ldpi/route_from.png and b/data/styles/ldpi/route_from.png differ diff --git a/data/styles/ldpi/route_to.png b/data/styles/ldpi/route_to.png index adb7b9d2d3..fd3bd9bf35 100644 Binary files a/data/styles/ldpi/route_to.png and b/data/styles/ldpi/route_to.png differ diff --git a/data/styles/mdpi/route_from.png b/data/styles/mdpi/route_from.png index 24ab5a50d2..e299ba9cdd 100644 Binary files a/data/styles/mdpi/route_from.png and b/data/styles/mdpi/route_from.png differ diff --git a/data/styles/mdpi/route_to.png b/data/styles/mdpi/route_to.png index 993fa8b7cb..dff02c01a1 100644 Binary files a/data/styles/mdpi/route_to.png and b/data/styles/mdpi/route_to.png differ diff --git a/data/styles/xhdpi/route_from.png b/data/styles/xhdpi/route_from.png index 754e31fb70..27f3fbce33 100644 Binary files a/data/styles/xhdpi/route_from.png and b/data/styles/xhdpi/route_from.png differ diff --git a/data/styles/xhdpi/route_to.png b/data/styles/xhdpi/route_to.png index d9ddd5b64c..686b326c9e 100644 Binary files a/data/styles/xhdpi/route_to.png and b/data/styles/xhdpi/route_to.png differ diff --git a/data/styles/xxhdpi/route_from.png b/data/styles/xxhdpi/route_from.png index 9106bbc35e..8ca4bdd89f 100644 Binary files a/data/styles/xxhdpi/route_from.png and b/data/styles/xxhdpi/route_from.png differ diff --git a/data/styles/xxhdpi/route_to.png b/data/styles/xxhdpi/route_to.png index b964c7b51a..60a656453b 100644 Binary files a/data/styles/xxhdpi/route_to.png and b/data/styles/xxhdpi/route_to.png differ diff --git a/data/styles/yota/api-result.png b/data/styles/yota/api-result.png index bbfc50f4a6..8f3f27e7a7 100644 Binary files a/data/styles/yota/api-result.png and b/data/styles/yota/api-result.png differ diff --git a/data/styles/yota/placemark-blue.png b/data/styles/yota/placemark-blue.png index 21586c524c..c2b686de90 100644 Binary files a/data/styles/yota/placemark-blue.png and b/data/styles/yota/placemark-blue.png differ diff --git a/data/styles/yota/placemark-brown.png b/data/styles/yota/placemark-brown.png index eba5dfbdcb..f638920852 100644 Binary files a/data/styles/yota/placemark-brown.png and b/data/styles/yota/placemark-brown.png differ diff --git a/data/styles/yota/placemark-green.png b/data/styles/yota/placemark-green.png index 05f53f90ab..44b8857ff1 100644 Binary files a/data/styles/yota/placemark-green.png and b/data/styles/yota/placemark-green.png differ diff --git a/data/styles/yota/placemark-orange.png b/data/styles/yota/placemark-orange.png index b24cde4cc0..326ab640c4 100644 Binary files a/data/styles/yota/placemark-orange.png and b/data/styles/yota/placemark-orange.png differ diff --git a/data/styles/yota/placemark-pink.png b/data/styles/yota/placemark-pink.png index e8fe956bdd..8553c98345 100644 Binary files a/data/styles/yota/placemark-pink.png and b/data/styles/yota/placemark-pink.png differ diff --git a/data/styles/yota/placemark-purple.png b/data/styles/yota/placemark-purple.png index a48d38c7b2..878fbef6ac 100644 Binary files a/data/styles/yota/placemark-purple.png and b/data/styles/yota/placemark-purple.png differ diff --git a/data/styles/yota/placemark-red.png b/data/styles/yota/placemark-red.png index 509c86c05b..33b159be2c 100644 Binary files a/data/styles/yota/placemark-red.png and b/data/styles/yota/placemark-red.png differ diff --git a/data/styles/yota/placemark-yellow.png b/data/styles/yota/placemark-yellow.png index 6f0cf7fd86..55a61176ec 100644 Binary files a/data/styles/yota/placemark-yellow.png and b/data/styles/yota/placemark-yellow.png differ diff --git a/data/styles/yota/route_from.png b/data/styles/yota/route_from.png index 24ab5a50d2..e299ba9cdd 100644 Binary files a/data/styles/yota/route_from.png and b/data/styles/yota/route_from.png differ diff --git a/data/styles/yota/route_to.png b/data/styles/yota/route_to.png index 993fa8b7cb..dff02c01a1 100644 Binary files a/data/styles/yota/route_to.png and b/data/styles/yota/route_to.png differ diff --git a/data/styles/yota/search-result-active.png b/data/styles/yota/search-result-active.png index b3f319068e..942dfa2c3a 100644 Binary files a/data/styles/yota/search-result-active.png and b/data/styles/yota/search-result-active.png differ diff --git a/data/styles/yota/search-result.png b/data/styles/yota/search-result.png index 5367062dc6..667090c5ee 100644 Binary files a/data/styles/yota/search-result.png and b/data/styles/yota/search-result.png differ diff --git a/graphics/depth_constants.hpp b/graphics/depth_constants.hpp index cad5fc8320..806664d43c 100644 --- a/graphics/depth_constants.hpp +++ b/graphics/depth_constants.hpp @@ -20,9 +20,9 @@ namespace graphics static const int locationDepth = balloonBaseDepth - 10; static const int poiDepth = locationDepth - 10; static const int bookmarkDepth = poiDepth; - static const int routingFinishDepth = bookmarkDepth; - static const int routingSymbolsDepth = bookmarkDepth - 10; + static const int routingFinishDepth = bookmarkDepth - balloonContentInc; + static const int routingSymbolsDepth = routingFinishDepth; static const int tracksDepth = routingSymbolsDepth - balloonContentInc; static const int tracksOutlineDepth = tracksDepth - 10; - static const int activePinDepth = tracksDepth - 10; + static const int activePinDepth = tracksOutlineDepth - 10; }