Skip to content

Open Infrastructure Map, a view of infrastructure data in OpenStreetMap

Workaround ID field wierdness and add additional name fields

Russ Garrett9b50245ef292
diff --git a/tegola/generate_tegola_config.py b/tegola/generate_tegola_config.py
index bce9717..737b71a 100644
--- a/tegola/generate_tegola_config.py
+++ b/tegola/generate_tegola_config.py
@@ -23,10 +23,10 @@ with open(sys.argv[2], "r") as f:
def build_field(name, val):
- nl_char = '\n'
- if ':' in name:
- name = "\""+name+"\""
-
+ nl_char = "\n"
+ if ":" in name:
+ name = '"' + name + '"'
+
if val is None:
return name
else:
@@ -41,13 +41,24 @@ def get_field_sets(names):
def build_sql(data):
- nl_char = '\n'
+ nl_char = "\n"
sql = "SELECT "
+ # Note on ID fields:
+ # The OSM ID generated by imposm3 can be negative (for relation IDs), however
+ # MVT feature IDs cannot be negative, and tegola/mvt_postgis seems to enforce this by
+ # coalescing negative IDs to null, although no errors are generated.
+ #
+ # The ID field is not required by the MVT spec, but it does seem to be required by
+ # tegola/mvt_postgis.
+ #
+ # Here we alias the ID for use as the feature ID, and also include the ID as a
+ # separate field, which can be negative.
+
if "id_field" in data and data["id_field"] not in [
f["name"] for f in data.get("fields", [])
]:
- sql += data["id_field"] + ", "
+ sql += data["id_field"] + " AS mvt_id_field, " + data["id_field"] + ", "
sql += ", ".join(
build_field(f["name"], f.get("sql"))
@@ -62,8 +73,8 @@ def build_sql(data):
for layer in config["layers"]:
- layer_maps = layer.get('map')
- if 'map' not in layer:
+ layer_maps = layer.get("map")
+ if "map" not in layer:
layer_maps = [default_map]
for map_name in layer_maps:
@@ -81,13 +92,13 @@ for layer in config["layers"]:
"geometry_type": layer["geometry_type"],
}
- if "id_field" in layer:
- layer_config["id_fieldname"] = layer["id_field"]
+ if layer["id_field"]:
+ layer_config["id_fieldname"] = "mvt_id_field"
conf["providers"][0]["layers"].append(layer_config)
for name, layers in map_layers.items():
- conf["maps"].append({"name": name, "layers": layers, "center": [0.0,0.0,2.0]})
+ conf["maps"].append({"name": name, "layers": layers, "center": [0.0, 0.0, 2.0]})
-print(toml.dumps(conf))
\ No newline at end of file
+print(toml.dumps(conf))
diff --git a/tegola/layers.yml b/tegola/layers.yml
index 23aecbd..099087e 100644
--- a/tegola/layers.yml
+++ b/tegola/layers.yml
@@ -32,6 +32,14 @@ field_sets:
sql: tags -> 'name'
- name: name_en
sql: tags -> 'name:en'
+ - name: name_es
+ sql: tags -> 'name:es'
+ - name: name_fr
+ sql: tags -> 'name:fr'
+ - name: name_zh
+ sql: tags -> 'name:zh'
+ - name: name_pt
+ sql: tags -> 'name:pt'
- name: operator
sql: tags -> 'operator'
- name: ref
@@ -208,7 +216,7 @@ layers:
min_zoom: 2
id_field: gid
fields:
- - name: gid
+ - name: mvt_id_field
sql: max(osm_id)
- name: geom
sql: ST_AsMVTGeom(ST_SnapToGrid(ST_Centroid(geometry), !PIXEL_WIDTH! / 2, !PIXEL_WIDTH! / 2), !BBOX!)