forked from organicmaps/organicmaps
Fix parnter priority
This commit is contained in:
itomko
yoksnod
parent
b84a0b4bcd
commit
6dd7643a92
8 changed files with 76 additions and 16 deletions
|
|
@ -304,8 +304,20 @@ area[amenity=biergarten]
|
|||
{z-index: 2782;}
|
||||
|
||||
node[sponsored=partner2],
|
||||
area[sponsored=partner2]
|
||||
{z-index: 2790;}
|
||||
area[sponsored=partner2],
|
||||
node[sponsored=partner4],
|
||||
area[sponsored=partner4],
|
||||
node[sponsored=partner6],
|
||||
area[sponsored=partner6],
|
||||
node[sponsored=partner7],
|
||||
area[sponsored=partner7],
|
||||
node[sponsored=partner8],
|
||||
area[sponsored=partner8],
|
||||
node[sponsored=partner9],
|
||||
area[sponsored=partner9],
|
||||
node[sponsored=partner10],
|
||||
area[sponsored=partner10]
|
||||
{z-index: 2792;}
|
||||
|
||||
node[railway=halt],
|
||||
node[railway=station],
|
||||
|
|
@ -2616,7 +2628,7 @@ area|z14-[sponsored=partner2]
|
|||
|
||||
node|z18-[sponsored=partner2],
|
||||
area|z18-[sponsored=partner2]
|
||||
{font-size: 11;}
|
||||
{icon-image: partner2-l.svg;font-size: 11;}
|
||||
|
||||
/* Adidas */
|
||||
|
||||
|
|
@ -2626,7 +2638,7 @@ area|z15-[sponsored=partner4]
|
|||
|
||||
node|z18-[sponsored=partner4],
|
||||
area|z18-[sponsored=partner4]
|
||||
{font-size: 11;}
|
||||
{icon-image: partner4-l.svg;font-size: 11;}
|
||||
|
||||
node|z15-[sponsored=partner6],
|
||||
area|z15-[sponsored=partner6]
|
||||
|
|
@ -2634,7 +2646,7 @@ area|z15-[sponsored=partner6]
|
|||
|
||||
node|z18-[sponsored=partner6],
|
||||
area|z18-[sponsored=partner6]
|
||||
{font-size: 11;}
|
||||
{icon-image: partner6-l.svg;font-size: 11;}
|
||||
|
||||
node|z15-[sponsored=partner7],
|
||||
area|z15-[sponsored=partner7]
|
||||
|
|
@ -2642,7 +2654,7 @@ area|z15-[sponsored=partner7]
|
|||
|
||||
node|z18-[sponsored=partner7],
|
||||
area|z18-[sponsored=partner7]
|
||||
{font-size: 11;}
|
||||
{icon-image: partner7-l.svg;font-size: 11;}
|
||||
|
||||
/* Rosinter */
|
||||
|
||||
|
|
@ -2652,7 +2664,7 @@ area|z15-[sponsored=partner8]
|
|||
|
||||
node|z18-[sponsored=partner8],
|
||||
area|z18-[sponsored=partner8]
|
||||
{font-size: 11;}
|
||||
{icon-image: partner8-l.svg;font-size: 11;}
|
||||
|
||||
node|z15-[sponsored=partner9],
|
||||
area|z15-[sponsored=partner9]
|
||||
|
|
@ -2660,7 +2672,7 @@ area|z15-[sponsored=partner9]
|
|||
|
||||
node|z18-[sponsored=partner9],
|
||||
area|z18-[sponsored=partner9]
|
||||
{font-size: 11;}
|
||||
{icon-image: partner9-l.svg;font-size: 11;}
|
||||
|
||||
/* Sportmaster */
|
||||
|
||||
|
|
@ -2670,7 +2682,7 @@ area|z15-[sponsored=partner10]
|
|||
|
||||
node|z18-[sponsored=partner10],
|
||||
area|z18-[sponsored=partner10]
|
||||
{font-size: 11;}
|
||||
{icon-image: partner10-l.svg;font-size: 11;}
|
||||
|
||||
/* Fifa */
|
||||
|
||||
|
|
@ -2706,15 +2718,15 @@ area|z15-[event=fc2018][shop=gift]
|
|||
|
||||
/* Subway Station */
|
||||
|
||||
node|z13[event=fc2018][railway=station][transport=subway]
|
||||
node|z13[event=fc2018][railway=station]
|
||||
{icon-image: wfc_subway-s.svg;}
|
||||
node|z14[event=fc2018][railway=station][transport=subway]
|
||||
node|z14[event=fc2018][railway=station]
|
||||
{icon-image: wfc_subway-s.svg;}
|
||||
node|z15[event=fc2018][railway=station][transport=subway]
|
||||
node|z15[event=fc2018][railway=station]
|
||||
{icon-image: wfc_subway-m.svg;}
|
||||
node|z16[event=fc2018][railway=station][transport=subway]
|
||||
node|z16[event=fc2018][railway=station]
|
||||
{icon-image: wfc_subway-m.svg;}
|
||||
node|z17-[event=fc2018][railway=station][transport=subway]
|
||||
node|z17-[event=fc2018][railway=station]
|
||||
{icon-image: wfc_subway-m.svg;}
|
||||
|
||||
node|z17-[event=fc2018][railway=subway_entrance]
|
||||
|
|
@ -2734,6 +2746,23 @@ node|z18-[event=fc2018][railway=tram_stop],
|
|||
area|z18-[event=fc2018][railway=tram_stop]
|
||||
{icon-image: wfc_tram-m.svg;}
|
||||
|
||||
/* Train Station */
|
||||
|
||||
node|z11[event=fc2018][railway=halt]
|
||||
{icon-image: wfc_train-s.svg;icon-min-distance: 10;}
|
||||
node|z12[event=fc2018][railway=halt]
|
||||
{icon-image: wfc_train-s.svg;text-offset: 1;font-size: 9;}
|
||||
node|z13[event=fc2018][railway=halt]
|
||||
{icon-image: wfc_train-s.svg;text-offset: 1;font-size: 10;}
|
||||
node|z14[event=fc2018][railway=halt]
|
||||
{icon-image: wfc_train-s.svg;text-offset: 1;font-size: 11;text-halo-opacity: 0.7;}
|
||||
node|z15[event=fc2018][railway=halt]
|
||||
{icon-image: wfc_train-m.svg;text-offset: 1;font-size: 12;text-halo-opacity: 0.8;}
|
||||
node|z16[event=fc2018][railway=halt]
|
||||
{icon-image: wfc_train-m.svg;text-offset: 1;font-size: 13;text-halo-opacity: 0.8;}
|
||||
node|z17-[event=fc2018][railway=halt]
|
||||
{icon-image: wfc_train-m.svg;text-offset: 1;font-size: 13;text-halo-opacity: 0.9;}
|
||||
|
||||
/* Bus Station */
|
||||
|
||||
node|z12-13[event=fc2018][amenity=bus_station],
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><rect fill="#fff" height="24" opacity=".6" rx="2.5" width="24"/><rect fill="#9d231c" height="22" rx="2" width="22" x="1" y="1"/><path d="m9.98815609 5c-.55199428 0-1.3650411.27503853-1.7986638.60127953l-.39473019.29697977c-.4413803.33207751-.7971528 1.05785273-.79475001 1.59643433l.03779211 8.47101817c.01530791.4998463.51358532.9996926 1.01186274.9996926h8.96899346c.4982774 0 .9890867-.3290061.9812469-.9996926l-.0377921-8.47101817c-.002452-.54960882-.3700068-1.27019334-.8036295-1.59643433l-.3947301-.29697977c-.4413803-.33207751-1.256897-.60127953-1.7986638-.60127953zm-.60899364 2.73138011c.37576655-.40121583 1.12061815-.72646552 1.68426525-.72646552h2.9529805c.5544275 0 1.3052256.33549393 1.6782516.7507908l.3121379.34750889v2.83344302c0 .5576723-.4577073 1.009755-.9994741 1.009755h-4.9769357c-.55199426 0-.99947405-.4408636-.99947405-1.009755v-2.83344302zm.64830625 6.84203919c0 .4140867-.33463316.7497694-.74741614.7497694-.41278297 0-.74741612-.3356827-.74741612-.7497694 0-.4140866.33463315-.7497694.74741612-.7497694.41278298 0 .74741614.3356828.74741614.7497694zm-.06913537 4.3919851h5.08333337l-1.0416667-2h1.875l3.125 6h-1.875l-1.0416667-2h-7.16666664l-1.04166666 2h-1.875l3.125-6h1.875zm5.79932557-5.1417545c.412783 0 .7474162.3356828.7474162.7497694 0 .4140867-.3346332.7497694-.7474162.7497694-.4127829 0-.7474161-.3356827-.7474161-.7497694 0-.4140866.3346332-.7497694.7474161-.7497694z" fill="#fff"/></g></svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.4 KiB |
7
data/styles/clear/style-clear/symbols/wfc_train-m.svg
Normal file
7
data/styles/clear/style-clear/symbols/wfc_train-m.svg
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
<svg width="24" height="24" viewBox="0 0 24 24">
|
||||
<g fill="none" fill-rule="evenodd">
|
||||
<rect width="24" height="24" fill="#FFF" opacity=".6" rx="2.5"/>
|
||||
<rect width="22" height="22" x="1" y="1" fill="#9D231C" rx="2"/>
|
||||
<path fill="#FFF" d="M9.98815609,5 C9.43616181,5 8.62311499,5.27503853 8.18949229,5.60127953 L7.7947621,5.8982593 C7.3533818,6.23033681 6.9976093,6.95611203 7.00001209,7.49469363 L7.0378042,15.9657118 C7.05311211,16.4655581 7.55138952,16.9654044 8.04966694,16.9654044 L17.0186604,16.9654044 C17.5169378,16.9654044 18.0077471,16.6363983 17.9999073,15.9657118 L17.9621152,7.49469363 C17.9596632,6.94508481 17.5921084,6.22450029 17.1584857,5.8982593 L16.7637556,5.60127953 C16.3223753,5.26920202 15.5068586,5 14.9650918,5 L9.98815609,5 Z M9.37916245,7.73138011 C9.754929,7.33016428 10.4997806,7.00491459 11.0634277,7.00491459 L14.0164082,7.00491459 C14.5708357,7.00491459 15.3216338,7.34040852 15.6946598,7.75570539 L16.0067977,8.10321428 L16.0067977,10.9366573 C16.0067977,11.4943296 15.5490904,11.9464123 15.0073236,11.9464123 L10.0303879,11.9464123 C9.47839364,11.9464123 9.03091385,11.5055487 9.03091385,10.9366573 L9.03091385,8.10321428 L9.37916245,7.73138011 Z M10.0274687,14.5734193 C10.0274687,14.987506 9.69283554,15.3231887 9.28005256,15.3231887 C8.86726959,15.3231887 8.53263644,14.987506 8.53263644,14.5734193 C8.53263644,14.1593327 8.86726959,13.8236499 9.28005256,13.8236499 C9.69283554,13.8236499 10.0274687,14.1593327 10.0274687,14.5734193 Z M9.95833333,18.9654044 L15.0416667,18.9654044 L14,16.9654044 L15.875,16.9654044 L19,22.9654044 L17.125,22.9654044 L16.0833333,20.9654044 L8.91666666,20.9654044 L7.875,22.9654044 L6,22.9654044 L9.125,16.9654044 L11,16.9654044 L9.95833333,18.9654044 Z M15.7576589,13.8236499 C16.1704419,13.8236499 16.5050751,14.1593327 16.5050751,14.5734193 C16.5050751,14.987506 16.1704419,15.3231887 15.7576589,15.3231887 C15.344876,15.3231887 15.0102428,14.987506 15.0102428,14.5734193 C15.0102428,14.1593327 15.344876,13.8236499 15.7576589,13.8236499 Z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2 KiB |
1
data/styles/clear/style-clear/symbols/wfc_train-s.svg
Normal file
1
data/styles/clear/style-clear/symbols/wfc_train-s.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><rect fill="#fff" height="16" opacity=".6" rx="1.5" width="16"/><rect fill="#9d231c" height="14" rx="1" width="14" x="1" y="1"/><path d="m8.00000001 11-1.13636364 2h3.27272723l-1.13636361-2zm-1.5 0h-1.00000001c-.25 0-.5-.2857143-.5-.5714286v-5.27580551c0-.55785568.35937913-1.28372142.80269575-1.62148646l-.1053915.08029829c.43958759-.33492389 1.2546056-.61157772 1.81206465-.61157772h1.9812622c.5660157 0 1.368748.27381267 1.8120647.61157772l-.1053916-.08029829c.4395876.33492388.8026958 1.06372926.8026958 1.62148646v5.27580551c0 .2857143-.25.5714286-.5.5714286h-1l2.5 4.4h-1.5l-.7954546-1.4h-4.40909085l-.79545455 1.4h-1.5zm.49999999-6.85714286-1 .57142857v1.71428572h5v-1.71428572l-1-.57142857zm-.5 4.57142857c-.277 0-.5.25485715-.5.57142858 0 .31657142.223.57142857.5.57142857s.5-.25485715.5-.57142857c0-.31657143-.223-.57142858-.5-.57142858zm4 0c-.277 0-.5.25485715-.5.57142858 0 .31657142.223.57142857.5.57142857s.5-.25485715.5-.57142857c0-.31657143-.223-.57142858-.5-.57142858z" fill="#fff"/></g></svg>
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.4 KiB |
7
data/styles/clear/style-night/symbols/wfc_train-m.svg
Normal file
7
data/styles/clear/style-night/symbols/wfc_train-m.svg
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
<svg width="24" height="24" viewBox="0 0 24 24">
|
||||
<g fill="none" fill-rule="evenodd">
|
||||
<rect width="24" height="24" fill="#fff" opacity=".4" rx="2.5"/>
|
||||
<rect width="22" height="22" x="1" y="1" fill="#731915" rx="2"/>
|
||||
<path fill="#fff" d="m9.98815609 5c-.55199428 0-1.3650411.27503853-1.7986638.60127953l-.39473019.29697977c-.4413803.33207751-.7971528 1.05785273-.79475001 1.59643433l.03779211 8.47101817c.01530791.4998463.51358532.9996926 1.01186274.9996926h8.96899346c.4982774 0 .9890867-.3290061.9812469-.9996926l-.0377921-8.47101817c-.002452-.54960882-.3700068-1.27019334-.8036295-1.59643433l-.3947301-.29697977c-.4413803-.33207751-1.256897-.60127953-1.7986638-.60127953zm-.60899364 2.73138011c.37576655-.40121583 1.12061815-.72646552 1.68426525-.72646552h2.9529805c.5544275 0 1.3052256.33549393 1.6782516.7507908l.3121379.34750889v2.83344302c0 .5576723-.4577073 1.009755-.9994741 1.009755h-4.9769357c-.55199426 0-.99947405-.4408636-.99947405-1.009755v-2.83344302zm.64830625 6.84203919c0 .4140867-.33463316.7497694-.74741614.7497694-.41278297 0-.74741612-.3356827-.74741612-.7497694 0-.4140866.33463315-.7497694.74741612-.7497694.41278298 0 .74741614.3356828.74741614.7497694zm-.06913537 4.3919851h5.08333337l-1.0416667-2h1.875l3.125 6h-1.875l-1.0416667-2h-7.16666664l-1.04166666 2h-1.875l3.125-6h1.875zm5.79932557-5.1417545c.412783 0 .7474162.3356828.7474162.7497694 0 .4140867-.3346332.7497694-.7474162.7497694-.4127829 0-.7474161-.3356827-.7474161-.7497694 0-.4140866.3346332-.7497694.7474161-.7497694z" opacity=".6"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
7
data/styles/clear/style-night/symbols/wfc_train-s.svg
Normal file
7
data/styles/clear/style-night/symbols/wfc_train-s.svg
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
<svg width="16" height="16" viewBox="0 0 16 16">
|
||||
<g fill="none" fill-rule="evenodd">
|
||||
<rect width="16" height="16" fill="#fff" opacity=".4" rx="1.5"/>
|
||||
<rect width="14" height="14" x="1" y="1" fill="#731915" rx="1"/>
|
||||
<path fill="#fff" d="m8.00000001 11-1.13636364 2h3.27272723l-1.13636361-2zm-1.5 0h-1.00000001c-.25 0-.5-.2857143-.5-.5714286v-5.27580551c0-.55785568.35937913-1.28372142.80269575-1.62148646l-.1053915.08029829c.43958759-.33492389 1.2546056-.61157772 1.81206465-.61157772h1.9812622c.5660157 0 1.368748.27381267 1.8120647.61157772l-.1053916-.08029829c.4395876.33492388.8026958 1.06372926.8026958 1.62148646v5.27580551c0 .2857143-.25.5714286-.5.5714286h-1l2.5 4.4h-1.5l-.7954546-1.4h-4.40909085l-.79545455 1.4h-1.5zm.49999999-6.85714286-1 .57142857v1.71428572h5v-1.71428572l-1-.57142857zm-.5 4.57142857c-.277 0-.5.25485715-.5.57142858 0 .31657142.223.57142857.5.57142857s.5-.25485715.5-.57142857c0-.31657143-.223-.57142858-.5-.57142858zm4 0c-.277 0-.5.25485715-.5.57142858 0 .31657142.223.57142857.5.57142857s.5-.25485715.5-.57142857c0-.31657143-.223-.57142858-.5-.57142858z" opacity=".6"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
Loading…
Add table
Reference in a new issue