Merge pull request #44 from opengisch/fixandbump

Fixes and bump toppingmaker
opengisch · Dec 7, 2022 · d22ff65 · d22ff65
2 parents 9eee8c8 + a9e9a80
commit d22ff65
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/modelbaker/dataobjects/project.py b/modelbaker/dataobjects/project.py
@@ -25,8 +25,8 @@
     QgsExpressionContextUtils,
     QgsLayerTreeGroup,
     QgsMapLayer,
-    QgsPrintLayout,
     QgsMapThemeCollection,
+    QgsPrintLayout,
     QgsProject,
     QgsReadWriteContext,
 )
@@ -244,7 +244,7 @@ def create(
             self.legend.create(qgis_project, group)
 
         self.load_custom_layer_order(qgis_project)
-        
+
         self.load_mapthemes(qgis_project)
 
         self.load_custom_variables(qgis_project)
@@ -313,7 +313,10 @@ def load_mapthemes(self, qgis_project):
                             map_theme_record.setCheckedGroupNodes(checked_group_nodes)
                     else:
                         # it's not group node
-                        if qgis_project.mapLayersByName(node_name)[0]:
+                        if (
+                            qgis_project.mapLayersByName(node_name)
+                            and qgis_project.mapLayersByName(node_name)[0]
+                        ):
                             map_theme_layer_record = (
                                 QgsMapThemeCollection.MapThemeLayerRecord()
                             )

diff --git a/scripts/package_pip_packages.sh b/scripts/package_pip_packages.sh
@@ -3,7 +3,7 @@ LIBS_DIR="modelbaker/libs"
 
 DEPRECATION=("deprecation" "2.1.0")
 PGSERVICEPARSER=("pgserviceparser" "1.1.0")
-TOPPINGMAKER=("toppingmaker" "1.1.0")
+TOPPINGMAKER=("toppingmaker" "1.2.3")
 
 PACKAGES=(
   DEPRECATION[@]