forked from organicmaps/organicmaps
[DESIGN] new styles and icons
This commit is contained in:
rachytski
Alex Zolotarev
parent
cfbe2459ab
commit
5824c518ed
11 changed files with 780 additions and 598 deletions
|
|
@ -301,116 +301,125 @@
|
|||
<symbolStyle id="100" name="pub">
|
||||
<resourceStyle width="52" x="676" y="208" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="101" name="pubx">
|
||||
<symbolStyle id="101" name="pub.svg.2011_11_13_17_16_11.0">
|
||||
<resourceStyle width="52" x="728" y="208" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="102" name="railway-crossing-small">
|
||||
<symbolStyle id="102" name="pubx">
|
||||
<resourceStyle width="52" x="780" y="208" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="103" name="railway-crossing">
|
||||
<symbolStyle id="103" name="railway-crossing-small">
|
||||
<resourceStyle width="52" x="832" y="208" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="104" name="railway-station">
|
||||
<symbolStyle id="104" name="railway-crossing">
|
||||
<resourceStyle width="52" x="884" y="208" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="105" name="recycling">
|
||||
<symbolStyle id="105" name="railway-station-mini">
|
||||
<resourceStyle width="52" x="936" y="208" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="106" name="religion">
|
||||
<symbolStyle id="106" name="railway-station">
|
||||
<resourceStyle width="52" x="0" y="260" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="107" name="restaurant">
|
||||
<symbolStyle id="107" name="recycling">
|
||||
<resourceStyle width="52" x="52" y="260" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="108" name="roundabout_left">
|
||||
<resourceStyle width="40" x="104" y="260" height="40"/>
|
||||
<symbolStyle id="108" name="religion">
|
||||
<resourceStyle width="52" x="104" y="260" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="109" name="roundabout_right">
|
||||
<resourceStyle width="40" x="144" y="260" height="40"/>
|
||||
<symbolStyle id="109" name="restaurant">
|
||||
<resourceStyle width="52" x="156" y="260" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="110" name="school">
|
||||
<resourceStyle width="52" x="184" y="260" height="52"/>
|
||||
<symbolStyle id="110" name="roundabout_left">
|
||||
<resourceStyle width="40" x="208" y="260" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="111" name="shelter-fireplace">
|
||||
<resourceStyle width="52" x="236" y="260" height="52"/>
|
||||
<symbolStyle id="111" name="roundabout_right">
|
||||
<resourceStyle width="40" x="248" y="260" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="112" name="shelter">
|
||||
<symbolStyle id="112" name="school">
|
||||
<resourceStyle width="52" x="288" y="260" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="113" name="shooting-borderless">
|
||||
<symbolStyle id="113" name="shelter-fireplace">
|
||||
<resourceStyle width="52" x="340" y="260" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="114" name="shooting">
|
||||
<symbolStyle id="114" name="shelter">
|
||||
<resourceStyle width="52" x="392" y="260" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="115" name="slipway">
|
||||
<symbolStyle id="115" name="shooting-borderless">
|
||||
<resourceStyle width="52" x="444" y="260" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="116" name="soccer-borderless">
|
||||
<symbolStyle id="116" name="shooting">
|
||||
<resourceStyle width="52" x="496" y="260" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="117" name="soccer">
|
||||
<symbolStyle id="117" name="slipway">
|
||||
<resourceStyle width="52" x="548" y="260" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="118" name="speed_trap">
|
||||
<resourceStyle width="40" x="600" y="260" height="40"/>
|
||||
<symbolStyle id="118" name="soccer-borderless">
|
||||
<resourceStyle width="52" x="600" y="260" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="119" name="subway">
|
||||
<resourceStyle width="52" x="640" y="260" height="52"/>
|
||||
<symbolStyle id="119" name="soccer">
|
||||
<resourceStyle width="52" x="652" y="260" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="120" name="supermarket">
|
||||
<resourceStyle width="52" x="692" y="260" height="52"/>
|
||||
<symbolStyle id="120" name="speed_trap">
|
||||
<resourceStyle width="40" x="704" y="260" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="121" name="survey_point">
|
||||
<resourceStyle width="20" x="744" y="260" height="20"/>
|
||||
<symbolStyle id="121" name="subway">
|
||||
<resourceStyle width="52" x="744" y="260" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="122" name="swimming-borderless">
|
||||
<resourceStyle width="52" x="764" y="260" height="52"/>
|
||||
<symbolStyle id="122" name="supermarket">
|
||||
<resourceStyle width="52" x="796" y="260" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="123" name="swimming">
|
||||
<resourceStyle width="52" x="816" y="260" height="52"/>
|
||||
<symbolStyle id="123" name="survey_point">
|
||||
<resourceStyle width="20" x="848" y="260" height="20"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="124" name="synagogue">
|
||||
<symbolStyle id="124" name="swimming-borderless">
|
||||
<resourceStyle width="52" x="868" y="260" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="125" name="telephone">
|
||||
<symbolStyle id="125" name="swimming">
|
||||
<resourceStyle width="52" x="920" y="260" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="126" name="tennis-borderless">
|
||||
<symbolStyle id="126" name="synagogue">
|
||||
<resourceStyle width="52" x="972" y="260" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="127" name="tennis">
|
||||
<symbolStyle id="127" name="telephone">
|
||||
<resourceStyle width="52" x="0" y="312" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="128" name="theatre">
|
||||
<symbolStyle id="128" name="tennis-borderless">
|
||||
<resourceStyle width="52" x="52" y="312" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="129" name="toilets">
|
||||
<symbolStyle id="129" name="tennis">
|
||||
<resourceStyle width="52" x="104" y="312" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="130" name="traffic_signal">
|
||||
<resourceStyle width="40" x="156" y="312" height="40"/>
|
||||
<symbolStyle id="130" name="theatre">
|
||||
<resourceStyle width="52" x="156" y="312" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="131" name="tramway">
|
||||
<resourceStyle width="52" x="196" y="312" height="52"/>
|
||||
<symbolStyle id="131" name="toilets">
|
||||
<resourceStyle width="52" x="208" y="312" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="132" name="tree">
|
||||
<resourceStyle width="12" x="248" y="312" height="12"/>
|
||||
<symbolStyle id="132" name="traffic_signal">
|
||||
<resourceStyle width="40" x="260" y="312" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="133" name="university">
|
||||
<resourceStyle width="52" x="260" y="312" height="52"/>
|
||||
<symbolStyle id="133" name="tramway-mini">
|
||||
<resourceStyle width="52" x="300" y="312" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="134" name="viewpoint">
|
||||
<resourceStyle width="36" x="312" y="312" height="36"/>
|
||||
<symbolStyle id="134" name="tramway">
|
||||
<resourceStyle width="52" x="352" y="312" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="135" name="vulcan">
|
||||
<resourceStyle width="22" x="348" y="312" height="22"/>
|
||||
<symbolStyle id="135" name="tree">
|
||||
<resourceStyle width="12" x="404" y="312" height="12"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="136" name="wastewater">
|
||||
<resourceStyle width="36" x="370" y="312" height="36"/>
|
||||
<symbolStyle id="136" name="university">
|
||||
<resourceStyle width="52" x="416" y="312" height="52"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="137" name="windmill">
|
||||
<resourceStyle width="40" x="406" y="312" height="40"/>
|
||||
<symbolStyle id="137" name="viewpoint">
|
||||
<resourceStyle width="36" x="468" y="312" height="36"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="138" name="vulcan">
|
||||
<resourceStyle width="22" x="504" y="312" height="22"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="139" name="wastewater">
|
||||
<resourceStyle width="36" x="526" y="312" height="36"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="140" name="windmill">
|
||||
<resourceStyle width="40" x="562" y="312" height="40"/>
|
||||
</symbolStyle>
|
||||
</page>
|
||||
</skin>
|
||||
|
|
|
|||
|
|
@ -301,116 +301,125 @@
|
|||
<symbolStyle id="100" name="pub">
|
||||
<resourceStyle width="28" x="80" y="140" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="101" name="pubx">
|
||||
<symbolStyle id="101" name="pub.svg.2011_11_13_17_16_11.0">
|
||||
<resourceStyle width="28" x="108" y="140" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="102" name="railway-crossing-small">
|
||||
<symbolStyle id="102" name="pubx">
|
||||
<resourceStyle width="28" x="136" y="140" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="103" name="railway-crossing">
|
||||
<symbolStyle id="103" name="railway-crossing-small">
|
||||
<resourceStyle width="28" x="164" y="140" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="104" name="railway-station">
|
||||
<symbolStyle id="104" name="railway-crossing">
|
||||
<resourceStyle width="28" x="192" y="140" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="105" name="recycling">
|
||||
<symbolStyle id="105" name="railway-station-mini">
|
||||
<resourceStyle width="28" x="220" y="140" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="106" name="religion">
|
||||
<symbolStyle id="106" name="railway-station">
|
||||
<resourceStyle width="28" x="248" y="140" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="107" name="restaurant">
|
||||
<symbolStyle id="107" name="recycling">
|
||||
<resourceStyle width="28" x="276" y="140" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="108" name="roundabout_left">
|
||||
<resourceStyle width="22" x="304" y="140" height="22"/>
|
||||
<symbolStyle id="108" name="religion">
|
||||
<resourceStyle width="28" x="304" y="140" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="109" name="roundabout_right">
|
||||
<resourceStyle width="22" x="326" y="140" height="22"/>
|
||||
<symbolStyle id="109" name="restaurant">
|
||||
<resourceStyle width="28" x="332" y="140" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="110" name="school">
|
||||
<resourceStyle width="28" x="348" y="140" height="28"/>
|
||||
<symbolStyle id="110" name="roundabout_left">
|
||||
<resourceStyle width="22" x="360" y="140" height="22"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="111" name="shelter-fireplace">
|
||||
<resourceStyle width="28" x="376" y="140" height="28"/>
|
||||
<symbolStyle id="111" name="roundabout_right">
|
||||
<resourceStyle width="22" x="382" y="140" height="22"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="112" name="shelter">
|
||||
<symbolStyle id="112" name="school">
|
||||
<resourceStyle width="28" x="404" y="140" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="113" name="shooting-borderless">
|
||||
<symbolStyle id="113" name="shelter-fireplace">
|
||||
<resourceStyle width="28" x="432" y="140" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="114" name="shooting">
|
||||
<symbolStyle id="114" name="shelter">
|
||||
<resourceStyle width="28" x="460" y="140" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="115" name="slipway">
|
||||
<symbolStyle id="115" name="shooting-borderless">
|
||||
<resourceStyle width="28" x="0" y="168" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="116" name="soccer-borderless">
|
||||
<symbolStyle id="116" name="shooting">
|
||||
<resourceStyle width="28" x="28" y="168" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="117" name="soccer">
|
||||
<symbolStyle id="117" name="slipway">
|
||||
<resourceStyle width="28" x="56" y="168" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="118" name="speed_trap">
|
||||
<resourceStyle width="22" x="84" y="168" height="22"/>
|
||||
<symbolStyle id="118" name="soccer-borderless">
|
||||
<resourceStyle width="28" x="84" y="168" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="119" name="subway">
|
||||
<resourceStyle width="28" x="106" y="168" height="28"/>
|
||||
<symbolStyle id="119" name="soccer">
|
||||
<resourceStyle width="28" x="112" y="168" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="120" name="supermarket">
|
||||
<resourceStyle width="28" x="134" y="168" height="28"/>
|
||||
<symbolStyle id="120" name="speed_trap">
|
||||
<resourceStyle width="22" x="140" y="168" height="22"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="121" name="survey_point">
|
||||
<resourceStyle width="12" x="162" y="168" height="12"/>
|
||||
<symbolStyle id="121" name="subway">
|
||||
<resourceStyle width="28" x="162" y="168" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="122" name="swimming-borderless">
|
||||
<resourceStyle width="28" x="174" y="168" height="28"/>
|
||||
<symbolStyle id="122" name="supermarket">
|
||||
<resourceStyle width="28" x="190" y="168" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="123" name="swimming">
|
||||
<resourceStyle width="28" x="202" y="168" height="28"/>
|
||||
<symbolStyle id="123" name="survey_point">
|
||||
<resourceStyle width="12" x="218" y="168" height="12"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="124" name="synagogue">
|
||||
<symbolStyle id="124" name="swimming-borderless">
|
||||
<resourceStyle width="28" x="230" y="168" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="125" name="telephone">
|
||||
<symbolStyle id="125" name="swimming">
|
||||
<resourceStyle width="28" x="258" y="168" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="126" name="tennis-borderless">
|
||||
<symbolStyle id="126" name="synagogue">
|
||||
<resourceStyle width="28" x="286" y="168" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="127" name="tennis">
|
||||
<symbolStyle id="127" name="telephone">
|
||||
<resourceStyle width="28" x="314" y="168" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="128" name="theatre">
|
||||
<symbolStyle id="128" name="tennis-borderless">
|
||||
<resourceStyle width="28" x="342" y="168" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="129" name="toilets">
|
||||
<symbolStyle id="129" name="tennis">
|
||||
<resourceStyle width="28" x="370" y="168" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="130" name="traffic_signal">
|
||||
<resourceStyle width="22" x="398" y="168" height="22"/>
|
||||
<symbolStyle id="130" name="theatre">
|
||||
<resourceStyle width="28" x="398" y="168" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="131" name="tramway">
|
||||
<resourceStyle width="28" x="420" y="168" height="28"/>
|
||||
<symbolStyle id="131" name="toilets">
|
||||
<resourceStyle width="28" x="426" y="168" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="132" name="tree">
|
||||
<resourceStyle width="8" x="448" y="168" height="8"/>
|
||||
<symbolStyle id="132" name="traffic_signal">
|
||||
<resourceStyle width="22" x="454" y="168" height="22"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="133" name="university">
|
||||
<resourceStyle width="28" x="456" y="168" height="28"/>
|
||||
<symbolStyle id="133" name="tramway-mini">
|
||||
<resourceStyle width="28" x="476" y="168" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="134" name="viewpoint">
|
||||
<resourceStyle width="20" x="484" y="168" height="20"/>
|
||||
<symbolStyle id="134" name="tramway">
|
||||
<resourceStyle width="28" x="0" y="196" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="135" name="vulcan">
|
||||
<resourceStyle width="13" x="0" y="196" height="13"/>
|
||||
<symbolStyle id="135" name="tree">
|
||||
<resourceStyle width="8" x="28" y="196" height="8"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="136" name="wastewater">
|
||||
<resourceStyle width="20" x="13" y="196" height="20"/>
|
||||
<symbolStyle id="136" name="university">
|
||||
<resourceStyle width="28" x="36" y="196" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="137" name="windmill">
|
||||
<resourceStyle width="22" x="33" y="196" height="22"/>
|
||||
<symbolStyle id="137" name="viewpoint">
|
||||
<resourceStyle width="20" x="64" y="196" height="20"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="138" name="vulcan">
|
||||
<resourceStyle width="13" x="84" y="196" height="13"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="139" name="wastewater">
|
||||
<resourceStyle width="20" x="97" y="196" height="20"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="140" name="windmill">
|
||||
<resourceStyle width="22" x="117" y="196" height="22"/>
|
||||
</symbolStyle>
|
||||
</page>
|
||||
</skin>
|
||||
|
|
|
|||
|
|
@ -301,116 +301,125 @@
|
|||
<symbolStyle id="100" name="pub">
|
||||
<resourceStyle width="40" x="130" y="280" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="101" name="pubx">
|
||||
<symbolStyle id="101" name="pub.svg.2011_11_13_17_16_11.0">
|
||||
<resourceStyle width="40" x="170" y="280" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="102" name="railway-crossing-small">
|
||||
<symbolStyle id="102" name="pubx">
|
||||
<resourceStyle width="40" x="210" y="280" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="103" name="railway-crossing">
|
||||
<symbolStyle id="103" name="railway-crossing-small">
|
||||
<resourceStyle width="40" x="250" y="280" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="104" name="railway-station">
|
||||
<symbolStyle id="104" name="railway-crossing">
|
||||
<resourceStyle width="40" x="290" y="280" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="105" name="recycling">
|
||||
<symbolStyle id="105" name="railway-station-mini">
|
||||
<resourceStyle width="40" x="330" y="280" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="106" name="religion">
|
||||
<symbolStyle id="106" name="railway-station">
|
||||
<resourceStyle width="40" x="370" y="280" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="107" name="restaurant">
|
||||
<symbolStyle id="107" name="recycling">
|
||||
<resourceStyle width="40" x="410" y="280" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="108" name="roundabout_left">
|
||||
<resourceStyle width="31" x="450" y="280" height="31"/>
|
||||
<symbolStyle id="108" name="religion">
|
||||
<resourceStyle width="40" x="450" y="280" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="109" name="roundabout_right">
|
||||
<resourceStyle width="31" x="481" y="280" height="31"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="110" name="school">
|
||||
<symbolStyle id="109" name="restaurant">
|
||||
<resourceStyle width="40" x="0" y="320" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="111" name="shelter-fireplace">
|
||||
<resourceStyle width="40" x="40" y="320" height="40"/>
|
||||
<symbolStyle id="110" name="roundabout_left">
|
||||
<resourceStyle width="31" x="40" y="320" height="31"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="112" name="shelter">
|
||||
<resourceStyle width="40" x="80" y="320" height="40"/>
|
||||
<symbolStyle id="111" name="roundabout_right">
|
||||
<resourceStyle width="31" x="71" y="320" height="31"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="113" name="shooting-borderless">
|
||||
<resourceStyle width="40" x="120" y="320" height="40"/>
|
||||
<symbolStyle id="112" name="school">
|
||||
<resourceStyle width="40" x="102" y="320" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="114" name="shooting">
|
||||
<resourceStyle width="40" x="160" y="320" height="40"/>
|
||||
<symbolStyle id="113" name="shelter-fireplace">
|
||||
<resourceStyle width="40" x="142" y="320" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="115" name="slipway">
|
||||
<resourceStyle width="40" x="200" y="320" height="40"/>
|
||||
<symbolStyle id="114" name="shelter">
|
||||
<resourceStyle width="40" x="182" y="320" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="116" name="soccer-borderless">
|
||||
<resourceStyle width="40" x="240" y="320" height="40"/>
|
||||
<symbolStyle id="115" name="shooting-borderless">
|
||||
<resourceStyle width="40" x="222" y="320" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="117" name="soccer">
|
||||
<resourceStyle width="40" x="280" y="320" height="40"/>
|
||||
<symbolStyle id="116" name="shooting">
|
||||
<resourceStyle width="40" x="262" y="320" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="118" name="speed_trap">
|
||||
<resourceStyle width="31" x="320" y="320" height="31"/>
|
||||
<symbolStyle id="117" name="slipway">
|
||||
<resourceStyle width="40" x="302" y="320" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="119" name="subway">
|
||||
<resourceStyle width="40" x="351" y="320" height="40"/>
|
||||
<symbolStyle id="118" name="soccer-borderless">
|
||||
<resourceStyle width="40" x="342" y="320" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="120" name="supermarket">
|
||||
<resourceStyle width="40" x="391" y="320" height="40"/>
|
||||
<symbolStyle id="119" name="soccer">
|
||||
<resourceStyle width="40" x="382" y="320" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="121" name="survey_point">
|
||||
<resourceStyle width="16" x="431" y="320" height="16"/>
|
||||
<symbolStyle id="120" name="speed_trap">
|
||||
<resourceStyle width="31" x="422" y="320" height="31"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="122" name="swimming-borderless">
|
||||
<resourceStyle width="40" x="447" y="320" height="40"/>
|
||||
<symbolStyle id="121" name="subway">
|
||||
<resourceStyle width="40" x="453" y="320" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="123" name="swimming">
|
||||
<symbolStyle id="122" name="supermarket">
|
||||
<resourceStyle width="40" x="0" y="360" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="124" name="synagogue">
|
||||
<resourceStyle width="40" x="40" y="360" height="40"/>
|
||||
<symbolStyle id="123" name="survey_point">
|
||||
<resourceStyle width="16" x="40" y="360" height="16"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="125" name="telephone">
|
||||
<resourceStyle width="40" x="80" y="360" height="40"/>
|
||||
<symbolStyle id="124" name="swimming-borderless">
|
||||
<resourceStyle width="40" x="56" y="360" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="126" name="tennis-borderless">
|
||||
<resourceStyle width="40" x="120" y="360" height="40"/>
|
||||
<symbolStyle id="125" name="swimming">
|
||||
<resourceStyle width="40" x="96" y="360" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="127" name="tennis">
|
||||
<resourceStyle width="40" x="160" y="360" height="40"/>
|
||||
<symbolStyle id="126" name="synagogue">
|
||||
<resourceStyle width="40" x="136" y="360" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="128" name="theatre">
|
||||
<resourceStyle width="40" x="200" y="360" height="40"/>
|
||||
<symbolStyle id="127" name="telephone">
|
||||
<resourceStyle width="40" x="176" y="360" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="129" name="toilets">
|
||||
<resourceStyle width="40" x="240" y="360" height="40"/>
|
||||
<symbolStyle id="128" name="tennis-borderless">
|
||||
<resourceStyle width="40" x="216" y="360" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="130" name="traffic_signal">
|
||||
<resourceStyle width="31" x="280" y="360" height="31"/>
|
||||
<symbolStyle id="129" name="tennis">
|
||||
<resourceStyle width="40" x="256" y="360" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="131" name="tramway">
|
||||
<resourceStyle width="40" x="311" y="360" height="40"/>
|
||||
<symbolStyle id="130" name="theatre">
|
||||
<resourceStyle width="40" x="296" y="360" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="132" name="tree">
|
||||
<resourceStyle width="10" x="351" y="360" height="10"/>
|
||||
<symbolStyle id="131" name="toilets">
|
||||
<resourceStyle width="40" x="336" y="360" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="133" name="university">
|
||||
<resourceStyle width="40" x="361" y="360" height="40"/>
|
||||
<symbolStyle id="132" name="traffic_signal">
|
||||
<resourceStyle width="31" x="376" y="360" height="31"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="134" name="viewpoint">
|
||||
<resourceStyle width="28" x="401" y="360" height="28"/>
|
||||
<symbolStyle id="133" name="tramway-mini">
|
||||
<resourceStyle width="40" x="407" y="360" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="135" name="vulcan">
|
||||
<resourceStyle width="18" x="429" y="360" height="18"/>
|
||||
<symbolStyle id="134" name="tramway">
|
||||
<resourceStyle width="40" x="447" y="360" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="136" name="wastewater">
|
||||
<resourceStyle width="28" x="447" y="360" height="28"/>
|
||||
<symbolStyle id="135" name="tree">
|
||||
<resourceStyle width="10" x="487" y="360" height="10"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="137" name="windmill">
|
||||
<resourceStyle width="31" x="475" y="360" height="31"/>
|
||||
<symbolStyle id="136" name="university">
|
||||
<resourceStyle width="40" x="0" y="400" height="40"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="137" name="viewpoint">
|
||||
<resourceStyle width="28" x="40" y="400" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="138" name="vulcan">
|
||||
<resourceStyle width="18" x="68" y="400" height="18"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="139" name="wastewater">
|
||||
<resourceStyle width="28" x="86" y="400" height="28"/>
|
||||
</symbolStyle>
|
||||
<symbolStyle id="140" name="windmill">
|
||||
<resourceStyle width="31" x="114" y="400" height="31"/>
|
||||
</symbolStyle>
|
||||
</page>
|
||||
</skin>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
76
data/styles/symbols/railway-station-mini.svg
Normal file
76
data/styles/symbols/railway-station-mini.svg
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
|
||||
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
version="1.0"
|
||||
id="Layer_1"
|
||||
x="0px"
|
||||
y="0px"
|
||||
width="24"
|
||||
height="24"
|
||||
viewBox="0 0 24 24"
|
||||
enable-background="new 0 0 66.461 100"
|
||||
xml:space="preserve"
|
||||
inkscape:version="0.48.2 r9819"
|
||||
sodipodi:docname="railway-station.svg"><title
|
||||
id="title3765">Train Map Icon</title><metadata
|
||||
id="metadata13"><rdf:RDF><cc:Work
|
||||
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Train Map Icon</dc:title><dc:creator><cc:Agent><dc:title>Yury Melnichek</dc:title></cc:Agent></dc:creator><dc:source>mapsforhumans.com</dc:source></cc:Work></rdf:RDF></metadata><defs
|
||||
id="defs11" /><sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="909"
|
||||
inkscape:window-height="754"
|
||||
id="namedview9"
|
||||
showgrid="true"
|
||||
inkscape:zoom="19.154332"
|
||||
inkscape:cx="16.487407"
|
||||
inkscape:cy="13.293445"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="0"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="Layer_1"><inkscape:grid
|
||||
type="xygrid"
|
||||
id="grid2982"
|
||||
empspacing="2"
|
||||
visible="true"
|
||||
enabled="true"
|
||||
snapvisiblegridlinesonly="true" /></sodipodi:namedview>
|
||||
|
||||
|
||||
<rect
|
||||
ry="3.4000001"
|
||||
rx="3.2"
|
||||
y="3"
|
||||
x="4"
|
||||
height="17"
|
||||
width="16"
|
||||
id="rect3759"
|
||||
style="fill:#f2f2f2;fill-opacity:1;stroke:none" /><rect
|
||||
style="fill:#0044d8;fill-opacity:1;stroke:none"
|
||||
id="rect2989"
|
||||
width="14"
|
||||
height="15"
|
||||
x="5"
|
||||
y="4"
|
||||
rx="2.8000002"
|
||||
ry="3" />
|
||||
<path
|
||||
style="fill:#ffffff;fill-opacity:1"
|
||||
d="m 11.984445,5.3245238 c -0.368153,0 -0.683293,0.2052752 -0.855543,0.5092356 l -1.3377565,0 C 8.756891,5.8329038 8.0012976,6.5481919 8.002284,7.329639 l 0,5.537937 c -9.874e-4,0.7592 0.6831692,1.397115 1.3688682,1.495881 l -2.0533018,2.673486 1.1822039,0 7.4665507,0 0.715545,0 -2.068857,-2.673486 c 0.686404,-0.09888 1.370417,-0.736681 1.368867,-1.495881 l 0,-5.537937 C 15.98396,6.5481919 15.23691,5.8329038 14.208855,5.8337594 l -0.7311,0 -0.637767,0 C 12.667738,5.529799 12.352598,5.3245238 11.984445,5.3245238 z m 0,0.5092356 c 0.27491,0 0.49777,0.2279925 0.49777,0.5092357 0,0.281243 -0.22286,0.5092356 -0.49777,0.5092356 -0.274911,0 -0.49777,-0.2279926 -0.49777,-0.5092356 0,-0.2812432 0.222859,-0.5092357 0.49777,-0.5092357 z M 9.4644834,7.3932936 c 0.1113913,-0.00391 0.2429587,2.139e-4 0.3888828,0 l 2.1466338,0 2.146633,0 c 0.584402,8.4e-4 0.881658,0.043642 0.886653,0.7797668 l 0,1.0025578 c 0.0015,0.4818481 0.235367,0.7638538 -0.886653,0.7638538 l -2.146633,0 -2.1466338,0 c -0.8940971,0 -0.9031936,-0.2820057 -0.9022083,-0.7638538 l 0,-1.0025578 c 0,-0.6628219 0.1791524,-0.7680279 0.5133255,-0.7797668 z m 0.2799965,4.7899974 c 0.4353411,-0.0021 0.7913481,0.308902 0.7933211,0.684285 -0.0019,0.376727 -0.35798,0.681475 -0.7933211,0.684285 -0.430975,-0.0028 -0.7787521,-0.307678 -0.7777658,-0.684285 -9.884e-4,-0.375383 0.3467908,-0.686119 0.7777658,-0.684285 z m 4.4799301,0 c 0.435343,-0.0021 0.775512,0.308902 0.777766,0.684285 -0.0024,0.376605 -0.342423,0.681353 -0.777766,0.684285 -0.431538,-0.0031 -0.794589,-0.30768 -0.793321,-0.684285 -0.0013,-0.375383 0.361783,-0.686119 0.793321,-0.684285 z M 9.993364,15 l 1.991081,0 1.99108,0 0.388883,0.509237 -4.7443707,0 L 9.993364,15 z m -0.7466544,1.018472 5.4910264,0 0.388882,0.509236 -6.2532361,0 0.3733277,-0.509236 z"
|
||||
id="path7"
|
||||
inkscape:connector-curvature="0" /></svg>
|
||||
|
After Width: | Height: | Size: 4 KiB |
132
data/styles/symbols/tramway-mini.svg
Normal file
132
data/styles/symbols/tramway-mini.svg
Normal file
|
|
@ -0,0 +1,132 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
version="1.1"
|
||||
width="24"
|
||||
height="24"
|
||||
id="symbol-bus"
|
||||
viewBox="0 0 51.502147 51.502147"
|
||||
inkscape:version="0.48.2 r9819"
|
||||
sodipodi:docname="tramway-mini.svg">
|
||||
<title
|
||||
id="title2983">Tramway Stop Map Icon</title>
|
||||
<metadata
|
||||
id="metadata23">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title>Tramway Stop Map Icon</dc:title>
|
||||
<dc:creator>
|
||||
<cc:Agent>
|
||||
<dc:title>Yury Melnichek</dc:title>
|
||||
</cc:Agent>
|
||||
</dc:creator>
|
||||
<dc:source>mapsforhumans.com</dc:source>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<defs
|
||||
id="defs21" />
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="876"
|
||||
inkscape:window-height="731"
|
||||
id="namedview19"
|
||||
showgrid="true"
|
||||
showguides="true"
|
||||
inkscape:guide-bbox="true"
|
||||
inkscape:zoom="21.911915"
|
||||
inkscape:cx="11.36558"
|
||||
inkscape:cy="11.369316"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="0"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="symbol-bus">
|
||||
<inkscape:grid
|
||||
type="xygrid"
|
||||
id="grid2985"
|
||||
empspacing="2"
|
||||
visible="true"
|
||||
enabled="true"
|
||||
snapvisiblegridlinesonly="true" />
|
||||
</sodipodi:namedview>
|
||||
<rect
|
||||
ry="7.7253222"
|
||||
rx="6.8669529"
|
||||
y="4.2918458"
|
||||
x="8.5836916"
|
||||
height="38.62661"
|
||||
width="34.334766"
|
||||
id="rect2995"
|
||||
style="fill:#f2f2f2;fill-opacity:1;stroke:none" />
|
||||
<rect
|
||||
style="fill:#003cd8;fill-opacity:1;stroke:none"
|
||||
id="rect2993"
|
||||
width="30.042919"
|
||||
height="34.334766"
|
||||
x="10.729614"
|
||||
y="6.4377685"
|
||||
rx="6.0085835"
|
||||
ry="6.8669538" />
|
||||
<path
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none"
|
||||
d="m 19.619869,17.167383 18.546905,0 0,17.167382 -3.372165,0 -1.686081,-3.121342 -13.488659,0 -1.686082,3.121342 -3.372164,0 c -1.150275,0 -1.686082,-0.439642 -1.686082,-1.560672 l 0,-4.682013 c 0,-0.72602 0.538403,-2.36761 0.929259,-2.99424 l 4.128987,-6.369786 c 0.355801,-0.456595 0.917828,-1.560672 1.686082,-1.560671 z"
|
||||
id="rect3005"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="ccccccccccccc" />
|
||||
<path
|
||||
sodipodi:type="arc"
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none"
|
||||
id="path3008"
|
||||
sodipodi:cx="10"
|
||||
sodipodi:cy="18"
|
||||
sodipodi:rx="2"
|
||||
sodipodi:ry="2"
|
||||
d="m 12,18 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
|
||||
transform="matrix(1.6860822,0,0,1.5606711,6.1312114,6.2426844)" />
|
||||
<path
|
||||
transform="matrix(1.6860822,0,0,1.5606711,12.875541,6.2426844)"
|
||||
d="m 12,18 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
|
||||
sodipodi:ry="2"
|
||||
sodipodi:rx="2"
|
||||
sodipodi:cy="18"
|
||||
sodipodi:cx="10"
|
||||
id="path3010"
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none"
|
||||
sodipodi:type="arc" />
|
||||
<path
|
||||
style="fill:#0044d8;fill-opacity:1;stroke:none"
|
||||
d="m 19.047788,19.610604 -3.463393,5.342975 c -0.512897,0.964891 -0.107885,1.57783 1.440553,1.57783 l 7.653168,0 0,-7.803355 -3.906719,0 c -1.151528,0 -1.031312,0.138181 -1.723609,0.88255 z"
|
||||
id="path3012"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="ccccccc" />
|
||||
<rect
|
||||
style="fill:#0044d8;fill-opacity:1;stroke:none"
|
||||
id="rect3782"
|
||||
width="10.116493"
|
||||
height="7.8033557"
|
||||
x="26.364197"
|
||||
y="18.728054" />
|
||||
<path
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none"
|
||||
d="m 26.605857,8.5836914 -4.342725,3.4334766 -0.0016,0.858369 0.0016,0.858369 4.342725,3.433476 0.03912,0 0.634015,-1.502145 -3.568289,-2.7897 3.584008,-2.7897 -0.01293,-1.5021458 z m 1.291081,0 -0.622761,-2e-7 0.0047,1.4913678 3.51327,2.800478 -3.52113,2.7897 -0.626003,1.502145 1.251982,0 4.342726,-3.433476 0.0094,-0.858369 -0.0094,-0.858369 z"
|
||||
id="rect3795"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cccccccccccccccccccccc" />
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 4.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 127 KiB After Width: | Height: | Size: 130 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 57 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 93 KiB After Width: | Height: | Size: 95 KiB |
|
|
@ -48,7 +48,7 @@ world 000000000000000000 +
|
|||
[religion] 000000000000000000 -
|
||||
christian 000000000000001111 -
|
||||
{}
|
||||
hospital 000000000000001111 -
|
||||
hospital 000000000000000111 -
|
||||
hunting_stand 000000000000000001 -
|
||||
kindergarten 000000000000000111 -
|
||||
library 000000000000000001 -
|
||||
|
|
@ -933,9 +933,9 @@ world 000000000000000000 +
|
|||
tunnel 000000000000111111 -
|
||||
{}
|
||||
level_crossing 000000000000000011 -
|
||||
light_rail 000000000011111111 +
|
||||
light_rail 000000000000111111 +
|
||||
bridge 000000000000000011 -
|
||||
tunnel 000000000011111111 -
|
||||
tunnel 000000000000111111 -
|
||||
{}
|
||||
monorail 000000000000111111 +
|
||||
bridge 000000000000000011 -
|
||||
|
|
@ -980,7 +980,7 @@ world 000000000000000000 +
|
|||
bridge 000000000000000011 -
|
||||
tunnel 000000000011111111 -
|
||||
{}
|
||||
tram_stop 000000000000001111 -
|
||||
tram_stop 000000000000000111 -
|
||||
yard 000000000000001111 +
|
||||
bridge 000000000000000011 -
|
||||
tunnel 000000000000111111 -
|
||||
|
|
|
|||
201
map/map_tests/screen_coverage_test.cpp
Normal file
201
map/map_tests/screen_coverage_test.cpp
Normal file
|
|
@ -0,0 +1,201 @@
|
|||
#include "../../testing/testing.hpp"
|
||||
|
||||
#include "../screen_coverage.hpp"
|
||||
|
||||
#include "../coverage_generator.hpp"
|
||||
#include "../tile_renderer.hpp"
|
||||
#include "../../yg/rendercontext.hpp"
|
||||
#include "../../std/bind.hpp"
|
||||
#include "../../platform/platform.hpp"
|
||||
#include "../../yg/internal/opengl.hpp"
|
||||
|
||||
class RenderContextMock : public yg::gl::RenderContext
|
||||
{
|
||||
public:
|
||||
|
||||
void makeCurrent()
|
||||
{}
|
||||
|
||||
shared_ptr<yg::gl::RenderContext> createShared()
|
||||
{
|
||||
return shared_ptr<yg::gl::RenderContext>(new RenderContextMock());
|
||||
}
|
||||
|
||||
void endThreadDrawing()
|
||||
{}
|
||||
};
|
||||
|
||||
class TileRendererMock : public TileRenderer
|
||||
{
|
||||
public:
|
||||
TileRendererMock(string const & skinName,
|
||||
unsigned scaleEtalonSize,
|
||||
unsigned maxTilesCount,
|
||||
unsigned tasksCount,
|
||||
yg::Color const & bgColor,
|
||||
RenderPolicy::TRenderFn const & renderFn)
|
||||
: TileRenderer(skinName, scaleEtalonSize, maxTilesCount, tasksCount, bgColor, renderFn)
|
||||
{}
|
||||
|
||||
void DrawTile(core::CommandsQueue::Environment const & env,
|
||||
Tiler::RectInfo const & rectInfo,
|
||||
int sequenceID)
|
||||
{
|
||||
shared_ptr<yg::gl::BaseTexture> tileTarget = m_resourceManager->renderTargets().Front(true);
|
||||
|
||||
shared_ptr<yg::InfoLayer> layer(new yg::InfoLayer());
|
||||
|
||||
ScreenBase frameScreen;
|
||||
|
||||
unsigned tileWidth = m_resourceManager->tileTextureWidth();
|
||||
unsigned tileHeight = m_resourceManager->tileTextureHeight();
|
||||
|
||||
m2::RectI renderRect(1, 1, tileWidth - 1, tileHeight - 1);
|
||||
|
||||
frameScreen.OnSize(renderRect);
|
||||
frameScreen.SetFromRect(rectInfo.m_rect);
|
||||
|
||||
LOG(LINFO, ("drawTile : ", rectInfo.m_y, rectInfo.m_x, rectInfo.m_tileScale, rectInfo.m_drawScale, ", id=", rectInfo.toUInt64Cell()));
|
||||
|
||||
if (sequenceID < m_sequenceID)
|
||||
return;
|
||||
|
||||
if (HasTile(rectInfo))
|
||||
return;
|
||||
|
||||
threads::Sleep(500);
|
||||
|
||||
AddTile(rectInfo, Tile(tileTarget, layer, frameScreen, rectInfo, 0));
|
||||
}
|
||||
};
|
||||
|
||||
class WindowHandleMock : public WindowHandle
|
||||
{
|
||||
public:
|
||||
void invalidateImpl()
|
||||
{}
|
||||
};
|
||||
|
||||
void foo()
|
||||
{}
|
||||
|
||||
void ScreenCoverageTestImpl(int executorsNum)
|
||||
{
|
||||
yg::gl::g_doFakeOpenGLCalls = true;
|
||||
|
||||
shared_ptr<WindowHandle> windowHandle(new WindowHandleMock());
|
||||
shared_ptr<yg::gl::RenderContext> primaryContext(new RenderContextMock());
|
||||
shared_ptr<yg::ResourceManager> resourceManager = make_shared_ptr(new yg::ResourceManager(
|
||||
30000 * sizeof(yg::gl::Vertex),
|
||||
50000 * sizeof(unsigned short),
|
||||
20,
|
||||
3000 * sizeof(yg::gl::Vertex),
|
||||
5000 * sizeof(unsigned short),
|
||||
100,
|
||||
10 * sizeof(yg::gl::AuxVertex),
|
||||
10 * sizeof(unsigned short),
|
||||
30,
|
||||
512, 256, 10,
|
||||
512, 256, 5,
|
||||
512, 512, 20,
|
||||
"unicode_blocks.txt",
|
||||
"fonts_whitelist.txt",
|
||||
"fonts_blacklist.txt",
|
||||
2 * 1024 * 1024,
|
||||
GetPlatform().CpuCores() + 1,
|
||||
yg::Rt8Bpp,
|
||||
false));
|
||||
|
||||
TileRendererMock tileRenderer("basic.skn", 512 + 256, 10, executorsNum, yg::Color(), bind(&foo));
|
||||
|
||||
CoverageGenerator gen(
|
||||
GetPlatform().TileSize(),
|
||||
GetPlatform().ScaleEtalonSize(),
|
||||
&tileRenderer,
|
||||
windowHandle
|
||||
);
|
||||
|
||||
gen.Initialize();
|
||||
tileRenderer.Initialize(primaryContext, resourceManager, 1);
|
||||
|
||||
ScreenBase screen0(m2::RectI(0, 0, 347, 653), m2::RectD(14.672034256593292412, 56.763875246806442476, 16.337299222955756761, 59.897644765638396791));
|
||||
ScreenBase screen1(m2::RectI(0, 0, 347, 653), m2::RectD(13.539462118087413955, 56.759076212321247112, 15.204727084449878305, 59.892845731153201427));
|
||||
ScreenBase screen2(m2::RectI(0, 0, 347, 653), m2::RectD(16.154935912518372021, 56.749478143350856385, 17.82020087888083637, 59.8832476621828107));
|
||||
ScreenBase screen3(m2::RectI(0, 0, 347, 653), m2::RectD(17.335498395876193456, 56.725482970924879567, 19.000763362238657805, 59.859252489756833882));
|
||||
|
||||
gen.AddCoverScreenTask(screen0);
|
||||
|
||||
/// waiting for CoverScreen processed
|
||||
gen.WaitForEmptyAndFinished();
|
||||
/// waiting for the tiles to be rendered...
|
||||
tileRenderer.WaitForEmptyAndFinished();
|
||||
/// ...and merged
|
||||
gen.WaitForEmptyAndFinished();
|
||||
|
||||
gen.AddCoverScreenTask(screen1);
|
||||
|
||||
gen.WaitForEmptyAndFinished();
|
||||
tileRenderer.WaitForEmptyAndFinished();
|
||||
gen.WaitForEmptyAndFinished();
|
||||
|
||||
gen.AddCoverScreenTask(screen0);
|
||||
|
||||
gen.WaitForEmptyAndFinished();
|
||||
tileRenderer.WaitForEmptyAndFinished();
|
||||
gen.WaitForEmptyAndFinished();
|
||||
|
||||
/// checking that erased tiles are completely unlocked
|
||||
|
||||
TileCache * tileCache = &tileRenderer.GetTileCache();
|
||||
|
||||
vector<Tiler::RectInfo> erasedRects;
|
||||
|
||||
erasedRects.push_back(Tiler::RectInfo(8, 8, 9, 40));
|
||||
erasedRects.push_back(Tiler::RectInfo(8, 8, 9, 41));
|
||||
erasedRects.push_back(Tiler::RectInfo(8, 8, 9, 42));
|
||||
|
||||
for (unsigned i = 0; i < erasedRects.size(); ++i)
|
||||
CHECK(tileCache->lockCount(erasedRects[i]) == 0, ());
|
||||
|
||||
/// checking, that tiles in coverage are present and locked
|
||||
|
||||
vector<Tiler::RectInfo> coveredRects;
|
||||
|
||||
coveredRects.push_back(Tiler::RectInfo(8, 8, 10, 40));
|
||||
coveredRects.push_back(Tiler::RectInfo(8, 8, 10, 41));
|
||||
coveredRects.push_back(Tiler::RectInfo(8, 8, 10, 42));
|
||||
|
||||
for (unsigned i = 0; i < coveredRects.size(); ++i)
|
||||
CHECK(tileCache->lockCount(coveredRects[i]) > 0, (coveredRects[i].m_x, coveredRects[i].m_y, coveredRects[i].m_tileScale, coveredRects[i].m_drawScale, coveredRects[i].toUInt64Cell()));
|
||||
|
||||
gen.AddCoverScreenTask(screen2);
|
||||
gen.WaitForEmptyAndFinished();
|
||||
tileRenderer.WaitForEmptyAndFinished();
|
||||
gen.WaitForEmptyAndFinished();
|
||||
|
||||
for (unsigned i = 0; i < coveredRects.size(); ++i)
|
||||
CHECK(tileCache->lockCount(coveredRects[i]) == 0, (coveredRects[i].m_x, coveredRects[i].m_y, coveredRects[i].m_tileScale, coveredRects[i].m_drawScale, coveredRects[i].toUInt64Cell()));
|
||||
|
||||
coveredRects.clear();
|
||||
|
||||
coveredRects.push_back(Tiler::RectInfo(8, 8, 11, 40));
|
||||
coveredRects.push_back(Tiler::RectInfo(8, 8, 11, 41));
|
||||
coveredRects.push_back(Tiler::RectInfo(8, 8, 11, 42));
|
||||
|
||||
for (unsigned i = 0; i < coveredRects.size(); ++i)
|
||||
CHECK(tileCache->lockCount(coveredRects[i]) == 0, (coveredRects[i].m_x, coveredRects[i].m_y, coveredRects[i].m_tileScale, coveredRects[i].m_drawScale, coveredRects[i].toUInt64Cell()));
|
||||
|
||||
gen.AddCoverScreenTask(screen3);
|
||||
gen.WaitForEmptyAndFinished();
|
||||
tileRenderer.WaitForEmptyAndFinished();
|
||||
gen.WaitForEmptyAndFinished();
|
||||
|
||||
gen.Cancel();
|
||||
}
|
||||
|
||||
UNIT_TEST(ScreenCoverageTest)
|
||||
{
|
||||
ScreenCoverageTestImpl(2);
|
||||
// ScreenCoverageTestImpl(2);
|
||||
}
|
||||
|
||||
Loading…
Add table
Reference in a new issue