Open Infrastructure Map, a view of infrastructure data in OpenStreetMap
Switch solar heatmap view to use function, include power plants
Russ Garrett57be99b1e4be
diff --git a/schema/views.sql b/schema/views.sqlindex 9c700e5..884bc55 100644--- a/schema/views.sql+++ b/schema/views.sql@@ -102,3 +102,44 @@ BEGINEND IF;END$$;++CREATE OR REPLACE FUNCTION power_heatmap(pixel_width NUMERIC, search_geom public.geometry) RETURNS+ TABLE (mvt_id_field BIGINT,+ geom public.geometry(Point, 3857),+ output BIGINT)+ LANGUAGE plpgsql+ AS $$+DECLARE+BEGIN+ RETURN QUERY SELECT max(osm_id) AS mvt_id_field,+ ST_SnapToGrid(u.geom, pixel_width / 2, pixel_width / 2) AS geom,+ round(sum(u.output)::NUMERIC / 1e3)::BIGINT AS output FROM (+ SELECT osm_id,+ ST_Centroid(geometry) AS geom,+ coalesce(+ convert_power(tags -> 'generator:output:electricity'),+ modules_output(tags -> 'generator:solar:modules'),+ solar_output(geometry),+ 0) AS output+ FROM osm_power_generator+ WHERE source = 'solar' AND+ construction = ''+ AND geometry && search_geom+ UNION ALL+ SELECT osm_id,+ ST_Centroid(geometry) AS geom,+ coalesce(+ convert_power(tags -> 'plant:output:electricity'),+ st_area(ST_Transform(geometry, 4326)::geography) * 40,+ 1000) AS output+ FROM power_plant+ WHERE source = 'solar' AND+ construction = '' AND+ NOT EXISTS (select 1 from osm_power_generator g+ where ST_Intersects(g.geometry, power_plant.geometry)+ and g.source = 'solar')+ AND geometry && search_geom+ ) u+ GROUP BY u.geom;+END+$$;\ No newline at end of filediff --git a/tegola/layers.yml b/tegola/layers.ymlindex b124c7f..a2fd6aa 100644--- a/tegola/layers.yml+++ b/tegola/layers.yml@@ -346,25 +346,10 @@ layers:id_field: mvt_id_fieldfields:- 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!)+ sql: ST_AsMVTGeom(geometry, !BBOX!)- name: output- sql: >- round(sum(coalesce(- convert_power(tags -> 'generator:output:electricity'),- modules_output(tags -> 'generator:solar:modules'),- solar_output(geometry),- 0)- )::NUMERIC / 1e3,- 2)- from: osm_power_generator- where: >- source = 'solar' AND- coalesce(tags -> 'generator:type', '') != 'solar_thermal_collector' AND- construction = '' AND- geometry && !BBOX!- GROUP BY geom+ from: power_heatmap(!PIXEL_WIDTH!, !BBOX!)- name: telecoms_communication_linemap: