Symbols/Icons: Bugfix, avoid and warn for illegal values

plepe · Aug 27, 2014 · 3f31bbe · 3f31bbe
1 parent 142d27b
commit 3f31bbe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/pgmapcss/icons/process_icons.py b/pgmapcss/icons/process_icons.py
@@ -5,6 +5,9 @@ def build_icon(x, stat):
     if os.path.exists(x['icon-image']):
         return x['icon-image']
 
+    if True in x.values():
+        return True
+
     src = x['icon-image'] + '-' + x['icon-width'] + '.svg'
     dest = x['icon-image'] + '-' + x['icon-color'] + '-' + x['icon-width'] + '.svg'
 
@@ -37,4 +40,4 @@ def init(stat):
     )
 
 def process_icons(style_id, args, stat, conn):
-    images = stat.property_values('final-icon-image', value_type='value')
+    images = stat.property_values('final-icon-image', value_type='value', eval_true=False, warn_unresolvable=True)
diff --git a/pgmapcss/symbols/process_symbols.py b/pgmapcss/symbols/process_symbols.py
@@ -5,6 +5,9 @@
 def build_symbol(x, stat):
     shapes = { 'triangle': 3, 'square': 4, 'pentagon': 5, 'hexagon': 6, 'heptagon': 7, 'octagon': 8, 'nonagon': 9, 'decagon': 10, 'circle': None }
 
+    if True in x.values():
+        return True
+
     if x['symbol-shape'] not in shapes:
         print('Warning: invalid shape {symbol-shape}'.format(x))
         return None
@@ -78,4 +81,4 @@ def process_symbols(style_id, args, stat, conn):
         pass
 
     stat['symbols_dir'] = symbols_dir
-    images = stat.property_values('final-symbol-image', value_type='value')
+    images = stat.property_values('final-symbol-image', value_type='value', eval_true=False, warn_unresolvable=True)