Skip to content

Commit db2991b

Browse files
committed
Add 5 columns to districts
1 parent 2a3cb5d commit db2991b

File tree

3 files changed

+105
-1
lines changed

3 files changed

+105
-1
lines changed
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Generated by Django 4.2.16 on 2024-11-28 09:46
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
("api", "0215_alter_generaldocument_document_and_more"),
10+
]
11+
12+
operations = [
13+
migrations.AddField(
14+
model_name="district",
15+
name="emma_id",
16+
field=models.CharField(blank=True, help_text="Meteoalarm EMMA_ID", max_length=10, null=True, verbose_name="emma_id"),
17+
),
18+
migrations.AddField(
19+
model_name="district",
20+
name="fips_code",
21+
field=models.PositiveIntegerField(blank=True, help_text="USA FIPS Code", null=True, verbose_name="fips_code"),
22+
),
23+
migrations.AddField(
24+
model_name="district",
25+
name="nuts1",
26+
field=models.CharField(
27+
blank=True,
28+
help_text="Nomenclature of Territorial Units for Statistics 1",
29+
max_length=3,
30+
null=True,
31+
verbose_name="nuts1",
32+
),
33+
),
34+
migrations.AddField(
35+
model_name="district",
36+
name="nuts2",
37+
field=models.CharField(
38+
blank=True,
39+
help_text="Nomenclature of Territorial Units for Statistics 2",
40+
max_length=4,
41+
null=True,
42+
verbose_name="nuts2",
43+
),
44+
),
45+
migrations.AddField(
46+
model_name="district",
47+
name="nuts3",
48+
field=models.CharField(
49+
blank=True,
50+
help_text="Nomenclature of Territorial Units for Statistics 3",
51+
max_length=5,
52+
null=True,
53+
verbose_name="nuts3",
54+
),
55+
),
56+
]

api/models.py

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,29 @@ class District(models.Model):
298298
wb_year = models.CharField(
299299
verbose_name=_("WB year"), max_length=4, null=True, blank=True, help_text=_("population data year from WB API")
300300
)
301+
nuts1 = models.CharField(
302+
verbose_name=_("nuts1"),
303+
max_length=3,
304+
blank=True,
305+
null=True,
306+
help_text=_("Nomenclature of Territorial Units for Statistics 1"),
307+
)
308+
nuts2 = models.CharField(
309+
verbose_name=_("nuts2"),
310+
max_length=4,
311+
blank=True,
312+
null=True,
313+
help_text=_("Nomenclature of Territorial Units for Statistics 2"),
314+
)
315+
nuts3 = models.CharField(
316+
verbose_name=_("nuts3"),
317+
max_length=5,
318+
blank=True,
319+
null=True,
320+
help_text=_("Nomenclature of Territorial Units for Statistics 3"),
321+
)
322+
emma_id = models.CharField(verbose_name=_("emma_id"), max_length=10, blank=True, null=True, help_text=_("Meteoalarm EMMA_ID"))
323+
fips_code = models.PositiveIntegerField(verbose_name=_("fips_code"), blank=True, null=True, help_text=_("USA FIPS Code"))
301324

302325
class Meta:
303326
ordering = ("code",)

api/serializers.py

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,22 @@ class DistrictSerializer(ModelSerializer):
332332

333333
class Meta:
334334
model = District
335-
fields = ("name", "code", "country", "id", "is_deprecated", "bbox", "centroid", "wb_population", "wb_year")
335+
fields = (
336+
"name",
337+
"code",
338+
"country",
339+
"id",
340+
"is_deprecated",
341+
"bbox",
342+
"centroid",
343+
"wb_population",
344+
"wb_year",
345+
"nuts1",
346+
"nuts2",
347+
"nuts3",
348+
"emma_id",
349+
"fips_code",
350+
)
336351

337352
@staticmethod
338353
def get_bbox(district) -> dict:
@@ -387,6 +402,11 @@ class MiniDistrictGeoSerializer(GeoSerializerMixin, ModelSerializer):
387402
country_name = serializers.CharField(source="country.name", read_only=True)
388403
country_iso = serializers.CharField(source="country.iso", read_only=True)
389404
country_iso3 = serializers.CharField(source="country.iso3", read_only=True)
405+
nuts1 = serializers.CharField(read_only=True)
406+
nuts2 = serializers.CharField(read_only=True)
407+
nuts3 = serializers.CharField(read_only=True)
408+
emma_id = serializers.CharField(read_only=True)
409+
fips_code = serializers.IntegerField(read_only=True)
390410

391411
@staticmethod
392412
def get_bbox(district) -> Union[dict, None]:
@@ -417,6 +437,11 @@ class Meta:
417437
"is_deprecated",
418438
"wb_population",
419439
"wb_year",
440+
"nuts1",
441+
"nuts2",
442+
"nuts3",
443+
"emma_id",
444+
"fips_code",
420445
)
421446

422447

0 commit comments

Comments
 (0)