Skip to content

Commit

Permalink
added border control point
Browse files Browse the repository at this point in the history
changed the fill of bare rocks
  • Loading branch information
IgorMagellan committed Mar 17, 2022
1 parent 33e0617 commit 962f3a6
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 10 deletions.
10 changes: 8 additions & 2 deletions Tiramisu-changelog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Tiramisu 4.1 for OpenAndroMap *
* Tiramisu 4.2 for OpenAndroMap *
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
(mapsforge V4+)

Expand Down Expand Up @@ -90,5 +90,11 @@ Release version 4.1
добавил charging_station
19/02/2022
заливка территории hospital розовым

20/02/2022
добавил подписи для всех barriers
12/03/2022
переделал hedge на scale="all"
17/03/2022
добавил пограничный пункт контроля barrier=border_control
поднял контраст для bare_rock
Release version 4.2
16 changes: 8 additions & 8 deletions Tiramisu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -437,10 +437,10 @@ version="5" map-background="#ffffff" map-background-outside="#ffffff">
<rule cat="tms_terrain" e="way" k="natural" v="glacier" zoom-min="12"> <area fill="#BBE0FFFF" stroke="#E0FFFF" stroke-width="0.8" /> </rule>

<!-- Bare ground -->
<rule cat="tms_terrain" e="way" k="natural" v="rock|stone|bare_rock|bedrock" zoom-min="13" zoom-max="13"> <area src="file:/res/p_rock.svg" symbol-width="060" /> </rule>
<rule cat="tms_terrain" e="way" k="natural" v="rock|stone|bare_rock|bedrock" zoom-min="14" zoom-max="14"> <area src="file:/res/p_rock.svg" symbol-width="090" /> </rule>
<rule cat="tms_terrain" e="way" k="natural" v="rock|stone|bare_rock|bedrock" zoom-min="15" zoom-max="15"> <area src="file:/res/p_rock.svg" symbol-width="130" /> </rule>
<rule cat="tms_terrain" e="way" k="natural" v="rock|stone|bare_rock|bedrock" zoom-min="16" zoom-max="99"> <area src="file:/res/p_rock.svg" symbol-width="170" /> </rule>
<rule cat="tms_terrain" e="way" k="natural" v="rock|stone|bare_rock|bedrock" zoom-min="13" zoom-max="13"> <area src="file:/res/p_rock2.svg" symbol-width="060" /> </rule>
<rule cat="tms_terrain" e="way" k="natural" v="rock|stone|bare_rock|bedrock" zoom-min="14" zoom-max="14"> <area src="file:/res/p_rock2.svg" symbol-width="090" /> </rule>
<rule cat="tms_terrain" e="way" k="natural" v="rock|stone|bare_rock|bedrock" zoom-min="15" zoom-max="15"> <area src="file:/res/p_rock2.svg" symbol-width="130" /> </rule>
<rule cat="tms_terrain" e="way" k="natural" v="rock|stone|bare_rock|bedrock" zoom-min="16" zoom-max="99"> <area src="file:/res/p_rock2.svg" symbol-width="170" /> </rule>

<rule cat="tms_terrain" e="way" k="natural" v="scree" zoom-min="13" zoom-max="13"> <area src="file:/res/p_scree.svg" symbol-width="015" /> </rule>
<rule cat="tms_terrain" e="way" k="natural" v="scree" zoom-min="14" zoom-max="14"> <area src="file:/res/p_scree.svg" symbol-width="025" /> </rule>
Expand Down Expand Up @@ -492,8 +492,8 @@ version="5" map-background="#ffffff" map-background-outside="#ffffff">
</rule>

<rule cat="tms_terrain" e="way" k="barrier" v="hedge" zoom-min="15">
<line stroke="#A5CBA5" stroke-width="0.42" stroke-linecap="round" />
<line stroke="#CBE1CB" stroke-width="0.36" stroke-dasharray="2,5" stroke-linecap="butt" />
<line stroke="#A5CBA5" stroke-width="0.52" stroke-linecap="round" />
<line stroke="#CBE1CB" stroke-width="0.46" scale="all" stroke-dasharray="0.2,0.5" stroke-linecap="butt" />
</rule>

<!-- Contour lines -->
Expand Down Expand Up @@ -524,7 +524,6 @@ version="5" map-background="#ffffff" map-background-outside="#ffffff">

<!-- natural reserve -->


<!-- protected, aboriginal areas -->
<rule cat="tms_terrain" e="way" k="*" v="*">
<!-- <rule e="way" k="boundary" v="aboriginal_lands" zoom-min="8" cat="tms_oopt" >
Expand Down Expand Up @@ -555,7 +554,7 @@ version="5" map-background="#ffffff" map-background-outside="#ffffff">
<line stroke="#80606060" stroke-width="0.2"/>
</rule>
<rule e="way" k="*" v="*" zoom-min="14">
<line src="file:/res/p_rock.svg" stroke-width="1.9"/>
<line src="file:/res/p_rock2.svg" stroke-width="1.9"/>
<line stroke="#AA606060" stroke-width="1.6" scale="all" stroke-dasharray="0.1,0.3" stroke-linecap="butt"/>
<rule cat="tms_landnames" e="way" k="*" v="*" zoom-min="16">
<pathText k="name" font-style="bold_italic" font-family="serif" font-size="11" fill="#666666" stroke="#FFFFFF" stroke-width="3" dy="-1.1"/>
Expand Down Expand Up @@ -2852,6 +2851,7 @@ version="5" map-background="#ffffff" map-background-outside="#ffffff">
<rule e="any" k="*" v="turnstile"> <symbol priority="415" display="always" id="s_barrier" src="file:/res/s_barrier_turnstile.svg" symbol-width="21" /> </rule>
<rule e="any" k="*" v="log"> <symbol priority="415" display="always" id="s_barrier" src="file:/res/s_barrier_log.svg" symbol-width="21" /> </rule>
<rule e="any" k="*" v="kissing_gate"> <symbol priority="415" display="always" id="s_barrier" src="file:/res/s_kissing_gate.svg" symbol-width="21" /> </rule>
<rule e="any" k="*" v="border_control"> <symbol priority="420" display="always" id="s_barrier" src="file:/res/s_border_control.svg" symbol-width="21" /> </rule>
<rule e="any" k="*" v="*" zoom-min="16">
<caption cat="tms_landnames" k="name" symbol-id="s_barrier" position="above" font-style="bold" font-size="8" fill="#ff4c4d" stroke="#E5FFFFFF" stroke-width="2" />
</rule>
Expand Down
Loading

0 comments on commit 962f3a6

Please sign in to comment.