Move national park boundaries into admin, and rename layer for clarity.

EdLoach · May 10, 2013 · a744495 · a744495
1 parent 9228139
commit a744495
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 28 deletions.
diff --git a/admin.mss b/admin.mss
@@ -83,3 +83,30 @@
     </Rule>
 </Style>
 */
+
+#national-park-boundaries {
+  [zoom >= 7] {
+    [zoom < 13] {
+      polygon-opacity: 0.05;
+      polygon-fill: green;
+    }
+    line-color: green;
+    line-width: 1.5;
+    line-dasharray: 4,2;
+    line-opacity: 0.15;
+    [zoom >= 10] {
+      line-width: 3;
+      line-dasharray: 6,2;
+    }
+  }
+  [way_area > 200000000][zoom >= 8][zoom < 12],
+  [zoom >= 11][zoom < 12] {
+    text-name: "[name]";
+    text-size: 8;
+    text-fill: #9c9;
+    text-face-name: @bold-fonts;
+    text-halo-radius: 1;
+    text-wrap-width: 14;
+    [zoom >= 11] { text-size: 11; }
+  }
+}
diff --git a/other.mss b/other.mss
@@ -69,32 +69,6 @@
   }
 }
 
-#misc-boundaries {
-  [zoom >= 7] {
-    [zoom < 13] {
-      polygon-opacity: 0.05;
-      polygon-fill: green;
-    }
-    line-color: green;
-    line-width: 1.5;
-    line-dasharray: 4,2;
-    line-opacity: 0.15;
-    [zoom >= 10] {
-      line-width: 3;
-      line-dasharray: 6,2;
-    }
-  }
-  [way_area > 200000000][zoom >= 8][zoom < 12],
-  [zoom >= 11][zoom < 12] {
-    text-name: "[name]";
-    text-size: 8;
-    text-fill: #9c9;
-    text-face-name: @bold-fonts;
-    text-halo-radius: 1;
-    text-wrap-width: 14;
-    [zoom >= 11] { text-size: 11; }
-  }
-}
 
 #theme-park {
   [tourism = 'theme_park'][zoom >= 13] {

diff --git a/project.mml b/project.mml
@@ -2105,12 +2105,12 @@
         "geometry_field": "way",
         "dbname": "gis"
       },
-      "id": "misc-boundaries",
+      "id": "national-park-boundaries",
       "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": "misc-boundaries"
+      "name": "national-park-boundaries"
     },
     {
       "extent": [