Properly control the ordering of place names.

EdLoach · Nov 28, 2012 · a625f73 · a625f73
1 parent f4455c5
commit a625f73
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/placenames.mss b/placenames.mss
@@ -56,7 +56,7 @@
   }
 }
 
-.city {
+#placenames-medium::city {
   [place = 'city'],
   [place = 'metropolis'] {
     [zoom >= 6][zoom < 15] {
@@ -75,7 +75,7 @@
   }
 }
 
-.town {
+#placenames-medium::town {
   [place = 'town'],
   [place = 'large_town'],
   [place = 'small_town'] {
@@ -97,7 +97,7 @@
   }
 }
 
-.suburb {
+#placenames-small::suburb {
   [place = 'suburb'][zoom >= 12] {
     text-name: "[name]";
     text-size: 10;
@@ -111,7 +111,7 @@
   }
 }
 
-.village {
+#placenames-small::village {
   [place = 'village'],
   [place = 'large_village'] {
     [zoom >=12] {
@@ -128,7 +128,7 @@
   }
 }
 
-.hamlet {
+#placenames-small::hamlet {
   [place = 'hamlet'],
   [place = 'locality'],
   [place = 'isolated_dwelling'],

diff --git a/project.mml b/project.mml
@@ -1577,7 +1577,7 @@
         "dbname": "gis"
       },
       "id": "placenames-medium",
-      "class": "city town",
+      "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": {},
@@ -1600,7 +1600,7 @@
         "dbname": "gis"
       },
       "id": "placenames-small",
-      "class": "suburb village hamlet",
+      "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": {},