Skip to content

Commit 25d97a5

Browse files
authored
Merge pull request #1171 from MTES-MCT/feat-oscsge-cover-percent
feat(ocsge_cover_percent): change model to match user needs
2 parents 3ea165c + 592b0b8 commit 25d97a5

File tree

3 files changed

+37
-38
lines changed

3 files changed

+37
-38
lines changed

airflow/include/sql/sparte/models/for_export/ocsge_collectivite_cover_percent.sql

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,26 @@
11
{{ config(materialized="table") }}
22

3-
{% set surface_france = 543940.0 %} /* km2 */
3+
{% set surface_france = 641184 %}
4+
-- Source : https://fr.wikipedia.org/wiki/Superficie_de_la_France
45

5-
6-
with latest_millesimes_marked as (
7-
SELECT
8-
departement,
9-
index,
10-
row_number() over (partition by
11-
departement
12-
order by index desc
13-
) as rn
14-
15-
from {{ ref('millesimes') }}
16-
), surface_by_departements as (
176
SELECT
18-
latest_millesimes_marked.departement,
19-
departement.surface / 1000000.0 as surface
7+
departement.code as code,
8+
departement.name as name,
9+
departement.surface / 1000000.0 as surface_km2,
10+
departement.surface / 1000000.0 * 100 / {{ surface_france }} as percent_of_france,
11+
land_ocsge_status.has_ocsge
2012
FROM
21-
latest_millesimes_marked
13+
{{ ref('departement')}}
2214
LEFT JOIN
23-
{{ ref('departement')}} ON latest_millesimes_marked.departement = departement.code
24-
WHERE rn = 1
25-
)
15+
{{ ref('land_ocsge_status')}}
16+
ON land_ocsge_status.land_id = departement.code
17+
AND land_ocsge_status.land_type = 'DEPART'
18+
UNION
2619
SELECT
27-
round(sum(surface)::numeric, 2) as surface_couverte_par_ocsge,
28-
{{ surface_france }}::numeric as surface_france,
29-
round((sum(surface) / {{ surface_france }} * 100.0)::numeric, 2) as pourcentage_couvert_par_ocsge
30-
FROM
31-
surface_by_departements
20+
'976' as code,
21+
'Mayotte' as name,
22+
374.0 as surface_km2,
23+
374.0 * 100 / {{ surface_france }} as percent_of_france,
24+
false as has_ocsge
25+
ORDER BY
26+
code

airflow/include/sql/sparte/models/for_export/ocsge_surface_cover_percent.yml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,24 @@ version: 2
44
models:
55
- name: ocsge_surface_cover_percent
66
columns:
7-
- name: surface_france
7+
- name: code
88
data_tests:
9-
- not_null
10-
- name: pourcentage_couvert_par_ocsge
9+
- not_null
10+
- unique
11+
- has_all_departements
12+
- name: name
1113
data_tests:
12-
- not_null
13-
- is_percent_between_0_and_100
14-
- name: surface_couverte_par_ocsge
14+
- not_null
15+
- unique
16+
- name: surface_km2
1517
data_tests:
16-
- not_null
18+
- not_null
19+
- name: percent_of_france
20+
data_tests:
21+
- not_null
22+
- is_percent_between_0_and_100
23+
- name: has_ocsge
24+
data_tests:
25+
- not_null
26+
- accepted_values:
27+
values: [true, false]

0 commit comments

Comments
 (0)