Refactoring and testing complete. (+13 squashed commits)

milstd2525/milstd2525symbology.py

@@ -48,7 +48,24 @@ def symbolForCode(code, size):
         for i in range(symbol.symbolLayerCount()):
             symbol.takeSymbolLayer(0)
 
-        echelonCode = code[3] + code[8:10]
+        # Decode the sidc number to find the symbol
+        # Referenced https://explorer.milsymb.net/#/explore/ for the decoding
+        version = code[:2]
+        standard_identity = code[2:4]
+        symbol_set = code[4:6]
+        status = code[6]
+        hqtffd = code[7]
+        amplifier_descriptor = code[8:10]
+        entity = code[10:12]
+        entity_type = code[12:14]
+        entity_subtype = code[14:16]
+        sector_one_modifier = code[16:18]
+        sector_two_modifier = code[18:20]
+
+        # From Symbol Set, identify which Folder our image is in.
+        image_dir = getDirectoryFromSymbolSet(symbol_set)
+
+        echelonCode = '1' + amplifier_descriptor
         echelonLayer = getSymbolLayer('Echelon', echelonCode, size)
         if echelonLayer is not None:
             symbol.insertSymbolLayer(0, echelonLayer)
@@ -76,23 +93,37 @@ def symbolForCode(code, size):
         # log.debug('oca: %s %s' % (ocaCode, str(ocaLayer is not None)))
 
         mainCode = code[4:6] + code[10:16]
-        mainLayer = getSymbolLayer('Appendices', mainCode, size)
+        mainLayer = getSymbolLayer(image_dir, mainCode, size)
         if mainLayer is not None:
             symbol.insertSymbolLayer(0, mainLayer)
+        else:
+            mainCode = code[4:6] + code[10:16] + '_' + code[4]
+            mainLayer = getSymbolLayer(image_dir, mainCode, size)
+            if mainLayer is not None:
+                symbol.insertSymbolLayer(0, mainLayer)
         # log.debug('main: %s %s' % (mainCode, str(mainLayer is not None)))
 
         modifier1Code = code[4:6] + code[16:18] + '1'
-        modifier1Layer = getSymbolLayer('Appendices', modifier1Code, size)
+        modifier1Layer = getSymbolLayer(image_dir + '/mod1', modifier1Code, size)
         if modifier1Layer is not None:
             symbol.insertSymbolLayer(0, modifier1Layer)
 
         modifier2Code = code[4:6] + code[18:20] + '2'
-        modifier2Layer = getSymbolLayer('Appendices', modifier2Code, size)
+        modifier2Layer = getSymbolLayer(image_dir + '/mod2', modifier2Code, size)
         if modifier2Layer is not None:
             symbol.insertSymbolLayer(0, modifier2Layer)
 
-        frameCode = '%s_%s_%s' % (code[2], code[3:6], code[0])
-        frameLayer = getSymbolLayer('Frames', frameCode, size)
+        if int(status) > 1:
+            frameCode = '%s_%s_%s' % (code[2], code[3:6], '0')
+        else:
+            frameCode = '%s_%s_%s' % (code[2], code[3:6], status)
+        if int(code[2] == 1):
+            frameLayer = getSymbolLayer('Frames/Exercise', frameCode, size)
+        elif int(code[2] == 2):
+            frameLayer = getSymbolLayer('Frames/Sim', frameCode, size)
+        else:
+            frameLayer = getSymbolLayer('Frames', frameCode, size)
+
         if frameLayer is not None:
             symbol.insertSymbolLayer(0, frameLayer)
         # log.debug('frame: %s %s' % (frameCode, str(frameLayer is not None)))
@@ -105,6 +136,35 @@ def symbolForCode(code, size):
     return symbol
 
 
+# noinspection PyPep8Naming
+def getDirectoryFromSymbolSet(symbol_set):
+    image_path = 'Appendices'
+    if symbol_set in ['01', '02']:
+        return image_path + '/Air'
+    if symbol_set in ['05', '06']:
+        return image_path + '/Space'
+    if symbol_set in ['10', '11', '15', '20']:
+        return image_path + '/Land'
+    if symbol_set in ['25']:
+        return image_path + '/ControlMeasures'
+    if symbol_set in ['30']:
+        return image_path + '/SeaSurface'
+    if symbol_set in ['35', '36']:
+        return image_path + '/SeaSubsurface'
+    if symbol_set in ['40']:
+        return image_path + '/Activities'
+    if symbol_set in ['45']:
+        return image_path + '/METOC/Atmospheric'
+    if symbol_set in ['46']:
+        return image_path + '/METOC/Oceanographic'
+    if symbol_set in ['50', '51', '52', '53', '54']:
+        return image_path + '/SigInt'
+    if symbol_set in ['60']:
+        return image_path + '/Cyberspace'
+
+    return image_path
+
+
 # noinspection PyPep8Naming
 def getSymbolLayer(folder, svg, size):
     svg = svg + '.svg'
@@ -116,6 +176,7 @@ def getSymbolLayer(folder, svg, size):
             filepath = os.path.join(base, matching[0])
             break
     if filepath is not None:
+        print('filepath: ' + filepath)
         symbolLayer = QgsSvgMarkerSymbolLayer(filepath)
         symbolLayer.setSizeUnit(3)
         symbolLayer.setSize(size)