Skip to content

Commit

Permalink
Update for 2025
Browse files Browse the repository at this point in the history
  • Loading branch information
metaodi committed Jan 2, 2025
1 parent cc9da05 commit b59dc3b
Show file tree
Hide file tree
Showing 16 changed files with 42 additions and 40 deletions.
4 changes: 2 additions & 2 deletions config/regions/adliswil.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
region: adliswil
start_date: 2024-01-01
end_date: 2024-12-31
start_date: 2025-01-01
end_date: 2025-12-31

collections:
cardboard: ~
Expand Down
4 changes: 2 additions & 2 deletions config/regions/basel.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
region: basel
start_date: 2024-01-01
end_date: 2024-12-31
start_date: 2025-01-01
end_date: 2025-12-31

collections:
bulky_goods: ~
Expand Down
4 changes: 2 additions & 2 deletions config/regions/duebendorf.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
region: duebendorf
start_date: 2024-01-01
end_date: 2024-12-31
start_date: 2025-01-01
end_date: 2025-12-31
zip: 8600

collections:
Expand Down
4 changes: 2 additions & 2 deletions config/regions/horgen.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
region: horgen
start_date: 2024-01-01
end_date: 2024-12-31
start_date: 2025-01-01
end_date: 2025-12-31

collections:
cardboard: ~
Expand Down
4 changes: 2 additions & 2 deletions config/regions/kilchberg.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
region: kilchberg
start_date: 2024-01-01
end_date: 2024-12-31
start_date: 2025-01-01
end_date: 2025-12-31

collections:
cardboard: ~
Expand Down
4 changes: 2 additions & 2 deletions config/regions/langnau.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
region: langnau
start_date: 2024-01-01
end_date: 2024-12-31
start_date: 2025-01-01
end_date: 2025-12-31

collections:
cardboard: ~
Expand Down
4 changes: 2 additions & 2 deletions config/regions/oberrieden.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
region: oberrieden
start_date: 2024-01-01
end_date: 2024-12-31
start_date: 2025-01-01
end_date: 2025-12-31

collections:
cardboard: ~
Expand Down
4 changes: 2 additions & 2 deletions config/regions/richterswil.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
region: richterswil
start_date: 2024-01-01
end_date: 2024-12-31
start_date: 2025-01-01
end_date: 2025-12-31

collections:
cardboard: ~
Expand Down
4 changes: 2 additions & 2 deletions config/regions/rueschlikon.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
region: rueschlikon
start_date: 2024-01-01
end_date: 2024-12-31
start_date: 2025-01-01
end_date: 2025-12-31

collections:
cardboard: ~
Expand Down
4 changes: 2 additions & 2 deletions config/regions/stgallen.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
region: stgallen
start_date: 2024-01-01
end_date: 2024-06-30
start_date: 2025-01-01
end_date: 2025-06-30

collections:
cardboard: ~
Expand Down
4 changes: 2 additions & 2 deletions config/regions/thalwil.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
region: thalwil
start_date: 2024-01-01
end_date: 2024-12-31
start_date: 2025-01-01
end_date: 2025-12-31

collections:
cardboard: ~
Expand Down
5 changes: 3 additions & 2 deletions config/regions/uster.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
region: uster
start_date: 2024-01-01
end_date: 2024-12-31
start_date: 2025-01-01
end_date: 2025-12-31

collections:
cardboard: ~
Expand All @@ -9,3 +9,4 @@ collections:
paper: ~
special: ~
waste: ~
chipping_service: ~
4 changes: 2 additions & 2 deletions config/regions/waedenswil.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
region: waedenswil
start_date: 2024-01-01
end_date: 2024-12-31
start_date: 2025-01-01
end_date: 2025-12-31

collections:
cardboard: ~
Expand Down
4 changes: 2 additions & 2 deletions config/regions/zurich.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
region: zurich
start_date: 2024-01-01
end_date: 2024-12-31
start_date: 2025-01-01
end_date: 2025-12-31

collections:
cardboard: ~
Expand Down
16 changes: 8 additions & 8 deletions csv/duebendorf/duebendorf.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,30 +31,28 @@

source = [
{
'url': 'https://www.duebendorf.ch/_doc/4777654',
'url': 'https://www.duebendorf.ch/_doc/5447728',
'area': '1',
},
{
'url': 'https://www.duebendorf.ch/_doc/4777657',
'url': 'https://www.duebendorf.ch/_doc/5447731',
'area': '2',
},
{
'url': 'https://www.duebendorf.ch/_doc/4777660',
'url': 'https://www.duebendorf.ch/_doc/5447734',
'area': '3',
},
{
'url': 'https://www.duebendorf.ch/_doc/4777663',
'url': 'https://www.duebendorf.ch/_doc/5447737',
'area': '4',
},
{ # Separater Karton-Kalender, da Karton im Kreis 4 oben fehlt
'url': 'https://www.duebendorf.ch/_doc/4777642',
'area': '4',
}
]

waste_type_map = {
'Kehricht': 'waste',
'Grüngut': 'organic',
'Gruengut': 'organic',
'Gr ngut': 'organic',
'Papier': 'paper',
'Karton': 'cardboard',
'Sonderabfallmobil': 'special',
Expand All @@ -70,6 +68,8 @@
'Hauptsammelstelle geschlossen',
'Hauptsammelstelle Nachmittag geschlossen',
'Hauptsammelstelle Vormittag geöffnet',
'Hauptsammelstelle Vormittag ge ffnet',
'Hauptsammelstelle',
'Kompostabgabe',
]

Expand Down
9 changes: 5 additions & 4 deletions csv/uster/uster.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@

source = {
'1': {
'url': 'https://www.uster.ch/_doc/4890898',
'url': 'https://www.uster.ch/_doc/5435044',
},
'2': {
'url': 'https://www.uster.ch/_doc/4890901',
'url': 'https://www.uster.ch/_doc/5435053',
},
'3': {
'url': 'https://www.uster.ch/_doc/4890907',
'url': 'https://www.uster.ch/_doc/5435059',
},
'4': {
'url': 'https://www.uster.ch/_doc/4890910',
'url': 'https://www.uster.ch/_doc/5435104',
},
}

Expand All @@ -55,6 +55,7 @@
'Karton': 'cardboard',
'Sonderabfallsammlung': 'special',
'Sonderabfall': 'special',
'Häcksel': 'chipping_service',
}

def waste_type(in_type):
Expand Down

0 comments on commit b59dc3b

Please sign in to comment.