Merge branch 'master' into master

Author: Swatz

libvin/decoding.py

@@ -4,7 +4,7 @@
 (c) Copyright 2016 Dan Kegel <[email protected]>
 """
 
-from libvin.static import *
+from static import *
 
 
 class Vin(object):
@@ -155,6 +155,7 @@ def make(self):
         '''
         man = self.manufacturer
         for suffix in [
+           'Argentina',
            'Canada',
            'Cars',
            'France',
@@ -165,34 +166,42 @@ def make(self):
            'Turkey',
            'USA',
            'USA - trucks',
+           'USA (AutoAlliance International)',
            ]:
              if man.endswith(suffix):
                 man = man.replace(" %s" % suffix, "")
         if man == "General Motors":
             return "GMC"
-        make = man
-        # 2012 and later: first 3 positions became overloaded, some 'make' aka brand info moved further in; see
-        # https://en.wikibooks.org/wiki/Vehicle_Identification_Numbers_(VIN_codes)/Chrysler/VIN_Codes
-        # http://www.allpar.com/mopar/vin-decoder.html
-        if self.year > 2011:
-            if man == 'Chrysler':
+        if man == 'Chrysler':
+            # 2012 and later: first 3 positions became overloaded, some 'make' aka brand info moved further in; see
+            # https://en.wikibooks.org/wiki/Vehicle_Identification_Numbers_(VIN_codes)/Chrysler/VIN_Codes
+            # http://www.allpar.com/mopar/vin-decoder.html
+            if self.year > 2011:
                 brandcode = self.vin[4]
                 if brandcode == 'D':
-                    make = 'Dodge'
+                    return 'Dodge'
                 if brandcode == 'F':
-                    make = 'Fiat'
+                    return 'Fiat'
                 if brandcode == 'J':
-                    make = 'Jeep'
+                    return 'Jeep'
+        if man == "Fuji Heavy Industries (Subaru)":
+            return 'Subaru'
         if man == 'Nissan':
-            # FIXME: this was gathered from just four test cases, probably needs updating
-            brandcode = self.vin[3:5]
-            if brandcode == 'CV':
-                make = 'Infiniti'
-            if brandcode == 'BS':
-                make = 'Infiniti'
-            if brandcode == 'CS':
-                make = 'Infiniti'
-        return make
+            # ftp://safercar.gov/MfrMail/ORG7377.pdf "MY12 Nissan VIN Coding System"
+            # https://vpic.nhtsa.dot.gov/mid/home/displayfile/29173 "MY16 Nissan VIN Coding System"
+            # say Ininiti if offset 4 is [JVY], Nissan otherwise.
+            # ftp://safercar.gov/MfrMail/ORG6337.pdf "MY11 Nissan VIN Coding System"
+            # says that plus Infiniti if offset 4 + 5 are S1.  (Nissan Rogue is S5.)
+            # ftp://ftp.nhtsa.dot.gov/mfrmail/ORG7846.pdf "MY13 Nissan VIN Coding System"
+            # says that plus Infiniti if offset 4 + 5 are L0.
+            if self.vin[4] in "JVY" or self.vin[4:6] == 'S1' or self.vin[4:6] == 'L0':
+                return 'Infiniti'
+        if man == 'Renault Samsung':
+            # FIXME: they build other makes, too
+            return 'Nissan'
+        if man == 'Subaru-Isuzu Automotive':
+            return 'Subaru'
+        return man
 
     @property
     def year(self):

libvin/static.py

@@ -325,6 +325,7 @@
     'XL9': 'Spyker',
     'XMC': 'Mitsubishi (NedCar)',
     'XTA': 'Lada/AutoVaz (Russia)',
+    'YH4': 'Fisker',
     'YK1': 'Saab',
     'YS2': 'Scania AB',
     'YS3': 'Saab',
@@ -361,6 +362,7 @@
     '1FV': 'Freightliner',
     '1F9': 'FWD Corp.',
     '1G': 'General Motors USA',
+    '1GB': 'Chevrolet USA',
     '1GC': 'Chevrolet Truck USA',
     '1GT': 'GMC Truck USA',
     '1G1': 'Chevrolet USA',
@@ -369,6 +371,7 @@
     '1G4': 'Buick USA',
     '1G6': 'Cadillac USA',
     '1GM': 'Pontiac USA',
+    '1GN': 'Chevrolet USA',
     '1G8': 'Saturn USA',
     '1GY': 'Cadillac',
     '1H': 'Honda USA',
@@ -388,6 +391,7 @@
     '1XK': 'Kenworth USA',
     '1XP': 'Peterbilt USA',
     '1YV': 'Mazda USA (AutoAlliance International)',
+    '1ZV': 'Ford Motor Company',
     '137': 'Hummer',
     '19U': 'Acura',
     '19V': 'Acura',
@@ -408,6 +412,8 @@
     '2FV': 'Freightliner',
     '2FZ': 'Sterling',
     '2G': 'General Motors Canada',
+    '2GC': 'Chevrolet Canada',
+    '2GN': 'Chevrolet Canada',
     '2G1': 'Chevrolet Canada',
     '2G2': 'Pontiac Canada',
     '2G3': 'Oldsmobile Canada',
@@ -421,26 +427,35 @@
     '2M': 'Mercury',
     '2P3': 'Plymouth Canada',
     '2T': 'Toyota Canada',
+    '2T2': 'Lexus Canada',
     '2V4': 'Volkswagen Canada',
     '2WK': 'Western Star',
     '2WL': 'Western Star',
     '2WM': 'Western Star',
     '3C3': 'Chrysler',
+    '3C4': 'Dodge Mexico',
     '3C6': 'Chrysler',
+    '3CZ': 'Honda Mexico',
     '3D3': 'Dodge Mexico',
     '3D4': 'Dodge Mexico',
     '3D7': 'Dodge Mexico',
+    '3MZ': 'Mazda Mexico',
     '3FA': 'Ford Motor Company Mexico',
     '3FE': 'Ford Motor Company Mexico',
     '3G': 'General Motors Mexico',
+    '3GC': 'Chevrolet Mexico',
+    '3GN': 'Chevrolet Mexico',
     '3GY': 'Cadillac',
     '3H': 'Honda Mexico',
     '3LN': 'Lincoln',
     '3N': 'Nissan Mexico',
     '3P3': 'Plymouth Mexico',
+    '3TM': 'Toyota Mexico',
     '3VW': 'Volkswagen Mexico',
     '4A3': 'Mitsubishi',
+    '4A4': 'Mitsubishi',
     '4F': 'Mazda USA',
+    '4JG': 'Mercedes-Benz',
     '4M': 'Mercury',
     '4S': 'Subaru-Isuzu Automotive',
     '4T': 'Toyota',
@@ -459,6 +474,7 @@
     '5FR': 'Acura',
     '5GA': 'Buick',
     '5GN': 'Hummer',
+    '5GR': 'Hummer',   # general motors
     '5J6': 'Honda',
     '5J8': 'Acura',
     '5L': 'Lincoln',
@@ -467,6 +483,10 @@
     '5T': 'Toyota USA - trucks',
     '5UM': 'BMW',
     '5UX': 'BMW',
+    '5XX': 'Kia',
+    '5YF': 'Toyota',
+    '55S': 'Mercedes-Benz',
+    '58A': 'Lexus',
     '6AB': 'MAN Australia',
     '6F4': 'Nissan Motor Company Australia',
     '6F5': 'Kenworth Australia',
@@ -487,6 +507,7 @@
     '8AK': 'Suzuki Argentina',
     '8AJ': 'Toyota Argentina',
     '8AW': 'Volkswagen Argentina',
+    '8BR': 'Mercedes-Benz Argentina',
     '93U': 'Audi Brazil',
     '9BG': 'Chevrolet Brazil',
     '935': 'Citroen Brazil',