From aea6245eb090e1765a7c07bc426a77e075dc4c41 Mon Sep 17 00:00:00 2001 From: xmd5a Date: Thu, 2 Jun 2022 10:24:39 +0300 Subject: [PATCH 1/6] Add club=automobile to map (https://github.com/osmandapp/OsmAnd/issues/10486) --- icons/svg/club/automobile.svg | 82 ++++++++++++++++++ icons/tools/sortfiles.sh | 1 + rendering_styles/default.render.xml | 2 + .../drawable-mdpi/mm_club_automobile.png | Bin 0 -> 254 bytes .../drawable-xhdpi/mm_club_automobile.png | Bin 0 -> 332 bytes .../drawable-xxhdpi/mm_club_automobile.png | Bin 0 -> 582 bytes .../map-icons-vector/mm_club_automobile.xml | 11 +++ .../drawable-hdpi/mx_club_automobile.png | Bin 0 -> 735 bytes .../drawable-mdpi/mx_club_automobile.png | Bin 0 -> 392 bytes .../drawable-xhdpi/mx_club_automobile.png | Bin 0 -> 667 bytes .../drawable-xxhdpi/mx_club_automobile.png | Bin 0 -> 1030 bytes .../poi-icons-vector/mx_club_automobile.xml | 11 +++ test-resources/synthetic_test_rendering.osm | 14 +-- 13 files changed, 116 insertions(+), 5 deletions(-) create mode 100644 icons/svg/club/automobile.svg create mode 100644 rendering_styles/style-icons/map-icons-png/drawable-mdpi/mm_club_automobile.png create mode 100644 rendering_styles/style-icons/map-icons-png/drawable-xhdpi/mm_club_automobile.png create mode 100644 rendering_styles/style-icons/map-icons-png/drawable-xxhdpi/mm_club_automobile.png create mode 100644 rendering_styles/style-icons/map-icons-vector/mm_club_automobile.xml create mode 100644 rendering_styles/style-icons/poi-icons-png/drawable-hdpi/mx_club_automobile.png create mode 100644 rendering_styles/style-icons/poi-icons-png/drawable-mdpi/mx_club_automobile.png create mode 100644 rendering_styles/style-icons/poi-icons-png/drawable-xhdpi/mx_club_automobile.png create mode 100644 rendering_styles/style-icons/poi-icons-png/drawable-xxhdpi/mx_club_automobile.png create mode 100644 rendering_styles/style-icons/poi-icons-vector/mx_club_automobile.xml diff --git a/icons/svg/club/automobile.svg b/icons/svg/club/automobile.svg new file mode 100644 index 0000000000..2c15c7096b --- /dev/null +++ b/icons/svg/club/automobile.svg @@ -0,0 +1,82 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/icons/tools/sortfiles.sh b/icons/tools/sortfiles.sh index a528787adc..53e50a449e 100755 --- a/icons/tools/sortfiles.sh +++ b/icons/tools/sortfiles.sh @@ -2048,6 +2048,7 @@ icon_alias club_sport club_sport icon_alias club_music club_music icon_alias club_scout club_scout icon_alias club_social club_social +icon_alias club_automobile club_automobile icon_alias hazard_yes functional-icons_hazard icon_alias hazard_nuclear_map functional-icons_hazard_nuclear diff --git a/rendering_styles/default.render.xml b/rendering_styles/default.render.xml index f3e14354c4..d35ae32ec4 100644 --- a/rendering_styles/default.render.xml +++ b/rendering_styles/default.render.xml @@ -6785,6 +6785,7 @@ + @@ -8180,6 +8181,7 @@ + diff --git a/rendering_styles/style-icons/map-icons-png/drawable-mdpi/mm_club_automobile.png b/rendering_styles/style-icons/map-icons-png/drawable-mdpi/mm_club_automobile.png new file mode 100644 index 0000000000000000000000000000000000000000..b6fdcbb63ce0c2534a8e7dc2e21578b3cdda7e55 GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kwj^(N7l!{JxM1({$v~0Ko-U3d z8WVf_7j`)Xinv~%{GB`Oa>&ILfj44_YMqbLBXX`W&W`deJ6zMQ5PUR#L-(moGEYA} zJGA5B2FurX&RU8a1s#9ryLINKJCFOSIPSabjhK0|q%rJA_=fu}soN#&!k=quFM7$e z*XteAn(jqAmVKzaBy@xMd5Rf>-vR&9+F0AwsjdE3L*L!&+;#fHwyHIsgnlsC&7c3v zf9r?bkX3bh0ZirzEIJMEQ_Ps()eB`g%kDcZzwKz{v6gA)egU1&;OXk;vd$@?2>>O* BZ%Y6G literal 0 HcmV?d00001 diff --git a/rendering_styles/style-icons/map-icons-png/drawable-xhdpi/mm_club_automobile.png b/rendering_styles/style-icons/map-icons-png/drawable-xhdpi/mm_club_automobile.png new file mode 100644 index 0000000000000000000000000000000000000000..b4a2df65718c478d23741fbf0020e95935178966 GIT binary patch literal 332 zcmV-S0ki&zP)&5(e^N=;rgQepU5!OQ!(n zW>GFWqPHXaC>KN9cb3Z>@`(c&0t;eT0K-V${SnP1je_-zBu%p&Jb87u72Tcd9y7@= zfnQ(+3@X|_uml>QU(4N&=tk0oq!%;$Dg~I?x1?7|=aR0Y1`}T&Y5@njNm11Tc=x%E zgZi=StGCrWAou$1Con6%XPw{VLxU^-N{DE-=v53OMHSKc8ORM9|0|kE(u}@s_g>PE euMuSR-C+ZT3L6u?5(L%&0000mG#D<{l1xh;G(3B3fWFRy)m}B75B)U1c z`XA`%9}u*-Sdn{BkRTdDf&>XJL9}Fk9qxJhOYh^o`#Tq&*%vOHdw%!(<8$vh@0{Ox zaFrx!SkkPd;gVR7r0H~76>kpEt_poAiB0QF&pY+@&7DKFD+;tjF*m$6 zfo<2`Y4LnJZ(M!?l*ATYc(GIOl^L@CM`e3VKQIN{3gi>;-poGaf_b3z77JIW`Yma^ zE|{TAn5I^v4ChzPC$9YoSg(+)A9$JCk0qIz9u>y7Xkmi^WTdwoc`=3T>~Du z*ti-Wmb;bbw8)oq7kCPM174ZgpCD8%c`l7k00DQ8 UyjjHZ#Q*>R07*qoM6N<$g4WRs+yDRo literal 0 HcmV?d00001 diff --git a/rendering_styles/style-icons/map-icons-vector/mm_club_automobile.xml b/rendering_styles/style-icons/map-icons-vector/mm_club_automobile.xml new file mode 100644 index 0000000000..568a959784 --- /dev/null +++ b/rendering_styles/style-icons/map-icons-vector/mm_club_automobile.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/rendering_styles/style-icons/poi-icons-png/drawable-hdpi/mx_club_automobile.png b/rendering_styles/style-icons/poi-icons-png/drawable-hdpi/mx_club_automobile.png new file mode 100644 index 0000000000000000000000000000000000000000..c1817710808fe990f9e3874cebdc45f20a0b8315 GIT binary patch literal 735 zcmV<50wDc~P)2&uB!ti`4L+r z2eGwlY@q9)vclWHDz<+kRmyJ`pZxxT9eq9rkCOun+G@CK18{ z?xktxR@3H{tnD-5+tRcS2(*phJIN0iDviI3C7fGLn^&?}VeNJDLoXN|>PK654GlbU zf&RenJ-M60?dA5|vt zfMU*D!uBH9w&dp=pdvbVH)9<&3WVJ{ck7olpd}52k7~Cq_ByxwcW%l~XRn&I~Wc4V@k1N5*b|1dRu zRn;t7rh9;TeOHY}@p%!CO8JGVMuYNMu6WGZV$ojwWz6}s&r%N4pnTR${0Btx%GG|m RR$~AF002ovPDHLkV1gJKVd($> literal 0 HcmV?d00001 diff --git a/rendering_styles/style-icons/poi-icons-png/drawable-mdpi/mx_club_automobile.png b/rendering_styles/style-icons/poi-icons-png/drawable-mdpi/mx_club_automobile.png new file mode 100644 index 0000000000000000000000000000000000000000..3ea11fa1cca62b1ef479e98745ebeed12e69cd67 GIT binary patch literal 392 zcmV;30eAk1P)(uh;AVSGKCuv z>!^s>h@GW75K@RBngpLkCSwMZ`FDyyZu9@Y-23jlH}eP91>Wb;6CTQP6*0Q#)wP?YGNtYQXD)y~=6u1otFAZ-vue^134XioC}zRR%y)@VzkM z$j*2R3I9g4!HHNLph?8BBCKXRqn)lDJLP(r!TWSDu7Ebs4FyyHyvHW62Tb_lzR)q| z78v8~dzURKfQUn&j`L&}ycZeloDbj`s1b3X1(1#h1|dUEXPGY$;Hj{}ja1&U2MGok zOmCl5cu|44_=majo170YS{SWDhoYH7HFt8MBSo_`0PX~jqWKpv0&2j>V(KB2Cw$NJ mA?>tX;}ZBx*D%WJSBYNRSXn9295s`vEv{aUeK#GNc z3gi}nf~6nY?Mj^?)w( z8sT`(^13vb4H4%r1NmYACqu=RJy0}8-oThgu66z%HnTbNLE=K3#PLlajcg5HaU)+s zrGXN=9oe1Vq{0E3z$IYPlhzNE2Q+AkB;PC+WcR>97J-}i+dRM_gj=*&^vIcGK)L8s z#DQ1tR0-)_CaLm`aBrw>wy4Q9zWX3c|COjRPki&jOIhNKMMPV)QBHS<6{^eus}{}( zSxlD}K*E430?auvb_3#Y2pw#J zOfehSc^A8P&tW0&F8se3`5RejplIY9P}bO_#wInCwSg6U@#G-CiN~0hD{KJh3R7(H zWgvwpSn6 zb9?TEL?Yo4iIrGYsnEi4U>Bf(A>MIRs(dd}Y||`$r^eDkFVHh>+>?vAoOoNnWWV~pxF%25ZjfiF}a%{XF^p2yoy}zqAGQ=3iiWVF6Dy9ZF0dxZu z%hK-%ebUL{*s-Cvn2Sh&3X1L`#D+G=MdTE7iVz#KN&golgDfP2EF^<0gf?jEhVa{8 ztcemE)*zt|_z3jPdQGI*cyD(MXzqys>9T7I8Jl{Lg=CP0WRQhqkcDJWB9VxR(?L=7 zvjU+PSPv}nE2)lA6gLo#NEeR+=KYP!$#XSu4QlV?#$k*JHcB`5Lnn5*ik%^@IRFbO zaVAFM87oK)unc$_Mv4PXESHY3dSswAIce| z6avP-P*{UZ`GhSso!-e;P(N+JQq9_N6xV$Vs$;U>j{^=|b zzM{C}Ta1>s+y=gAW-2tZ!FT%X7Sorl;->7^iu8_D`3l_9Px{|x^#+-4FNn0g{t&GX z)tx0wPd*eGmnS;@h4i0Q3&|i0$sh~KAPdPL3$6xzM(ChSD`i>{I)KlfG=B-{Fjl7AXfeTaIpErZcH~BW zvc0iVqU5sT+JjE1L4*?L0hnMXij$r+h0J9o-HTaB=O7EoAPckpSh(+!o=y?Ae71sY z-(KMQ?FNk^x}K~-FD>g|_!43ux}NM?u9qz9ZS#$#0D9^Ts?ZCJ7}k!^%yHj>>L`Go zI)h{%uYq=;9~frxE_%53y1h0ZjH2mDBoYnh7sX8=9$(~t>Hq)$07*qoM6N<$f}^3} AbpQYW literal 0 HcmV?d00001 diff --git a/rendering_styles/style-icons/poi-icons-vector/mx_club_automobile.xml b/rendering_styles/style-icons/poi-icons-vector/mx_club_automobile.xml new file mode 100644 index 0000000000..34e86ea69c --- /dev/null +++ b/rendering_styles/style-icons/poi-icons-vector/mx_club_automobile.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/test-resources/synthetic_test_rendering.osm b/test-resources/synthetic_test_rendering.osm index b27c57fe9e..a9e770ac8d 100644 --- a/test-resources/synthetic_test_rendering.osm +++ b/test-resources/synthetic_test_rendering.osm @@ -5839,7 +5839,7 @@ - + @@ -5854,9 +5854,13 @@ - + + + + + + - @@ -21143,11 +21147,11 @@ - + - + From 7c3043446d962c026781887aa0b4a787dff44cb5 Mon Sep 17 00:00:00 2001 From: xmd5a Date: Thu, 2 Jun 2022 15:02:08 +0300 Subject: [PATCH 2/6] Add intersectionMargin to depth points (https://github.com/osmandapp/OsmAnd-Issues/issues/1361) --- rendering_styles/default.render.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rendering_styles/default.render.xml b/rendering_styles/default.render.xml index d35ae32ec4..9b364373e1 100644 --- a/rendering_styles/default.render.xml +++ b/rendering_styles/default.render.xml @@ -6993,7 +6993,7 @@ - + From 42f0488175ae03215e5551b10deebe628ec34b14 Mon Sep 17 00:00:00 2001 From: xmd5a Date: Mon, 6 Jun 2022 09:32:55 +0300 Subject: [PATCH 3/6] Add club=veterans (https://github.com/osmandapp/OsmAnd/issues/10486) --- icons/svg/club/automobile.svg | 83 +------- icons/svg/club/veterans.svg | 1 + icons/tools/sortfiles.sh | 1 + rendering_styles/default.render.xml | 2 + .../drawable-mdpi/mm_club_veterans.png | Bin 0 -> 242 bytes .../drawable-xhdpi/mm_club_automobile.png | Bin 332 -> 332 bytes .../drawable-xhdpi/mm_club_veterans.png | Bin 0 -> 396 bytes .../drawable-xxhdpi/mm_club_automobile.png | Bin 582 -> 583 bytes .../drawable-xxhdpi/mm_club_veterans.png | Bin 0 -> 580 bytes .../map-icons-vector/mm_club_automobile.xml | 16 +- .../map-icons-vector/mm_club_veterans.xml | 13 ++ .../drawable-hdpi/mx_club_automobile.png | Bin 735 -> 583 bytes .../drawable-hdpi/mx_club_veterans.png | Bin 0 -> 580 bytes .../drawable-mdpi/mx_club_automobile.png | Bin 392 -> 332 bytes .../drawable-mdpi/mx_club_veterans.png | Bin 0 -> 396 bytes .../drawable-xhdpi/mx_club_automobile.png | Bin 667 -> 536 bytes .../drawable-xhdpi/mx_club_veterans.png | Bin 0 -> 758 bytes .../drawable-xxhdpi/mx_club_automobile.png | Bin 1030 -> 896 bytes .../drawable-xxhdpi/mx_club_veterans.png | Bin 0 -> 1261 bytes .../poi-icons-vector/mx_club_automobile.xml | 16 +- .../poi-icons-vector/mx_club_veterans.xml | 13 ++ test-resources/synthetic_test_rendering.osm | 193 +++++++++--------- 22 files changed, 146 insertions(+), 192 deletions(-) create mode 100644 icons/svg/club/veterans.svg create mode 100644 rendering_styles/style-icons/map-icons-png/drawable-mdpi/mm_club_veterans.png create mode 100644 rendering_styles/style-icons/map-icons-png/drawable-xhdpi/mm_club_veterans.png create mode 100644 rendering_styles/style-icons/map-icons-png/drawable-xxhdpi/mm_club_veterans.png create mode 100644 rendering_styles/style-icons/map-icons-vector/mm_club_veterans.xml create mode 100644 rendering_styles/style-icons/poi-icons-png/drawable-hdpi/mx_club_veterans.png create mode 100644 rendering_styles/style-icons/poi-icons-png/drawable-mdpi/mx_club_veterans.png create mode 100644 rendering_styles/style-icons/poi-icons-png/drawable-xhdpi/mx_club_veterans.png create mode 100644 rendering_styles/style-icons/poi-icons-png/drawable-xxhdpi/mx_club_veterans.png create mode 100644 rendering_styles/style-icons/poi-icons-vector/mx_club_veterans.xml diff --git a/icons/svg/club/automobile.svg b/icons/svg/club/automobile.svg index 2c15c7096b..e0c93819f3 100644 --- a/icons/svg/club/automobile.svg +++ b/icons/svg/club/automobile.svg @@ -1,82 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - + diff --git a/icons/svg/club/veterans.svg b/icons/svg/club/veterans.svg new file mode 100644 index 0000000000..098db7eebd --- /dev/null +++ b/icons/svg/club/veterans.svg @@ -0,0 +1 @@ + diff --git a/icons/tools/sortfiles.sh b/icons/tools/sortfiles.sh index 53e50a449e..618f8f5ae7 100755 --- a/icons/tools/sortfiles.sh +++ b/icons/tools/sortfiles.sh @@ -2049,6 +2049,7 @@ icon_alias club_music club_music icon_alias club_scout club_scout icon_alias club_social club_social icon_alias club_automobile club_automobile +icon_alias club_veterans club_veterans icon_alias hazard_yes functional-icons_hazard icon_alias hazard_nuclear_map functional-icons_hazard_nuclear diff --git a/rendering_styles/default.render.xml b/rendering_styles/default.render.xml index 9b364373e1..9a12af6da0 100644 --- a/rendering_styles/default.render.xml +++ b/rendering_styles/default.render.xml @@ -6786,6 +6786,7 @@ + @@ -8182,6 +8183,7 @@ + diff --git a/rendering_styles/style-icons/map-icons-png/drawable-mdpi/mm_club_veterans.png b/rendering_styles/style-icons/map-icons-png/drawable-mdpi/mm_club_veterans.png new file mode 100644 index 0000000000000000000000000000000000000000..f279dc62b10acc09b1b6be72cb535cf8721b0e7b GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kwj^(N7l!{JxM1({$v~0io-U3d z8WX2pF!XB*6kvH!d2GJZ+g#5Vdl^l_;*Ky!&ZuC`bM*FpVKR}+!^foL*rUx0EBN osB0l_|BT06!8+{ke|Z04;>k`e-s`Zu66jh($ literal 0 HcmV?d00001 diff --git a/rendering_styles/style-icons/map-icons-png/drawable-xhdpi/mm_club_automobile.png b/rendering_styles/style-icons/map-icons-png/drawable-xhdpi/mm_club_automobile.png index b4a2df65718c478d23741fbf0020e95935178966..b9719e902210a345f8f0b1d3803d7a9871659e7f 100644 GIT binary patch delta 271 zcmV+q0r39J0?Y!CMt_OuLV~;8B3Bp!F0wOch*$DDq6^6;WRw~z!CQv2puw+-%*>)(bVM(I?4w)^ zUEf(QbI2zSUHxg@T$`Z2aeei+ng`@w zzrzG(#rLfDn|y50_*X(i^NsV0VWg-cdOriXLF<1-8%dhcckSLw+WHznR^K1K0DOWQ V4?D1(9RL6T00>D%PDHLkV1hvCepdhh delta 271 zcmV+q0r39J0?Y!CMt@1rg@o*Ki(DZJF0#`zBvwg|I$uEIlUGMUmt1#2f9g7)dG0;xsHSSvFoe1)jS~g z`t2t$E52u)-{eDsEB{J}XtwB83?oGq(fJw34I2L|nn==&zHRqj(vPnZWcA%)1BD73 V6TT7z)&Kwi00>D%PDHLkV1kq1epmni diff --git a/rendering_styles/style-icons/map-icons-png/drawable-xhdpi/mm_club_veterans.png b/rendering_styles/style-icons/map-icons-png/drawable-xhdpi/mm_club_veterans.png new file mode 100644 index 0000000000000000000000000000000000000000..6f561558cdbaa452bd65a75989ba2bf4588c2998 GIT binary patch literal 396 zcmV;70dxL|P)5>m#b^>zh&dJ+5n?j=`XlIt&+y)xxp)43GXwt}kt?cgU_LXY6A=q#1O(cd zDGL#i<(SD8r-45qFwTOkHAMyLKz{^T00O5)M8-l5^+M}?^7_iBaguLPyV8+?k8KiY4;yrHyzmnb?)2bLqfai(+GiD zk@XYLvw91x0dIWT1<(T)Bch*MpS=g_2C$mK3eZSG0<*x@qzz`FHq^d)r>>{mvU-*B q=Vb+&>YiE|%7?n6HcJWo3%mmZel=u=i7m$f0000!Z literal 0 HcmV?d00001 diff --git a/rendering_styles/style-icons/map-icons-png/drawable-xxhdpi/mm_club_automobile.png b/rendering_styles/style-icons/map-icons-png/drawable-xxhdpi/mm_club_automobile.png index a2c64c9e1a2c270f6419d18cadd75d052ae77345..c01e48292f9eed7a9ac5909831b4e0becec4d3ef 100644 GIT binary patch delta 540 zcmV+%0^|M01jhuBHh=s{L_t(oh2@yPYZO5g$3HJoi-cGRb|+j&tYcwiQfOm@fMtr9 zQb=Q!kS;}9{{uIY8Sg^tB{5t7ARs)_>cV%T%{F1SF{;X%Scl zegNx|79}-Od>Uu~8^CAaR_g2M4N20H%C(f@2PLtCZoJVUyV9Y*za-Xw;+ax!?i{LJ zQJ^h~x#6_|Y`XSVo98=ub|gTS-YekjSzENAltNw3{oJ`MPHo&QdR z;pk^C=_>HR#oh(-dCz1P5O5E;p4!`H_N~`IKEc~aGT;rzh1a;Gp&TGTp(DeEnSBSo zq}yx2{Sc6(o4{D=JEW-QqViw2^02kO(4=dBG_#+*0)J|)L;fgoS2|rz1XcNnbLMvY za{;soG}Be3tX!bjJ{IZ*S~asBGur`HE96=+v){l<-9S^4nv$BpRE1n~k_Lde93bFS zL0+q>va~z20Xz@9+XOHk@cl0pe~WnS_c9NXZcF;*620hEo}(gP(g^Sv*aKdf+20^k eEqTt2{uKfLB#*qCLu3a40000Y$xcVRH=pPWYxLA>UP>>)RLV^SdECp4k^JoO^!v`{Q%( zIq#g`d2p2^X;{*%q~VfSkEH2zSru;%(5?!7DTz(%OwT*@_J8Cu)$I)dNoq)%2R48M zU_;Wpq(+KA0~)|4@EN$1`r3L!lC+?5Eu{ESN$jW-Z*<7|+VuC9#Cp#?Q|ir~L$xak zv_mmByf%St*WPLId^>Mkegc%l7F~F;Q}2}-vj0bAdrUtt1>6ec6Y$>5KIDRVp!F6D zSEu?dX}m6&p?^%6rdFd2=U2@quKfvEuaK)Bc$wOdC7GG!Y`!4rwR_7K0sp@9--|Gu z{_G`P10K29yFfngnaBbH9soB}d)Lgqb{ohicpFIuyy2|y8k01T1LP-kWVkT1@4!~N zy$(DK0ZFi-Wmb;bbw8)oq7kCPM174ZgpCD8% dc`l7k02BdtkGxsL^2GoE002ovPDHLkV1n)`1TX*q diff --git a/rendering_styles/style-icons/map-icons-png/drawable-xxhdpi/mm_club_veterans.png b/rendering_styles/style-icons/map-icons-png/drawable-xxhdpi/mm_club_veterans.png new file mode 100644 index 0000000000000000000000000000000000000000..55d936cf052a18ce0cae2da3057edcf727321b9a GIT binary patch literal 580 zcmV-K0=xZ*P)cIU?^{WpBtM~lr=&Mo0);9h^y^jtl}a6HAIMs5plW*7K$rIWGJ&sW zcAX{Anxq{CyQdPAXFerKb7_H63Frj2t?1=}T*UqYK5zp}WC|03+A^p@3``CfZwib9 zl1X=+803Q?h4glYh9v5vrYyAViFX0Y{ S$ - - - - + + + + diff --git a/rendering_styles/style-icons/map-icons-vector/mm_club_veterans.xml b/rendering_styles/style-icons/map-icons-vector/mm_club_veterans.xml new file mode 100644 index 0000000000..fb4d39e593 --- /dev/null +++ b/rendering_styles/style-icons/map-icons-vector/mm_club_veterans.xml @@ -0,0 +1,13 @@ + + + + diff --git a/rendering_styles/style-icons/poi-icons-png/drawable-hdpi/mx_club_automobile.png b/rendering_styles/style-icons/poi-icons-png/drawable-hdpi/mx_club_automobile.png index c1817710808fe990f9e3874cebdc45f20a0b8315..c01e48292f9eed7a9ac5909831b4e0becec4d3ef 100644 GIT binary patch delta 541 zcmV+&0^3`PSm&;VQHv}Z9A!!j< z2YvwSk`^U3QhXX{02{z(;8yDE=nYBIlFGG|;s+(MgKoUhA-mF{zrQ5bf8v=^Z|)qb zT~VMdin-yn0c^VVR-5NLdE@dEpd_~J!pq%yFU*i#9+mAegTM@MBalzPdo%lx3+92= z+ALh%>W`#}x_@AXGhteK8D%)RYCdx9PrzD*T!X-~)P5+*%q(Z~1xc^nTRsi=cb)%E zgyHCCFX<}qz{TDL@_El>77%a`xSrbEX7;VuKt93SNHX9J$A#Cpq@f%jKcOSTg_(T^ zzNFi0!2J-Aq?^E4>N}*U=A!anxAL&HzR;v=e>Ah7y?+8~twa7Oa#uQCP6So?h;!z4 z`*Q)b2{hAHrL0__*gh8O23j?<9W&bjRx9LMF|*&mO5H$HlA4m5z*L1?bCL#txf~$i zR6$;=sNkl|g1KZVcR zx2xyvo43V9|HU%%pZELiciw+y-@IjwMXDo?6DA~kg$rrg-G8pJSq&Raf+NnRB>K^= zs{WF=tHMeqk#<5iV%BqhTQ(_Gg^1 z5AR4O5yArQrD^9@)8>_|?K9!q(zFf;w2k09$qyJRjlYW}oLfzsSF%`P?RD})FBl!_ zM_YFd4Lovz{(r#lJ-M60?dA5L+!$(0;4|N6f!$c|f zUioNHIe)s96DwS`VywBR{r>Db(mr~P%)bs$C`gR&IpQb!E zVt&v-d!l7?v~0$nzMYuqXd8HGNgpELx^}fO>sbjYjc#5symwg)gc`gYsFfc+A;i(O&#z%=xs>QV!Fg ceAZ0-2SoD9)qcBHV*mgE07*qoM6N<$f@@b=@c;k- diff --git a/rendering_styles/style-icons/poi-icons-png/drawable-hdpi/mx_club_veterans.png b/rendering_styles/style-icons/poi-icons-png/drawable-hdpi/mx_club_veterans.png new file mode 100644 index 0000000000000000000000000000000000000000..55d936cf052a18ce0cae2da3057edcf727321b9a GIT binary patch literal 580 zcmV-K0=xZ*P)cIU?^{WpBtM~lr=&Mo0);9h^y^jtl}a6HAIMs5plW*7K$rIWGJ&sW zcAX{Anxq{CyQdPAXFerKb7_H63Frj2t?1=}T*UqYK5zp}WC|03+A^p@3``CfZwib9 zl1X=+803Q?h4glYh9v5vrYyAViFX0Y{ S$w~z!CQv2 zpuw+-%*>)(bVM(I?4w)^UEf(QbI2zSUHxg@T$`Z2aeei+ng`@wzrzG(#rLfDn|y50_*X(i^NsV0VWg-cdOriXLF<1-8%dhc lckSLw+WHznRv6zOz5slJ8xK3MogDxG002ovPDHLkV1ihdgA4!w delta 347 zcmV-h0i^!S0*C{UHh(=yL_t(YiOrNTN&`_8MbC?wq!61Z?jj2iiwFuSvj$y(Q;2RM z1Tuvi5$mXk*od8_I}lQcAesc9MJ8hgllgawKyLH@zuf!oyf^a))&<_@(GwoZauqqj z_yN2uXG(2P7y^y-IJB4@l~X%t%&ut{pq&dYQrdbTF=fHqZ?PQ~_8SI=7;2Ee9ai9f|jt2%ILr!OzFA(6Vu)>X0 z-m(V?1{h3lpHx(MQGvMlhq>~boDVQs7_CBwqM1WAcXFX4MYA*j?gWpb`4=z(YQV^1 t>LHUSe9!bD?X+Fv68KElFv{vziC+nCXZs#l8cF~F002ovPDHLkV1mZZokjov diff --git a/rendering_styles/style-icons/poi-icons-png/drawable-mdpi/mx_club_veterans.png b/rendering_styles/style-icons/poi-icons-png/drawable-mdpi/mx_club_veterans.png new file mode 100644 index 0000000000000000000000000000000000000000..6f561558cdbaa452bd65a75989ba2bf4588c2998 GIT binary patch literal 396 zcmV;70dxL|P)5>m#b^>zh&dJ+5n?j=`XlIt&+y)xxp)43GXwt}kt?cgU_LXY6A=q#1O(cd zDGL#i<(SD8r-45qFwTOkHAMyLKz{^T00O5)M8-l5^+M}?^7_iBaguLPyV8+?k8KiY4;yrHyzmnb?)2bLqfai(+GiD zk@XYLvw91x0dIWT1<(T)Bch*MpS=g_2C$mK3eZSG0<*x@qzz`FHq^d)r>>{mvU-*B q=Vb+&>YiE|%7?n6HcJWo3%mmZel=u=i7m$f0000!Z literal 0 HcmV?d00001 diff --git a/rendering_styles/style-icons/poi-icons-png/drawable-xhdpi/mx_club_automobile.png b/rendering_styles/style-icons/poi-icons-png/drawable-xhdpi/mx_club_automobile.png index 0cf8df5dac405e903cb761fa476dbccb99095fee..dec039c18fac78f439282c60a212a98296bed152 100644 GIT binary patch delta 493 zcmVfr^R(fEsWFJbV6+{FNSX2$-LIMF|`j2Cmt+jCEKO z?^&9})E?MQU_nHlB;E=2DIyK$T+c$RD9BB9zwH7Mk+$;Oun69lK%O%LpYstOHUJLj zs-{~t&|OoSkAG24BVa`ty#jRu-8%51w3jVn)+MC3_QE;$5o(fZT#oSi7o!r;wHrd* zJ^d*SUa5GfyaXJuAx^H{d@u^1>>io24m9)W`SeA jUjg>g&$DIGub32HBsZ6@WABa9^oM{4a{_fgMY?_FfdevFi;0R1D{ap zq2s*ufG+bI;dsvSx-^$7)h`C-z*kn_rO6Gft&c-JisA@TeMj8 z$eCk6x#&~Gfqz%-R0-)_CaLm`aBrw>wy4Q9zWX3c|COjRPki&jOIhNKMMPV)QBHS< z6{^eus}{}(SxlD}K*E430?auvb_3#Y2pz0q2g(V(&3-FwF9YM81@^|)KFU?zTLmJ>67PTyv8g?bbIQsaFCjOj{+@mWq3w*# zWz;jE0qZ|P`b;q!*m)Pbch6xV?=Jkm82KAnX`pE28&KBRq{b#Sl(m5seDUNUzlq0~ zmMd%k=xPd6Z1H6vg+4sHzKQd{jdr-ND_o9#53JyeCkN#@P&E2}UbjA>2%$0@&%oD= z^$m|&LHOeao@A^)wF-ph@0HL#uJap3xB!6imgmEw?PH3*fVfi(mqK|NiA3QOF9+VS2~dH zKhPQ*k$5eI-J7($(#$}=CkaZ{e;al6pZBMZ)P4U{BFP?aNV=j#cvI4vk|mM_K~hy4 zq~|1E3?Zzh?Iaa|6O!&qno=^d>sHcWNYZZe|6S6B5W@YmTrvX~2X4EyTL+fuei!iN zm$Q2fOl}+TEriV25eZ4q>UE)61{&6O9k|K>bEGsPCV_X3Sg#uyHUmdv`HwLIUnEV~ zbE8MQrjk7~YR^#+L%_78gGx>#FQB47kKXq2dOm{RH~?OC3101+nBU+&wJ82l4;(h4 zEhD+&HY&hRt6TQG6zg6eFf7B7n?KjD@{%hh*)an~*Y zmpWzxl4EzONCB7Gj8DMH9_1QgUoE)vlQnq3<0-+Wnc-I1BRL$Yf2%k%v_UWO(}lCGAm7s9e)Ttpa@X0Z@X!+DGj<8 zxUWgEb`-^Ot|*kdDYWLX(E)A&?TQ*urVZR|LabUC(Ti9iVpA6Bzk+O#his6CY>)?QgT57??OpUq5^HVH9TE9beAexgB-Zpa-;L|k+kJ{{ zLTs)<9$vPlJGQ5qV=HC5V%%YO2S#4!UfjBAiRs34I35n5YP+IeLIW z+{O7!?n4OgTiZ0Z}he00rJV@}G~HyMIit19c7ON2>ZGhL{ejiikXQ zG@DMd-5B&FhL9S0($^v22(axK;^RgdPB`*!14k`1h`2}4jHB(9s=kdUX9rb%CnB#a zng&GVqJ@S|vMOA|_;D;DHS?vLX2lt#>NPch>&9AcICQK4X`aXclMYeefy2gHMvA;u zOju~Bntx)h;rl{WKgJYOMpf5EJYOD955BLqiGn}aOk=cJAZkKxrXgCRo#p&rV3Tv5|QVQ=IGNb)F7+N3m3`i z&>w3FsQ0pC69{>uV=v?y}`W_RJRY(85P%Bqc)!?A>B`To5i^xqBo zMNo1*WrLPI{g+}1agbb3*`SA>{=W8p(=0u}D6r^Qax4O)|FfQss1e{Uuuv?}7K-m9 h=3*MCCzHwam7filkvSm6g@FJ7002ovPDHLkV1mpsmk0m= delta 990 zcmV<410no?2ZjicHh;TGL_t(|ob8;=Z%siMhoAS}_DTqqkcOSuS}3bxK@e=&SYc_S zNvl#4!A&I+G;JmP1zkyqKfp&2Vugq%(vV=mLW=tSY{#Ov^qw=*nQ~|5NaoqynR)yE z`s+LInR9#Yg+wCZ5s8&pRjJUzabOpqfFa&-RH}S0Qf$*Ket)ON(n2rLGi~G`EdU%U zQf$fk1O2f(HzMpQT5L>%lxAeSXt6O38p@4`W-M}SydLz9qqV)it2Q#k7{`hh8}urs z1~>t90~O2C?+AU;$>G?sp|_ZeNPr58?jpp7HpoTf6myCY8?#CO7bJr$B!es@gDiwL zXzGUW+h44S5`P=kAfXTV2=vW*O{Ca(Z+8r6?uh{DvTF(%n|hFiWRQhqkcDKBg=A17 zk%)=YK~eRy0-+aJ4=nO4sg6+;HxQ0U7motw{f*1Xb2V@cYVYL6VT=hjN;mgICw94t zoguC{01GK`CPv~JD@YBn40swwiUUn7myWP{X09N`wtql6+!$v|=#(=XBy0_&!hQm2^*tkJFvb$QQHGUQdPQzx14 zKmBx?*+l;7ED*k;xZ_)lmbcsnzG!ADG_%2X`s^0dm#yNa?AMC)j#T*y+|p0_-)8j& znQkwLw7vcitq;|mB}`8~6d9K%I{t<9pH&OVAPdPL3&|i0$sh}^27N~8piC=eS`j*c z&wrjYh0JBe_2W=I(#g4Lug}(w1ZO>H3Yp7_TLt~#Vs1>h&}cEib2;E>L`GoI)h{%uYq=;9~frxE_%53y1h0ZjH2mDBoYnh7sX8=9$(~t>Hq)$ M07*qoM6N<$g1jTylmGw# diff --git a/rendering_styles/style-icons/poi-icons-png/drawable-xxhdpi/mx_club_veterans.png b/rendering_styles/style-icons/poi-icons-png/drawable-xxhdpi/mx_club_veterans.png new file mode 100644 index 0000000000000000000000000000000000000000..98bc3cb494863a371fac8acebe303c8d6da970d7 GIT binary patch literal 1261 zcmVM^LDc@ z*`3`a&IcZOJ3ITE-+c3%nVmmRibNujNF?F_oCcN&%QA2}bX_cjQJ^EK6~ea1l9{zb z77$7xLfFm1%!1UR$7o37DRTjA?hRlwlaaa#+O9-_3Wx#~5CtkA3RFN8sDLO?0a2g= zqCf>ifeHvEkUJL}tJt<{FZi4EB#1y}HY4d#Nk2HrZEap8U!2R59x=1OHfe8Yf_2hnc3sk8N#~v9&4|=ezc}AZ zdf3eVF6H2m1Rcf9Y+lmi>hCKyB2p{O-{V_JN6l=u8V|P!z$Easx2D_yX4m=r>*c=y z)V5GoJE=%t4JlH`%Xc2w({vqz1GIt93Pke7nFc1B_PsWM7H}>{Bww5_f$?IiJB%EW ze9i%NY#nV)fHB}qjyPw4s;4O14`3Ad*%RjyP{(%EP&7K5H?tKDZeGr%=@DQmqj{|Y z`wI5P zvO2hubN~MZV8Cxqv@DRkNiR5QSDN;-F@Qr}^K$26UFY6`rhRRyiTTY-IoHqC;7d5D z<}Bh3FM<}<&tAw9@J3a2EOmShn3uG>j0s8e8R>ge&bRAkwy(tVH!0i1-YM}ck~%r} z^3sRp-ICAWr1Swu;3-M(NxIcZ?n+ur|AxYpEatlt+gV93n%SpS7E&7EHc9VGdcwQ4 zr1H^_#i$Z-T>mdhI&NmaR9R3ZqnMdpGqWcpolt+D(vmb;RXHhbNfTNVXI0Xhk`7fZ zjuhaWG;o)sk0m|mCM$`g+&Fn%6yM={TikbZ?=^;t4DrsWUT7TjG z=QqNb1|#vTqyr(vkpi8x?*SZ?^ogV?H(AnxhVQ`r!w)wky=-P5RN`dQ029F5^iLs* zHVyNp9+!c8>-0bPRKv^`CB3Hp&U+(Es;kcTX*0W8iDN@j*IewR)_z~nRez<6a69%B zz^=-?8iL>g0Ve4sCuu1!Zw|e+B1zh>UoUvE;}k#xt7I3EPuE$OI}Z!CBnG-?u(LMSN}mPKVM_bEC|3}V8(feSzz$=2Ecc~RQiko zFOV#vxvZpV?mN-_P1ms$z$veitKRi&nr9%2f%||Tz5HEIptqW+S0$v8a3v#JdQ1a% z7T6dCULjdR&EiiW=r5jw0UXJx)ITImXz0-scwil|kA^%Mh X((I3)lVex%00000NkvXXu0mjfMtoN$ literal 0 HcmV?d00001 diff --git a/rendering_styles/style-icons/poi-icons-vector/mx_club_automobile.xml b/rendering_styles/style-icons/poi-icons-vector/mx_club_automobile.xml index 34e86ea69c..329c5ab6cc 100644 --- a/rendering_styles/style-icons/poi-icons-vector/mx_club_automobile.xml +++ b/rendering_styles/style-icons/poi-icons-vector/mx_club_automobile.xml @@ -1,11 +1,11 @@ - - - - + + + + diff --git a/rendering_styles/style-icons/poi-icons-vector/mx_club_veterans.xml b/rendering_styles/style-icons/poi-icons-vector/mx_club_veterans.xml new file mode 100644 index 0000000000..2f6fb47f12 --- /dev/null +++ b/rendering_styles/style-icons/poi-icons-vector/mx_club_veterans.xml @@ -0,0 +1,13 @@ + + + + diff --git a/test-resources/synthetic_test_rendering.osm b/test-resources/synthetic_test_rendering.osm index a9e770ac8d..d6e2fced50 100644 --- a/test-resources/synthetic_test_rendering.osm +++ b/test-resources/synthetic_test_rendering.osm @@ -1183,7 +1183,7 @@ - + @@ -1453,7 +1453,7 @@ - + @@ -1461,7 +1461,7 @@ - + @@ -4870,7 +4870,7 @@ - + @@ -5075,7 +5075,7 @@ - + @@ -5891,7 +5891,7 @@ - + @@ -5904,7 +5904,7 @@ - + @@ -5925,7 +5925,7 @@ - + @@ -5949,7 +5949,7 @@ - + @@ -6078,10 +6078,10 @@ - + - + @@ -6107,7 +6107,7 @@ - + @@ -7071,6 +7071,10 @@ + + + + @@ -8402,20 +8406,20 @@ - + - + - + - - + + @@ -8468,7 +8472,7 @@ - + @@ -8843,30 +8847,30 @@ - + - + - + - + - + - + @@ -10388,20 +10392,20 @@ - + - + - + - + @@ -10489,15 +10493,15 @@ - + - + - + @@ -10943,19 +10947,19 @@ - + - + - + - + @@ -11202,23 +11206,23 @@ - + - + - + - + - + @@ -11345,7 +11349,7 @@ - + @@ -14028,19 +14032,19 @@ - + - + - + - + @@ -14183,63 +14187,63 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -14536,19 +14540,19 @@ - + - + - + - + @@ -14657,27 +14661,27 @@ - + - + - + - + - + - + @@ -15208,15 +15212,15 @@ - + - + - + @@ -15373,11 +15377,11 @@ - + - + @@ -16189,27 +16193,27 @@ - + - + - + - + - + @@ -18810,11 +18814,11 @@ - + - + @@ -19044,19 +19048,19 @@ - + - + - + - + @@ -19112,7 +19116,7 @@ - + @@ -20440,7 +20444,7 @@ - + @@ -20453,7 +20457,7 @@ - + @@ -20510,7 +20514,7 @@ - + @@ -20518,11 +20522,11 @@ - + - + @@ -20957,7 +20961,7 @@ - + @@ -22974,7 +22978,7 @@ - + @@ -53237,9 +53241,10 @@ - + + From 0b9a292090a5f5f6112e0ab0edc25555d81a810e Mon Sep 17 00:00:00 2001 From: Jo <93162192+josail@users.noreply.github.com> Date: Mon, 6 Jun 2022 11:45:28 +0200 Subject: [PATCH 4/6] debugging nautical.render.xml seabed icon and letter display (#827) * debugging nautical.render.xml seabed icon and letter display debugging the display of seabedDetail with regard to default property setting, letters and visibility of seagrass and weed icons * rotate icons seamark_j21_rocky and seamark_j22_coral icons seamark_j21_rocky and seamark_j22_coral and their corresponding night shaders rotated by 90 degree clockwise for correct display in OSMAND in line with INT-1 J21 and J22 * INT-1 J21 rocky and J22 coral pathIcon Step adjusted * Update nautical.render.xml set letters to italics according to INT-1 standard and in line with proposed nautical map legend for Seabed area and nature, compare OSM wiki https://wiki.openstreetmap.org/wiki/Seamarks/INT-1_Section_J --- icons/svg/seamark_int1/seamark_j21_rocky.svg | 97 ++++++-- icons/svg/seamark_int1/seamark_j22_coral.svg | 219 ++++++++++++++---- .../seamark_j21_rocky_shield_night.svg | 104 +++++++-- .../seamark_j22_coral_shield_night.svg | 200 ++++++++++++---- icons/tools/Generating_OSMAND_map_icons.txt | 28 +++ rendering_styles/nautical.render.xml | 74 +++--- .../drawable-hdpi/mm_seamark_j21_rocky.png | Bin 0 -> 918 bytes .../mm_seamark_j21_rocky_night.png | Bin 0 -> 1672 bytes .../drawable-hdpi/mm_seamark_j22_coral.png | Bin 0 -> 1001 bytes .../mm_seamark_j22_coral_night.png | Bin 0 -> 1997 bytes .../drawable-mdpi/mm_seamark_j21_rocky.png | Bin 576 -> 595 bytes .../mm_seamark_j21_rocky_night.png | Bin 0 -> 988 bytes .../drawable-mdpi/mm_seamark_j22_coral.png | Bin 564 -> 617 bytes .../mm_seamark_j22_coral_night.png | Bin 0 -> 1175 bytes .../drawable-xhdpi/mm_seamark_j21_rocky.png | Bin 1267 -> 1284 bytes .../mm_seamark_j21_rocky_night.png | Bin 0 -> 2210 bytes .../drawable-xhdpi/mm_seamark_j22_coral.png | Bin 1356 -> 1324 bytes .../mm_seamark_j22_coral_night.png | Bin 0 -> 2793 bytes .../drawable-xxhdpi/mm_seamark_j21_rocky.png | Bin 1933 -> 1966 bytes .../mm_seamark_j21_rocky_night.png | Bin 0 -> 3356 bytes .../drawable-xxhdpi/mm_seamark_j22_coral.png | Bin 2131 -> 2083 bytes .../mm_seamark_j22_coral_night.png | Bin 0 -> 4534 bytes .../map-icons-vector/mm_seamark_j21_rocky.xml | 24 +- .../mm_seamark_j21_rocky_night.xml | 27 +++ .../map-icons-vector/mm_seamark_j22_coral.xml | 120 +++++----- .../mm_seamark_j22_coral_night.xml | 123 ++++++++++ 26 files changed, 777 insertions(+), 239 deletions(-) create mode 100644 icons/tools/Generating_OSMAND_map_icons.txt create mode 100644 rendering_styles/style-icons/map-icons-png/drawable-hdpi/mm_seamark_j21_rocky.png create mode 100644 rendering_styles/style-icons/map-icons-png/drawable-hdpi/mm_seamark_j21_rocky_night.png create mode 100644 rendering_styles/style-icons/map-icons-png/drawable-hdpi/mm_seamark_j22_coral.png create mode 100644 rendering_styles/style-icons/map-icons-png/drawable-hdpi/mm_seamark_j22_coral_night.png create mode 100644 rendering_styles/style-icons/map-icons-png/drawable-mdpi/mm_seamark_j21_rocky_night.png create mode 100644 rendering_styles/style-icons/map-icons-png/drawable-mdpi/mm_seamark_j22_coral_night.png create mode 100644 rendering_styles/style-icons/map-icons-png/drawable-xhdpi/mm_seamark_j21_rocky_night.png create mode 100644 rendering_styles/style-icons/map-icons-png/drawable-xhdpi/mm_seamark_j22_coral_night.png create mode 100644 rendering_styles/style-icons/map-icons-png/drawable-xxhdpi/mm_seamark_j21_rocky_night.png create mode 100644 rendering_styles/style-icons/map-icons-png/drawable-xxhdpi/mm_seamark_j22_coral_night.png create mode 100644 rendering_styles/style-icons/map-icons-vector/mm_seamark_j21_rocky_night.xml create mode 100644 rendering_styles/style-icons/map-icons-vector/mm_seamark_j22_coral_night.xml diff --git a/icons/svg/seamark_int1/seamark_j21_rocky.svg b/icons/svg/seamark_int1/seamark_j21_rocky.svg index e3dca07164..4c6fa25174 100644 --- a/icons/svg/seamark_int1/seamark_j21_rocky.svg +++ b/icons/svg/seamark_int1/seamark_j21_rocky.svg @@ -1,21 +1,78 @@ - - - RCKLDG06L - rockledge - - - - - RCKLDG06L - - - - - - - - - - - + + + + + RCKLDG06L + rockledge + + + + + RCKLDG06L + + + + + + + + + + + diff --git a/icons/svg/seamark_int1/seamark_j22_coral.svg b/icons/svg/seamark_int1/seamark_j22_coral.svg index 669bcfb347..76565d42c8 100644 --- a/icons/svg/seamark_int1/seamark_j22_coral.svg +++ b/icons/svg/seamark_int1/seamark_j22_coral.svg @@ -1,53 +1,170 @@ - - - CORLDG06L - coralledge - - - - - CORLDG06L - - - - - - - - - - - - + + + + + CORLDG06L + coralledge + + + + + CORLDG06L + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/svg/seamark_int1_shields/seamark_j21_rocky_shield_night.svg b/icons/svg/seamark_int1_shields/seamark_j21_rocky_shield_night.svg index 18ccb8c069..625de6ed36 100644 --- a/icons/svg/seamark_int1_shields/seamark_j21_rocky_shield_night.svg +++ b/icons/svg/seamark_int1_shields/seamark_j21_rocky_shield_night.svg @@ -1,23 +1,83 @@ - - - RCKLDG06L - rockledge - - - - - RCKLDG06L - image/svg+xml - - - - - - - - - - - - + + + + + RCKLDG06L + rockledge + + + + + RCKLDG06L + image/svg+xml + + + + + + + + + + + + diff --git a/icons/svg/seamark_int1_shields/seamark_j22_coral_shield_night.svg b/icons/svg/seamark_int1_shields/seamark_j22_coral_shield_night.svg index 1f6a6daedc..e7977f2819 100644 --- a/icons/svg/seamark_int1_shields/seamark_j22_coral_shield_night.svg +++ b/icons/svg/seamark_int1_shields/seamark_j22_coral_shield_night.svg @@ -1,47 +1,155 @@ - - - CORLDG06L - coralledge - - - - - CORLDG06L - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + CORLDG06L + coralledge + + + + + CORLDG06L + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/tools/Generating_OSMAND_map_icons.txt b/icons/tools/Generating_OSMAND_map_icons.txt new file mode 100644 index 0000000000..6a7a060114 --- /dev/null +++ b/icons/tools/Generating_OSMAND_map_icons.txt @@ -0,0 +1,28 @@ +Some instruction for generating new OSMAND map icons from .svg files with the OsmAnd-resources\icons\tools + +1. place new .svg files in a resonably named svg source folder \icons\svg\source_folder_name\ + +2. open \icons\tools\generatedpng.sh in editor and add or uncomment (delete initial # sign) a line pointing to the source_folder_name, + e.g.: genMapIconsStdSize 'source_folder_name' '#' x2 + +3. place a copy of rsvg-convert.exe (https://github.com/miyako/console-rsvg-convert) into the C:\Windows\System32\ folder + +4. run generatedpng.sh in git bash + +5. new files are generated from the new .svg files: + a working copy of the svg files in \icons\vd\svg\source_folder_name_file_name.svg + four different scales of png files in corresponding subfolder in \icons\png\...\source_folder_name_file_name.png + a xml version of the svg file in \icons\vd\map\source_folder_name_file_name.xml + +6. open \icons\tools\sortfiles.sh in editor, save a new working copy with new filename and add in it required icon_alias command lines for all new files, + e.g.: icon_alias target_name_in_app_render_xml original_source_folder_name_file_name + you can comment-out or erase all other and unrequired alias command lines in order to significantly speed up the very long copying process + +7. in case the target filenames already exists, you need to delete the existing .png files manually in all four target folders (because overwriting of existing .png files is prevented in sortfiles.sh) + \rendering_styles\style-icons\map-icons-png\...\target_name_in_app_render_xml.png + +8. rund sortfiles.sh in git bash (install bash beforehand, if not already available) + +9. if available, the following files are copied to \rendering_styles\style-icons\... folders + four different scales of png files in corresponding subfolder from \icons\png\...\source_folder_name_file_name.png to \rendering_styles\style-icons\map-icons-png\...\mm_target_name_in_app_render_xml.png + a xml version of the svg file from \icons\vd\map\source_folder_name_file_name.xml to \rendering_styles\style-icons\map-icons-vector\h_target_name_in_app_render_xml.xml \ No newline at end of file diff --git a/rendering_styles/nautical.render.xml b/rendering_styles/nautical.render.xml index 31abf3b577..f18d591461 100644 --- a/rendering_styles/nautical.render.xml +++ b/rendering_styles/nautical.render.xml @@ -1,6 +1,6 @@ - - + + @@ -17,7 +17,7 @@ - + - - - - + + + + + + - - - - - - + + + + + + + + - - - + + + - - + + - - - + + + + + + + + + + + + + @@ -3077,11 +3091,14 @@ - + - + + + + + + @@ -3397,7 +3414,7 @@ - + @@ -3787,9 +3804,10 @@ + - - + + diff --git a/rendering_styles/style-icons/map-icons-png/drawable-hdpi/mm_seamark_j21_rocky.png b/rendering_styles/style-icons/map-icons-png/drawable-hdpi/mm_seamark_j21_rocky.png new file mode 100644 index 0000000000000000000000000000000000000000..3e97c091046ee5a228c3069f52d31aa7af3ea41a GIT binary patch literal 918 zcmV;H18Mw;P)&W9e;^`AC|iofwxY5O3R&3Nt%cI{PiA)Uywl7qJ2stj zoOkC7hj(VqoH@UDW}e^sJkL2)%L;74yEuY96@UJD<5IkgGdP>JU-42-QJr!driAFP z@EESnDd_*O5vOn*+pw_P0v41wb`alU2%GTHto>JE9folkmSPEx;&(isj?c!U;&1b0 z(`z^2MT~32Lc8teZi=0Yw{RNEun4bc1o3p*{}gV;b;6-8!4FK|Cme^>Bq+3Q=?dC(~HOX)eH8 zJe@(YOUF+4vEBXn@Fp(u_1{% z*d$~vUd4=t=tJ0vJ8*ILWuBWI8bXiZuk`pwJcCvFq;<}H_(|j2zE}AarK=1J@dt#p z_8hy!1a8VLq$r~znae^Iji_MOPK1^z)%o{`oT4z9Hq7UFX(FmAVUF#uHTE3Ix0fDv@5#?u~YZ zDkg9|jf*PytSk(QG-6Do%3YdI3*lvGCh7n!Q!Z@ z39JyQ#5L*pX(4c0Sn7bNnQP)Y!QxrR-zAd?5bg5sg^m7z2mN>2Jcw&WKk07K;mF2^ zLi~2E{@)YSi<;fJg%oAG%$JMGt^+I6_;pz!MJYRhAz_O%6=*3$*$JGI;o5LBWhXEp zJbrZrTC%W71o3xxNGwuwaiwSgx7(kUr?uYXF)2EBqvGC)qfPtntor0tBwzdSrl`pJ sM4GTt++I)nwCIA2c literal 0 HcmV?d00001 diff --git a/rendering_styles/style-icons/map-icons-png/drawable-hdpi/mm_seamark_j21_rocky_night.png b/rendering_styles/style-icons/map-icons-png/drawable-hdpi/mm_seamark_j21_rocky_night.png new file mode 100644 index 0000000000000000000000000000000000000000..53708cbd06290e3ab2b7d0d57d7c5d98904aa830 GIT binary patch literal 1672 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 literal 0 HcmV?d00001 diff --git a/rendering_styles/style-icons/map-icons-png/drawable-mdpi/mm_seamark_j21_rocky.png b/rendering_styles/style-icons/map-icons-png/drawable-mdpi/mm_seamark_j21_rocky.png index 4fbf477c9a35d31091b660b3e44baa3e610682ef..512eab56232277691f52d86569ed861c0de487e9 100644 GIT binary patch delta 553 zcmV+^0@nS&1k(hNHGcvKNkloIv3hR~T! zumvaa6o1BCm6XDzoZ~j)3Py1sb8!~ExQBPBq6q^j0`jsKFYp>CvWX^@5^mz5I_+^D z9$>vR)xt5C9etLIu2kZ7NHUEg)jPWu@(W-a*nGA4>aL2o`^td%ft*~S1kha zatNoSZCNhz7JsbZuE>Ex$?JhZvE1V^2kWs0E3gC$6>Qj@c#d-Ry#;%41HbSFr?C$k z)M2YixP@mpgOAzggXosu%>TsqIV8#eXVvVL4h;1*Fo4ZABJLb@H%+ zn~{_)fD70!{LqPZ%oKhY!Uxfk4d9x1WG5swK)S`TTo$KdzevJzcC}@q+OZjr66;S$ zhj`?UiB^2l=@oZfC@CgfE8d8vOhBt>!KO^WC(JKeKuV84D&C5lMHaLOW3Ivu(YF66 rTHshVi6S`e7cu-BFL6n9LdpCExQ=Q!&RV1;00000NkvXXu0mjf13v># delta 534 zcmV+x0_pwJ1i%E4HGcv1Nkl&x=lB6bJCn`_7n{8Rku4F{VT`l7&Woq)a1L z(oEqWAX(V3N3#?uHbhE|ER>Sel+0?dLVjf-V_`%Y)R^%rjIns0spq}j;oT_demD1? z@BQ9$zxSNy910XDP~bmD8}|N<#4Av#LD!Ap-wDc@``u`%A%F1|Y|Y{4V^$I`z?)hP z%)vR#t--)ObmZ_yaV&}FVWd_Ajq&;=M^}%!jDgiTx>b0P#1)KA^X(37OAU<2Yg3MR zJDw!*O{_(8!Zn~B4->8lpQbUe4u{L}#d>_iXSC*sm*ZIy-;IVl6K+w=^)%rcM&WxHS9zQm#_s(GU9Q}&Ts>Gjsr0s!YlM7n)ld%WjO{~@s==l zBiIuk^a&@qEfF6Qs*}Y*PvMMEwL7>ijDLBGlejt+^auxVm(a88_=?jw zAuN*#)jMJ_UZWR-LQe;UWp-TH37taa2I5cl;RwzP)3LskB@bBXn Y)vIBwzYo@vasU7T07*qoM6N<$f_ke3JOBUy diff --git a/rendering_styles/style-icons/map-icons-png/drawable-mdpi/mm_seamark_j21_rocky_night.png b/rendering_styles/style-icons/map-icons-png/drawable-mdpi/mm_seamark_j21_rocky_night.png new file mode 100644 index 0000000000000000000000000000000000000000..cd119a6182298c5880fd8ff245e98b9544aa1cea GIT binary patch literal 988 zcmV<210(#2P)QCT$$CSS?ZtRwkX?I}9~0?4mCG09O@1 zP^sWb5X65#6vQsN62y;r+T?Cfm zI9|>RkShcIe*bAncLPU52tU|z_G?iT%@z^5k%c@?X_~$bj7z$0 zI2^th$MHzSA!i20$Hy-Whr^4uPc#~h)lrE<&I|z9&LmwLr8wklLx5JR^`-4dQpfg$ zq;cRJ@Eg#{vg~-hUhfnI$h8H{X7d?fQqoS_ec*dwC~1f7eYU41{Q>+x0Fs^pI+C84 znwnaWg78Z83TCKB1#d8Aydu^YNqG2&rC27?*f+a*|`Yx`?S-xV1^g#iHO=jW%&}7Vn$Cw1o(1j!ezyH9FbpAVwY?pv*`5H9 z^e8YofM&D#h@_W*Q>9YrShZR`dF@n$%`1Gr-``QGRQh@17HPxdlJ@p`y+b$C?>Dks zMR?@MkpS!mz8$4_Zh*sw4^Oc97C1Lb@!SBlTJ5r=ewJmsM-5P<2Hpe?0Smw^@TVl% z-UZYpU5=vYg`xntyP#63ys^H%e#!P@Km%ZNIKq`j=~qR?0saOIHIR9GQO%qH0000< KMNUMnLSTZ{ZqVES literal 0 HcmV?d00001 diff --git a/rendering_styles/style-icons/map-icons-png/drawable-mdpi/mm_seamark_j22_coral.png b/rendering_styles/style-icons/map-icons-png/drawable-mdpi/mm_seamark_j22_coral.png index b48d1ade95303cbf56993dc71858bdb8c6085731..e6c0d588dbffb58bf3a143b32863da5b397ff5f2 100644 GIT binary patch delta 575 zcmV-F0>J&W1nC5jHGcvgNkls z2vG|q(NeIoun@5_wiXH&7B+&~+4zKrh>Z`d#J3@0@DYrPZ$l6f)M7RmAxO?9d;MYA zP7Zt4kqv*gFyul}-{jgi)!Qx7g*pA28>+h0Vj~Ccjr1Ngk z1AZ9487&mLPzXvwdi${zHAOl47wXW7Q+S!3JI5hYi+?#qlc^U2>6whoaSY*=(23JU z6BvsIF__-Zt}BKTR$(39iFTcgJW@Q0b}^WAi3DxUj&EXgE0jPFo(lnL68bQLrDA%% zp40Ax&?4UW7G8@<=zLyddD`(?ti?GYJT?BvazzM~v08+0kto63NEx9Tuv0Xj+c+tv z;l}Jjr1hfQ@HGcu=NklONh=<7{~Ds^D2!QCZjaOf+7;hg2^o!a)~KY znuUeyiY!QJij_!V!D7lrHi!vD7D95J$*@xHOp?^pOjdHq;+!|f@tOs8{@;3g&*eGi z|9hVEJBNaTf`Wp7&m^4x)5W7P>MsQh!;_>x2d!Dm4lIX(*?+_lEK2$%RK<2pKOfzI zRk7WN;TVz#_>{%hp&=L0i19d?jGe};*nSun<}_j#Ze`=0n1~s8kj;I>&{V(xA^V;9 zmIU@-I?kaUz1c<$QE&@BB;!|b0e3JLFVKO7alWrC05->uw^zun9dEH)s6ZP|pcaF1 z4{NhEwdfX(uYU>eVg+7ea*Sz-Nv$r$teUa7f`Crk#X;Q0AZ*357=In7vNg@PgfB6^ z28Xa86R=b;XE*a_8_p)1 zRSDIak1p)R`zZP|w&1ABl&@vA;H!>wvQ;oim*DIk>=DfK_%|C8%-I_SJ;!Uz>nFa< z0YBdwgeSCo&yQoHP^SC{Qc9Q-+v}o${Bf(qNWZ=t1qB5K|0&-ANx@+o#aRq#00000 MNkvXXt^-0~g7~%kPXGV_ diff --git a/rendering_styles/style-icons/map-icons-png/drawable-mdpi/mm_seamark_j22_coral_night.png b/rendering_styles/style-icons/map-icons-png/drawable-mdpi/mm_seamark_j22_coral_night.png new file mode 100644 index 0000000000000000000000000000000000000000..864b16dd45466051ebd6629cb85cdd0efdd6182f GIT binary patch literal 1175 zcmV;I1Zew-P)6LTO->AdG0z40F%D$HCFb1}bI@y^b@^Id^?M z%nV2bog+@)>t1~8xA$IauTA7o9LLX@*<+F}c<&!Hv-JQfK@e=p<8!l^HSp4m&u>TS?#d_4Uok1CZ$i z8jZ$c01W__0W^_p8X6i(CHXUF&ddVi{GZ=UfNLCC<4gNQMA51NcMI&T6&#sia&*oeRLs){^`QfCoTH z_XI(3Zen8MWl5(by;Q5!KJV@Aou3CFQy290^{r}ZYT65+4Zs`#SArmDnOT?QYqi>k zl3taxrCctbx~%}!YV|CD6_OH3{Q!24kB=Yh?CiXLb6gz9t))_FBx~}_0C61Oo2KbD zlJ@~v3BZ$_kaWU1cND-$l8>9&A~W*|!-2l4dIBqqw?UJ@jN}Y3i(lkBky&vxC>iRW{Uv7XI zRVtM)%!z4NVN4N-}W@i0`LScWYR2t6Wllug! z)#?#RWs-*gJSAxZ8kn4%+y!78fQF24P*i+7K=M?+_*6`J@rOO pj(P8|nb~0g{Xr1Cl{Mi%^*6(YA;)W#(vylJA}Wdsq@o7~(F>v{R8T<=sRS|1+FUE8)IutA%|~nQZhxGaX5C$P zwVnGLclQgIJHPqOz4JY1?%aFsIcKOHM&lAZfzR+K?ycedD}TcjEW$RlcPcMd$SXO9 z;x4qSAWh*Nx1A+;M}Z!8vkU+SK=WY(&4&RG>W<6OMHj5*pmG}QcR?y@NLN) zlc7QJ)K0+=@&4!McH(thEJnnDLp^o~VHe;gh47zZdUe!lhvyVR=ab=^7*QpuT4D?q zE0oY=fDZSbFi)X?vn%FO2_6^1FRPl!o?yQOedd$hyMGD#E*&WpursUoPtbSiNTGnn ztUe<_-=$+nfXws^WLgkLbnSd7QfV&ymvpOnm} zrkJ33vVRW>&(NU41w#0(7+x`#Jw}$*H{m&Su#Dn1qW`A7;UXPb?17-;&^*c-y!Hjkh(6~dm zwdZ50u0k)x?ZOBeFgQ>5?{Qw%;Q<3o=*~DEuZh?|E_kDe@(k;t-GIW?3gH(TM1m7b z);b~l>lJgU1g9x%f@u|V=@BVhVuU3JtMNmkdz6Ay*45Um9wU_8mi?ZN(?u>oov`qJ z7JskHs_eKu5vOjEYLju4@CCy8n2jqish4(JL=Mq15jkF>A4P{d<12+p+u1GFgyq8e zYqfiuVO7mpmxy@^-(U-#5uviqyT#!mdFmVyQC=jTdMjS371}LzUla6QI#MX0H9?=rkU{~uL$smCtM(D3P(bbmpJfnzC(sd7 z6xm`Q;N-n%J6(;l%TnzI@4?+2epjy%xq|DmlIIiE3x!P;iW(=Jqwgo;Ra0Dt-|hWw zuclv=r}hU7!<|}=?9$DNdHsif0Utwd8?+Y&ga7~l07*qo IM6N<$f(U|Ik^lez delta 1229 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 literal 0 HcmV?d00001 diff --git a/rendering_styles/style-icons/map-icons-png/drawable-xhdpi/mm_seamark_j22_coral.png b/rendering_styles/style-icons/map-icons-png/drawable-xhdpi/mm_seamark_j22_coral.png index c9a735e149ec745cf0795bce4096691ecf35cc63..00069851d1612893f727f3a552cfe39fc5be27fd 100644 GIT binary patch delta 1288 zcmV+j1^4>Q3ako{HGc%*Nkl)@u&!USIY$JsJdS*0;ajR3^U62{SFg_ zudrAFr$lc!mL}qh@^yN_T$1Bqu?;G|!e+dRJA`ehd$bC{9~YUU4YF{!&{SC}v#3V&0JB9t1fc3gnuNRe@wiD&UOz86PhTlv0UV4<#qqmrl(6siHW1&cf|A7=`e zcd2lYmSCMok59q!1Uw4ENL+vg;@4h_a|&gY5KSTt)|KktRv@or7%0@cQv^jVxC?)Y zg?Ld!jCGCcgs^j}o{bZyKnaT^3Vl;zg7D_g(g%MW4q`Vs6~q`4wxfsN1sQtFm|1|M>s@t z?b`c1LHG$Jp+Scx;Fvq6hyv+WoWBS255fCl5tick{HO);Oo)ueHNx9$vg1~U5=P8JK`$icYFV9j_YAwNzf>20TqMShO-J~)D3z%7%Jfu94jk!9D$+2 zBmBFE-`8t#gy``2O12HQ;p6i2!-}Jp9uq~oT$^k$I%SK|-Er3-4CrJ`>S=PR6OYZJ z05U^nUk4(TsMX71i6NI!)e=cZ7#nH?DFu z8gQ!U68lotSaGu6QMgHl88TyeUcp?FW1L8pmBhBFdknxMxJVeeMMC&iX%e-C<4!vp zyiIrr7mLP;y2dnd{B6ZI!b7ZGkmYzq6iSaPhGx%VXwAP{gu&|&o#Ug#uRmM(1%H(U zNeR~{W0@mXirnBFA^dRBJ6I||A6YZMQYf7z9HKsr7FmQ??GArl9wmII4%*~*g+{z2 z1YLqBWewETE002ovPDHLkU;%<_;BYSh delta 1320 zcmV+@1=sql3d{VMNf}aUEf9M7qsX!%gI=f=g;*-RY1*>3hzO#>BFQw+UdUXQ>3VUtG`HN#uRose z>E7Mldw+N9CnTH?{J8h`oaa2xxz9Q0dCmck$K&yMJRXn7Ky64qP4X8q_&F>)d3jGpYg2TtlFt1R`Bzx*%Ca~D zih+-0Yk7*^bJB6YwLmFwyZ$f9;Ol4L*L+HIW$+VVSbvJ%4CyuM|7pO(lI_ee7{^NW zd6)ELdzf_*!UXwJ8dw7jTpyK~@0o%ij)Q9?%&YPh9eLTf1LX`&_?m*eo8wYGyu) zWvm;x3)}Ox^j`_?*9S}v^&N}t#a`g@48E#lr#T{@Dfy?e)v5O!@j>69ws(N_z?u=j zRy9`ZBOV0yWEfO8_OZVMDm_c+b(r_u8YXsM@|LW zvBbO)_ygFEon_jw;PhbI1K?C_0#9&;Mq>MLKLhJ}8b4r5IF0F8)St(a>TCMHf%GKn z7$!em49pX2Wos`m4hx90T`BoN;9luJsrFe>Cv(*BVuk^Q*{XgcQ*;(dXDL=PbJ(FJ z?SIr3rbd0(iK>ltpIMo4p9(Oaoh@cG$MZn*oWPs z9O2GxIj3du7U^^l)bARC58qDm3>RU`xPKEEmEr?z6&@j|0{2N?iLHX&z)fnqHS8dX zQeZxIOq~aur$M#>w@BxJo@r-)cU~9;tdVRc_Tg_~NfRvpECU`Rn8|6_@@^qWU`dPt zzQY3BKyX5B#a2%xFj2Ar!Hio0*Gu-Ho~y9z+KZL7#lQnZ_Edxt>E^JdIG_Hdv407x zIK2dSh#Wx`YSjNavJ3ImHE%7X#l*wqLTzSXRwp z0UIo(1gFN$1eIhw!4}B@R}aB<5?km$v9X+vm5(a=Um6yw^Wl)J8n}#X2bws_v3(xB zI=f&W#R63*>SQ;m+@~@EJ0?%er&s{$vD@6u1-4s+Rhn@Hw(IeDJRXn7<00{QJRXn7 eVIq#hFzUO_0hTL@< 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 literal 0 HcmV?d00001 diff --git a/rendering_styles/style-icons/map-icons-png/drawable-xxhdpi/mm_seamark_j21_rocky.png b/rendering_styles/style-icons/map-icons-png/drawable-xxhdpi/mm_seamark_j21_rocky.png index d2739d6ab526eefbc1744873924e3dfec6d40149..6eab842bc0828a8b4020b5ca3e646f5fa8e9fc26 100644 GIT binary patch delta 1934 zcmV;92XXj~53Uc8Hh*JDL_t(|obBChj9g_E!0}&qp)YP}kcKLM;jc)wc9i zXqVbuKb)D&y|c3~vomv_nYr^%p6tClyZ4@Z&b{|}&U4OrW`B;}U@11@b$AUf!$o*A z9!w}#U$X?)V+YP)yg~a=GU@u5^Km;)X{_{YyE&1JeaReLhhwHz`g7QhZFpM>LHm&< zxL;$1AHjF=KCDb7U_bK;{LMtg{{tV!f^?$wKdbSqyy8c3BjzQPs}wB6U*wg)59?D3 zRWxTMJolHycz?diA8|DfGQ(pwSV}#iON49hMxlpV5NA^XASWFlmeBFdE$<*D*yK)C^MiSu93g{H>VY+d~8)y z{(fm^W|J|L@Z8HY+dIXqX6Z<2fTNl1mnM@UF)0o3RA&29oSjOLl%zDkBbn`UM3!6W zNIC4AheN_MCQ?u8=j!K+P~+mt{+Ngl9I3RPCx7+0`yMst>m)uSMnhLt+UhC(_XXj| zJt1aH|BBrr#pOh2#O*&eYHzfw+P+ZaMYKZ7KHyq>zeC6FnXHFY&d>F@ZHmuNiLB^9 ziBRJS;U^4>4*NXudb$X&5(&Lo9&59_9V3MSR^yhs-;Lo>+$UlIJMdx?$2?!u4ZK$E@uC7vwTX*ts){epdfas8Q}iJvLvVIPIwp>XZC+y@cFxrq7AT8KG$b&!RPNf ziZ;Ofy8Y5SOhp@@{(R#FpFc}iq`MS73_V=8zqFw9UVsfE^KQK;cYPG^Dd_x@QnUdM ziSd0kt?=S0{&u#^7g=_1$h1b87H2we?th-(A+=%X&)RUjVKJxl6+B>O<*nnwv##%x zO2I8^N;oZE56vv4yfEB$%#RD4}b{;iXC z0jIs`xJkBu80%tHod~1#l85r=xj@wX)zPtDCU8xiaUufiDJ7d7vNj?uYbuE zJ|=QWZxoYp1DfDAjg@*#6lolvC|NLyl9)Q8Qq^E@p2i_238+po+KwP5wt z^4a#7Sj6KciDWDVXWXEj__fG6x)y7Sx|m*M zk$ezkkEuQ5*|z`S2L)ZzjOm8J^r*N)H&phQ$}eYAWlR)z?-s9`s*y&_?0-5&#Ov;d zt%=*8tdOr6&PK1kjdy5l6rw*^A?gXXh}X_9@vjEQtItUtkYT&LvhETKy0*e{yi3H3 ze}#9qc)Y%4nfxMt-$^S@`Pd|X_m?KR)eVjqk=I}4m=fjpcZ&hC@B01nj#yvQEe06P zY?mqk(=7(b7S*j0&RHqw7JmagoY@{0L&pIHG9)I`s-vLYX0~qJJds{F(mByOOX^Db zEH?>Oix-Xf+e)`&{W$+9G#S6eatNag1t{9DWi9jyGUZXZM2v0bx{A~ugpoK8U#JKMbNhK;7_0!OIr4^@q+^eSi zqXtXX7s{~kP^$*GBY&+pt|D1ang`-h<8cd{>~&)BqpT+vRTkCDp^u)m6Qfp zoY_9AL}AD*DGiWar{RTUQY0p&0kY>V<=szO17z0@YBd9{XGv**Y^S>j7p4*HynA}HU^Y=?HNM^`E?6ibUW zs+4KA?ZfTGia$HL;T2TRuqa90DALx~iRI~+m?-b4$mw}fe1*xM@t_|10*C(tWY@iE UJ%K<>00000Ne4wvM6N<$f*Tyol>h($ delta 1900 zcmaJ+dpy$%AKq`n=5m^bBSw}P+7cp{+={s-mxPZ?MN{W2a!cm6ew*CNb(rj+^sY`J zccmrS>B3HhLZ^~wHkS}5tqmJq=l$#a^?pCkAK&NuJfF|^d76-g$Pz2i*^_waSW5NR z-=gyZ1J!9g>D0ow@8%WEGWPF9Ar)s>6~~<8pjfPab_e_id(A)6)B{o1Vt~i93tFIr zQl2qhFQ6opb>?gxxsXh{y#MjvsnXVIoB4(Gfo^FvhoT;)7yf>Jyjwg@X>NaaBE9CP zoX8#j0{Cz8&)$34xq;+B6I2su{s(b>fQ%ZG`+bwNt0Y=>*TfzEA<;4o>R;_OP<}_!nMZ400Aa0&So-a!LPagg{%EO0-*;8Vyc+sn}Iv zlV-PU{t@=jcDd(&vQDbaWW|t~{DX(BkJM)A4=QXzpFtc6wGG(Ln?Mi@&dj*@B6%N= zj*r-#ZKU@K0$Fe=P&LCho!Y(zb6`Gt<#PKfc9RLVEoJH~DL_&~VG3nSC~EvqGbBj2 z?*d$WbGFmiQDOEo@3fW&&;jh@aWK1|>aK<%b_$X>Y3E+d0m&^xhvD25ZM@n^g}h=Dx*J zRa)LMs8ov1{-TBN#Jx$vd6X!4iU*?Ye{=w1qb*xH!vPaO1A(q3#WV`D z1_DDqyW@~@qwdBgiNb{b9S4zt8y58O$cUy=DPMy5Rl?tiSH6La?k|*C-q5&?t6n&p zEes2vQ>AQ=Cxb5r2#B87p36k&s|2Cv&I4b8*h=*AYF~N{<9dt@Uw?Na{1Th2Gw8 zIP=gUqUQNy973C>`eeGhxF5Hbvcdkxl^d{1b^{+&{_TXLH72s|Fgoh#Uz*HP!|73d zH^gWq(@!sI2z?AaZydw(irPfX^?d!{ONi(i`bZ?B80Q14+}rO`)E)z7``uRMZ(oZu zzVpVdI{0R+&Y+#(0o!98SHBo56KC#;gb8WrfTG}b?|T%{&>?FBzPhaC+H6*^#$;1w zniHs|yITl9{kY@LhiJS+2u(<79 z=o12AWdR%W$Pz$s8+^J_Q}4lRlwMxm_Ptjv+11uyH18#joO2+}aS?MxSLj=wT<8lR zfo2F=dBjA_$|i=cb**!cEB1XXZb|qwt5SknWe$IE&$74#SgT&#m&j|Y$-WDsuI_1* zbD|_!8OpF2)6+@lp0b#ul=P91{P1a|N-h6i5=b=zuDu_TtoX)sG*P-}L5o97aN49TQvnuS3Vt%J)mHqT@oRBb|AA|IK)8avH$N=Sj^<9YE}6XhFf8bmM-yjwc9OE3}Q1%PizbKppWp3m#O@1 z!sIro*D|@(f$D$VNT4ujhFTeTv+lhR`@)RlYdUN;-_ls zxon(4@0nQT3b^O9kU_cj3N6Z&M{MvPiita6e-3g)^0D%cxD2rN#V)v3vs1vSG{B-n zLtyvKokmF*_f=QcYhV!6Ne*x;`EM5jR6$U?O?`f=!F7xpr?b^(q%aR=*)6w3%osbK z`+&hT@9C5aF)+2#PL+&lCeRNlWgwSpOO*XDj>!Bk#^`n~ diff --git a/rendering_styles/style-icons/map-icons-png/drawable-xxhdpi/mm_seamark_j21_rocky_night.png b/rendering_styles/style-icons/map-icons-png/drawable-xxhdpi/mm_seamark_j21_rocky_night.png new file mode 100644 index 0000000000000000000000000000000000000000..274e1162574a01cfe8e8d9fa43e237e5934d87b9 GIT binary patch literal 3356 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 + android:pathData="m286.29,9.772c-18.564,2.808 -36.924,5.616 -52.224,12.96 -15.3,7.344 -31.008,19.008 -39.576,31.104 -8.772,11.88 -14.28,30.24 -12.852,40.392 1.428,10.152 21.012,20.304 21.012,20.304" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="1"/> + android:pathData="m365.238,64.204c-22.032,-1.728 -44.064,-3.456 -66.912,0 -22.644,3.672 -52.224,10.368 -69.36,21.6 -17.34,11.448 -29.172,32.616 -33.864,46.872 -4.896,14.472 2.04,30.24 5.1,39.096 3.06,8.64 8.16,11.232 13.464,13.608" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="1"/> + android:pathData="m228.558,290.572c-11.832,-1.512 -23.664,-3.024 -32.028,-10.8 -8.16,-7.56 -15.096,-22.464 -17.136,-35.64 -2.04,-13.392 -1.632,-33.912 4.488,-43.848C190.002,190.348 203.058,188.404 215.706,184.732 228.354,181.06 242.022,178.252 259.77,178.684 277.518,178.9 299.754,182.788 322.194,186.676" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="1"/> + android:pathData="m224.478,368.332c-5.916,-3.888 -11.832,-7.992 -14.688,-15.552 -2.856,-7.56 -5.916,-19.44 -2.652,-29.592 3.264,-10.152 9.588,-22.464 22.44,-31.536C242.226,282.58 267.726,274.156 283.638,268.324 299.55,262.708 309.138,260.548 325.05,256.876 341.166,252.988 360.546,249.532 379.926,245.86" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="1"/> + android:pathData="m241.614,441.772c-8.16,-3.888 -16.116,-7.56 -21.012,-15.12 -4.896,-7.344 -8.568,-19.224 -8.364,-29.376C212.646,387.34 214.482,374.38 222.438,366.604 230.394,358.828 246.306,353.212 260.178,351.052 273.846,348.676 288.738,350.836 305.466,352.996 321.99,354.94 341.166,359.26 360.138,363.364" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="1"/> + android:pathData="m329.538,560.572c-14.28,3.672 -28.56,7.344 -44.472,8.208 -16.116,0.864 -37.74,0.432 -51.816,-2.808 -13.872,-3.24 -25.296,-7.776 -31.824,-16.416 -6.528,-8.856 -7.548,-22.896 -6.936,-36.072 0.408,-13.176 2.448,-30.888 10.2,-42.768C212.238,458.836 225.702,448.468 240.39,442.42 255.078,436.156 265.686,433.564 292.614,433.348 319.542,433.132 360.954,437.02 402.366,440.908" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="1"/> diff --git a/rendering_styles/style-icons/map-icons-vector/mm_seamark_j21_rocky_night.xml b/rendering_styles/style-icons/map-icons-vector/mm_seamark_j21_rocky_night.xml new file mode 100644 index 0000000000..61d0d618c4 --- /dev/null +++ b/rendering_styles/style-icons/map-icons-vector/mm_seamark_j21_rocky_night.xml @@ -0,0 +1,27 @@ + + + + + + + + diff --git a/rendering_styles/style-icons/map-icons-vector/mm_seamark_j22_coral.xml b/rendering_styles/style-icons/map-icons-vector/mm_seamark_j22_coral.xml index 49471f9ff3..8dea1cb7b0 100644 --- a/rendering_styles/style-icons/map-icons-vector/mm_seamark_j22_coral.xml +++ b/rendering_styles/style-icons/map-icons-vector/mm_seamark_j22_coral.xml @@ -1,93 +1,93 @@ + android:pathData="M364.596,77.999 L270.586,24.979" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="m270.586,24.906l-52.36,0" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="m218.464,24.906 l-20.801,31.812" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="M197.282,56.791 L249.404,78.023" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="M249.404,77.999 L186.572,109.811" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="M187.524,109.57L239.884,109.57" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="M239.646,109.57 L197.758,151.986" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="m343.414,388.889 l-41.888,55.912" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="7.86"/> + android:pathData="M197.282,151.986 L343.414,141.285" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="M343.652,195.125 L291.53,184.424" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="m291.292,183.557l-0,53.02" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="m288.198,547.949l-0,32.535" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="5.35"/> + android:pathData="m289.15,0.994l-0,32.535" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="5.35"/> + android:pathData="M291.292,236.336 L223.462,225.635" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="M223.224,226.455 L353.886,332.254" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="M223.224,258.749 L249.404,311.528" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="m292.72,139.695 l26.18,52.779" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="M250.356,309.359 L197.044,288.295" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.9"/> + android:pathData="M197.282,290.079 L236.552,332.495" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="m236.314,331.049 l-49.742,21.063" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="m233.22,331.049 l-49.742,21.063" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="M187.524,352.739 L312.95,395.155" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="M312.474,396.119 L396.012,385.418" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="M375.068,458.779 L270.824,437.715" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="M270.586,437.089 L317.472,489.868" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="m317.472,490.109 l-80.92,-21.232" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="m236.314,470.829 l40.46,42.416" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="m277.012,511.799 l-90.202,42.416" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="M187.524,552.769 L376.02,542.237" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="6.83"/> + android:pathData="M223.224,258.749L262.494,258.749" + android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="5.91"/> diff --git a/rendering_styles/style-icons/map-icons-vector/mm_seamark_j22_coral_night.xml b/rendering_styles/style-icons/map-icons-vector/mm_seamark_j22_coral_night.xml new file mode 100644 index 0000000000..72c9fb98f9 --- /dev/null +++ b/rendering_styles/style-icons/map-icons-vector/mm_seamark_j22_coral_night.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ee80ca5f25475412eae07724b00e315e810ca2d1 Mon Sep 17 00:00:00 2001 From: xmd5a Date: Mon, 6 Jun 2022 12:50:29 +0300 Subject: [PATCH 5/6] Fix seabed PR (https://github.com/osmandapp/OsmAnd-Issues/issues/1391) --- rendering_styles/nautical.render.xml | 40 ++++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/rendering_styles/nautical.render.xml b/rendering_styles/nautical.render.xml index f18d591461..3a906a6dce 100644 --- a/rendering_styles/nautical.render.xml +++ b/rendering_styles/nautical.render.xml @@ -1569,14 +1569,14 @@ - + - - + + - + - + @@ -1587,22 +1587,22 @@ - + - + - + - + - - + + @@ -3071,8 +3071,8 @@ - - + + @@ -3082,26 +3082,26 @@ - + - + - - + + - + - + - + From b8fcb937a98187a10af8edb8155bcf54293338b0 Mon Sep 17 00:00:00 2001 From: alisa911 Date: Mon, 6 Jun 2022 18:51:55 +0300 Subject: [PATCH 6/6] add destination_priority attr --- routing/routing.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/routing/routing.xml b/routing/routing.xml index ae471f7052..97a7292f87 100644 --- a/routing/routing.xml +++ b/routing/routing.xml @@ -856,6 +856,10 @@ + + @@ -1622,6 +1626,10 @@ + +