From 7fa4df6ac22a36a4bc7c726a83d75df4b7223670 Mon Sep 17 00:00:00 2001
From: Andy Allan <andy@gravitystorm.co.uk>
Date: Fri, 16 Nov 2012 11:51:38 +0000
Subject: [PATCH] Add power and placenames.

---
 placenames.mss | 290 +++++++++++++++++++++++++------------------------
 power.mss      |  74 ++++++-------
 project.mml    |  10 +-
 3 files changed, 184 insertions(+), 190 deletions(-)

diff --git a/placenames.mss b/placenames.mss
index 386382221b..2beb2e2cce 100644
--- a/placenames.mss
+++ b/placenames.mss
@@ -1,146 +1,148 @@
-/*
-<Style name="continent">
-    <Rule>
-      <Filter>[place] = 'continent'</Filter>
-      &maxscale_zoom1;
-      &minscale_zoom2;
-      <TextSymbolizer size="10" fill="#9d6c9d" dy="0" fontset-name="book-fonts" halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
-    </Rule>
-</Style>
-<Style name="country">
-    <Rule>
-      <Filter>[place] = 'country'</Filter>
-      &maxscale_zoom2;
-      &minscale_zoom3;
-      <TextSymbolizer size="8" fill="#9d6c9d" dy="0" fontset-name="book-fonts" halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
-    </Rule>
-    <Rule>
-      <Filter>[place] = 'country'</Filter>
-      &maxscale_zoom4;
-      &minscale_zoom6;
-      <TextSymbolizer size="10" fill="#9d6c9d" dy="0" fontset-name="book-fonts" halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
-    </Rule>
-</Style>
-<Style name="state">
-    <Rule>
-      <Filter>[place] = 'state'</Filter>
-      &maxscale_zoom4;
-      &minscale_zoom4;
-      <TextSymbolizer size="9" fill="#9d6c9d" dy="0" fontset-name="oblique-fonts" halo-radius="1" wrap-width="0">[ref]</TextSymbolizer>
-    </Rule>
-    <Rule>
-      <Filter>[place] = 'state'</Filter>
-      &maxscale_zoom5;
-      &minscale_zoom6;
-      <TextSymbolizer size="9" fill="#9d6c9d" dy="0" fontset-name="oblique-fonts" halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
-    </Rule>
-    <Rule>
-      <Filter>[place] = 'state'</Filter>
-      &maxscale_zoom7;
-      &minscale_zoom8;
-      <TextSymbolizer size="11" fill="#9d6c9d" dy="0" fontset-name="oblique-fonts" halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
-    </Rule>
-</Style>
-<Style name="capital">
-     <Rule>
-      &maxscale_zoom5;
-      &minscale_zoom5;
-      <TextSymbolizer size="9" fill="#000" dy="0" fontset-name="book-fonts" halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
-    </Rule>
-    <Rule>
-      &maxscale_zoom6;
-      &minscale_zoom8;
-      <TextSymbolizer size="11" fill="#000" dy="0" fontset-name="book-fonts" halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
-    </Rule>
-    <Rule>
-      &maxscale_zoom9;
-      &minscale_zoom10;
-      <TextSymbolizer size="11" fill="#000" dy="0" fontset-name="book-fonts" halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
-    </Rule>
-    <Rule>
-      &maxscale_zoom11;
-      &minscale_zoom14;
-      <TextSymbolizer size="14" fill="#000" dy="0" fontset-name="book-fonts" halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
-    </Rule>
-</Style>
-<Style name="city">
-    <Rule>
-      <Filter>[place] = 'city' or [place]='metropolis'</Filter>
-      &maxscale_zoom6;
-      &minscale_zoom8;
-      <TextSymbolizer size="8" fill="#000" dy="0" fontset-name="book-fonts" halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
-    </Rule>
-    <Rule>
-      <Filter>[place] = 'city' or [place]='metropolis'</Filter>
-      &maxscale_zoom9;
-      &minscale_zoom10;
-      <TextSymbolizer size="11" fill="#000" dy="0" fontset-name="book-fonts" halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
-    </Rule>
-    <Rule>
-      <Filter>[place] = 'city' or [place]='metropolis'</Filter>
-      &maxscale_zoom11;
-      &minscale_zoom14;
-      <TextSymbolizer size="14" fill="#000" dy="0" fontset-name="book-fonts" halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
-    </Rule>
-</Style>
-<Style name="town">
-    <Rule>
-      <Filter>[place] = 'town' or [place]='large_town' or [place]='small_town'</Filter>
-      &maxscale_zoom9;
-      &minscale_zoom10;
-      <TextSymbolizer size="8" fill="#000" fontset-name="book-fonts" halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
-    </Rule>
-    <Rule>
-      <Filter>[place] = 'town' or [place]='large_town' or [place]='small_town'</Filter>
-      &maxscale_zoom11;
-      &minscale_zoom13;
-      <TextSymbolizer size="10" fill="#000" fontset-name="book-fonts" halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
-    </Rule>
-    <Rule>
-      <Filter>[place] = 'town' or [place]='large_town' or [place]='small_town'</Filter>
-      &maxscale_zoom14;
-      <TextSymbolizer size="14" fill="#777777" fontset-name="book-fonts" halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
-    </Rule>
-</Style>
-<Style name="suburb">
-    <Rule>
-      <Filter>[place] = 'suburb'</Filter>
-      &maxscale_zoom12;
-      &minscale_zoom13;
-      <TextSymbolizer size="10" fill="#000" fontset-name="book-fonts" halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
-    </Rule>
-    <Rule>
-      <Filter>[place] = 'suburb'</Filter>
-      &maxscale_zoom14;
-      <TextSymbolizer size="13" fill="#777777" fontset-name="book-fonts" halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
-    </Rule>
-</Style>
-<Style name="village">
-    <Rule>
-      <Filter>[place] = 'village' or [place]='large_village'</Filter>
-      &maxscale_zoom12;
-      &minscale_zoom14;
-      <TextSymbolizer size="9" fill="#000" fontset-name="book-fonts" halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
-    </Rule>
-    <Rule>
-      <Filter>[place] = 'village' or [place]='large_village'</Filter>
-      &maxscale_zoom15;
-      <TextSymbolizer size="12" fill="#777777" fontset-name="book-fonts" halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
-    </Rule>
-</Style>
-<Style name="hamlet">
-    <Rule>
-      <Filter>[place] = 'hamlet' or [place] = 'locality' or [place] = 'isolated_dwelling' or [place] = 'farm'</Filter>
-      &maxscale_zoom14;
-      &minscale_zoom15;
-      <TextSymbolizer size="8" fill="#000" fontset-name="book-fonts" halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
-    </Rule>
-    <Rule>
-      <Filter>[place] = 'hamlet' or [place] = 'locality' or [place] = 'isolated_dwelling' or [place] = 'farm'</Filter>
-      &maxscale_zoom16;
-      <TextSymbolizer size="11" fill="#777777" fontset-name="book-fonts" halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
-    </Rule>
-</Style>
+#continent {
+  [place = 'continent'][zoom >= 1][zoom < 3] {
+    text-name: "[name]";
+    text-size: 10;
+    text-fill: #9d6c9d;
+    text-face-name: @book-fonts;
+    text-halo-radius: 1;
+    text-wrap-width: 20;
+  }
+}
 
+.country {
+  [place = 'country'][zoom >= 2][zoom < 6] {
+    text-name: "[name]";
+    text-size: 8;
+    text-fill: #9d6c9d;
+    text-face-name: @book-fonts;
+    text-halo-radius: 1;
+    text-wrap-width: 20;
+    [zoom >= 4] {
+      text-size: 10;
+    }
+  }
+}
 
-*/
+.state {
+  [place = 'state'][zoom >= 4][zoom < 9] {
+    text-name: "[ref]";
+    text-size: 8;
+    text-fill: #9d6c9d;
+    text-face-name: @oblique-fonts;
+    text-halo-radius: 1;
+    text-wrap-width: 0;
+    [zoom >= 5] {
+      text-name: "[name]";
+    }
+    [zoom >= 7] {
+      text-size: 11;
+    }
+  }
+}
+
+#placenames-capital {
+  [zoom >= 5][zoom < 15] {
+    text-name: "[name]";
+    text-size: 9;
+    text-fill: #000;
+    text-face-name: @book-fonts;
+    text-halo-radius: 1;
+    [zoom >= 6] {
+      text-size: 11;
+    }
+    [zoom >= 11] {
+      text-size: 14;
+    }
+  }
+}
+
+.city {
+  [place = 'city'],
+  [place = 'metropolis'] {
+    [zoom >= 6][zoom < 15] {
+      text-name: "[name]";
+      text-size: 8;
+      text-fill: #000;
+      text-face-name: @book-fonts;
+      text-halo-radius: 1;
+      [zoom >= 9] {
+        text-size: 11;
+      }
+      [zoom >= 11] {
+        text-size: 14;
+      }
+    }
+  }
+}
+
+.town {
+  [place = 'town'],
+  [place = 'large_town'],
+  [place = 'small_town'] {
+    [zoom >= 9] {
+      text-name: "[name]";
+      text-size: 8;
+      text-fill: #000;
+      text-face-name: @book-fonts;
+      text-halo-radius: 1;
+      text-wrap-width: 20;
+    }
+    [zoom >= 11] {
+      text-size: 10;
+    }
+    [zoom >= 14] {
+      text-size: 14;
+      text-fill: #777777;
+    }
+  }
+}
+
+.suburb {
+  [place = 'suburb'][zoom >= 12] {
+    text-name: "[name]";
+    text-size: 10;
+    text-fill: #000;
+    text-face-name: @book-fonts;
+    text-halo-radius: 1;
+    [zoom >= 14] {
+      text-size: 13;
+      text-fill: #777777;
+    }
+  }
+}
+
+.village {
+  [place = 'village'],
+  [place = 'large_village'] {
+    [zoom >=12] {
+      text-name: "[name]";
+      text-size: 9;
+      text-fill: #000;
+      text-face-name: @book-fonts;
+      text-halo-radius: 1;
+      [zoom >= 15] {
+        text-size: 12;
+        text-fill: #777777;
+      }
+    }
+  }
+}
+
+.hamlet {
+  [place = 'hamlet'],
+  [place = 'locality'],
+  [place = 'isolated_dwelling'],
+  [place = 'farm'] {
+    [zoom >= 14] {
+      text-name: "[name]";
+      text-size: 8;
+      text-fill: #000;
+      text-face-name: @book-fonts;
+      text-halo-radius: 1;
+    }
+    [zoom >= 16] {
+      text-size: 11;
+      text-fill: #777777;
+    }
+  }
+}
diff --git a/power.mss b/power.mss
index 7bb7110ea4..e402c0dcb5 100644
--- a/power.mss
+++ b/power.mss
@@ -1,42 +1,34 @@
-/*
-<Style name="power_line">
-    <Rule>
-      &maxscale_zoom14;
-      &minscale_zoom15;
-      <LineSymbolizer stroke="#777" stroke-width="1"/>
-    </Rule>
-    <Rule>
-      &maxscale_zoom16;
-      <LineSymbolizer stroke="#777" stroke-width="1.5"/>
-    </Rule>
-</Style>
-<Style name="power_minorline">
-    <Rule>
-      &maxscale_zoom16;
-      <LineSymbolizer stroke="#777" stroke-width="0.5"/>
-    </Rule>
-</Style>
-<Style name="power_towers">
-    <Rule>
-      &maxscale_zoom14;
-      &minscale_zoom14;
-      <PointSymbolizer file="&symbols;/power_tower_3x3.png" allow-overlap="false"/>
-    </Rule>
-    <Rule>
-      &maxscale_zoom15;
-      &minscale_zoom16;
-      <PointSymbolizer file="&symbols;/power_tower_5x5.png" allow-overlap="false"/>
-    </Rule>
-    <Rule>
-      &maxscale_zoom17;
-      <PointSymbolizer file="&symbols;/power_tower.png" allow-overlap="false"/>
-    </Rule>
-</Style>
-<Style name="power_poles">
-    <Rule>
-      &maxscale_zoom16;
-      <PointSymbolizer file="&symbols;/power_pole.png" allow-overlap="false"/>
-    </Rule>
-</Style>
+#power-line {
+  [zoom >= 14] {
+    line-width: 1;
+    line-color: #777;
+  }
+  [zoom >= 16] {
+    line-width: 1.5;
+  }
+}
 
-*/
\ No newline at end of file
+#power-minorline {
+  [zoom >= 16] {
+    line-width: 0.5;
+    line-color: #777;
+  }
+}
+
+#power-towers {
+  [zoom >= 14] {
+    point-file: url('symbols/power_tower_3x3.png');
+  }
+  [zoom >= 15] {
+    point-file: url('symbols/power_tower_5x5.png');
+  }
+  [zoom >= 17] {
+    point-file: url('symbols/power_tower.png');
+  }
+}
+
+#power-poles {
+  [zoom >= 16] {
+    point-file: url('symbols/power_pole.png');
+  }
+}
diff --git a/project.mml b/project.mml
index 7f7881097e..b5e96466b5 100644
--- a/project.mml
+++ b/project.mml
@@ -1346,7 +1346,7 @@
         "dbname": "gis"
       },
       "id": "placenames-large",
-      "class": "",
+      "class": "country state",
       "srs-name": "900913",
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "advanced": {},
@@ -1368,12 +1368,12 @@
         "geometry_field": "way",
         "dbname": "gis"
       },
-      "id": "placename-capital",
+      "id": "placenames-capital",
       "class": "",
       "srs-name": "900913",
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "advanced": {},
-      "name": "placename-capital"
+      "name": "placenames-capital"
     },
     {
       "geometry": "point",
@@ -1392,7 +1392,7 @@
         "dbname": "gis"
       },
       "id": "placenames-medium",
-      "class": "",
+      "class": "city town",
       "srs-name": "900913",
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "advanced": {},
@@ -1415,7 +1415,7 @@
         "dbname": "gis"
       },
       "id": "placenames-small",
-      "class": "",
+      "class": "suburb village hamlet",
       "srs-name": "900913",
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "advanced": {},