[graphics] dropped circle element from styles

1 files changed, 23 insertions, 196 deletions

diff --git a/data/drules_proto-bw.txt b/data/drules_proto-bw.txt
index 19f4affffd..37e06c71b8 100644
--- a/data/drules_proto-bw.txt
+++ b/data/drules_proto-bw.txt
@@ -213,30 +213,6 @@ cont {
 cont {
   name: "aerialway-station"
   element {
-    scale: 13
-    circle {
-      radius: 2.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 14
-    circle {
-      radius: 2.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 15
-    circle {
-      radius: 3.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
     scale: 16
     caption {
       primary {
@@ -246,11 +222,6 @@ cont {
       }
       priority: 15000
     }
-    circle {
-      radius: 4.0
-      color: 16777215
-      priority: 14000
-    }
   }
   element {
     scale: 17
@@ -262,11 +233,6 @@ cont {
       }
       priority: 15000
     }
-    circle {
-      radius: 3.2
-      color: 16777215
-      priority: 14000
-    }
   }
   element {
     scale: 18
@@ -278,11 +244,6 @@ cont {
       }
       priority: 15000
     }
-    circle {
-      radius: 3.2
-      color: 16777215
-      priority: 14000
-    }
   }
   element {
     scale: 19
@@ -294,11 +255,6 @@ cont {
       }
       priority: 15000
     }
-    circle {
-      radius: 3.2
-      color: 16777215
-      priority: 14000
-    }
   }
 }
 cont {
@@ -7607,11 +7563,6 @@ cont {
       name: "symbols/maki/roadblock-12.svg:#000000:#FFFFFF:::"
       priority: 16000
     }
-    circle {
-      radius: 1.2
-      color: 16777215
-      priority: 14000
-    }
   }
   element {
     scale: 17
@@ -7619,11 +7570,6 @@ cont {
       name: "symbols/maki/roadblock-12.svg:#000000:#FFFFFF:::"
       priority: 16000
     }
-    circle {
-      radius: 1.6
-      color: 16777215
-      priority: 14000
-    }
   }
   element {
     scale: 18
@@ -7631,11 +7577,6 @@ cont {
       name: "symbols/maki/roadblock-12.svg:#000000:#FFFFFF:::"
       priority: 16000
     }
-    circle {
-      radius: 1.6
-      color: 16777215
-      priority: 14000
-    }
   }
   element {
     scale: 19
@@ -7643,11 +7584,6 @@ cont {
       name: "symbols/maki/roadblock-12.svg:#000000:#FFFFFF:::"
       priority: 16000
     }
-    circle {
-      radius: 1.6
-      color: 16777215
-      priority: 14000
-    }
   }
 }
 cont {
@@ -7658,11 +7594,6 @@ cont {
       name: "symbols/neta/bollard-18.svg:#000000:#FFFFFF:::"
       priority: 16000
     }
-    circle {
-      radius: 1.2
-      color: 16777215
-      priority: 14000
-    }
   }
   element {
     scale: 17
@@ -7670,11 +7601,6 @@ cont {
       name: "symbols/neta/bollard-18.svg:#000000:#FFFFFF:::"
       priority: 16000
     }
-    circle {
-      radius: 1.6
-      color: 16777215
-      priority: 14000
-    }
   }
   element {
     scale: 18
@@ -7682,11 +7608,6 @@ cont {
       name: "symbols/neta/bollard-18.svg:#000000:#FFFFFF:::"
       priority: 16000
     }
-    circle {
-      radius: 1.6
-      color: 16777215
-      priority: 14000
-    }
   }
   element {
     scale: 19
@@ -7694,11 +7615,6 @@ cont {
       name: "symbols/neta/bollard-18.svg:#000000:#FFFFFF:::"
       priority: 16000
     }
-    circle {
-      radius: 1.6
-      color: 16777215
-      priority: 14000
-    }
   }
 }
 cont {
@@ -8015,76 +7931,6 @@ cont {
   }
 }
 cont {
-  name: "barrier-stile"
-  element {
-    scale: 16
-    circle {
-      radius: 1.2
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 17
-    circle {
-      radius: 1.6
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 18
-    circle {
-      radius: 1.6
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 19
-    circle {
-      radius: 1.6
-      color: 16777215
-      priority: 14000
-    }
-  }
-}
-cont {
-  name: "barrier-toll_booth"
-  element {
-    scale: 16
-    circle {
-      radius: 1.2
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 17
-    circle {
-      radius: 1.6
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 18
-    circle {
-      radius: 1.6
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 19
-    circle {
-      radius: 1.6
-      color: 16777215
-      priority: 14000
-    }
-  }
-}
-cont {
   name: "barrier-wall"
   element {
     scale: 16
@@ -10701,7 +10547,20 @@ cont {
 cont {
   name: "entrance"
   element {
+    scale: 16
+    symbol {
+      name: "symbols/neta/circle-10.svg:#000000:#FFFFFF:::"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
     scale: 17
+    symbol {
+      name: "symbols/neta/circle-10.svg:#000000:#FFFFFF:::"
+      apply_for_type: 1
+      priority: 16023
+    }
     caption {
       primary {
         height: 9
@@ -10711,14 +10570,14 @@ cont {
       }
       priority: 15023
     }
-    circle {
-      radius: 2.0
-      color: 16777215
-      priority: 14023
-    }
   }
   element {
     scale: 18
+    symbol {
+      name: "symbols/neta/circle-10.svg:#000000:#FFFFFF:::"
+      apply_for_type: 1
+      priority: 16023
+    }
     caption {
       primary {
         height: 9
@@ -10728,14 +10587,14 @@ cont {
       }
       priority: 15023
     }
-    circle {
-      radius: 2.0
-      color: 16777215
-      priority: 14023
-    }
   }
   element {
     scale: 19
+    symbol {
+      name: "symbols/neta/circle-10.svg:#000000:#FFFFFF:::"
+      apply_for_type: 1
+      priority: 16023
+    }
     caption {
       primary {
         height: 9
@@ -10751,11 +10610,6 @@ cont {
       }
       priority: 15023
     }
-    circle {
-      radius: 2.0
-      color: 16777215
-      priority: 14023
-    }
   }
 }
 cont {
@@ -51644,33 +51498,6 @@ cont {
   }
 }
 cont {
-  name: "man_made-cairn"
-  element {
-    scale: 17
-    circle {
-      radius: 3.2
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 18
-    circle {
-      radius: 3.2
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 19
-    circle {
-      radius: 3.2
-      color: 16777215
-      priority: 14000
-    }
-  }
-}
-cont {
   name: "man_made-communication_tower"
   element {
     scale: 16