Open Infrastructure Map, a view of infrastructure data in OpenStreetMap
Power line optimisation
Russ Garrettf2195fe30aaa
diff --git a/config.toml b/config.tomlindex cb06270..92dce24 100644--- a/config.toml+++ b/config.toml@@ -110,7 +110,7 @@ user = "osm"[[providers.layers]]name = "power_line"geometry_type = "LineString"-sql = "SELECT gid, ST_AsBinary(geometry) AS geom, tunnel, location, first_semi(frequency) AS frequency, tags -> 'name' AS name, line, tags -> 'ref' AS ref, char_length(tags -> 'ref') AS ref_len, convert_voltage(voltage) / 1000 AS voltage, convert_voltage(nth_semi(voltage, 2)) / 1000 AS voltage_2, convert_voltage(nth_semi(voltage, 3)) / 1000 AS voltage_3, tags -> 'operator' AS operator, construction != '' AS construction FROM power_lines(!ZOOM!) WHERE geometry && !BBOX! ORDER BY convert_voltage(voltage) ASC NULLS FIRST"+sql = "SELECT gid, ST_AsBinary(geometry) AS geom, tunnel, location, first_semi(frequency) AS frequency, tags -> 'name' AS name, line, tags -> 'ref' AS ref, char_length(tags -> 'ref') AS ref_len, convert_voltage(voltage) / 1000 AS voltage, convert_voltage(nth_semi(voltage, 2)) / 1000 AS voltage_2, convert_voltage(nth_semi(voltage, 3)) / 1000 AS voltage_3, tags -> 'operator' AS operator, construction != '' AS construction FROM power_lines(!ZOOM!, !BBOX!) ORDER BY convert_voltage(voltage) ASC NULLS FIRST"[[providers.layers]]name = "power_tower"diff --git a/views.sql b/views.sqlindex 4bc96f0..46b4cea 100644--- a/views.sql+++ b/views.sql@@ -42,7 +42,7 @@ CREATE OR REPLACE VIEW power_plant AS/* Dispatch power line query to the appropriate generalised table based on zoom. */-CREATE OR REPLACE FUNCTION power_lines(zoom INT) RETURNS+CREATE OR REPLACE FUNCTION power_lines(zoom INT, search_geom geometry) RETURNSTABLE (gid bigint,geometry geometry(LineString, 3857),type character varying,@@ -65,7 +65,8 @@ BEGINosm_power_line_gen_500.frequency, osm_power_line_gen_500.circuits,osm_power_line_gen_500.construction, osm_power_line_gen_500.tunnel,osm_power_line_gen_500.tags- FROM osm_power_line_gen_500;+ FROM osm_power_line_gen_500+ WHERE osm_power_line_gen_500.geometry && search_geom;ELSIF zoom < 8 THENRETURN QUERY SELECT osm_id, osm_power_line_gen_100.geometry,osm_power_line_gen_100.type, osm_power_line_gen_100.location,@@ -73,14 +74,16 @@ BEGINosm_power_line_gen_100.frequency, osm_power_line_gen_100.circuits,osm_power_line_gen_100.construction, osm_power_line_gen_100.tunnel,osm_power_line_gen_100.tags- FROM osm_power_line_gen_100;+ FROM osm_power_line_gen_100+ WHERE osm_power_line_gen_100.geometry && search_geom;ELSERETURN QUERY SELECT osm_id, osm_power_line.geometry,osm_power_line.type, osm_power_line.location, osm_power_line.line,osm_power_line.voltage, osm_power_line.frequency,osm_power_line.circuits, osm_power_line.construction, osm_power_line.tunnel,osm_power_line.tags- FROM osm_power_line;+ FROM osm_power_line+ WHERE osm_power_line.geometry && search_geom;END IF;END$$;