[styles] Fixed some POI symbol names.

16 files changed, 79 insertions, 143 deletions

diff --git a/data/drules_proto-bw.bin b/data/drules_proto-bw.bin
index 177176fc9b..fdca901cfb 100644
--- a/data/drules_proto-bw.bin
+++ b/data/drules_proto-bw.bin
diff --git a/data/drules_proto-bw.txt b/data/drules_proto-bw.txt
index adaebdccbd..698e5de669 100644
--- a/data/drules_proto-bw.txt
+++ b/data/drules_proto-bw.txt
@@ -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
     }
   }
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 99caaf64ca..fccdfe4aa6 100644
--- a/data/drules_proto.bin
+++ b/data/drules_proto.bin
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 7cb66c56cd..a2621b89de 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -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
     }
   }
diff --git a/data/resources-hdpi/basic.skn b/data/resources-hdpi/basic.skn
index 1924b81f59..be68e1c9f0 100644
--- a/data/resources-hdpi/basic.skn
+++ b/data/resources-hdpi/basic.skn
@@ -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">
diff --git a/data/resources-ldpi/basic.skn b/data/resources-ldpi/basic.skn
index 475ff7effc..16f47491d2 100644
--- a/data/resources-ldpi/basic.skn
+++ b/data/resources-ldpi/basic.skn
@@ -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">
diff --git a/data/resources-mdpi/basic.skn b/data/resources-mdpi/basic.skn
index 70b6dff0d4..d24c2ede8c 100644
--- a/data/resources-mdpi/basic.skn
+++ b/data/resources-mdpi/basic.skn
@@ -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">
diff --git a/data/resources-xhdpi/basic.skn b/data/resources-xhdpi/basic.skn
index f4150a861f..f15a9fc294 100644
--- a/data/resources-xhdpi/basic.skn
+++ b/data/resources-xhdpi/basic.skn
@@ -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">
diff --git a/data/resources-xxhdpi/basic.skn b/data/resources-xxhdpi/basic.skn
index f8dfe86023..fa5d681d6a 100644
--- a/data/resources-xxhdpi/basic.skn
+++ b/data/resources-xxhdpi/basic.skn
@@ -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">
diff --git a/data/resources-yota/basic.skn b/data/resources-yota/basic.skn
index 6f3f21a97b..a73c50ee1a 100644
--- a/data/resources-yota/basic.skn
+++ b/data/resources-yota/basic.skn
@@ -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">
diff --git a/data/styles/include/base_sport.mapcss b/data/styles/include/base_sport.mapcss
index 3207a55ee3..bdefe2424b 100644
--- a/data/styles/include/base_sport.mapcss
+++ b/data/styles/include/base_sport.mapcss
@@ -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]
diff --git a/data/styles/ink.mapcss b/data/styles/ink.mapcss
index 6d6c062499..5076464c0a 100644
--- a/data/styles/ink.mapcss
+++ b/data/styles/ink.mapcss
@@ -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]
 {
diff --git a/data/styles/normal.mapcss b/data/styles/normal.mapcss
index 48372e8c14..ad460f3f48 100644
--- a/data/styles/normal.mapcss
+++ b/data/styles/normal.mapcss
@@ -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]
 {
diff --git a/data/styles/symbols/earthquakeCamp.svg b/data/styles/symbols/earthquake-camp.svg
index 4c7301c9a9..4c7301c9a9 100644
--- a/data/styles/symbols/earthquakeCamp.svg
+++ b/data/styles/symbols/earthquake-camp.svg
diff --git a/data/styles/symbols/golfCourse.svg b/data/styles/symbols/golf-course.svg
index fbbd510702..fbbd510702 100644
--- a/data/styles/symbols/golfCourse.svg
+++ b/data/styles/symbols/golf-course.svg
diff --git a/data/styles/symbols/hospital0.svg b/data/styles/symbols/hospital0.svg
deleted file mode 100644
index 90d995f12e..0000000000
--- a/data/styles/symbols/hospital0.svg
+++ /dev/null
@@ -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>