pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[styles] Fixed some POI symbol names.

Browse source
This commit is contained in:
vng 2014-09-06 22:57:37 +03:00 • committed by Alex Zolotarev
parent 39c251c9bf
commit aa21ec0449
16 changed files with 79 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/drules_proto-bw.bin
View file

Binary file not shown.

104
data/drules_proto-bw.txt
View file

@ -4583,35 +4583,35 @@ cont {
element {
scale: 15
area {
color: 13421738
color: 12303257
priority: 1368
}
}
element {
scale: 16
area {
color: 13421738
color: 12303257
priority: 1368
}
}
element {
scale: 17
area {
color: 13421738
color: 12303257
priority: 1368
}
}
element {
scale: 18
area {
color: 13421738
color: 12303257
priority: 1368
}
}
element {
scale: 19
area {
color: 13421738
color: 12303257
priority: 1368
}
}
@ -7190,42 +7190,42 @@ cont {
element {
scale: 14
symbol {
name: "earthquakecamp"
name: "earthquake-camp"
priority: 16000
}
}
element {
scale: 15
symbol {
name: "earthquakecamp"
name: "earthquake-camp"
priority: 16000
}
}
element {
scale: 16
symbol {
name: "earthquakecamp"
name: "earthquake-camp"
priority: 16000
}
}
element {
scale: 17
symbol {
name: "earthquakecamp"
name: "earthquake-camp"
priority: 16000
}
}
element {
scale: 18
symbol {
name: "earthquakecamp"
name: "earthquake-camp"
priority: 16000
}
}
element {
scale: 19
symbol {
name: "earthquakecamp"
name: "earthquake-camp"
priority: 16000
}
}
@ -16087,13 +16087,13 @@ cont {
scale: 15
lines {
width: 2.0
color: 13421738
color: 12303257
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
}
area {
color: 13421738
color: 12303257
priority: 1027
}
path_text {
@ -16108,13 +16108,13 @@ cont {
scale: 16
lines {
width: 3.0
color: 13421738
color: 12303257
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
}
area {
color: 13421738
color: 12303257
priority: 1027
}
path_text {
@ -16129,13 +16129,13 @@ cont {
scale: 17
lines {
width: 7.0
color: 13421738
color: 12303257
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
}
area {
color: 13421738
color: 12303257
priority: 1027
}
path_text {
@ -16150,13 +16150,13 @@ cont {
scale: 18
lines {
width: 9.0
color: 13421738
color: 12303257
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
}
area {
color: 13421738
color: 12303257
priority: 1027
}
path_text {
@ -16171,13 +16171,13 @@ cont {
scale: 19
lines {
width: 17.0
color: 13421738
color: 12303257
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
}
area {
color: 13421738
color: 12303257
priority: 1027
}
path_text {
@ -16194,7 +16194,7 @@ cont {
element {
scale: 15
area {
color: 13421738
color: 12303257
priority: 1027
}
path_text {
@ -16208,7 +16208,7 @@ cont {
element {
scale: 16
area {
color: 13421738
color: 12303257
priority: 1027
}
path_text {
@ -16222,7 +16222,7 @@ cont {
element {
scale: 17
area {
color: 13421738
color: 12303257
priority: 1027
}
path_text {
@ -16236,7 +16236,7 @@ cont {
element {
scale: 18
area {
color: 13421738
color: 12303257
priority: 1027
}
path_text {
@ -16250,7 +16250,7 @@ cont {
element {
scale: 19
area {
color: 13421738
color: 12303257
priority: 1027
}
path_text {
@ -16268,7 +16268,7 @@ cont {
scale: 15
lines {
width: 2.0
color: 13421738
color: 12303257
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -16288,7 +16288,7 @@ cont {
cap: BUTTCAP
}
area {
color: 13421738
color: 12303257
priority: 1027
}
path_text {
@ -16303,7 +16303,7 @@ cont {
scale: 16
lines {
width: 3.0
color: 13421738
color: 12303257
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -16323,7 +16323,7 @@ cont {
cap: BUTTCAP
}
area {
color: 13421738
color: 12303257
priority: 1027
}
path_text {
@ -16338,7 +16338,7 @@ cont {
scale: 17
lines {
width: 7.0
color: 13421738
color: 12303257
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -16358,7 +16358,7 @@ cont {
cap: BUTTCAP
}
area {
color: 13421738
color: 12303257
priority: 1027
}
path_text {
@ -16373,7 +16373,7 @@ cont {
scale: 18
lines {
width: 9.0
color: 13421738
color: 12303257
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -16393,7 +16393,7 @@ cont {
cap: BUTTCAP
}
area {
color: 13421738
color: 12303257
priority: 1027
}
path_text {
@ -16408,7 +16408,7 @@ cont {
scale: 19
lines {
width: 17.0
color: 13421738
color: 12303257
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -16428,7 +16428,7 @@ cont {
cap: BUTTCAP
}
area {
color: 13421738
color: 12303257
priority: 1027
}
path_text {
@ -16446,7 +16446,7 @@ cont {
scale: 15
lines {
width: 2.0
color: 13421738
color: 12303257
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -16470,7 +16470,7 @@ cont {
cap: BUTTCAP
}
area {
color: 13421738
color: 12303257
priority: 1027
}
path_text {
@ -16485,7 +16485,7 @@ cont {
scale: 16
lines {
width: 3.0
color: 13421738
color: 12303257
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -16509,7 +16509,7 @@ cont {
cap: BUTTCAP
}
area {
color: 13421738
color: 12303257
priority: 1027
}
path_text {
@ -16524,7 +16524,7 @@ cont {
scale: 17
lines {
width: 7.0
color: 13421738
color: 12303257
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -16548,7 +16548,7 @@ cont {
cap: BUTTCAP
}
area {
color: 13421738
color: 12303257
priority: 1027
}
path_text {
@ -16563,7 +16563,7 @@ cont {
scale: 18
lines {
width: 9.0
color: 13421738
color: 12303257
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -16587,7 +16587,7 @@ cont {
cap: BUTTCAP
}
area {
color: 13421738
color: 12303257
priority: 1027
}
path_text {
@ -16602,7 +16602,7 @@ cont {
scale: 19
lines {
width: 17.0
color: 13421738
color: 12303257
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -16626,7 +16626,7 @@ cont {
cap: BUTTCAP
}
area {
color: 13421738
color: 12303257
priority: 1027
}
path_text {
@ -31808,21 +31808,21 @@ cont {
element {
scale: 17
symbol {
name: "golfCourse"
name: "golf-course"
priority: 16000
}
}
element {
scale: 18
symbol {
name: "golfCourse"
name: "golf-course"
priority: 16000
}
}
element {
scale: 19
symbol {
name: "golfCourse"
name: "golf-course"
priority: 16000
}
}
@ -49982,21 +49982,21 @@ cont {
element {
scale: 17
symbol {
name: "golfCourse"
name: "golf-course"
priority: 16000
}
}
element {
scale: 18
symbol {
name: "golfCourse"
name: "golf-course"
priority: 16000
}
}
element {
scale: 19
symbol {
name: "golfCourse"
name: "golf-course"
priority: 16000
}
}

BIN
data/drules_proto.bin
View file

Binary file not shown.

24
data/drules_proto.txt
View file

@ -9558,42 +9558,42 @@ cont {
element {
scale: 14
symbol {
name: "earthquakecamp"
name: "earthquake-camp"
priority: 16000
}
}
element {
scale: 15
symbol {
name: "earthquakecamp"
name: "earthquake-camp"
priority: 16000
}
}
element {
scale: 16
symbol {
name: "earthquakecamp"
name: "earthquake-camp"
priority: 16000
}
}
element {
scale: 17
symbol {
name: "earthquakecamp"
name: "earthquake-camp"
priority: 16000
}
}
element {
scale: 18
symbol {
name: "earthquakecamp"
name: "earthquake-camp"
priority: 16000
}
}
element {
scale: 19
symbol {
name: "earthquakecamp"
name: "earthquake-camp"
priority: 16000
}
}
@ -37450,7 +37450,7 @@ cont {
priority: -16189
}
symbol {
name: "golfCourse"
name: "golf-course"
priority: 16000
}
}
@ -37461,7 +37461,7 @@ cont {
priority: -16190
}
symbol {
name: "golfCourse"
name: "golf-course"
priority: 16000
}
}
@ -37472,7 +37472,7 @@ cont {
priority: -16191
}
symbol {
name: "golfCourse"
name: "golf-course"
priority: 16000
}
}
@ -59891,21 +59891,21 @@ cont {
element {
scale: 17
symbol {
name: "golfCourse"
name: "golf-course"
priority: 16000
}
}
element {
scale: 18
symbol {
name: "golfCourse"
name: "golf-course"
priority: 16000
}
}
element {
scale: 19
symbol {
name: "golfCourse"
name: "golf-course"
priority: 16000
}
}

4
data/resources-hdpi/basic.skn
View file

@ -340,7 +340,7 @@
<symbolStyle id="113" name="gymnastics-borderless">
<resourceStyle x="140" y="191" height="28" width="28"/>
</symbolStyle>
<symbolStyle id="114" name="golfcourse">
<symbolStyle id="114" name="golf-course">
<resourceStyle x="168" y="191" height="28" width="28"/>
</symbolStyle>
<symbolStyle id="115" name="gate">
@ -373,7 +373,7 @@
<symbolStyle id="124" name="equestrian-borderless">
<resourceStyle x="448" y="191" height="28" width="28"/>
</symbolStyle>
<symbolStyle id="125" name="earthquakecamp">
<symbolStyle id="125" name="earthquake-camp">
<resourceStyle x="476" y="191" height="28" width="28"/>
</symbolStyle>
<symbolStyle id="126" name="basketball-borderless">

4
data/resources-ldpi/basic.skn
View file

@ -337,7 +337,7 @@
<symbolStyle id="112" name="archery-borderless">
<resourceStyle width="20" x="200" y="89" height="20"/>
</symbolStyle>
<symbolStyle id="113" name="golfcourse">
<symbolStyle id="113" name="golf-course">
<resourceStyle width="20" x="220" y="89" height="20"/>
</symbolStyle>
<symbolStyle id="114" name="gate">
@ -346,7 +346,7 @@
<symbolStyle id="115" name="athletics-borderless">
<resourceStyle width="20" x="260" y="89" height="20"/>
</symbolStyle>
<symbolStyle id="116" name="earthquakecamp">
<symbolStyle id="116" name="earthquake-camp">
<resourceStyle width="20" x="280" y="89" height="20"/>
</symbolStyle>
<symbolStyle id="117" name="arrow">

4
data/resources-mdpi/basic.skn
View file

@ -331,7 +331,7 @@
<symbolStyle id="110" name="gymnastics-borderless">
<resourceStyle width="20" x="180" y="95" height="20"/>
</symbolStyle>
<symbolStyle id="111" name="golfcourse">
<symbolStyle id="111" name="golf-course">
<resourceStyle width="20" x="200" y="95" height="20"/>
</symbolStyle>
<symbolStyle id="112" name="alpine_hut">
@ -346,7 +346,7 @@
<symbolStyle id="115" name="athletics-borderless">
<resourceStyle width="20" x="280" y="95" height="20"/>
</symbolStyle>
<symbolStyle id="116" name="earthquakecamp">
<symbolStyle id="116" name="earthquake-camp">
<resourceStyle width="20" x="300" y="95" height="20"/>
</symbolStyle>
<symbolStyle id="117" name="arrow">

4
data/resources-xhdpi/basic.skn
View file

@ -334,7 +334,7 @@
<symbolStyle name="alpine_hut" id="111">
<resourceStyle width="40" x="360" height="40" y="186"/>
</symbolStyle>
<symbolStyle name="golfcourse" id="112">
<symbolStyle name="golf-course" id="112">
<resourceStyle width="40" x="400" height="40" y="186"/>
</symbolStyle>
<symbolStyle name="gate" id="113">
@ -352,7 +352,7 @@
<symbolStyle name="archery" id="117">
<resourceStyle width="40" x="600" height="40" y="186"/>
</symbolStyle>
<symbolStyle name="earthquakecamp" id="118">
<symbolStyle name="earthquake-camp" id="118">
<resourceStyle width="40" x="640" height="40" y="186"/>
</symbolStyle>
<symbolStyle name="equestrian-borderless" id="119">

4
data/resources-xxhdpi/basic.skn
View file

@ -334,7 +334,7 @@
<symbolStyle name="alpine_hut" id="111">
<resourceStyle height="52" width="52" x="780" y="305"/>
</symbolStyle>
<symbolStyle name="golfcourse" id="112">
<symbolStyle name="golf-course" id="112">
<resourceStyle height="52" width="52" x="832" y="305"/>
</symbolStyle>
<symbolStyle name="gate" id="113">
@ -352,7 +352,7 @@
<symbolStyle name="archery" id="117">
<resourceStyle height="52" width="52" x="104" y="357"/>
</symbolStyle>
<symbolStyle name="earthquakecamp" id="118">
<symbolStyle name="earthquake-camp" id="118">
<resourceStyle height="52" width="52" x="156" y="357"/>
</symbolStyle>
<symbolStyle name="equestrian-borderless" id="119">

4
data/resources-yota/basic.skn
View file

@ -331,7 +331,7 @@
<symbolStyle id="110" name="gymnastics-borderless">
<resourceStyle height="23" x="69" y="125" width="23"/>
</symbolStyle>
<symbolStyle id="111" name="golfcourse">
<symbolStyle id="111" name="golf-course">
<resourceStyle height="23" x="92" y="125" width="23"/>
</symbolStyle>
<symbolStyle id="112" name="gate">
@ -358,7 +358,7 @@
<symbolStyle id="119" name="dog_park">
<resourceStyle height="23" x="276" y="125" width="23"/>
</symbolStyle>
<symbolStyle id="120" name="earthquakecamp">
<symbolStyle id="120" name="earthquake-camp">
<resourceStyle height="23" x="299" y="125" width="23"/>
</symbolStyle>
<symbolStyle id="121" name="equestrian-borderless">

2
data/styles/include/base_sport.mapcss
View file

@ -105,7 +105,7 @@ node|z17-[sport=golf],
area|z17-[leisure=golf_course],
node|z17-[leisure=golf_course]
{
icon-image: golfCourse.svg;
icon-image: golf-course.svg;
}
area|z17-[sport=baseball],
node|z17-[sport=baseball]

2
data/styles/ink.mapcss
View file

@ -902,7 +902,7 @@ line|z14[piste:lift=j-bar]::d2p2
area|z14-[earthquake:damage=spontaneous_camp],
node|z14-[earthquake:damage=spontaneous_camp]
{
icon-image: earthquakecamp.svg;
icon-image: earthquake-camp.svg;
}
line|z14[railway=spur]
{

2
data/styles/normal.mapcss
View file

@ -954,7 +954,7 @@ line|z14[piste:lift=j-bar]::d2p2
area|z14-[earthquake:damage=spontaneous_camp],
node|z14-[earthquake:damage=spontaneous_camp]
{
icon-image: earthquakecamp.svg;
icon-image: earthquake-camp.svg;
}
line|z14[railway=spur]
{

0
data/styles/symbols/earthquakeCamp.svg → data/styles/symbols/earthquake-camp.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2 KiB

0
data/styles/symbols/golfCourse.svg → data/styles/symbols/golf-course.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

64
data/styles/symbols/hospital0.svg
View file

@ -1,64 +0,0 @@
<?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"
id="hospital"
viewBox="0 0 22.4 22.4"
height="24"
inkscape:version="0.48.2 r9819"
sodipodi:docname="hospital.svg"
style="fill:none;stroke:#e60202;stroke-width:3px">
<metadata
id="metadata11">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs9" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="859"
inkscape:window-height="654"
id="namedview7"
showgrid="true"
inkscape:zoom="15.733333"
inkscape:cx="7.5"
inkscape:cy="11.25"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="hospital">
<inkscape:grid
type="xygrid"
id="grid2988"
empspacing="2"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" />
</sodipodi:namedview>
<path
style="fill:#c70000;fill-opacity:1;stroke:none"
d="m 9.3333333,5.6 0,3.7333333 -3.7333333,0 0,3.7333337 3.7333333,0 0,3.733333 3.7333337,0 0,-3.733333 3.733333,0 0,-3.7333337 -3.733333,0 0,-3.7333333 -3.7333337,0 z"
id="path2990" />
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.9 KiB