openpilot v0.5.12 release

old-commit-hash: 3f9059fea8

selfdrive/mapd/default_speeds_generator.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 import json
-import six
 
 DEFAULT_OUTPUT_FILENAME = "default_speeds_by_region.json"
 
@@ -146,6 +145,31 @@ def main(filename = DEFAULT_OUTPUT_FILENAME):
   DE.add_rule({"zone:maxspeed": "DE:rural"}, "100")
   DE.add_rule({"zone:maxspeed": "DE:motorway"}, "none")
   DE.add_rule({"bicycle_road": "yes"}, "30")
+  
+
+  """
+  --------------------------------------------------
+      EE - Estonia
+  --------------------------------------------------
+  """
+  EE = Country("EE")
+  countries.append(EE)
+
+  """ Default rules """
+  EE.add_rule({"highway": "motorway"}, "90")
+  EE.add_rule({"highway": "trunk"}, "90")
+  EE.add_rule({"highway": "primary"}, "90")
+  EE.add_rule({"highway": "secondary"}, "50")
+  EE.add_rule({"highway": "tertiary"}, "50")
+  EE.add_rule({"highway": "unclassified"}, "90")
+  EE.add_rule({"highway": "residential"}, "40")
+  EE.add_rule({"highway": "service"}, "40")
+  EE.add_rule({"highway": "motorway_link"}, "90")
+  EE.add_rule({"highway": "trunk_link"}, "70")
+  EE.add_rule({"highway": "primary_link"}, "70")
+  EE.add_rule({"highway": "secondary_link"}, "50")
+  EE.add_rule({"highway": "tertiary_link"}, "50")
+  EE.add_rule({"highway": "living_street"}, "20")
 
 
   """ --- DO NOT MODIFY CODE BELOW THIS LINE --- """
@@ -206,7 +230,7 @@ class Country(Region):
   def jsonify(self):
     ret_dict = {}
     ret_dict[self.name] = {}
-    for r_name, region in six.iteritems(self.regions):
+    for r_name, region in self.regions.items():
       ret_dict[self.name].update(region.jsonify())
     ret_dict[self.name]['Default'] = self.rules
     return ret_dict

selfdrive/mapd/mapd_helpers.py

@@ -1,4 +1,3 @@
-import six
 import math
 import json
 import numpy as np
@@ -92,7 +91,7 @@ def geocode_maxspeed(tags, location_info):
       rule_valid = all(
         tag_name in tags
         and tags[tag_name] == value
-        for tag_name, value in six.iteritems(rule['tags'])
+        for tag_name, value in rule['tags'].items()
       )
       if rule_valid:
         max_speed = rule['speed']
@@ -103,7 +102,7 @@ def geocode_maxspeed(tags, location_info):
       rule_valid = all(
         tag_name in tags
         and tags[tag_name] == value
-        for tag_name, value in six.iteritems(rule['tags'])
+        for tag_name, value in rule['tags'].items()
       )
       if rule_valid:
         max_speed = rule['speed']