Revert "Merge pull request #1951 from Komzpa/drop_circles"

This reverts commit 76bfb712f9e1b10506f1f9854b125d5da8989799, reversing
changes made to a3663831dc4300feb99e1d1e99acc59341412a95.

1 files changed, 196 insertions, 23 deletions

diff --git a/data/drules_proto-bw.txt b/data/drules_proto-bw.txt
index 37e06c71b8..19f4affffd 100644
--- a/data/drules_proto-bw.txt
+++ b/data/drules_proto-bw.txt
@@ -213,6 +213,30 @@ 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 {
@@ -222,6 +246,11 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 4.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
@@ -233,6 +262,11 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 3.2
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
@@ -244,6 +278,11 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 3.2
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
@@ -255,6 +294,11 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 3.2
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
@@ -7563,6 +7607,11 @@ cont {
       name: "symbols/maki/roadblock-12.svg:#000000:#FFFFFF:::"
       priority: 16000
     }
+    circle {
+      radius: 1.2
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
@@ -7570,6 +7619,11 @@ cont {
       name: "symbols/maki/roadblock-12.svg:#000000:#FFFFFF:::"
       priority: 16000
     }
+    circle {
+      radius: 1.6
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
@@ -7577,6 +7631,11 @@ cont {
       name: "symbols/maki/roadblock-12.svg:#000000:#FFFFFF:::"
       priority: 16000
     }
+    circle {
+      radius: 1.6
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
@@ -7584,6 +7643,11 @@ cont {
       name: "symbols/maki/roadblock-12.svg:#000000:#FFFFFF:::"
       priority: 16000
     }
+    circle {
+      radius: 1.6
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
@@ -7594,6 +7658,11 @@ cont {
       name: "symbols/neta/bollard-18.svg:#000000:#FFFFFF:::"
       priority: 16000
     }
+    circle {
+      radius: 1.2
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
@@ -7601,6 +7670,11 @@ cont {
       name: "symbols/neta/bollard-18.svg:#000000:#FFFFFF:::"
       priority: 16000
     }
+    circle {
+      radius: 1.6
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
@@ -7608,6 +7682,11 @@ cont {
       name: "symbols/neta/bollard-18.svg:#000000:#FFFFFF:::"
       priority: 16000
     }
+    circle {
+      radius: 1.6
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
@@ -7615,6 +7694,11 @@ cont {
       name: "symbols/neta/bollard-18.svg:#000000:#FFFFFF:::"
       priority: 16000
     }
+    circle {
+      radius: 1.6
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
@@ -7931,6 +8015,76 @@ 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
@@ -10547,20 +10701,7 @@ 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
@@ -10570,14 +10711,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
@@ -10587,14 +10728,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
@@ -10610,6 +10751,11 @@ cont {
       }
       priority: 15023
     }
+    circle {
+      radius: 2.0
+      color: 16777215
+      priority: 14023
+    }
   }
 }
 cont {
@@ -51498,6 +51644,33 @@ 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