Skip to content

Open Infrastructure Map, a view of infrastructure data in OpenStreetMap

Fix minor bugs in Tegola python and config

FLacombeb137a8205d66
diff --git a/tegola/generate_tegola_config.py b/tegola/generate_tegola_config.py
index 4dda221..bce9717 100644
--- a/tegola/generate_tegola_config.py
+++ b/tegola/generate_tegola_config.py
@@ -23,10 +23,14 @@ with open(sys.argv[2], "r") as f:
def build_field(name, val):
+ nl_char = '\n'
+ if ':' in name:
+ name = "\""+name+"\""
+
if val is None:
return name
else:
- return f"{val} AS {name}"
+ return f"{val.strip().replace(nl_char,'')} AS {name}"
def get_field_sets(names):
@@ -37,6 +41,7 @@ def get_field_sets(names):
def build_sql(data):
+ nl_char = '\n'
sql = "SELECT "
if "id_field" in data and data["id_field"] not in [
@@ -50,9 +55,9 @@ def build_sql(data):
)
sql += f" FROM {data['from']}"
if "where" in data:
- sql += f" WHERE {data['where'].strip()}"
+ sql += f" WHERE {data['where'].strip().replace(nl_char,'')}"
if "order_by" in data:
- sql += f" ORDER BY {data['order_by'].strip()}"
+ sql += f" ORDER BY {data['order_by'].strip().replace(nl_char,'')}"
return sql
@@ -85,4 +90,4 @@ for layer in config["layers"]:
for name, layers in map_layers.items():
conf["maps"].append({"name": name, "layers": layers, "center": [0.0,0.0,2.0]})
-print(toml.dumps(conf))
+print(toml.dumps(conf))
\ No newline at end of file
diff --git a/tegola/tegola.yml b/tegola/tegola.yml
index 7165ee7..e541d18 100644
--- a/tegola/tegola.yml
+++ b/tegola/tegola.yml
@@ -1,5 +1,5 @@
webserver:
- port: 8081
+ port: :8081
cache:
type: file