Add safe checks for feature styling collection

karimnaaji · karimnaaji · commit 40daf895ecf8 · 2017-10-24T11:36:26.000-04:00
diff --git a/Assets/Editor/MapzenMapEditor.cs b/Assets/Editor/MapzenMapEditor.cs
@@ -141,6 +141,12 @@ private void LogWarnings()
     {
         foreach (var style in mapzenMap.FeatureStyling)
         {
+            if (style == null)
+            {
+                Debug.LogWarning("'Null' style provided in feature styling collection");
+                continue;
+            }
+
             if (style.FilterStyles.Count == 0)
             {
                 Debug.LogWarning("The style " + style.name + " has no filter");
diff --git a/Assets/Mapzen/Unity/TileTask.cs b/Assets/Mapzen/Unity/TileTask.cs
@@ -44,7 +44,10 @@ public void Start(List<FeatureStyle> featureStyling, SceneGroup root)
 
         foreach (var style in featureStyling)
         {
-            // TODO: group by style?
+            if (style == null)
+            {
+                continue;
+            }
 
             foreach (var filterStyle in style.FilterStyles)
             {

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,12 @@ private void LogWarnings()`
`141`	`141`	`{`
`142`	`142`	`foreach (var style in mapzenMap.FeatureStyling)`
`143`	`143`	`{`
	`144`	`+ if (style == null)`
	`145`	`+ {`
	`146`	`+ Debug.LogWarning("'Null' style provided in feature styling collection");`
	`147`	`+ continue;`
	`148`	`+ }`
	`149`	`+`
`144`	`150`	`if (style.FilterStyles.Count == 0)`
`145`	`151`	`{`
`146`	`152`	`Debug.LogWarning("The style " + style.name + " has no filter");`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,10 @@ public void Start(List<FeatureStyle> featureStyling, SceneGroup root)`
`44`	`44`
`45`	`45`	`foreach (var style in featureStyling)`
`46`	`46`	`{`
`47`		`- // TODO: group by style?`
	`47`	`+ if (style == null)`
	`48`	`+ {`
	`49`	`+ continue;`
	`50`	`+ }`
`48`	`51`
`49`	`52`	`foreach (var filterStyle in style.FilterStyles)`
`50`	`53`	`{`