data/drules_proto.txt

@@ -34947,6 +34947,13 @@ cont {
       priority: 4400
     }
   }
+  element {
+    scale: 20
+    symbol {
+      name: "speedcam-s"
+      priority: 4400
+    }
+  }
 }
 cont {
   name: "highway-steps"
@@ -37712,6 +37719,23 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-traffic_signals"
+  element {
+    scale: 19
+    symbol {
+      name: "traffic_signals"
+      priority: 3165
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "traffic_signals"
+      priority: 3165
+    }
+  }
+}
 cont {
   name: "highway-trunk"
   element {
@@ -63352,6 +63376,13 @@ cont {
       priority: 15
     }
   }
+  element {
+    scale: 20
+    area {
+      color: 3641313805
+      priority: 15
+    }
+  }
 }
 cont {
   name: "piste:type-downhill-area"
@@ -63404,6 +63435,13 @@ cont {
       priority: 15
     }
   }
+  element {
+    scale: 20
+    area {
+      color: 3653532415
+      priority: 15
+    }
+  }
 }
 cont {
   name: "piste:type-downhill-easy"
@@ -63583,6 +63621,13 @@ cont {
       priority: 15
     }
   }
+  element {
+    scale: 20
+    area {
+      color: 3641387003
+      priority: 15
+    }
+  }
 }
 cont {
   name: "piste:type-downhill-expert"
@@ -63762,6 +63807,13 @@ cont {
       priority: 15
     }
   }
+  element {
+    scale: 20
+    area {
+      color: 3642885669
+      priority: 15
+    }
+  }
 }
 cont {
   name: "piste:type-downhill-freeride"
@@ -64068,6 +64120,13 @@ cont {
       priority: 15
     }
   }
+  element {
+    scale: 20
+    area {
+      color: 3657174555
+      priority: 15
+    }
+  }
 }
 cont {
   name: "piste:type-downhill-novice"
@@ -64247,6 +64306,13 @@ cont {
       priority: 15
     }
   }
+  element {
+    scale: 20
+    area {
+      color: 3227511598
+      priority: 15
+    }
+  }
 }
 cont {
   name: "piste:type-hike"
@@ -64843,6 +64909,13 @@ cont {
       priority: 15
     }
   }
+  element {
+    scale: 20
+    area {
+      color: 3653532415
+      priority: 15
+    }
+  }
 }
 cont {
   name: "piste:type-snow_park"

data/drules_proto_vehicle_dark.txt

@@ -20225,6 +20225,23 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-traffic_signals"
+  element {
+    scale: 19
+    symbol {
+      name: "traffic_signals"
+      priority: 3165
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "traffic_signals"
+      priority: 3165
+    }
+  }
+}
 cont {
   name: "highway-trunk"
   element {

data/drules_proto_vehicle_light.txt

@@ -19817,6 +19817,23 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-traffic_signals"
+  element {
+    scale: 19
+    symbol {
+      name: "traffic_signals"
+      priority: 3165
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "traffic_signals"
+      priority: 3165
+    }
+  }
+}
 cont {
   name: "highway-trunk"
   element {

data/replaced_tags.txt

@@ -149,8 +149,6 @@ artwork_type=bust : artwork_type=statue
 
 place=allotments : place=neighbourhood
 
-crossing=traffic_signals : highway=traffic_signals
-
 # Replace top tags from here https://taginfo.openstreetmap.org/search?q=recycling on the common ones.
 recycling:electrical_appliances=yes       : recycling:small_appliances=yes
 recycling:small_electrical_appliances=yes : recycling:small_appliances=yes

data/styles/default/dark/symbols/traffic_signals.svg

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" width="24" height="24" version="1.1" viewBox="0 0 24 24" xml:space="preserve" id="svg3"><defs id="defs3"/>
+ <rect style="" id="rect1" width="10" height="24" x="7" y="0" ry="4" fill="#4d4d4d"/><ellipse cx="12" cy="5" fill="#ff2a2a" id="circle1" rx="2.9999995" ry="2.9999998" style=""/><ellipse cx="12" cy="12" fill="#ffcc00" id="circle2" rx="2.9999998" ry="3.0000002" style=""/><ellipse cx="12" cy="19.004646" fill="#00d40a" id="circle3" style="" rx="2.9999998" ry="3.0046463"/><metadata id="metadata3"><rdf:RDF><cc:Work rdf:about=""/></rdf:RDF></metadata></svg>

data/styles/default/light/symbols/traffic_signals.svg

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" width="24" height="24" version="1.1" viewBox="0 0 24 24" xml:space="preserve" id="svg3"><defs id="defs3"/>
+ <rect style="" id="rect9" width="10" height="24" x="7" y="0" ry="4"/><ellipse cx="12" cy="5" fill="#ff2a2a" id="circle1" rx="2.9999995" ry="2.9999998" style=""/><ellipse cx="12" cy="12" fill="#ffcc00" id="circle2" rx="2.9999998" ry="3.0000002" style=""/><ellipse cx="12" cy="19.004646" fill="#00d40a" id="circle3" style="" rx="2.9999998" ry="3.0046463"/><metadata id="metadata3"><rdf:RDF><cc:Work rdf:about=""/></rdf:RDF></metadata></svg>

data/styles/vehicle/include/Icons.mapcss

@@ -124,6 +124,10 @@ node|z14-[aeroway=aerodrome]::int_name,
 
 /*check offset int_name*/
 
+/* 3.2 Road Icons */
+node|z19-[highway=traffic_signals],
+{icon-image: traffic_signals.svg}
+
 
 node|z12[railway=station][!transport],
 {icon-image: train-s.svg;text-offset: 1;font-size: 11;}

data/styles/vehicle/include/priorities_4_overlays.prio.txt

@@ -174,6 +174,9 @@ amenity-charging_station-motorcar                   # icon z14- (also has captio
 amenity-fuel                                        # icon z12- (also has caption(optional) z12-)
 === 3200
 
+highway-traffic_signals                             # icon z19-
+=== 3165
+
 amenity-charging_station                            # icon z16- (also has caption(optional) z16-)
 amenity-vending_machine-fuel                        # icon z17- (also has caption(optional) z17-)
 === 3150

data/visibility.txt

@@ -502,7 +502,7 @@ world  000000000000000000000  +
             no-access  000000000000000011111  -
             tunnel  000000000000000000000  -
             {}
-        traffic_signals  000000000000000000000  -
+        traffic_signals  000000000000000000011  -
         trunk  000000111111111111111  +
             bridge  000000111111111111111  -
             tunnel  000000111111111111111  -

tools/python/stylesheet/drules_merge.py

@@ -74,7 +74,7 @@ def create_diff(zooms1, zooms2):
     print("{}: missing completely; {}".format(typ, zooms_string(zooms2[typ][0].scale, zooms2[typ][1].scale)))
     cont = drules_struct_pb2.ClassifElementProto()
     cont.name = typ
-    for z in range(zooms2[typ][0].scale, zooms2[typ][1].scale):
+    for z in range(zooms2[typ][0].scale, zooms2[typ][1].scale + 1):
       fix = copy.deepcopy(zooms2[typ][0])
       fix.scale = z
       cont.element.extend([fix])