Open Infrastructure Map, a view of infrastructure data in OpenStreetMap
View updates for vector
Russ Garrettcccc5211c94b
diff --git a/layers.yml b/layers.ymlindex 926bc57..6a7f7f1 100644--- a/layers.yml+++ b/layers.yml@@ -1,77 +1,111 @@- name: powerlayers:- - name: power_line- query: "SELECT geometry, tunnel, location, frequency, type, name, line,+ - name: line+ query: "SELECT osm_id AS gid, ST_AsBinary(geometry) AS geom, tunnel, location, frequency, type, name, line,ref, char_length(ref) AS ref_len,convert_voltage(voltage) / 1000 AS voltage, operator- FROM osm_power_lines"+ FROM osm_power_lines+ WHERE geometry && !BBOX!"geometry: linestring- - name: power_tower- query: "SELECT geometry, type, name, ref, operator- FROM osm_power_tower"+ - name: tower+ query: "SELECT osm_id AS gid, ST_AsBinary(geometry) AS geom, type, name, ref, operator+ FROM osm_power_tower+ WHERE geometry && !BBOX!"geometry: point- name: substation- query: "SELECT geometry, name, convert_voltage(voltage) / 1000 AS voltage, substation, operator- FROM substation"+ query: "SELECT osm_id AS gid, ST_AsBinary(geometry) AS geom, name,+ convert_voltage(voltage) / 1000 AS voltage, substation, operator+ FROM substation+ WHERE geometry && !BBOX!"geometry: linestring- name: substation_point- query: "SELECT ST_Centroid(geometry) AS geometry, name, convert_voltage(voltage) / 1000 AS voltage,+ query: "SELECT osm_id AS gid, ST_AsBinary(ST_Centroid(geometry)) AS geom, name,+ convert_voltage(voltage) / 1000 AS voltage,substationFROM substation- WHERE geometry && !bbox!+ WHERE geometry && !BBOX!"geometry: point- - name: power_plant- query: "SELECT geometry, name, operator, convert_power(output)/1e6 AS output, source,+ - name: plant+ query: "SELECT osm_id AS gid, ST_AsBinary(geometry) AS geom, name, operator,+ convert_power(output)/1e6 AS output, source,plant_label(name, output, source) AS label- FROM power_plant"+ FROM power_plant+ WHERE geometry && !BBOX!"geometry: linestring- - name: power_plant_point- query: "SELECT ST_Centroid(geometry) AS geometry, name, convert_power(output)/1e6 AS output, source,+ - name: plant_point+ query: "SELECT osm_id AS gid, ST_AsBinary(ST_Centroid(geometry)) AS geom, name,+ convert_power(output)/1e6 AS output, source,plant_label(name, output, source) AS labelFROM power_plant- WHERE geometry && !bbox!+ WHERE geometry && !BBOX!"geometry: point- - name: power_generator- query: "SELECT geometry, name, operator, convert_power(output)/1e3 AS output, source, type, ref- FROM osm_power_generator"+ - name: generator+ query: "SELECT osm_id AS gid, ST_AsBinary(ST_Centroid(geometry)) AS geom, name, operator,+ convert_power(output)/1e3 AS output, source, type, ref+ FROM osm_power_generator+ WHERE geometry && !BBOX!"geometry: geometry- - name: power_transformer- query: "SELECT geometry, name FROM osm_power_switchgear WHERE type = 'transformer'"+ - name: transformer+ query: "SELECT osm_id AS gid, ST_AsBinary(ST_Centroid(geometry)) AS geom, name+ FROM osm_power_switchgear+ WHERE type = 'transformer'+ AND geometry && !BBOX!"geometry: point- name: telecomslayers:- name: communication_line- query: "SELECT geometry, operator, name, location FROM osm_comms_cable"+ query: "SELECT osm_id AS gid, ST_AsBinary(geometry) AS geom, operator, name, location+ FROM osm_comms_cable+ WHERE geometry && !BBOX!"geometry: linestring- name: data_center- query: "SELECT geometry, operator, name, ref FROM osm_data_center"+ query: "SELECT osm_id AS gid, ST_AsBinary(geometry) AS geom, operator, name, ref+ FROM osm_data_center+ WHERE geometry && !BBOX!"geometry: linestring- name: mast- query: "SELECT geometry, operator, name, ref FROM osm_mast WHERE type = 'communications_tower' OR tower_type IN ('communication', 'radio', 'antenna')"+ query: "SELECT osm_id AS gid, ST_AsBinary(geometry) AS geom, operator, name, ref+ FROM osm_mast+ WHERE (type = 'communications_tower'+ OR tower_type IN ('communication', 'radio', 'antenna'))+ AND geometry && !BBOX!+ "geometry: point- name: petroleumlayers:- name: pipeline- query: "SELECT geometry, operator, name, location FROM osm_pipeline WHERE substance IN ('natural_gas', 'gas', 'oil', 'fuel', 'cng') OR type IN ('natural_gas', 'gas', 'oil', 'fuel', 'cng')"+ query: "SELECT osm_id AS gid, ST_AsBinary(geometry) AS geom, operator, name, location+ FROM osm_pipeline+ WHERE (substance IN ('natural_gas', 'gas', 'oil', 'fuel', 'cng')+ OR type IN ('natural_gas', 'gas', 'oil', 'fuel', 'cng'))+ AND geometry && !BBOX!"geometry: linestring- name: well- query: "SELECT geometry, operator, name FROM osm_petroleum_well"+ query: "SELECT osm_id AS gid, ST_AsBinary(geometry) AS geom, operator, name+ FROM osm_petroleum_well+ WHERE geometry && !BBOX!"geometry: point- name: site- query: "SELECT geometry, name, operator FROM osm_petroleum_site"+ query: "SELECT osm_id AS gid, ST_AsBinary(geometry) AS geom, name, operator+ FROM osm_petroleum_site+ WHERE geometry && !BBOX!"geometry: linestring- name: waterlayers:- name: pipeline- query: "SELECT geometry, operator, name, location FROM osm_pipeline WHERE substance = 'water' OR type = 'water'"- geometry: linestring-- name: microwave_hft- layers:- - name: microwave_link- query: "SELECT geometry, name AS operator, ref, type,- round(ST_Length(ST_Transform(geometry, 4326)::geography)/1000) AS length- FROM microwave_link, microwave_operator- WHERE microwave_operator.id = microwave_link.operator"+ query: "SELECT osm_id AS gid, ST_AsBinary(geometry) AS geom, operator, name, location+ FROM osm_pipeline+ WHERE (substance = 'water' OR type = 'water')+ AND geometry && !BBOX!"geometry: linestring+#- name: microwave_hft+# layers:+# - name: microwave_link+# query: "SELECT osm_id AS gid, ST_AsBinary(geometry) AS geom, name AS operator, ref, type,+# round(ST_Length(ST_Transform(geometry, 4326)::geography)/1000) AS length+# FROM microwave_link, microwave_operator+# WHERE microwave_operator.id = microwave_link.operator+# AND geometry && !BBOX!"+# geometry: linestringdiff --git a/util/generate_tegola_config.py b/util/generate_tegola_config.pynew file mode 100644index 0000000..104a3d7--- /dev/null+++ b/util/generate_tegola_config.py@@ -0,0 +1,58 @@+# coding=utf-8+from __future__ import division, absolute_import, print_function, unicode_literals+import sys+import yaml+import toml++dbname = "osm"+geometry_field = "geometry"++conf = {+ "webserver": {+ "port": ":8080"+ },+# "cache": {+# "type": "file",+# "path": "/tmp/tegola"+# },+ "providers": [{+ "name": "postgis",+ "type": "postgis",+ "host": "db",+ "port": 5432,+ "database": dbname,+ "user": "osm",+ "password": "osm",+ "srid": 3857,+ "max_connections": 20,+ "layers": []+ }+ ],+ "maps": [{+ "name": "openinframap",+ "layers": []+ }]+}+++with open(sys.argv[1], 'r') as f:+ config = yaml.load(f)++for out_layer in config:+ for layer in out_layer['layers']:+ lname = out_layer['name'] + '_' + layer['name']+ provider_layer_config = {+ "name": lname,+ "sql": layer['query']+ }+ conf["providers"][0]['layers'].append(provider_layer_config)++ map_layer_config = {+ "provider_layer": "postgis.%s" % (lname),+ "min_zoom": 0,+ "max_zoom": 17+ }+ conf['maps'][0]['layers'].append(map_layer_config)++with open('config.toml', 'w') as f:+ toml.dump(conf, f)diff --git a/views.sql b/views.sqlindex fdabf7f..0470f99 100644--- a/views.sql+++ b/views.sql@@ -2,7 +2,7 @@ DROP VIEW IF EXISTS substation;DROP MATERIALIZED VIEW IF EXISTS power_substation_relation;CREATE MATERIALIZED VIEW power_substation_relation AS- SELECT ST_ConvexHull(ST_Union(mem.geometry)) AS geometry, rel.name,+ SELECT rel.osm_id, ST_ConvexHull(ST_Union(mem.geometry)) AS geometry, rel.name,combine_voltage(rel.voltage, voltage_agg(mem.voltage)) AS voltage,combine_field(rel.substation, field_agg(mem.substation)) AS substation,combine_field(rel.operator, field_agg(mem.operator)) AS operator@@ -15,17 +15,17 @@ CREATE INDEX power_substation_relation_geom ON power_substation_relation USING GANALYZE power_substation_relation;CREATE OR REPLACE VIEW substation AS- SELECT geometry, name, voltage, substation, operator+ SELECT osm_id, geometry, name, voltage, substation, operatorFROM osm_power_substationUNION- SELECT geometry, name, voltage, substation, operator+ SELECT osm_id, geometry, name, voltage, substation, operatorFROM power_substation_relation;DROP VIEW IF EXISTS power_plant;DROP MATERIALIZED VIEW IF EXISTS power_plant_relation;CREATE MATERIALIZED VIEW power_plant_relation AS- SELECT ST_ConvexHull(ST_Union(mem.geometry)) AS geometry,+ SELECT rel.osm_id, ST_ConvexHull(ST_Union(mem.geometry)) AS geometry,rel.name, rel.operator, rel.output, rel.sourceFROM osm_power_plant_relation as rel, osm_power_plant_relation_member as memWHERE mem.osm_id = rel.osm_id@@ -36,8 +36,8 @@ CREATE INDEX power_plant_relation_geom ON power_plant_relation USING GIST (geomeANALYZE power_plant_relation;CREATE OR REPLACE VIEW power_plant AS- SELECT geometry, name, operator, output, source+ SELECT osm_id, geometry, name, operator, output, sourceFROM osm_power_plantUNION- SELECT geometry, name, operator, output, source+ SELECT osm_id, geometry, name, operator, output, sourceFROM power_plant_relation;