diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 0c0043e006..464e1a1bcc 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 6279e7d32d..054b20ce7f 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -5304,8 +5304,26 @@ cont {
 }
 cont {
   name: "boundary-national_park"
+  element {
+    scale: 10
+    area {
+      color: 3431500856
+      priority: 15
+    }
+  }
+  element {
+    scale: 11
+    area {
+      color: 3431500856
+      priority: 15
+    }
+  }
   element {
     scale: 12
+    area {
+      color: 3431500856
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-s"
       priority: 2500
@@ -5324,6 +5342,10 @@ cont {
   }
   element {
     scale: 13
+    area {
+      color: 3431500856
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-s"
       priority: 2500
@@ -5342,6 +5364,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 3431500856
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5359,6 +5385,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 3431500856
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5376,6 +5406,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 3431500856
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5393,6 +5427,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 3431500856
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5410,6 +5448,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 3431500856
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5427,6 +5469,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 3431500856
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5586,8 +5632,26 @@ cont {
 }
 cont {
   name: "boundary-protected_area-1"
+  element {
+    scale: 10
+    area {
+      color: 3431500856
+      priority: 15
+    }
+  }
+  element {
+    scale: 11
+    area {
+      color: 3431500856
+      priority: 15
+    }
+  }
   element {
     scale: 12
+    area {
+      color: 3431500856
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-s"
       priority: 2500
@@ -5606,6 +5670,10 @@ cont {
   }
   element {
     scale: 13
+    area {
+      color: 3431500856
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-s"
       priority: 2500
@@ -5624,6 +5692,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 3431500856
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5641,6 +5713,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 3431500856
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5658,6 +5734,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 3431500856
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5675,6 +5755,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 3431500856
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5692,6 +5776,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 3431500856
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5709,6 +5797,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 3431500856
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -24535,6 +24627,224 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-military"
+  element {
+    scale: 12
+    area {
+      color: 2162506037
+      priority: 15
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 2162506037
+      priority: 15
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2162506037
+      priority: 15
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2162506037
+      priority: 15
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2162506037
+      priority: 15
+    }
+    symbol {
+      name: "military-m"
+      priority: 520
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2162506037
+      priority: 15
+    }
+    symbol {
+      name: "military-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2162506037
+      priority: 15
+    }
+    symbol {
+      name: "military-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2162506037
+      priority: 15
+    }
+    symbol {
+      name: "military-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+}
+cont {
+  name: "landuse-military-danger_area"
+  element {
+    scale: 10
+    area {
+      color: 15022389
+      priority: 15
+    }
+  }
+  element {
+    scale: 11
+    area {
+      color: 15022389
+      priority: 15
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 2162506037
+      priority: 15
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 2162506037
+      priority: 15
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2162506037
+      priority: 15
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2162506037
+      priority: 15
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2162506037
+      priority: 15
+    }
+    symbol {
+      name: "military-m"
+      priority: 520
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2162506037
+      priority: 15
+    }
+    symbol {
+      name: "military-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2162506037
+      priority: 15
+    }
+    symbol {
+      name: "military-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2162506037
+      priority: 15
+    }
+    symbol {
+      name: "military-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+}
 cont {
   name: "landuse-orchard"
   element {
@@ -25482,22 +25792,22 @@ cont {
   element {
     scale: 10
     area {
-      color: 13031851
-      priority: -1860
+      color: 3431500856
+      priority: 15
     }
   }
   element {
     scale: 11
     area {
-      color: 13031851
-      priority: -1860
+      color: 3431500856
+      priority: 15
     }
   }
   element {
     scale: 12
     area {
-      color: 13031851
-      priority: -1860
+      color: 3431500856
+      priority: 15
     }
     symbol {
       name: "nparkf-outline-s"
@@ -25518,8 +25828,8 @@ cont {
   element {
     scale: 13
     area {
-      color: 13031851
-      priority: -1860
+      color: 3431500856
+      priority: 15
     }
     symbol {
       name: "nparkf-outline-s"
@@ -25540,8 +25850,8 @@ cont {
   element {
     scale: 14
     area {
-      color: 13031851
-      priority: -1860
+      color: 3431500856
+      priority: 15
     }
     symbol {
       name: "nparkf-outline-m"
@@ -25561,8 +25871,8 @@ cont {
   element {
     scale: 15
     area {
-      color: 13031851
-      priority: -1860
+      color: 3431500856
+      priority: 15
     }
     symbol {
       name: "nparkf-outline-m"
@@ -25582,8 +25892,8 @@ cont {
   element {
     scale: 16
     area {
-      color: 13163437
-      priority: -1860
+      color: 3431500856
+      priority: 15
     }
     symbol {
       name: "nparkf-outline-m"
@@ -25603,8 +25913,8 @@ cont {
   element {
     scale: 17
     area {
-      color: 13163437
-      priority: -1860
+      color: 3431500856
+      priority: 15
     }
     symbol {
       name: "nparkf-outline-m"
@@ -25624,8 +25934,8 @@ cont {
   element {
     scale: 18
     area {
-      color: 13163437
-      priority: -1860
+      color: 3431500856
+      priority: 15
     }
     symbol {
       name: "nparkf-outline-m"
@@ -25645,8 +25955,8 @@ cont {
   element {
     scale: 19
     area {
-      color: 13163437
-      priority: -1860
+      color: 3431500856
+      priority: 15
     }
     symbol {
       name: "nparkf-outline-m"
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index f4ba5d4e3f..821f20db98 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index af61bddf4c..fc71c5e1f1 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -5304,8 +5304,26 @@ cont {
 }
 cont {
   name: "boundary-national_park"
+  element {
+    scale: 10
+    area {
+      color: 3425648640
+      priority: 15
+    }
+  }
+  element {
+    scale: 11
+    area {
+      color: 3425648640
+      priority: 15
+    }
+  }
   element {
     scale: 12
+    area {
+      color: 3425648640
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-s"
       priority: 2500
@@ -5324,6 +5342,10 @@ cont {
   }
   element {
     scale: 13
+    area {
+      color: 3425648640
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-s"
       priority: 2500
@@ -5342,6 +5364,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 3425648640
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5359,6 +5385,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 3425648640
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5376,6 +5406,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 3425648640
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5393,6 +5427,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 3425648640
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5410,6 +5448,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 3425648640
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5427,6 +5469,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 3425648640
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5586,8 +5632,26 @@ cont {
 }
 cont {
   name: "boundary-protected_area-1"
+  element {
+    scale: 10
+    area {
+      color: 3425648640
+      priority: 15
+    }
+  }
+  element {
+    scale: 11
+    area {
+      color: 3425648640
+      priority: 15
+    }
+  }
   element {
     scale: 12
+    area {
+      color: 3425648640
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-s"
       priority: 2500
@@ -5606,6 +5670,10 @@ cont {
   }
   element {
     scale: 13
+    area {
+      color: 3425648640
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-s"
       priority: 2500
@@ -5624,6 +5692,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 3425648640
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5641,6 +5713,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 3425648640
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5658,6 +5734,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 3425648640
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5675,6 +5755,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 3425648640
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5692,6 +5776,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 3425648640
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -5709,6 +5797,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 3425648640
+      priority: 15
+    }
     symbol {
       name: "nparkf-outline-m"
       priority: 2500
@@ -24947,6 +25039,224 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-military"
+  element {
+    scale: 12
+    area {
+      color: 2159483932
+      priority: 15
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 2159483932
+      priority: 15
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2159483932
+      priority: 15
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2159483932
+      priority: 15
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2159483932
+      priority: 15
+    }
+    symbol {
+      name: "military-m"
+      priority: 520
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2159483932
+      priority: 15
+    }
+    symbol {
+      name: "military-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2159483932
+      priority: 15
+    }
+    symbol {
+      name: "military-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2159483932
+      priority: 15
+    }
+    symbol {
+      name: "military-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+}
+cont {
+  name: "landuse-military-danger_area"
+  element {
+    scale: 10
+    area {
+      color: 12000284
+      priority: 15
+    }
+  }
+  element {
+    scale: 11
+    area {
+      color: 12000284
+      priority: 15
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 2159483932
+      priority: 15
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 2159483932
+      priority: 15
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2159483932
+      priority: 15
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2159483932
+      priority: 15
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2159483932
+      priority: 15
+    }
+    symbol {
+      name: "military-m"
+      priority: 520
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2159483932
+      priority: 15
+    }
+    symbol {
+      name: "military-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2159483932
+      priority: 15
+    }
+    symbol {
+      name: "military-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2159483932
+      priority: 15
+    }
+    symbol {
+      name: "military-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+}
 cont {
   name: "landuse-orchard"
   element {
@@ -25894,22 +26204,22 @@ cont {
   element {
     scale: 10
     area {
-      color: 593674
-      priority: -1860
+      color: 3425648640
+      priority: 15
     }
   }
   element {
     scale: 11
     area {
-      color: 593674
-      priority: -1860
+      color: 3425648640
+      priority: 15
     }
   }
   element {
     scale: 12
     area {
-      color: 593674
-      priority: -1860
+      color: 3425648640
+      priority: 15
     }
     symbol {
       name: "nparkf-outline-s"
@@ -25930,8 +26240,8 @@ cont {
   element {
     scale: 13
     area {
-      color: 593674
-      priority: -1860
+      color: 3425648640
+      priority: 15
     }
     symbol {
       name: "nparkf-outline-s"
@@ -25952,8 +26262,8 @@ cont {
   element {
     scale: 14
     area {
-      color: 593674
-      priority: -1860
+      color: 3425648640
+      priority: 15
     }
     symbol {
       name: "nparkf-outline-m"
@@ -25973,8 +26283,8 @@ cont {
   element {
     scale: 15
     area {
-      color: 593674
-      priority: -1860
+      color: 3425648640
+      priority: 15
     }
     symbol {
       name: "nparkf-outline-m"
@@ -25994,8 +26304,8 @@ cont {
   element {
     scale: 16
     area {
-      color: 593674
-      priority: -1860
+      color: 3425648640
+      priority: 15
     }
     symbol {
       name: "nparkf-outline-m"
@@ -26015,8 +26325,8 @@ cont {
   element {
     scale: 17
     area {
-      color: 593674
-      priority: -1860
+      color: 3425648640
+      priority: 15
     }
     symbol {
       name: "nparkf-outline-m"
@@ -26036,8 +26346,8 @@ cont {
   element {
     scale: 18
     area {
-      color: 593674
-      priority: -1860
+      color: 3425648640
+      priority: 15
     }
     symbol {
       name: "nparkf-outline-m"
@@ -26057,8 +26367,8 @@ cont {
   element {
     scale: 19
     area {
-      color: 593674
-      priority: -1860
+      color: 3425648640
+      priority: 15
     }
     symbol {
       name: "nparkf-outline-m"
diff --git a/data/visibility.txt b/data/visibility.txt
index eef0d911d6..0cdf65a483 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -237,9 +237,9 @@ world  00000000000000000000  +
             state  00000000000000000000  -
             suburb  00000000000000000000  -
             {}
-        national_park  00000000000011111111  -
+        national_park  00000000001111111111  -
         protected_area  00000000000011111111  +
-            1  00000000000011111111  -
+            1  00000000001111111111  -
             2  00000000000011111111  -
             3  00000000000011111111  -
             4  00000000000011111111  -
@@ -639,8 +639,8 @@ world  00000000000000000000  +
             {}
         landfill  00000000000000011111  -
         meadow  00000000000000111111  -
-        military  00000000000000000000  +
-            danger_area  00000000000000000000  -
+        military  00000000000011111111  +
+            danger_area  00000000001111111111  -
             {}
         orchard  00000000000000111111  -
         quarry  00000000000000011111  -