Skip to content

Commit d4efb94

Browse files
authored
Merge pull request #1146 from MTES-MCT/fix-friche-enums
fix(friche): standardize enums
2 parents 8906302 + c3ae533 commit d4efb94

File tree

6 files changed

+35
-17
lines changed

6 files changed

+35
-17
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{% macro standardize_friche_type(friche_type) %}
2+
CASE
3+
WHEN {{ friche_type }} = 'friche cultuelle' THEN 'friche culturelle'
4+
ELSE {{ friche_type }}
5+
END
6+
{% endmacro %}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{% macro standardize_friche_zonage_environnemental(friche_zonage_environnemental) %}
2+
CASE
3+
WHEN {{ friche_zonage_environnemental }} = 'proximite_zone (reserves_naturelles)' THEN 'Proche d''une réserve naturelle'
4+
WHEN {{ friche_zonage_environnemental }} = 'reserve_naturelle' THEN 'Réserve naturelle'
5+
WHEN {{ friche_zonage_environnemental }} = 'natura_2000' THEN 'Natura 2000'
6+
WHEN {{ friche_zonage_environnemental }} = 'hors zone' THEN 'Hors zone'
7+
WHEN {{ friche_zonage_environnemental }} = 'znieff' THEN 'ZNIEFF'
8+
WHEN {{ friche_zonage_environnemental }} = 'proximite_zone (znieff)' THEN 'Proche d''une ZNIEFF'
9+
WHEN {{ friche_zonage_environnemental }} = 'proximite_zone (natura_2000)' THEN 'Proche d''une zone Natura 2000'
10+
ELSE {{ friche_zonage_environnemental }}
11+
END
12+
{% endmacro %}

airflow/include/sql/sparte/models/cartofriches/friche.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ with without_surface as (
1212
SELECT
1313
site_id,
1414
site_nom,
15-
site_type as friche_type,
15+
{{ standardize_friche_type('site_type') }} as friche_type,
1616
site_adresse,
1717
site_identif_date,
1818
site_actu_date,
@@ -82,7 +82,7 @@ SELECT
8282
monuhisto,
8383
monuhisto500,
8484
emprise_sol_bati,
85-
zonage_enviro as friche_zonage_environnemental,
85+
{{ standardize_friche_zonage_environnemental('zonage_enviro') }} as friche_zonage_environnemental,
8686
site_statut as friche_statut,
8787
long,
8888
lat,

airflow/include/sql/sparte/models/cartofriches/friche.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ models:
3737
- not_null
3838
- accepted_values:
3939
values: [
40-
'proximite_zone (reserves_naturelles)',
41-
'reserve_naturelle',
42-
'natura_2000',
43-
'hors zone',
44-
'znieff',
45-
'proximite_zone (znieff)',
46-
'proximite_zone (natura_2000)'
40+
"proche d''une réserve naturelle",
41+
"réserve naturelle",
42+
"natura 2000",
43+
"hors zone",
44+
"ZNIEFF",
45+
"proche d''une ZNIEFF",
46+
"proche d''une zone Natura 2000"
4747
]
4848
- name: friche_type_zone
4949
data_tests:
@@ -69,7 +69,7 @@ models:
6969
'autre',
7070
'mixte',
7171
'friche enseignement',
72-
'friche cultuelle', # TODO : faire retour à Cartofriches
72+
'friche culturelle',
7373
'inconnu',
7474
'friche portuaire',
7575
'friche carrière ou mine',

public_data/models/urbanisme/LandFricheType.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class FricheTypeChoices(models.TextChoices):
1616
AUTRE = ("autre",)
1717
MIXTE = ("mixte",)
1818
FRICHE_ENSEIGNEMENT = "friche enseignement"
19-
FRICHE_CULTURELLE = "friche cultuelle"
19+
FRICHE_CULTURELLE = "friche culturelle"
2020
INCONNU = "inconnu"
2121
FRICHE_PORTUAIRE = "friche portuaire"
2222
FRICHE_CARRIERE_MINE = "friche carrière ou mine"

public_data/models/urbanisme/LandFricheZonageEnvironnementale.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99

1010
class LandFricheZonageEnvironnementale(BaseLandFriche):
1111
class ZonageEnvironnementalChoices(models.TextChoices):
12-
PROXIMITE_ZONE_RESERVE_NATURELLE = "proximite_zone (reserves_naturelles)"
13-
RESERVE_NATURELLE = "reserve_naturelle"
14-
NATURA_2000 = "natura_2000"
12+
PROXIMITE_ZONE_RESERVE_NATURELLE = "proche d'une réserve naturelle"
13+
RESERVE_NATURELLE = "réserve naturelle"
14+
NATURA_2000 = "natura 2000"
1515
HORS_ZONE = "hors zone"
16-
ZNIEFF = "znieff"
17-
PROXIMITE_ZONE_ZNIEFF = "proximite_zone (znieff)"
18-
PROXIMITE_ZONE_NATURA_2000 = "proximite_zone (natura_2000)"
16+
ZNIEFF = "ZNIEFF"
17+
PROXIMITE_ZONE_ZNIEFF = "proche d'une ZNIEFF"
18+
PROXIMITE_ZONE_NATURA_2000 = "proche d'une zone Natura 2000"
1919

2020
friche_zonage_environnemental = models.CharField(choices=ZonageEnvironnementalChoices.choices)
2121

0 commit comments

Comments
 (0)