Styles were rebuilt

1 files changed, 84 insertions, 318 deletions

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 4e05d27b21..0755c963ff 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -31052,19 +31052,11 @@ cont {
     scale: 12
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
   element {
-    scale: 12
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    apply_if: "bbox_area<10000000"
-  }
-  element {
     scale: 13
     area {
       color: 9163744
@@ -31083,19 +31075,11 @@ cont {
     scale: 13
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
   element {
-    scale: 13
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    apply_if: "bbox_area<10000000"
-  }
-  element {
     scale: 14
     area {
       color: 9163744
@@ -31114,19 +31098,11 @@ cont {
     scale: 14
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
   element {
-    scale: 14
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    apply_if: "bbox_area<10000000"
-  }
-  element {
     scale: 15
     area {
       color: 9163744
@@ -31145,19 +31121,11 @@ cont {
     scale: 15
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
   element {
-    scale: 15
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    apply_if: "bbox_area<10000000"
-  }
-  element {
     scale: 16
     area {
       color: 9163744
@@ -31176,19 +31144,11 @@ cont {
     scale: 16
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
   element {
-    scale: 16
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    apply_if: "bbox_area<10000000"
-  }
-  element {
     scale: 17
     area {
       color: 9163744
@@ -31207,19 +31167,11 @@ cont {
     scale: 17
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
   element {
-    scale: 17
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    apply_if: "bbox_area<10000000"
-  }
-  element {
     scale: 18
     area {
       color: 9163744
@@ -31238,19 +31190,11 @@ cont {
     scale: 18
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
   element {
-    scale: 18
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    apply_if: "bbox_area<10000000"
-  }
-  element {
     scale: 19
     area {
       color: 9163744
@@ -31269,18 +31213,10 @@ cont {
     scale: 19
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
-  element {
-    scale: 19
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    apply_if: "bbox_area<10000000"
-  }
 }
 cont {
   name: "landuse-salt_pond"
@@ -37818,7 +37754,7 @@ cont {
     scale: 10
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
@@ -37841,7 +37777,7 @@ cont {
     scale: 11
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
@@ -37864,19 +37800,11 @@ cont {
     scale: 12
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
   element {
-    scale: 12
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    apply_if: "bbox_area<10000000"
-  }
-  element {
     scale: 13
     area {
       color: 9163744
@@ -37895,19 +37823,11 @@ cont {
     scale: 13
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
   element {
-    scale: 13
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    apply_if: "bbox_area<10000000"
-  }
-  element {
     scale: 14
     area {
       color: 9163744
@@ -37926,19 +37846,11 @@ cont {
     scale: 14
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
   element {
-    scale: 14
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    apply_if: "bbox_area<10000000"
-  }
-  element {
     scale: 15
     area {
       color: 9163744
@@ -37957,19 +37869,11 @@ cont {
     scale: 15
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
   element {
-    scale: 15
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    apply_if: "bbox_area<10000000"
-  }
-  element {
     scale: 16
     area {
       color: 9163744
@@ -37988,19 +37892,11 @@ cont {
     scale: 16
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
   element {
-    scale: 16
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    apply_if: "bbox_area<10000000"
-  }
-  element {
     scale: 17
     area {
       color: 9163744
@@ -38019,19 +37915,11 @@ cont {
     scale: 17
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
   element {
-    scale: 17
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    apply_if: "bbox_area<10000000"
-  }
-  element {
     scale: 18
     area {
       color: 9163744
@@ -38050,19 +37938,11 @@ cont {
     scale: 18
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
   element {
-    scale: 18
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    apply_if: "bbox_area<10000000"
-  }
-  element {
     scale: 19
     area {
       color: 9163744
@@ -38081,18 +37961,10 @@ cont {
     scale: 19
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
-  element {
-    scale: 19
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    apply_if: "bbox_area<10000000"
-  }
 }
 cont {
   name: "natural-land"
@@ -39254,7 +39126,7 @@ cont {
     scale: 10
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39277,7 +39149,7 @@ cont {
     scale: 11
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39300,19 +39172,11 @@ cont {
     scale: 12
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
   element {
-    scale: 12
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    apply_if: "bbox_area<10000000"
-  }
-  element {
     scale: 13
     area {
       color: 9163744
@@ -39331,19 +39195,11 @@ cont {
     scale: 13
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     apply_if: "bbox_area<4000000"
   }
   element {
-    scale: 13
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    apply_if: "bbox_area<10000000"
-  }
-  element {
     scale: 14
     area {
       color: 9163744
@@ -39362,33 +39218,18 @@ cont {
     scale: 14
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     caption {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15351
+      priority: 15229
     }
     apply_if: "bbox_area<4000000"
   }
   element {
-    scale: 14
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 15959
-    }
-    apply_if: "bbox_area<10000000"
-  }
-  element {
     scale: 15
     area {
       color: 9163744
@@ -39407,33 +39248,18 @@ cont {
     scale: 15
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     caption {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 15351
+      priority: 15229
     }
     apply_if: "bbox_area<4000000"
   }
   element {
-    scale: 15
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 15959
-    }
-    apply_if: "bbox_area<10000000"
-  }
-  element {
     scale: 16
     area {
       color: 9163744
@@ -39452,33 +39278,18 @@ cont {
     scale: 16
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     caption {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15351
+      priority: 15229
     }
     apply_if: "bbox_area<4000000"
   }
   element {
-    scale: 16
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4495803
-      }
-      priority: 15959
-    }
-    apply_if: "bbox_area<10000000"
-  }
-  element {
     scale: 17
     area {
       color: 9163744
@@ -39497,33 +39308,18 @@ cont {
     scale: 17
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     caption {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15351
+      priority: 15229
     }
     apply_if: "bbox_area<4000000"
   }
   element {
-    scale: 17
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4495803
-      }
-      priority: 15959
-    }
-    apply_if: "bbox_area<10000000"
-  }
-  element {
     scale: 18
     area {
       color: 9163744
@@ -39542,33 +39338,18 @@ cont {
     scale: 18
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     caption {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15351
+      priority: 15229
     }
     apply_if: "bbox_area<4000000"
   }
   element {
-    scale: 18
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4495803
-      }
-      priority: 15959
-    }
-    apply_if: "bbox_area<10000000"
-  }
-  element {
     scale: 19
     area {
       color: 9163744
@@ -39587,32 +39368,17 @@ cont {
     scale: 19
     area {
       color: 9163744
-      priority: -15649
+      priority: -15771
     }
     caption {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15351
+      priority: 15229
     }
     apply_if: "bbox_area<4000000"
   }
-  element {
-    scale: 19
-    area {
-      color: 9163744
-      priority: -15041
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4495803
-      }
-      priority: 15959
-    }
-    apply_if: "bbox_area<10000000"
-  }
 }
 cont {
   name: "natural-waterfall"
@@ -60916,7 +60682,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1959
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60930,7 +60696,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1959
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60944,7 +60710,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1959
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60961,7 +60727,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1959
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60975,7 +60741,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1959
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60989,7 +60755,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1959
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61001,140 +60767,140 @@ cont {
     scale: 0
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 1
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 2
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 3
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 4
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 5
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 6
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 7
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 8
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 9
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 10
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 11
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 12
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 13
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 14
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 15
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 16
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 17
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 18
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 19
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
 }
@@ -61149,7 +60915,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1959
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61163,7 +60929,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1959
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61177,7 +60943,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1959
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61194,7 +60960,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1959
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61208,7 +60974,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1959
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61222,7 +60988,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1959
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61319,7 +61085,7 @@ cont {
     }
     area {
       color: 9163744
-      priority: -15784
+      priority: -15041
     }
   }
   element {
@@ -61525,7 +61291,7 @@ cont {
     }
     area {
       color: 9163744
-      priority: -15784
+      priority: -15041
     }
   }
   element {
@@ -61724,70 +61490,70 @@ cont {
     scale: 0
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 1
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 2
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 3
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 4
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 5
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 6
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 7
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 8
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
     scale: 9
     area {
       color: 9163744
-      priority: -15771
+      priority: -15041
     }
   }
   element {
@@ -61801,7 +61567,7 @@ cont {
     }
     area {
       color: 9163744
-      priority: -15784
+      priority: -15041
     }
   }
   element {
@@ -62635,7 +62401,7 @@ cont {
     lines {
       width: 1.0
       color: 8421504
-      priority: 1243
+      priority: 1959
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -62645,7 +62411,7 @@ cont {
     lines {
       width: 1.0
       color: 8421504
-      priority: 1243
+      priority: 1959
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62655,7 +62421,7 @@ cont {
     lines {
       width: 1.0
       color: 8421504
-      priority: 1243
+      priority: 1959
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62665,7 +62431,7 @@ cont {
     lines {
       width: 1.0
       color: 8421504
-      priority: 1243
+      priority: 1959
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62675,7 +62441,7 @@ cont {
     lines {
       width: 1.0
       color: 8421504
-      priority: 1243
+      priority: 1959
       join: ROUNDJOIN
       cap: ROUNDCAP
     }