Fixed bands parsing for false color imagery

MC-899

Author: usplm

app/api/tiler.py

@@ -321,10 +321,7 @@ def get(self, request, pk=None, project_pk=None, tile_type="", z="", x="", y="",
         if bands == '': bands = None
         if rescale == '': rescale = None
         if color_map == '': color_map = None
-        if hillshade == '' or hillshade == '0': hillshade = None
-
-        pattern = re.compile("([A-Z]+?[a-z]*)")
-        input_bands = tuple(re.findall(pattern, bands))
+        if hillshade == '' or hillshade == '0': hillshade = None        
 
         try:
             expr, _discard_ = lookup_formula(formula, bands)
@@ -387,6 +384,8 @@ def get(self, request, pk=None, project_pk=None, tile_type="", z="", x="", y="",
                                    ci.index(ColorInterp.blue) + 1,)
                     elif 'Falsecolor' in formula and \
                             len(formula.split('_')) >= 2: # ex. Falsecolor_NRG
+                        pattern = re.compile("([A-Z]+?[a-z]*)")
+                        input_bands = tuple(re.findall(pattern, bands))
                         false_color_bands = tuple(re.findall(pattern, formula.split('_')[1]))
                         if len(false_color_bands) == 3:
                             indexes = (input_bands.index(false_color_bands[0]) + 1,