config: make layers protected and a dict

Author: pnorman

tilekiln/config.py

@@ -38,17 +38,18 @@ def __init__(self, yaml_string: str, filesystem: fs.base.FS):
         self.version = metadata.get("version")
         self.bounds = metadata.get("bounds")
         self.center = metadata.get("center")
-        # TODO: Make private and expose needed operations through proper functions
-        self.layers = []
+        self.__layers = {}
         try:
             for id, l in config.get("vector_layers", {}).items():
-                self.layers.append(LayerConfig(id, l, filesystem))
+                lc = LayerConfig(id, l, filesystem)
+                self.__layers[lc.id] = lc
+
         except Exception:
             raise ConfigError("Unable to process vector_layers")
 
-        if self.layers:
-            self.minzoom = min([layer.minzoom for layer in self.layers])
-            self.maxzoom = max([layer.maxzoom for layer in self.layers])
+        if self.__layers:
+            self.minzoom = min([layer.minzoom for layer in self.__layers.values()])
+            self.maxzoom = max([layer.maxzoom for layer in self.__layers.values()])
         else:
             self.minzoom = None
             self.maxzoom = None
@@ -71,15 +72,18 @@ def tilejson(self, url) -> str:
                           "fields": layer.fields,
                           "description": layer.description,
                           "minzoom": layer.minzoom,
-                          "maxzoom": layer.maxzoom} for layer in self.layers]
+                          "maxzoom": layer.maxzoom} for layer in self.__layers.values()]
         result["vector_layers"] = [{k: v for k, v in layer.items() if v is not None}
                                    for layer in vector_layers]
 
         return json.dumps({k: v for k, v in result.items() if v is not None},
                           sort_keys=True, indent=4)
 
+    def layer_names(self):
+        return [layer.name for layer in self.__layers.values()]
+
     def layer_queries(self, tile: Tile):
-        return list(filter(None, (layer.render_sql(tile) for layer in self.layers)))
+        return list(filter(None, (layer.render_sql(tile) for layer in self.__layers.values())))
 
 
 class LayerConfig:

tilekiln/scripts/config.py

@@ -45,14 +45,16 @@ def sql(config: str, layer: str, zoom: int, x: int, y: int):
         return 0
     else:
         # Iterate through the layers to find the right one
-        for lc in c.layers:
-            if lc.id == layer:
-                sql = lc.render_sql(Tile(zoom, x, y))
-                if sql is None:
-                    click.echo((f"Zoom {zoom} not between min zoom {lc.minzoom} "
-                                f"and max zoom {lc.maxzoom} for layer {layer}."), err=True)
-                    return 1
-                click.echo(sql)
-                return 0
-        click.echo(f"Layer '{layer}' not found in configuration", err=True)
-        return 1
+        try:
+            lc = c.__layers[layer]
+        except KeyError:
+            click.echo(f"Layer '{layer}' not found in configuration", err=True)
+            return 1
+
+        sql = lc.render_sql(Tile(zoom, x, y))
+        if sql is None:
+            click.echo((f"Zoom {zoom} not between min zoom {lc.minzoom} "
+                        f"and max zoom {lc.maxzoom} for layer {layer}."), err=True)
+            return 1
+        click.echo(sql)
+        return 0