From d5eed1cd285fbfd5d06ed6a12e7007a760da1b68 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 8 Feb 2016 01:22:58 +0100 Subject: [PATCH] Add category ui_hidden in order to disable properties in dependent styles --- .../RenderingRuleStorageProperties.java | 12 ++++++++--- .../osmand/render/RenderingRulesStorage.java | 20 +++++++++++------- .../drawable-large-hdpi/map_marker_blue.png | Bin 0 -> 2511 bytes .../drawable-large-hdpi/map_marker_green.png | Bin 0 -> 2498 bytes .../drawable-large-hdpi/map_marker_orange.png | Bin 0 -> 2535 bytes .../drawable-large-hdpi/map_marker_red.png | Bin 0 -> 2455 bytes .../drawable-large-hdpi/map_marker_yellow.png | Bin 0 -> 2511 bytes .../map_transport_stop_bus.png | Bin 0 -> 2074 bytes .../map_transport_stop_tram.png | Bin 0 -> 2343 bytes .../drawable-large-xhdpi/map_marker_blue.png | Bin 0 -> 3255 bytes .../drawable-large-xhdpi/map_marker_green.png | Bin 0 -> 3261 bytes .../map_marker_orange.png | Bin 0 -> 3274 bytes .../drawable-large-xhdpi/map_marker_red.png | Bin 0 -> 3213 bytes .../map_marker_yellow.png | Bin 0 -> 3262 bytes .../map_transport_stop_bus.png | Bin 0 -> 2700 bytes .../map_transport_stop_tram.png | Bin 0 -> 3135 bytes OsmAnd/res/drawable-large/map_marker_blue.png | Bin 0 -> 2176 bytes .../res/drawable-large/map_marker_green.png | Bin 0 -> 2172 bytes .../res/drawable-large/map_marker_orange.png | Bin 0 -> 2186 bytes OsmAnd/res/drawable-large/map_marker_red.png | Bin 0 -> 2154 bytes .../res/drawable-large/map_marker_yellow.png | Bin 0 -> 2187 bytes .../drawable-large/map_transport_stop_bus.png | Bin 0 -> 1824 bytes .../map_transport_stop_tram.png | Bin 0 -> 2006 bytes .../core/android/MapRendererContext.java | 5 ++++- .../osmand/plus/dialogs/ConfigureMapMenu.java | 7 +++++- .../plus/render/MapRenderRepositories.java | 8 +++++++ 26 files changed, 39 insertions(+), 13 deletions(-) create mode 100644 OsmAnd/res/drawable-large-hdpi/map_marker_blue.png create mode 100644 OsmAnd/res/drawable-large-hdpi/map_marker_green.png create mode 100644 OsmAnd/res/drawable-large-hdpi/map_marker_orange.png create mode 100644 OsmAnd/res/drawable-large-hdpi/map_marker_red.png create mode 100644 OsmAnd/res/drawable-large-hdpi/map_marker_yellow.png create mode 100644 OsmAnd/res/drawable-large-hdpi/map_transport_stop_bus.png create mode 100644 OsmAnd/res/drawable-large-hdpi/map_transport_stop_tram.png create mode 100644 OsmAnd/res/drawable-large-xhdpi/map_marker_blue.png create mode 100644 OsmAnd/res/drawable-large-xhdpi/map_marker_green.png create mode 100644 OsmAnd/res/drawable-large-xhdpi/map_marker_orange.png create mode 100644 OsmAnd/res/drawable-large-xhdpi/map_marker_red.png create mode 100644 OsmAnd/res/drawable-large-xhdpi/map_marker_yellow.png create mode 100644 OsmAnd/res/drawable-large-xhdpi/map_transport_stop_bus.png create mode 100644 OsmAnd/res/drawable-large-xhdpi/map_transport_stop_tram.png create mode 100644 OsmAnd/res/drawable-large/map_marker_blue.png create mode 100644 OsmAnd/res/drawable-large/map_marker_green.png create mode 100644 OsmAnd/res/drawable-large/map_marker_orange.png create mode 100644 OsmAnd/res/drawable-large/map_marker_red.png create mode 100644 OsmAnd/res/drawable-large/map_marker_yellow.png create mode 100644 OsmAnd/res/drawable-large/map_transport_stop_bus.png create mode 100644 OsmAnd/res/drawable-large/map_transport_stop_tram.png diff --git a/OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java b/OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java index d20563d622..83371ead24 100644 --- a/OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java +++ b/OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java @@ -7,6 +7,7 @@ import java.util.Map; public class RenderingRuleStorageProperties { + public static final String UI_CATEGORY_HIDDEN = "ui_hidden"; public static final String A_ENGINE_V1 = "engine_v1"; public static final String A_APP_MODE= "appMode"; @@ -307,12 +308,17 @@ public class RenderingRuleStorageProperties { } private RenderingRuleProperty registerRuleInternal(RenderingRuleProperty p) { - if(get(p.getAttrName()) == null) { - properties.put(p.getAttrName(), p); + RenderingRuleProperty existing = get(p.getAttrName()); + properties.put(p.getAttrName(), p); + if(existing == null) { p.setId(rules.size()); rules.add(p); + } else { + p.setId(existing.getId()); + rules.set(existing.getId(), p); + customRules.remove(existing); } - return get(p.getAttrName()); + return p; } public RenderingRuleProperty registerRule(RenderingRuleProperty p) { diff --git a/OsmAnd-java/src/net/osmand/render/RenderingRulesStorage.java b/OsmAnd-java/src/net/osmand/render/RenderingRulesStorage.java index 33a2a6ba1f..98c4cb7fcf 100644 --- a/OsmAnd-java/src/net/osmand/render/RenderingRulesStorage.java +++ b/OsmAnd-java/src/net/osmand/render/RenderingRulesStorage.java @@ -7,6 +7,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; @@ -470,12 +471,13 @@ public class RenderingRulesStorage { public static void main(String[] args) throws XmlPullParserException, IOException { STORE_ATTTRIBUTES = true; // InputStream is = RenderingRulesStorage.class.getResourceAsStream("default.render.xml"); - String defaultFile = "/Users/victorshcherb/osmand/repos/resources/rendering_styles/default.render.xml"; + final String loc = "/Users/victorshcherb/osmand/repos/resources/rendering_styles/"; + String defaultFile = loc + "UniRS.render.xml"; if(args.length > 0) { defaultFile = args[0]; } - Map renderingConstants = new LinkedHashMap(); - InputStream is = new FileInputStream(defaultFile); + final Map renderingConstants = new LinkedHashMap(); + InputStream is = new FileInputStream(loc + "default.render.xml"); try { XmlPullParser parser = PlatformUtil.newXMLPullParser(); parser.setInput(is, "UTF-8"); @@ -498,8 +500,9 @@ public class RenderingRulesStorage { final RenderingRulesStorageResolver resolver = new RenderingRulesStorageResolver() { @Override public RenderingRulesStorage resolve(String name, RenderingRulesStorageResolver ref) throws XmlPullParserException, IOException { - RenderingRulesStorage depends = new RenderingRulesStorage(name, null); - depends.parseRulesFromXmlInputStream(RenderingRulesStorage.class.getResourceAsStream(name + ".render.xml"), ref); + RenderingRulesStorage depends = new RenderingRulesStorage(name, renderingConstants); +// depends.parseRulesFromXmlInputStream(RenderingRulesStorage.class.getResourceAsStream(name + ".render.xml"), ref); + depends.parseRulesFromXmlInputStream(new FileInputStream(loc + name + ".render.xml"), ref); return depends; } }; @@ -508,9 +511,10 @@ public class RenderingRulesStorage { // storage = new RenderingRulesStorage("", null); // new DefaultRenderingRulesStorage().createStyle(storage); - - - printAllRules(storage); + for (RenderingRuleProperty p : storage.PROPS.getCustomRules()) { + System.out.println(p.getCategory() + " " + p.getName() + " " + p.getAttrName()); + } +// printAllRules(storage); // testSearch(storage); } diff --git a/OsmAnd/res/drawable-large-hdpi/map_marker_blue.png b/OsmAnd/res/drawable-large-hdpi/map_marker_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..744cebf0f7453f5be96f099e5dcddd13bb95cb90 GIT binary patch literal 2511 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 literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large-hdpi/map_marker_orange.png b/OsmAnd/res/drawable-large-hdpi/map_marker_orange.png new file mode 100644 index 0000000000000000000000000000000000000000..ebcea8544f5422a9a218ada61eba218a562d8dcc GIT binary patch literal 2535 zcmbVOd00&S9v`H%YI`G%`<|w#Fw2={YR+iU%(P4@qs^qqET8L%iO~e7;T##sI z+;>r2Uk<>O%3**?aKH;d5Cj|{0!XFVlc|dUG6|#-Ne~ev;YlDJB+7;9-ack*O3%M@JH6lIK@=M>o*j17tx=raf8>cPh;d zV$s|fZcGSrU{WX!lUTMyf$$^(crvyKjr{{l`&%rXDTjH8R30dm#!PkrCrXM)6;VC6zn7UAwe|KQ z#e$npKLPs($a^-*uFq_QjFIZk}i!+aX74PU7%xeljG=xVW#ToB}P2S$$hWx ztJ`pkTU?_TH7tH+^Y7M|8$Q%4Kfn9nbm_vs#=XnS88x;GH^^M;FJ?Ba@zpu>U?3(Q zT-#@5Y)vV@_wv<(8?_y;*o|Ap#h!OFEpwUK9>;r1S`VhC{(eQ`>QwhRu5r3`sV0vd zB(IUxh281wbQ!5nxCS&C3!n3;hb*+qJ@y4;=f57WX?ZXuJhvj#X zN0XgRf1t?BvC{or$9}xuSO*llw&{j4Hi2am@=N<$DPh$?fUYuiuXw*fzai z-ZqCN$h-O=iMwaChc#Dk>pRv>AYsL0oyEg1lk<0CsIFCIO}xda+``j6TN?6@URG2P z7#&B=RA%9Aa8RMlVOu3CHbl-i)rd`6Ra!K>yTnfY;$)E3pLR?AY)duW5r=JJUB-*T z{DG%y9gMC#uIE$B@}uSaI)fea80xdijmL@$@Kw#)%Ck00HT8yKw3izY)e-v`vo}}6 zM;AdLE!6X30iH+QrWI-bDMx`Tz(1cJcUJwr`HvBWL)ELgtZH$+%_jBrUi~uj{K`m| zf{d3JV%um3VAT2;nzy__Y@oE#kM4bFf~bs3-_FOF%#{3wr*Bhqz0Tv0eLnb<6F}q> zyKCDXmo#q09=40TEJ$6}Vs^ExFo82VoT1aQIPI#s@^)ukX3G(I*d`OKvr_loD%&k1 zMY&XD{g@HoHJeNh|M=V+af+d<06DM^Dnv z1oGGEoU&kxLQ6mIzuYwv9bOf@qO|{Xl)ziW?cZpTn{PfhD!STumw<$YbcdFNWt$MS zy3?`pqIm0`sC;aiuH3kHNvdnh_O2yTOS=q@^2Bw{Envztb3e#K4qUbEb3Ley9qM1w z_s=V}IP->N<0`DxVot+elPk%7xK2v?w0SJ(B8?N4!xSbwjbB(Z8hVs&*s*mn&doc^ zq$+>oZRO=Y^j`{* z;ij^e8f5#Y5l`S&Gq{3MC`WHJsfW~U-)PASzk3hM-nFXsk@oo08xP30_^QLThV>zT zkol1-J)hh;yVGazNpjJt+7`DxC9|@LhEGa)0m;9uH|@|kl8YTW_t`p^**OrcPIb}^ z?CD)=Kjo9dVCpi$>Xh;1=P_aLEc@R+jX7qi@~fDYw$CR-^JB+Ciaco}ZhD?}`R=yn zUBemZU) zJtJtOrh98f^1>njB3IqMEH3kFjc@nkkMTGsphX6+3xhS{of5UEPC+M4%hPqbzF3?- zv$ESWHjD9TKV$U#A(L$ymT5(Ljd{2Jaq@%yl8&JJcPL*M2W1kQtm*3``Vh&Rs^I8> z(b+AlW>m}~rerU&=lTqA!$&LhcNuTtC1TEBbfNXVxjb-7LUSI}$zTWkKE$)xyx`%i z3gorr8dJ+orrxRZP8NEn>fLu=@6-1mbG+p@+Hj)s6{E*8_vCG_`CoBr&kJX}L!hs^ ZB#grTkg%)a?Zb&*FSffMtBSEE0u&N<)T?|eU>@BMks-k<<)6QjjO z2n52!*N4N0-`?;YIcp~TbU$%saF`G6<=(@J0@BRK`I6o8y_F<7Eg3jf)XsAPN!pW1T2Aofi*Dd1O+72U=(WGDFzOp z7J)JqBvUF-lZ?VBWgNsr!=8Q)L9X)m|4OV-e@PUaGOR|Z!s6XYR55CSoy+Lyx;Xu4iRM#P%0viK;8e;}7-of5?4rwOiK^NVdrP4*X%=G)-Rj9+s% zra0P9CtX-Nr;U0O;ik;4Dd7YKrLoYLW zJczXyfvOrsjk>k<&zy713XiDuE!8~}NyHk7H_4KIs zX|MPtk&A@E1w-QORcIhx|N-iT3+Z?*Md_FW*0tW_b0j$f#D$xy zOt=uG_l|R*#PV>UBnMscMpf0emGLiabJLAZqd!Uf54RGCbE+u^`z#!1@Mo$%dT(;} z@PCV&b=d&opt}=;8|RnkBhvyHDx;q4V=uDyBa{Y)fo-ET9>zRRzyA=>_?C3@Ts=9*?-0;`IHLS)>#v^Z_rg5|T zGx&+$4_s_;Ic>;&Z;?jFt&QChdkVt5yRfT--f1=KTK{#6R8{jDsbO}R-u&i{ll*`S z);>nyLlD(Frz{m&JCh%6J;gU|N7@GQ-G z`q*rDR?Z)=GAZP3m&k^K|mqt2yPp&mTqrJ0q zjlm}xgF{QTx>B_kG^eLqaSx!qccH!4PA?v`It8y)nXAH!D)`UNR5W|!Y92%eH9NJ> zqB*8?P>}}_@e)~*+31n8J+7Q&K~px8Kk)j^v{zO^IqYm7X(c7ghT0-9jUp>E=ybjpz}tjccr7!semo<4MK^U=WOFcU(@&d|0rOI^iK-uA^Ee_%FSfAG;)Jn{aiZ7iPD ziniaiYiDUl<+y%iWM13#eR(aw_A7y|xs>X++b{njbWvhIls&aOawk0`y>EWrJP!yv zV_TOw-KoI!n8x+gonC0sHtxi>jQ*>?(wIedXPSpk4wX631;W1=^hEwS^j-4LI1|B`65F@$e|+-w(v^esib+?^j*@ zD{zeIB7N#lF4r#bJ1sN5>FelqBh)58mksPYerVkKh9@Q+dy!x9fjVNh_>d zth-~|VLz6EtQp$JVh=1!_~EamrY2XGT{*ut?`{40?yCBtq|W0&UHN;Am%jG5!fUtY s*$jweKi<45=wCCTW>HEk>o&j+PDX5p8Qqv2J_nI@y zY8DIzo8#lnU_oy$=-xcj0D8LQIK_x%5E`O!jgfJ9B2bCof&!t0h8p<&778Kc(@^V4 zOe|AI2g8KkDml1T< zVqky@o?IwX3Z)XnBqN6_ja1T5kkW5Q5X+d%AH)*H_e4P{!^Ci87@QLpBNk7d>#Mgy z$pZf?fkXz#1k`st|NqS&1`>stY?l9No+%U5k(0|GqX2Dw3==4U zCP)sA%5r|%H5g2Pz=z?^j(PevBi7Fvw5WXXo0-{$+g;FX7umZPJC*xMw>RJ(Kvom^Cd~zu{%E#$oq<~$;&nL-@hZ0&k)x4_AiaTmOo;>CiBr@?TNERb`Y++BSMhdAEBWE#KfZX ziCUevV8JWxU5a4a3RPX`_25T3-8DwN&hO74b!SA6d801rVa7(v$!)kyW_4}4x(MAF zo;TPMTLr#H+2q=qWfxzqZ0rbV>>ZKjrlma1PRo9ioUE!iD!ZAvm90P=IN`taNXQVa zLDWzlP(DGv-0<1Ruxg;F@iBe*$UU67e#%wuE6Mmuwt;=S`rS&8JC;`3HSHx%W8G?# zH>0A$q}APs;u(QY%|3nZ{-w&^vFE7p!fK6ebHS$NuZL*G3j_Vp&7Y{y8q<+5}(1-{@HrpXA^emAwFVcgyJxH;>d~ zYvBB`+PyE`Fw=Ys)BTX=WVJ8dG@|NIIiit&@Rl)LX#rQ7z)grL(=FjuwQ#;g#!UFg zqLGA+*41+O=tq_i}1hOY^b&(j8NSEZo0-?yQAy6{#< z8T8kdB@eeR&trY4>??~em=S+c`%L+dpwjm<(=>~1`oHwdZ!V6$ak-Z^%e6<7L|$;? z!ahsC)9wDJnjMLhJewoaEOLZ!@ywc!D zCo2;r@HYx*D&AI=u_d{}jy-kv9qkEb*_w)wTLSN8^m z=*3KT?m6z*yksG%j$PWjSc($ zG02<9V(XXJasI5o*ajS8hP0^A#)oiGoI)R_M)c2&&Zzsjx033e$9?ydCMPt_x5#rH z8*ggu%dI?Bek5)zhc>n)&~(gd?#>VMkn$Wd^3wCP9@M3Bu_W)adTHBzX^@S6fJ;f~ s;)e-OMw%&1YL2UbS~4F{Oqg$h5h4%j>_+#zn*7D`@$_e0^w^T{7p8YBE&u=k literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large-hdpi/map_transport_stop_bus.png b/OsmAnd/res/drawable-large-hdpi/map_transport_stop_bus.png new file mode 100644 index 0000000000000000000000000000000000000000..dbcec408efba1b60aafd3f3e34eb6f585605963e GIT binary patch literal 2074 zcmbVNYfuyC8V(AmAfjjn1f^@Z2uhOOKw=US5DE7aL{XJY4u6t{9WiV4V$3EmII^5{c)oR>0y!6bE9^IEkE3d3vsa0!R=( zWg}Av3KgDcyu??dL_;)zBC#e>%t0vbZU9fsB?x3F4g+eLRIcKx`IPs(TwFM|W-y%q1_&|fAcqctR1o4qAeR9GA1?~w zO^L*Eg9Y9neGw-B!JrZrR8^`Rht*WM%4UW^ zfU3kwi2|2kazMuj$6!e~pF$}85Q0o06n-L>t3D=*NEuxXE9ejnq|0QwxZYc<@L=>G z8K1RQiBc6PJs4GCNlGzMk64=-Fp;}|cce2U)Nt1;B}7qRsQ?ov$xu1&C*V_vFEm7g zaM^4SbY?QyREW)ns7%lWqQ-E!x1C!4A1BA9vl`+AaG`Qveqym$cxEw zb^$pq91mwt7Ub#W;W>l#ldEu8E=Fg3O9ZC#xbP`!=y7^5EPH$m?|Dq z0G^(@s=ELV8zpiCOHn!M%Jd;>0jiWFqlmW>lL7DZ%$0mb1B#++V1xrx*{B$%B21SU zDhGv_R2LM1nXn7YgqTG9AMnWkn?E`simq#x|7o6?S42nZwx33UID8r=R8CBgk{A{H zYo`{INcvnqfrm)lck5sWX63b{wW0b+l*O?|`w{y>A6}BHIOu z;*6f zZ`GUaHTuhFpAElvunlp0^UC#U`vv&0>SeH4zs(}CF6{M{L*-L<_H<`FFHJ0~V(Hy9 z-;^JaA9G0RT)9Ge?U$;_f-|#X?TaJwV>cJg>yU1(t@qDKg*V;YWzVaaQ_Bn3s=Zti z(z;{8Vcw6LtdQ@nM7uJtp3PlN&U+nppgijBA00*Gy8;|v7|y38|NiGsPx~$py$-Br zPdA>?C@A-TH}$sjgGTksMYSW58n{8xMc#Qfu=PQlyui9#>6_GN$BEze=FVRNQ|o|) z>501Am7xH%vRyd8ImSQav~BPF0UyS*$Kv&c3%0mrIIRfJE@0f&o4=Zy6I=LfG+Vve zk=%F>`e_yBt}V^K)|qiiD@>SZmFs&~??@{>d!*In|G@4n&)tGFUXR z8|(^p;OGBwFwHb)lQ67lpX%bThLcSx;mBVWv(VY!ADeZ3<=s;w6_drjjGmskFACkZ z-*{tsdSa?09hEFK=+~0XdnWhxs%;}pT@WeBiJ5uY&a}zgW^P5QA)?`+1vqRNSe$Yf9=B? z_FY!m4BV@vP`3ZPYV5Y!Bc5#*EBD#j?d%|24}eMgCk@gg(iToAoBGGz4A{XIHFdY< zU97(3wz#rJ;jkj8E+MY%tr&UkWsyzVZL;_IljSE1&o%#eCu%tJY1g|hC$l*E^M~E; z&+OuCH|Tva_tJTc^!VYze&(W}&7}sbsv?VQcGC)5x&r2uWKKF3>_2+D#xJ8`VaDLYYfw2Bg{QrG)|S*f$kujV$hoY3;xL{3g`?h`yfTqt5pUMiMKHa0+0~B*3vahfxodv-$~fGq9__c=(0_bF=x>!1YE4J;4s7~)X-8>{pG#vj;$-@lVZiN3i&blkB)tH84(?c>2_#ep*39Gej zTz8*z!l(4ph`CpB3&zq^uA>#wzXxj$}rZ^f2f?HvOiH*-BYtgqfOPtZK* lIbm)2@WHm0=!ADhAgOm&yEfI-GFJDu_VWr9l&||T>u)SnNXY;I literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large-hdpi/map_transport_stop_tram.png b/OsmAnd/res/drawable-large-hdpi/map_transport_stop_tram.png new file mode 100644 index 0000000000000000000000000000000000000000..b8278cdae2391efdb7950779bbdb2cb35ba67be8 GIT binary patch literal 2343 zcmbVOdpJ~iA0HFZNF=qis$*nS%;n6@%wdQbG#e6OP&j4|Ce5XpQ-&6ilBHMAc0pHL zOIwfiDoa}T%Su*6kxOAK3B~rlHmT@6D!uO?J^ROdp68t3?|07k^Z9vG!EzBq*21+Xaohqkw~eWN1Q0HCIV6kj~Kx6 zqKn=u|qLj9HM?v2qmFkmYL2c?JQZ z7OSL6RH~2zbBu7fVh_qAVoE=TAX9pJekPWyKP3uF8C3%-sUU?$mC5Gf`e3a_eUSgk z_@cFXTdWeH`XFk>9+eoYM}*}(7|Y$?JDM}Z)IeKQQmiQOE`dV4M~28zp@2ukzEC7m z3B=*hXbcvMLk2k=gRakY5}5>?nNYSDuoRAkY`Bx1q}#-*ufGmOy(eBm@Hv2 z!^vC(WRaPO1ZKfZm<6)1_&?$$|8M@Nm?-L8v;0r<%)i1qa&G&16tKhRVM65C1gWr5 zQOb5Oa5x=zp}={YruSY>qDQcw$<4O-iIT~Zyp2h8qi&p~$78hK);8zR;k0$>ff*hz zGiUPBC?wLUXQ8vjPBSG9g7=~f&@1u+!$Lp(S2Hu;i)C671Ojn!W2Vdcydn4C-m1qu zS?H8zEW)R}YMhjn)ju^>A3LzG^~Nw=kkWTqIGGCOuM(fKynE!~=%G`VqmBDBY)0e& z4V=!*{(eUbsLYt!bj|%(_3re8tRihuO*yY;=n2bK_s$i+Mf9e(LDy1`{rQuQKY4SJ zm7js`X`2|dVrMBQhCvEaU*6i#-53!S8#UXU6Z3R-Wc485v444I$M;@suSV_9$K~c< z9b1%F~LO*2C?4YI5UrI|`Pb?6f0g zo3w@tzwz^k*E-vV98Hwz2SZM0O1jz!d480Lk@CY;SB2fL*VN=*SNiuAx)rU8J=y7f zZ;g3v%`C6r^&N3RGE!^qQwrPn)%y9@wG6yZ?yn{p`>%SvAi&TOKSXt?ztT37(*JTq z6GmIn?MKKTwhz2rLwi&GZeir)aC!BD%wjz&`E>8VY{SO3SW$D+3q+r@Qs>N>B!eEj z%L)CKk;0xHT%iI)LTDH-%-#TxHuy7t2%$PA7^fR zyFGq)SNF!|W1V9`Q`i2LWq4pPB>B#B{H~O`T=Tc4msEu9!8$s!x4Gdwz4nLpKcqCS zs5H7@dH<^UV&{yS+ax0oV_LJ}5Z>tYXst!s%jsjmgROi0Z$-X;e(6&COykln8Z$Xz z&#USgD0+0nb!s|v8Ppo2IzDowvoANd)L1fJx1#fEn5hr9X%rG14=&o?Vw&w~1zu(ie3ph+(~S->ZEXC@{U_x^^z+Ys-n^`y57?)oZS z>*?axBR2yP*Y%=xn|{RW>KZY(SZ4mA$~Oe=5n6I8?Jo-NdoN%^tDTz1E1~mE`epe; z#ZJlAd6DB5zd|C<-{S|5qaDClpA4u(P25%ZmY>b;ldl({0jo@|JWeW!HrD%782M=2 zV_$!f(3&tZ5xl4&>)9fk*;Kb_$&n!sW6+A%qD~e4HF422cVoNC>3IKhv+ecat^1ug zX}-Eaf!w6sq3Mq2s7LqNY|y@3`rWN1_SvnIN&6W1?>h0s9XE%Jw;peJ^FxCcDG7Pn zMaQ2jBh*fL4gS(-9bnSq{3yw?@Wr^gtozmsbIRn=bi!ooKH$MDU^861cIRVpXlRX9 z+#$H9_aF8f`^#-Cv?d5Cx~a9HflF2pNURer#z!n1AK)o}y_x+zCv~g_*bH^*zOyp^r!T?j!CaLJJ3jfZK;7zO~&2`QTW$s zgHb1fUHmi~NTXY$(Ee$MJStcj swj5Giuk6rT@MOA?SpKk7{(gBFZfdD5;Z>)O`P{FI(A7&&=n|IvA4*=yy8r+H literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large-xhdpi/map_marker_blue.png b/OsmAnd/res/drawable-large-xhdpi/map_marker_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..8a5015e18937e379e5ae59029f5251110cec0d6a GIT binary patch literal 3255 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 literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large-xhdpi/map_marker_green.png b/OsmAnd/res/drawable-large-xhdpi/map_marker_green.png new file mode 100644 index 0000000000000000000000000000000000000000..236e007fa6a6fb714363c31084ac926e488ebcd5 GIT binary patch literal 3261 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 literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large-xhdpi/map_marker_orange.png b/OsmAnd/res/drawable-large-xhdpi/map_marker_orange.png new file mode 100644 index 0000000000000000000000000000000000000000..bba7856b1c0730c2f0033a8ea2c488a0f56436b2 GIT binary patch literal 3274 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 DW_U=$ literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large-xhdpi/map_marker_yellow.png b/OsmAnd/res/drawable-large-xhdpi/map_marker_yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..8a10d4157db4bf11ebc7a3e748e57ecd83edf859 GIT binary patch literal 3262 zcmbVPdpwi-AD=s6xl~eONS17~3%1oTn;o~UVJfAVUD{$7+vHM{O1Yer*x__hL!^^R zxs)#Amr{g9xt7W$5<17V9Q2zm=Xd@%uk*+6dA*+J`+Yvo`~CiWzMsnXE6D)HDR2@tR)(R2|DfM*KASRgMReK*UWMQ6rF zK4EPF0Mzz!Y1<^*$i7&HfCr^7VxTcRp^^;%Y;uhe(i!0_2`G%Uo6E;peY|tu3dCjN zthPFm9mqlgi^KJd6R`r~C^SY~I0M79a&-Z1ioq%ccq|DW6vK<)i?J~{tFO9P<$lo& zvjTmENWyVe--6mkrh*6p5ewu9b%HS9a5%^r1BE-HkqAe75W)fO2y?)|;0_Q6I2P`J zML2-IUsg(QA|@N_Pb7W!rF_F#aU>EU76yxsj)q1fp#srv7#xGaz#I@T1OlQ&K*X_p z2|WhF7hC^OAhN^^5mzYT3izN!MS7SZN`kXeM*8gtJRzC`9f=?iesI0`VhNqkVEypTUG)8p>;A7?EJ4Jg zO9UdCKoIex3#c4{L?Gq}gdhUpYt=#Etz14+5G`K6Sf+2MCbC4_y(}h4B;bL*<{8WV zhZv9yOc(>sf8KY^0+z#u;h#ozMJ#^9NG~1zT*EzctSf zld>Zhw||X-^5w5#V)2y|BvOvb^XcI?0DyLn7ZFd3=^Dw|7ZDI>R(C*J%viHpy!tq# zx=@bSz^5%;VfhTChe}Ar?^hqN@byI{CgJmIhN|Dxn%LDQACES$25Cm7>a0V$7{U|4 zjD*gP{E>S%qImNQ{2liBH_JA3kM+&?R8>aboaqsZT;_8oaD!K`Jp4ElusN?p*h`CW zIV7^a`%(pB4}1M(*Nn;Wwi9b{bwwiwW($JDRoj2V_j(@PqV~>KAyPYGe^!3vpEV8b6Y->_IkI>h)gC+<~~JYB|`>*G#XVbp7`9( zKR>kY=Og|lcUI172~C>LoEuD^8`7da3tPz3jN=BbNn7=Ru!4oRQM^u=(q{hhu3Z~^ ze9q8(yZ=a@MnfIX?~N5Y;qu9+O)7&Y0COp`fwG$ip4)dRwp zq9|03x~wqpS8rTfzO5RuU%dQ^>gMfM%cG1u*@6winsSyM6%qO>Nz-ML6v6Jr% z$Y0zjFrZ&_xRf20Jia;I&#bpZbrel}1+AYxLI|Foeh9p-ETuW;EK^1?3kx~m@8M=M zWS|mmBg@sLk{pavu*8K6OZwA~wWJW#i!teenet)uN~g^qtFC?*tH` z#^w7yDMII!KlBcX$EH`k%JJU0v;It`tLK8tq}_q^yUq<2nYA|grLB3@bk9*A7O{;9XAmE_CSOlOIPTfAED%+A1eEx9D@b-{pwlh#b)bRU8_T%!Z zHa5C)v@2Rv*a*Id!L+huyK>H6LU=b*nwFUs^!8`D@0jZC*W)#(_4n)P)F)G#sPbbY z{dy|(dKAixoObr55n%SH@2bv%5(fLz~C+{_7ojGUU;V+>p^%XvBkw^-( zYqPlkrtsGT=Aq~~Q<}YxXKz2MXDTJLRi&uhW@~b0t6Gu8%*DjBXX)|S=AxY;>o-0<1LdVQX^IGMWc?2 zjeM=TEFr^y`qi>hUuIwLP4Wt+P;bORcb-pV%8vQ{9m_Pgv77*_*jUQfGLIQi5hO2? zmnTVQQOHtW>+6|(%7B{Tm*HoW;io!mL=Dq0#ySTZwM>~}M!>PiEF1O3@o;@%p8|rwnFne=n-#7HS;?O5+# z*(XnI7n+}MX#c%@Pb&nP-7pxZ{=wQ%<+*Q9Q2P1Hz?9My)y^9I*Bt`|*Q=_pImxp4 z^3+sg?{$Avlu7bMbEFWh7twJt@#j@lSs!zq9Dy4S6o#g}QM;AY%dd-SzaooBi&(P1 zCPMV*e$FT8o^e1{`%f0#t?xs^TRa8_KX01!+-+UZ7k_Ex2~C?$@B{wEWtRit%TK1h zEpC_{+ubu-`)js62ijD$rw8-0&Ak1H*W)xy0=%b{ba-yp)5LkyCZ+iIw|1+KW70KdW}E#^)=7JGL=_$B z`2Aymxwk|T<^jU1@yRu8?73!2jZx(XM)s8L(*BXE=XxGRfA(E3G~O9%`>{`+?S8z; z;w~MKtlzzM1nu@nh3eJuThzYI7BwAP0_*PRD>xEq;Gx3R;B#skgRna>#l5kOso_VT z{mx(U%0dz!p?w#BX6)kQif*H)_D9*J+hil9;~`nq;koFjtB11|q^I|`oeO-lj)NU8 z-C9zVu!It4t2G#Kio17pqs3{$&${EGn#G0(Kj))w2}85A6T0ZcUDt~99KWMTHc+DX$uJgm%$(S}e4z}GLnpBbZvae+>TZiV% zx%=qB=9oHsJ6?mz7k1j_s4iU|Tg?UDzKK-moU_8ut-dptI8(f-;$zU9Z8cyfv`xo2 T?L*t*ABC3(g?QCH^w56+Byx)9 literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large-xhdpi/map_transport_stop_bus.png b/OsmAnd/res/drawable-large-xhdpi/map_transport_stop_bus.png new file mode 100644 index 0000000000000000000000000000000000000000..17c397c3b78133212fc99491594c46b1b17b4b1f GIT binary patch literal 2700 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 literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large-xhdpi/map_transport_stop_tram.png b/OsmAnd/res/drawable-large-xhdpi/map_transport_stop_tram.png new file mode 100644 index 0000000000000000000000000000000000000000..51afe238b5273e81ffb0d80f8d29437bad46ed3b GIT binary patch literal 3135 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 LuEcWNkktPG0^&nv literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large/map_marker_blue.png b/OsmAnd/res/drawable-large/map_marker_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..62d6e982178d03a31f4fbd23cf64623dc24363a9 GIT binary patch literal 2176 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 Gaqz#!r*^9V literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large/map_marker_orange.png b/OsmAnd/res/drawable-large/map_marker_orange.png new file mode 100644 index 0000000000000000000000000000000000000000..d797f9f9e359471d8d5f13facf0b69cee55d93e8 GIT binary patch literal 2186 zcmbVOc~ld39uIUug<`eKC7076h(M0XK@JGVCWOm`E6TA|2+2TVj!Bc@hC*pYqy>Qj zBJxB9Qm)d%L)dB&sel$Jf}m7b!CGBT7us5UV8tB}-2KDXKX%@m`Tma2=X-zOo0CC& zA0q<`0}KXZoA!yu*=DI2K71sv(S*7>; zz0h#|&$xC3rUOjLmaLWDq)Lax*>lUUddy-akyeoVju z8xTas!oG4UoEHSJVKoF$@h&(K2!a5Ofd{E{GKuO8kcc3aKx7a=B8~_$K_Zhx1U4Tm zYE3PUWrlFLo3_v$3oAho6_Y?nOiaWllJT%QjsP+k3<8lvAdzq=0;fqAEJ z`mY;rL~8`eDu@sQY2bLZ2(3q~?G_o$-Jcs;2cq6E1JzQrC_*_07R4(dCE~|nVbL4B zSSn_^5Gf=YB%@0d%3ZO!pI=i!{_(E&Rgm6e&&@B-{_dXMlxV^Uu68}-_x)vkw^9Fwqt)L%RwoR19RA!> zQ-2Js`9Y94JC!^)x`TJ<&b)=QnZ+gYG$v(x^R655G>1!F(ZH97Eh89hD{*&Z4KK&* zZ|!)Y|MmTx;QSy^&%8cz!pFyn`SkHS?|fTh+TD+t$d`x>O}=zX&z!{1))4w{J-%0Z zDlJQEld13$v>ea9>;JQH`X6%I6Q_>o^rvelZ6$M=%vh3RjPX?!RLih0iOyEp+`PeBFYcW1(YiQ&0JA;Y6M}WLPp(+^{c{ zDWBM#C%+JLaOGgd0qZtgj(=OwOPT)(MOEX4hrD~{)SByevl|Pkg3;o6VV`Yq=v*vw zMB3Llh*4kErcpbzk76P&h?@7hLPd4KS0=L_643+7DQ(6bJ$<$J*r&ga&|5x>8e zY%`Av;+@C{hXiTI9|R(@TQVn#g2$XJ8k z%I;W;Tm4NMHEr-Kea}oIYY5*Sb>X5Z5Q!cK_~DZHAX&`DDO};TGMJYm)fP z58@sd+vB*F19qv?eYL|0(WXN-vt{##PRTvNDr%R6A9%Er;v?h5=J%QylgD-1OY)zY ze)hn8+ypG|-vjU+57g4D?hTJ_F9RPo7G;g6E!0hLH4Ij_)J{+D{QjcLZsj%pa|2;J zJYH&T(J^6Z)vlG{;=}tneuPPJQT}2OMhax=r~^+nOOW-(a(cYa~na= zlUK7V?)Ub#C?>D9g}*3h7uB~kEqzqhd*0!;*nz{1u3*hyyn1!*CP`-4`+`!p)~Rqx zcGYUXxE?bw89g8NLdVf)aOn9ZS8O}nVO4Ry0YjQ^tv+nHPo?ZEWu=e3o8WG|Gbj(v zso&jJQJZjNqw_Zls`B5i*q%L;dn?ck<_AB&Nw?l> zVIA#i(EOVg5iY~;+I4hh604e1d-ifleeb^nGJpja-GqQHzjMoj3#(z7I+z@5gDAsN SW6Slw13zy*r|ECeS^ojEZE+<4 literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large/map_marker_red.png b/OsmAnd/res/drawable-large/map_marker_red.png new file mode 100644 index 0000000000000000000000000000000000000000..2ef9cdb3ac1fc4e038c913b5b6903b4593232ce0 GIT binary patch literal 2154 zcmbVNX;f2Z8jcG>VMKO{l9GuP2uzlnm86C(A&?3f2~<#!T#_3Iklc_2643Efq##JC z!{QjkA}%aS5gaPA9TkyU3o6pGDMnxfMHo(n!c-LJg5b;#Pk+ok=iYC7p67kPcR4p( z5bVFvbh9Z6h1$pu;D#V04SD@cHXz@L_L@3maM1XLYlN^=qXktE%0~jnKp4IpjDv=YoB(MsF;J{b!NyKEU&CT# z5;k@>Er=AP64_ja}AdA@ike zA{Mg@(Il|3@0aD8^Tu3ce$&?xytiUWOf-!KihK)r$eRl=9GAQW1utL2OC?sS=9jGJ%1QJm$U%J;a zTCE9z{_DmE(dy7tB}5E?)Nry&jO0VQb(M_7?vD*E0TFLlJ5@3yDPSTO7AMOgg@(^% zW04brL?&U;NmMce5_{k&9sn6H5mPfOMxUj6)eXr$C)MjfDaTgGe!(R03HMw zQhW?V1@IoASb~Ru7_n4Jp)r^Y3U-Ar`G4a_M4Tcn70dq=&*~OZkxSF}t$-}vHxr~l zI!J}IimI|vfI_X$;d6aLb%T>9;XvzH#~-fs(d#S2a=F$*+c zj%kIVBC<@LGx*@ac>cmRgYuqQ+qy9OFVF3Lb2d?Zz!yb@EkoD6e&O}}P(7D+&v4zW zcPJm5TOr*~tf>EXiaC>TuY_47-1Tdcd4<`~{Y%!fE>iPPYsP&Bh7^pF;Ml847Hb}E z&hU)6SR{%jr%E$&aQ4DXi_Mm|qc(isYyQZ&KQ=H=R)(daS#*&}v&HRbQ@MS!!m>Jd zSD=|KZqsnQWjlR+wBC4%)LdgVi57DF;@42A7K*KzcJ|(HPl>uZeTAHCtMQ?|f;!_h z)i>{d4&K=`{7SDE@2L!6p0LfJ1U4R5$+q?H4*XVDHWJiWS{`ZsJ?})mXp7#l$Jg)V zW!2Ax1{0xGb#9&BZo;9w#kUqJ&&**!zt!UQn)G(Ifbo?_a7S?kt(mwA-)qN%g;Jw< ziAZ+h<->5{LH0hO)HeQ4LIrlx&{kNLhdck}=b}3feuA%X4|9R@UG;+Q^6Ec7N?AY7 z3*^^6MTG6{^moO66MxR#Y5uK=cFJlpDzTU1-|~2-7+02NGUKj&?l}2Pn8>(!^GDVJ z&};o~FDWip-Cc%1{^#r(`j)&KhLaP<#E7p(y1mWb?tQZ%tJmzQJ-xxA+#Rhowca86fRJs|&sNIA1ABs$9=| zxbuX_xj_$9*5%SIWBmrpu)NXk?pLR&b-$;wa*x|0kc(S8od#+X_MBck(_PH_`iq;p zypKL}nr`?c;*b^Zv(CRiv7DfG#Q7IEoaGzYLiPSFnJK1cEuBsHZn#R1v$V^Nhe@r+ zs`Jw?q^sNGGM=ZOE3&aU^!U@x(qk?8O*6E0f{rYH)#FV;&;CZ<5h1WEG=h9SIPi_n zyXF+6mNIWg=0=ClI?S|_gCoiuJMNlZbt_+Nef`{MdTi&-He5k1Q!%XGVP|8|u>=R^ z!04w{S?r<6od+m7@4n<9H`h_L*S=wWSkq&Q^^D7S-d*&OsH<^A)j&;^w|9>?FEh^Yt8pEfn(^H)wBb_tJ5%-z z^xD+O;QlF7n;)n8>YGRRwdpU(d_v7Vucz?>T`ruO(%vd{g3_(ve;;vmWB-E$Uv@u` z^E++h!LY3ONPY@oV#HE4kl03udoe%ync=Sjo34`9;xi@z>$ZJjpcF3Rg!a2$y$DSM zYs?f`?3O15$8zR;ycC{j@1M?kmK?a>^Y!p0-WEvMWc4QSOxe6`E@==u7ACy_EO?DM o@m}Y8zdrY*KG5H#Y0+MUI&`vO?E>3bzV!F!`vr4rd`0R10p=ZG`v3p{ literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large/map_marker_yellow.png b/OsmAnd/res/drawable-large/map_marker_yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..6715e40614243b4c61ccc2216a84c4e72db1cb62 GIT binary patch literal 2187 zcmbVOX;c&E8V(?+sMy+D3212yq6lP}EM(D$m;`|u3=mn`f@GOMAjx1dhCo#)$fcC4 zh@he|vdg9*vM7QJR}d&$0hOf|E-DHftMv#7a?m><*!#oNA9v1~`L_3Yp7(o~b0(4R zv1^s7r6~%9TIJ@-@j^x_@^Y7%Am6e2k}_nlfVqCKHzb84genl_EP+HI#!Vp%2E9O` zByxW$DxSP0K_G6d)|bXccm$nyF=B=XsgPd~Tb7 z#mt+)VJz$ir~G()3>#8`7%JWoCk6ljLu23pDxFNCI$%gdfJz`T2mldB1egGkNg`qv z9xS4!l1Q0e9G3+xWW~aUz;HN|K!}Klz(!%p9Xo1Ra1`Sj5v0S5SoWcpr(C>V-fdAtPvo;RFCrBq$Vf_nNm> z!(QNDZhX>OEr<*U30|NYI-n9G`H)&Kf|1z$z0jN?;tg|;N`@pwDCa=p0}43N-?;oEkm>yu%y4mGTACn2tz6X1j!exfFA$C~;9i3e0?*nX*s#Ko&DZVgLkiLVza4 zi9iZ~qYK3n90-WSQYo2AW6;Rh1-#_{jUNGViZE9!|5H4RTS!IDO+U5*viR6cpc3gI z71Ao%uguI)s3pa29A|;H|G6$&{so9`%&2ixH1;d&L7jRBX&KovI)-!lOc2&?_j1p7 zm<=21jx*LezBjb6??i*GyYGB`t(Jk+VT6wcOf9q)nRbB=oj&xyjCrqI(-sQ#5Wn`4hX_$InG7il@;o_1#B z__h5l^_p_-P1I!*+wYS2o(AatT1D&tlXR|Z@=T#G$0)$CSJ{;7Ul1{G7 zXsE`A_4Lrv!oV0sJg04Ed`^&COyGc%`^;EC%PI4jWa|l|+Ye-xcI)k5zDdog-g~tS$@k5JI^+<;7r+(s=e1~#QcY4g_#!L79kqwqa@b!b4i-F;YEXA z9ykcL!PgSviEkc zvApYVF6g^X+03T9=L;$giRcUZD?>T=m^S8Mo804!oY!oOP=6nA;vld2ON7>E>pO4n z?Rl~S3wGi=&A-nTTUrTC-jli##hNh&G`g$XppvQo{luoMhhh_EUufQo_Eyg=u1ixw zm;8$`^fq-VI>R@!)ahzhU#idQD&6s-nW=mK(O!wJEijGm%Y?R)Mg=M9J+}Au zc*l&p^D6XY>GvIP*1o;i=W(a!XmD?&QF?}#X1e^>9ntTE*?XMIx`&fCnRptdx2Nsv zE_@PF$zKOE6b1s1!);&ZAS*5(F&6Q5IP_+?{f zsKM)U%NJ+Y6buaVHlQ0iC$mjQMAOp)6MSR4Cm}eEBir|+5k$rs#!%o8{y$% z22zs~XiAKX%z><#6hto1_i&0HpMxo&z!)Ylok#12PdxS?Ke8@jdBUu zTwnE=JA2Z3QkAyZb~3I5%>{*4ms%^1m;t35Q)sr{d`9X@bZFg5e@;sEiV2UX(YPNs z#Clfb%owBNlh@f!PMsHx-sdZNyS|ReGY9>eq?98j9!p~3hR1n>$~~SvJlY{DNfXEW z$Gs+9-inltjdqhatwhJ}KKPlC@Z9|kZiG~S>hsGs#=+XN`lhK}F$O3oYQ<3QX}f>U P{T{e+Jvb#hgJS;+Lmq%m literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large/map_transport_stop_bus.png b/OsmAnd/res/drawable-large/map_transport_stop_bus.png new file mode 100644 index 0000000000000000000000000000000000000000..917fbe34aae58048e3bfcd89f4a7f73ea263f9a9 GIT binary patch literal 1824 zcmbVNX;2eq7>)uVP*Dr0Eka#l5iD+YH)KP0fg&Va3WyPbY895<1y)HmBx@3aS~(oV zVbt+N0jo#{ThvmiI0da2pm@{@QXLd)@j_99wW5}e?FPa2hvScaGvB%I^S;k}&6Xs@ zN4YqAI12;qms98slOKA>Br!yICh}hb6Objqoh&UOI zgX45cI*W<6=;?Wu_(amOl*A};=%+xi8Rr#fXpR8Pnry8BH;0Ia^y2*4_6&)EArWqA zi1;L7K@cDilOU)fK#I-)q%eX)Fa{wo2qQQG<5CzH9%9~_p31=0 zs>oqm{4GSB#c?_uf=nip#1tT5^_dWYVHgBUA*mGPB|t;2mLtrd)-ZKMgNingdPc`F ztQN3oB+}VsT!@%w`q~AJE-vnkVy$5~P<+TBGogbJ2@Gj8Hou0X4V;?(m&RMA4T-rr z8dB2+cA1{!^N}%i1kA_o-G*#}JR5wDp5c>1WUE+mnTFPKF{%(T|3yME6s}OfZ~%%b zKt!QHKopiCU^+(1L4};6Ghiu(krXka=WY0KSc%DDI9w?YL=hwc#V|Nh86d-?m?}~g z31cJJ7_EULv?M)Zo8fH_W5eEw#g%%R;8=Yk%Vv*MK|&VGv4$*G2Pl=ctjhquWJXJ| zCc|`FnqGUYqVR^ZaE-_mYUid^JG=&Hh^J&vwqcF%>fvNYL~Sv{w> zq(zsWJ+ar`=aWRAQ4^Tm%fB}c#+gp%E?bzltFHF|z41!r_7zRm!`7p@0moctP2b%3 zSZ~r%=N7upM1?22amkaDY)=w0zW5(LAJk-75 z?tsiRW>I}tU!xOJVri;WV>?P6T34_~k~clM<0JRkohfQ8Tz%@S5IxK9o_G^X2V>iX6~cAVLIG*_q1TF-1A|6t92mX4FnnvyVhKDNOHenUr{Ak z)V(TE=e5xqI`4kV$3-r7IWJwAUffCYFf`BQ#1=IAPVE@~Bi)q=*E++NSbmyG^-iqp zSWt=@)NH*EHr;-4R_4kowsz z#+x=hKH68ke}BoEO;h$(*ZMx_Zua~vh`erYya&~6rZZjUuyxjd=a zB5DVVcmH*r+1pvQzE<^ISNB2rDc9$9g@N-Wl&Ulx;>Q@uSlxYf?^tXUVfbc(H^z_GyQ~rd>NcS z;ox~;@ZA=pC2CxL$9#v;995yzL1T}ndVwxh9kG#D%rm+Eftd8)Z)+P4nDZrDZzuoClyDf}2V+dI|kcRNx5 zSo=GDs$1sDOTRXHN3HDdt8^H%uh{FHmoNYhEnf={<_eRflC`A@$Exam6%SYc?Yq(m Z7VHdKc<)-qxx2Q1R!l^^>Ogo}!9Na@x>^7L literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large/map_transport_stop_tram.png b/OsmAnd/res/drawable-large/map_transport_stop_tram.png new file mode 100644 index 0000000000000000000000000000000000000000..3bda97a73bde6f8b0003b3d8de141e469ade0032 GIT binary patch literal 2006 zcmbVNZB!Fi8cx9v#G=3=Xj{XO_yN>OW&#PBKom#_#BBg0ny8=-$&jRyOw0rlkN~Yw zo9>ntx>5>)3NBiDq_nZM6*MlgRYVb}T2=}kD4+srJ+ypU>_o-gAD;f$IcMg+_ult; z-tRNE#Q0bb_t)Gh6pDv9PADbU0O#vAkNnE|8*y@3W{i;=H{xkV6KcRHQA#`&1H@WX zg-J0~nYFtai=a?kGc`$aqg?V9Pl0P0s8few*6K+#g%YvOtVb2QFe8wPsWdu1?P0xx z256Lgnv5-hBzgg+*2HBSu#MUANs8=U3Ped;w-$&n^GE_MW<&wAHeE;X%zWBYULGks zkC`;!sfuwIpZ3ftxg-$~;06p}GdQ3EhG8HKVZdx|2#dW2U_mgO2_Z}v0wI_OLp&A) zJb!4UHG?vZCl!jG+ah;-n%Zd8^O#JN$;2>)FmQv42_p!?gjh@#3nVo_B1>mP&7h8; z&oT%xLSfM8jT&4BI2qAYJj2MRk)A#aL93TYUJ&bu=ZPXy#x$dPCd`1CTCFp#r`m*3 ziv8D(mueG9S$d2q#RxpZpdjm!MxOVPf zP->JsE*FAA*laEcbGb0chC*R56;W_NE=P%_K`aDODA8G-m*Jx!0m6YGk$@A%hT#}C zf{=1ZD8fR7BB2OEX0c)&VMKKbY}U4hwEY|#^QTyzz<{Af+>nIh>9bvssK$*rp~m%q zK;W!;C=e*q=#;pL2y&L`S=2(zpvlCPA_J}kp5~dSd5I4ghJ~R@1O>U60tJ=q&{Pn? zU^WUm8iG@)~=37_fDd|3&d}bb885wDvK}{{+*LJP{{9oR5c5u-VkHxe{2b!!OxvgEc zaaD{t0o9tT+Uj<}?vkHT6l|Bg*rWRs*8o;rI@NmutQ zUYZ~8O}FjwcBjmF^9zPoZgGld!?1kCls>a%)ZgFMG_~C~S~8){47&feokL{z^|dFI z{^mHYInh|`mA=RjYo)Rh9!891;bZ&Sh1ZIg#dvJX-K$UEc=8{$X?Vh6J~25m|A6{L zNj`_bH`Rny-B|8pg z+;rLb1O2^*>FP@Z3)Pkk_kDfKPF{u=@%8;QDp=&QO*y@J1+$>)3gsLAzWxzyiC^s{!%jec&z?X-929%lT>i)2 zy&k*O_`{gIi2a_gsFNMGThVhjpAFEu-1;`OS0s88+3=|7(yNODzJvGG{T#_Dty64J zA9A%Vyjt>3+nCp}GO)8ISlIRM=nOhpj{{Wy{HWyfo#@t_b^PBuu z_g}AFUMUMubQQELP<>v8yuz#g?e)`%D%mfe^>#+C79>7SR0W=%n3tO4{q-a9mQfZq zbZ|qV&3aTiw&oOgRNG^n_~iDb$F15*6?9-J(buLjuo-a9%bvWejoZJRpUb5S->CEPVzNm@3zFLYarA~V~x=XX? Qg7Z%+j)@o6M(=$04{l#5*#H0l literal 0 HcmV?d00001 diff --git a/OsmAnd/src/net/osmand/core/android/MapRendererContext.java b/OsmAnd/src/net/osmand/core/android/MapRendererContext.java index da28bc9723..9c0a56af4b 100644 --- a/OsmAnd/src/net/osmand/core/android/MapRendererContext.java +++ b/OsmAnd/src/net/osmand/core/android/MapRendererContext.java @@ -28,6 +28,7 @@ import net.osmand.plus.OsmandSettings; import net.osmand.plus.OsmandSettings.CommonPreference; import net.osmand.plus.render.RendererRegistry; import net.osmand.render.RenderingRuleProperty; +import net.osmand.render.RenderingRuleStorageProperties; import net.osmand.render.RenderingRulesStorage; import net.osmand.util.Algorithms; @@ -175,7 +176,9 @@ public class MapRendererContext implements RendererRegistry.IRendererLoadedEvent RenderingRulesStorage storage = app.getRendererRegistry().getCurrentSelectedRenderer(); Map props = new HashMap(); for (RenderingRuleProperty customProp : storage.PROPS.getCustomRules()) { - if (customProp.isBoolean()) { + if(RenderingRuleStorageProperties.UI_CATEGORY_HIDDEN.equals(customProp.getCategory())){ + continue; + } else if (customProp.isBoolean()) { CommonPreference pref = prefs.getCustomRenderBooleanProperty(customProp.getAttrName()); props.put(customProp.getAttrName(), pref.get() + ""); } else { diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java index b7c665fa59..43c8e412c7 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java @@ -399,7 +399,12 @@ public class ConfigureMapMenu { RenderingRulesStorage renderer = activity.getMyApplication().getRendererRegistry().getCurrentSelectedRenderer(); if (renderer != null) { - List customRules = new ArrayList(renderer.PROPS.getCustomRules()); + List customRules = new ArrayList(); + for(RenderingRuleProperty p : renderer.PROPS.getCustomRules()) { + if(!RenderingRuleStorageProperties.UI_CATEGORY_HIDDEN.equals(p.getCategory())){ + customRules.add(p); + } + } createProperties(customRules, R.string.rendering_category_transport, "transport", adapter, activity); diff --git a/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java b/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java index 0ec1b78956..16b729fac7 100644 --- a/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java +++ b/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java @@ -620,10 +620,18 @@ public class MapRenderRepositories { if (customProp.isBoolean()) { if(customProp.getAttrName().equals(RenderingRuleStorageProperties.A_ENGINE_V1)) { renderingReq.setBooleanFilter(customProp, true); + } else if (RenderingRuleStorageProperties.UI_CATEGORY_HIDDEN.equals(customProp.getCategory())) { + renderingReq.setBooleanFilter(customProp, false); } else { CommonPreference pref = prefs.getCustomRenderBooleanProperty(customProp.getAttrName()); renderingReq.setBooleanFilter(customProp, pref.get()); } + } else if (RenderingRuleStorageProperties.UI_CATEGORY_HIDDEN.equals(customProp.getCategory())) { + if (customProp.isString()) { + renderingReq.setStringFilter(customProp, ""); + } else { + renderingReq.setIntFilter(customProp, 0); + } } else { CommonPreference settings = prefs.getCustomRenderProperty(customProp.getAttrName()); String res = settings.get();