fix packageio color loading

src/c3nav/mapdata/models/locations.py

@@ -69,7 +69,7 @@ class LocationModelMixin(Location):
             raise ValueError('can_describe has to be boolean!')
         kwargs['can_describe'] = can_describe
 
-        if 'color' not in data:
+        if 'color' in data:
             color = data['color']
             if not isinstance(color, str):
                 raise ValueError('color has to be str!')

src/c3nav/mapdata/packageio/read.py

@@ -142,6 +142,7 @@ class ReaderItem:
         try:
             add_data = self.model.fromfile(self.json_data, self.path_in_package)
         except Exception as e:
+            raise
             raise CommandError('Could not load data: %s' % e)
         self.data.update(add_data)